1758 files changed, 9472 insertions, 83876 deletions

diff --git a/Makefile.am.in b/Makefile.am.in
index 9cea71b0..0c9215c4 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -11,7 +11,7 @@
 COMPILE_AFTER_libkmime = libemailfunctions
 COMPILE_AFTER_libemailfunctions = libkcal libkpimidentities kmail korganizer
 COMPILE_AFTER_libkholidays = korganizer kontact
-COMPILE_AFTER_libkcal = kalarm kitchensync konsolekalendar korganizer libkpimexchange kpilot libkdepim karm knotes kresources kfile-plugins
+COMPILE_AFTER_libkcal = kalarm kitchensync konsolekalendar korganizer libkpimexchange libkdepim karm knotes kresources kfile-plugins
 COMPILE_AFTER_mimelib = korn kmail
 COMPILE_AFTER_libkdenetwork = kmail knode
 COMPILE_AFTER_libksieve = kmail
diff --git a/akregator/src/Makefile.am b/akregator/src/Makefile.am
index f146b486..45d0d964 100644
--- a/akregator/src/Makefile.am
+++ b/akregator/src/Makefile.am
@@ -146,7 +146,7 @@ libakregatorpart_la_SOURCES = \
 	kspeech.stub
 
 libakregatorpart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(LIB_KUTILS) -avoid-version -no-undefined $(all_libraries)
-libakregatorpart_la_LIBADD = libakregatorprivate.la 
+libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KHTML) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libkdepim -lkdepim
 
 # this is where the desktop file will go
 partdesktopdir = $(kde_servicesdir)
diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp
index c22e8418..18523993 100644
--- a/akregator/src/actionmanagerimpl.cpp
+++ b/akregator/src/actionmanagerimpl.cpp
@@ -148,7 +148,7 @@ void ActionManagerImpl::slotUpdateTagActions(bool enabled, const TQStringList& t
 
         for (TQValueList<TagAction*>::ConstIterator it = actions.begin(); it != actions.end(); ++it)
         {
-            (*it)->setChecked(tagIds.contains((*it)->tag().id()));
+            (*it)->setChecked(tagIds.tqcontains((*it)->tag().id()));
         }
     }
 }
@@ -197,7 +197,7 @@ void ActionManagerImpl::slotTagAdded(const Tag& tag)
     if (!Settings::showTaggingGUI())
         return;
 
-    if (!d->tagActions.contains(tag.id()))
+    if (!d->tagActions.tqcontains(tag.id()))
     {
         d->tagActions[tag.id()] = new TagAction(tag, d->view, TQT_SLOT(slotAssignTag(const Tag&, bool)), d->tagMenu);
         d->tagMenu->insert(d->tagActions[tag.id()]);
diff --git a/akregator/src/addfeedwidgetbase.ui b/akregator/src/addfeedwidgetbase.ui
index 6b55d5fb..09c10fa4 100644
--- a/akregator/src/addfeedwidgetbase.ui
+++ b/akregator/src/addfeedwidgetbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>AddFeedWidget</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -24,7 +24,7 @@
         </property>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>layout16</cstring>
+                <cstring>tqlayout16</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -56,7 +56,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -65,7 +65,7 @@
                 </spacer>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout15</cstring>
+                        <cstring>tqlayout15</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -75,7 +75,7 @@
                             <property name="name">
                                 <cstring>urlEdit</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>200</width>
                                     <height>0</height>
@@ -128,7 +128,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
@@ -137,7 +137,7 @@
         </spacer>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>ksqueezedtextlabel.h</includehint>
diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index 449b871e..aafb17be 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -116,7 +116,7 @@ class Part::ApplyFiltersInterceptor : public ArticleInterceptor
     }
 };
 
-Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
+Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/,
                               TQObject *parent, const char *name, const TQStringList& )
     : DCOPObject("AkregatorIface")
        , MyBasePart(parent, name)
@@ -168,7 +168,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
     {
         m_storage = Backend::StorageFactoryRegistry::self()->getFactory("dummy")->createStorage(storageParams);
 
-        KMessageBox::error(parentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").arg(Settings::archiveBackend()), i18n("Plugin error") );
+        KMessageBox::error(tqparentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").arg(Settings::archiveBackend()), i18n("Plugin error") );
     }
 
     Filters::ArticleFilterList list;
@@ -187,14 +187,14 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
     m_actionManager = new ActionManagerImpl(this);
     ActionManager::setInstance(m_actionManager);
 
-    m_view = new Akregator::View(this, parentWidget, m_actionManager, "akregator_view");
+    m_view = new Akregator::View(this, tqparentWidget, m_actionManager, "akregator_view");
     m_actionManager->initView(m_view);
     m_actionManager->setTagSet(Kernel::self()->tagSet());
 
     m_extension = new BrowserExtension(this, "ak_extension");
 
     connect(m_view, TQT_SIGNAL(setWindowCaption(const TQString&)), this, TQT_SIGNAL(setWindowCaption(const TQString&)));
-    connect(m_view, TQT_SIGNAL(setStatusBarText(const TQString&)), this, TQT_SIGNAL(setStatusBarText(const TQString&)));
+    connect(m_view, TQT_SIGNAL(seStatusBarText(const TQString&)), this, TQT_SIGNAL(seStatusBarText(const TQString&)));
     connect(m_view, TQT_SIGNAL(setProgress(int)), m_extension, TQT_SIGNAL(loadingProgress(int)));
     connect(m_view, TQT_SIGNAL(signalCanceled(const TQString&)), this, TQT_SIGNAL(canceled(const TQString&)));
     connect(m_view, TQT_SIGNAL(signalStarted(KIO::Job*)), this, TQT_SIGNAL(started(KIO::Job*)));
@@ -428,7 +428,7 @@ bool Part::openFile()
 
             if (file.size() > 0) // don't backup empty files 
             {
-                TQString backup = m_file + "-backup." +  TQString::number(TQDateTime::currentDateTime().toTime_t());
+                TQString backup = m_file + "-backup." +  TQString::number(TQDateTime::tqcurrentDateTime().toTime_t());
         
                 copyFile(backup);
         
@@ -444,7 +444,7 @@ bool Part::openFile()
     {
         if (file.size() > 0) // don't backup empty files 
         {
-            TQString backup = m_file + "-backup." +  TQString::number(TQDateTime::currentDateTime().toTime_t());
+            TQString backup = m_file + "-backup." +  TQString::number(TQDateTime::tqcurrentDateTime().toTime_t());
             copyFile(backup);
 
             KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (no valid OPML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("OPML Parsing Error") );
@@ -522,7 +522,7 @@ bool Part::mergePart(KParts::Part* part)
         {
           if (m_mergedPart) {
             factory()->removeClient(m_mergedPart);
-            if (childClients()->containsRef(m_mergedPart))
+            if (childClients()->tqcontainsRef(m_mergedPart))
               removeChildClient(m_mergedPart);
           }
           if (part)
@@ -538,7 +538,7 @@ TQWidget* Part::getMainWindow()
 {
     // this is a dirty fix to get the main window used for the tray icon
     
-    TQWidgetList *l = kapp->topLevelWidgets();
+    TQWidgetList *l = kapp->tqtopLevelWidgets();
     TQWidgetListIt it( *l );
     TQWidget *wid;
 
@@ -823,7 +823,7 @@ KParts::Part* Part::hitTest(TQWidget *widget, const TQPoint &globalPos)
         if (!widget) {
             break;
         }
-        widget = widget->parentWidget();
+        widget = widget->tqparentWidget();
     }
     if (m_view && m_view->currentFrame() && child) {
         return m_view->currentFrame()->part();
@@ -979,8 +979,8 @@ bool Part::tryToLock(const TQString& backendName)
                         "You should disable the archive for now "
                         "unless you are sure that %2 is not already running.</qt>")
                         .arg( programName, programName, backendName );
-              // TQString::arg( st ) only replaces the first occurrence of %1
-              // with st while TQString::arg( s1, s2 ) replacess all occurrences
+              // TQString::arg( st ) only tqreplaces the first occurrence of %1
+              // with st while TQString::arg( s1, s2 ) tqreplacess all occurrences
               // of %1 with s1 and all occurrences of %2 with s2. So don't
               // even think about changing the above to .arg( programName ).
             else
diff --git a/akregator/src/akregator_part.h b/akregator/src/akregator_part.h
index 3b0ec30e..487b001d 100644
--- a/akregator/src/akregator_part.h
+++ b/akregator/src/akregator_part.h
@@ -80,7 +80,7 @@ namespace Akregator
            typedef MyBasePart inherited;
 
             /** Default constructor.*/
-            Part(TQWidget *parentWidget, const char *widgetName,
+            Part(TQWidget *tqparentWidget, const char *widgetName,
                           TQObject *parent, const char *name, const TQStringList&);
 
 	        /** Destructor. */
diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp
index 8776ec12..59457286 100644
--- a/akregator/src/akregator_view.cpp
+++ b/akregator/src/akregator_view.cpp
@@ -366,7 +366,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
 
     if (!Settings::resetQuickFilterOnNodeChange())
     {
-        m_searchBar->slotSetStatus(Settings::statusFilter());
+        m_searchBar->slotSeStatus(Settings::statusFilter());
         m_searchBar->slotSetText(Settings::textFilter());
     }
 
@@ -411,10 +411,10 @@ void View::slotOnShutdown()
 void View::saveSettings()
 {
     const TQValueList<int> spl1 = m_horizontalSplitter->sizes();
-    if ( spl1.contains( 0 ) == 0 )
+    if ( spl1.tqcontains( 0 ) == 0 )
         Settings::setSplitter1Sizes( spl1 );
     const TQValueList<int> spl2 = m_articleSplitter->sizes();
-    if ( spl2.contains( 0 ) == 0 )
+    if ( spl2.tqcontains( 0 ) == 0 )
         Settings::setSplitter2Sizes( spl2 );
     Settings::setViewMode( m_viewMode );
     Settings::writeConfig();
@@ -457,7 +457,7 @@ void View::setTabIcon(const TQPixmap& icon)
 
 void View::connectFrame(Frame *f)
 {
-    connect(f, TQT_SIGNAL(statusText(const TQString &)), this, TQT_SLOT(slotStatusText(const TQString&)));
+    connect(f, TQT_SIGNAL(statusText(const TQString &)), this, TQT_SLOT(sloStatusText(const TQString&)));
     connect(f, TQT_SIGNAL(captionChanged (const TQString &)), this, TQT_SLOT(slotCaptionChanged (const TQString &)));
     connect(f, TQT_SIGNAL(loadingProgress(int)), this, TQT_SLOT(slotLoadingProgress(int)) );
     connect(f, TQT_SIGNAL(started()), this, TQT_SLOT(slotStarted()));
@@ -465,10 +465,10 @@ void View::connectFrame(Frame *f)
     connect(f, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCanceled(const TQString&)));
 }
 
-void View::slotStatusText(const TQString &c)
+void View::sloStatusText(const TQString &c)
 {
     if (sender() == m_currentFrame)
-        emit setStatusBarText(c);
+        emit seStatusBarText(c);
 }
 
 void View::slotCaptionChanged(const TQString &c)
@@ -570,7 +570,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* parent)
             // create a tag for every tag ID in the archive that is not part of the tagset
             // this is a fallback in case the tagset was corrupted,
             // so the tagging information from archive does not get lost.
-            if (!tagSet->containsID(*it))
+            if (!tagSet->tqcontainsID(*it))
             {
                 Tag tag(*it, *it);
                 tagSet->insert(tag);
@@ -690,7 +690,7 @@ void View::slotFrameChanged(Frame *f)
 
     emit setWindowCaption(f->caption());
     emit setProgress(f->progress());
-    emit setStatusBarText(f->statusText());
+    emit seStatusBarText(f->statusText());
 
     if (f->part() == m_part)
         m_part->mergePart(m_articleViewer);
@@ -1070,14 +1070,14 @@ void View::slotFetchingStarted()
 {
     m_mainFrame->setState(Frame::Started);
     m_actionManager->action("feed_stop")->setEnabled(true);
-    m_mainFrame->setStatusText(i18n("Fetching Feeds..."));
+    m_mainFrame->seStatusText(i18n("Fetching Feeds..."));
 }
 
 void View::slotFetchingStopped()
 {
     m_mainFrame->setState(Frame::Completed);
     m_actionManager->action("feed_stop")->setEnabled(false);
-    m_mainFrame->setStatusText(TQString::null);
+    m_mainFrame->seStatusText(TQString::null);
 }
 
 void View::slotFeedFetched(Feed *feed)
@@ -1152,7 +1152,7 @@ void View::slotNewTag()
 
 void View::slotTagCreated(const Tag& tag)
 {
-    if (m_tagNodeList && !m_tagNodeList->containsTagId(tag.id()))
+    if (m_tagNodeList && !m_tagNodeList->tqcontainsTagId(tag.id()))
     {
         TagNode* tagNode = new TagNode(tag, m_feedList->rootNode());
         m_tagNodeList->rootNode()->appendChild(tagNode);
@@ -1186,7 +1186,7 @@ void View::slotArticleSelected(const Article& article)
             if (delay > 0)
                 m_markReadTimer->start( delay*1000, true );
             else
-                a.setStatus(Article::Read);
+                a.seStatus(Article::Read);
         }
     }
 
@@ -1329,7 +1329,7 @@ void View::slotArticleDelete()
         for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
         {
             Feed* feed = (*it).feed();
-            if (!feeds.contains(feed))
+            if (!feeds.tqcontains(feed))
                 feeds.append(feed);
             feed->setNotificationMode(false);
             (*it).setDeleted();
@@ -1370,7 +1370,7 @@ void View::slotSetSelectedArticleRead()
         return;
 
     for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
-        (*it).setStatus(Article::Read);
+        (*it).seStatus(Article::Read);
 }
 
 void View::slotTextToSpeechRequest()
@@ -1408,7 +1408,7 @@ void View::slotSetSelectedArticleUnread()
         return;
 
     for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
-        (*it).setStatus(Article::Unread);
+        (*it).seStatus(Article::Unread);
 }
 
 void View::slotSetSelectedArticleNew()
@@ -1419,7 +1419,7 @@ void View::slotSetSelectedArticleNew()
         return;
 
     for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
-        (*it).setStatus(Article::New);
+        (*it).seStatus(Article::New);
 }
 
 void View::slotSetCurrentArticleReadDelayed()
@@ -1429,7 +1429,7 @@ void View::slotSetCurrentArticleReadDelayed()
     if (article.isNull())
         return;
 
-    article.setStatus(Article::Read);
+    article.seStatus(Article::Read);
 }
 
 void View::slotMouseOverInfo(const KFileItem *kifi)
@@ -1437,11 +1437,11 @@ void View::slotMouseOverInfo(const KFileItem *kifi)
     if (kifi)
     {
         KFileItem *k=(KFileItem*)kifi;
-        m_mainFrame->setStatusText(k->url().prettyURL());//getStatusBarInfo());
+        m_mainFrame->seStatusText(k->url().prettyURL());//geStatusBarInfo());
     }
     else
     {
-        m_mainFrame->setStatusText(TQString::null);
+        m_mainFrame->seStatusText(TQString::null);
     }
 }
 
@@ -1453,7 +1453,7 @@ void View::readProperties(KConfig* config)
         m_searchBar->slotSetText(config->readEntry("searchLine"));
         int statusfilter = config->readNumEntry("searchCombo", -1);
         if (statusfilter != -1)
-            m_searchBar->slotSetStatus(statusfilter);
+            m_searchBar->slotSeStatus(statusfilter);
     }
 
     int selectedID = config->readNumEntry("selectedNodeID", -1);
@@ -1529,7 +1529,7 @@ void View::updateTagActions()
         TQStringList atags = (*it).tags();
         for (TQStringList::ConstIterator it2 = atags.begin(); it2 != atags.end(); ++it2)
         {
-            if (!tags.contains(*it2))
+            if (!tags.tqcontains(*it2))
                 tags += *it2;
         }
     }
diff --git a/akregator/src/akregator_view.h b/akregator/src/akregator_view.h
index cb3e032c..4b9dcd13 100644
--- a/akregator/src/akregator_view.h
+++ b/akregator/src/akregator_view.h
@@ -83,7 +83,7 @@ namespace Akregator {
         public:
 
             /** constructor
-            @param part the Akregator::Part which contains this widget
+            @param part the Akregator::Part which tqcontains this widget
             @param parent parent widget
             @param Actionmanager for this view
             @param name the name of the widget (@ref TQWidget )
@@ -104,7 +104,7 @@ namespace Akregator {
             bool importFeeds(const TQDomDocument& doc);
 
             /** Parse OPML presentation of feeds and read in articles archive, if present. If @c parent is @c NULL, the current
-            feed list is replaced by the parsed one
+            feed list is tqreplaced by the parsed one
              @param doc TQDomDocument generated from OPML
              @param parent The parent group the new nodes */
             bool loadFeeds(const TQDomDocument& doc, Folder* parent = 0);
@@ -133,7 +133,7 @@ namespace Akregator {
             void signalUnreadCountChanged(int);
 
             void setWindowCaption(const TQString&);
-            void setStatusBarText(const TQString&);
+            void seStatusBarText(const TQString&);
             void setProgress(int);
             void signalStarted(KIO::Job*);
             void signalCompleted();
@@ -195,7 +195,7 @@ namespace Akregator {
             void slotMouseOverInfo(const KFileItem *kifi);
 
             /** sets the status bar text to a given string */
-	        void slotStatusText(const TQString &);
+	        void sloStatusText(const TQString &);
 
             void slotStarted();
             void slotCanceled(const TQString &);
diff --git a/akregator/src/article.cpp b/akregator/src/article.cpp
index 75d3f787..09f631a0 100644
--- a/akregator/src/article.cpp
+++ b/akregator/src/article.cpp
@@ -102,14 +102,14 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
 
     d->guid = article.guid();
     
-    if (!d->archive->contains(d->guid))
+    if (!d->archive->tqcontains(d->guid))
     {
         d->archive->addEntry(d->guid);
 
         if (article.meta("deleted") == "true") 
         { // if article is in deleted state, we just add the status and omit the rest
             d->status = Private::Read | Private::Deleted;
-            d->archive->setStatus(d->guid, d->status);
+            d->archive->seStatus(d->guid, d->status);
         }
         else
         { // article is not deleted, let's add it to the archive
@@ -123,7 +123,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
             d->archive->setCommentsLink(d->guid, article.commentsLink().url());
             d->archive->setGuidIsPermaLink(d->guid, article.guidIsPermaLink());
             d->archive->setGuidIsHash(d->guid, article.meta("guidIsHash") == "true");
-            d->pubDate = article.pubDate().isValid() ? article.pubDate() : TQDateTime::currentDateTime();
+            d->pubDate = article.pubDate().isValid() ? article.pubDate() : TQDateTime::tqcurrentDateTime();
             d->archive->setPubDate(d->guid, d->pubDate.toTime_t());
             d->archive->setAuthor(d->guid, article.author());
                         
@@ -157,7 +157,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
                 int statusInt = status.toInt();
                 if (statusInt == New)
                     statusInt = Unread;
-                setStatus(statusInt);
+                seStatus(statusInt);
             }
             setKeep(article.meta("keep") == "true");
         }
@@ -210,9 +210,9 @@ void Article::setDeleted()
     if (isDeleted())
         return;
   
-    setStatus(Read);
+    seStatus(Read);
     d->status = Private::Deleted | Private::Read;
-    d->archive->setStatus(d->guid, d->status);
+    d->archive->seStatus(d->guid, d->status);
     d->archive->setDeleted(d->guid);
 
     if (d->feed)
@@ -299,7 +299,7 @@ int Article::status() const
         return Unread;
 }
 
-void Article::setStatus(int stat)
+void Article::seStatus(int stat)
 {
     // use status() rather than statusBits() here to filter out status flags that we are not
     // interested in
@@ -319,7 +319,7 @@ void Article::setStatus(int stat)
                 d->status = ( d->status | Private::New) & ~Private::Read;
                 break;
         }
-        d->archive->setStatus(d->guid, d->status);
+        d->archive->seStatus(d->guid, d->status);
         if (d->feed)
             d->feed->setArticleChanged(*this, oldStatus);
      }
@@ -404,7 +404,7 @@ RSS::Enclosure Article::enclosure() const
 void Article::setKeep(bool keep)
 {
     d->status = keep ? ( statusBits() | Private::Keep) : ( statusBits() & ~Private::Keep);
-    d->archive->setStatus(d->guid, d->status);
+    d->archive->seStatus(d->guid, d->status);
     if (d->feed)
         d->feed->setArticleChanged(*this);
 }
@@ -425,7 +425,7 @@ void Article::removeTag(const TQString& tag)
 
 bool Article::hasTag(const TQString& tag) const
 {
-    return d->archive->tags(d->guid).contains(tag);
+    return d->archive->tags(d->guid).tqcontains(tag);
 }
 
 TQStringList Article::tags() const
@@ -457,7 +457,7 @@ TQString Article::buildTitle(const TQString& description)
     if (i != -1)
         s = s.left(i+1);
     TQRegExp rx("(<([^\\s>]*)(?:[^>]*)>)[^<]*", false);
-    TQString tagName, toReplace, replaceWith;
+    TQString tagName, toReplace, tqreplaceWith;
     while (rx.search(s) != -1 )
     {
         tagName=rx.cap(2);
@@ -466,11 +466,11 @@ TQString Article::buildTitle(const TQString& description)
         else if (tagName.startsWith("br") || tagName.startsWith("BR"))
         {
             toReplace=rx.cap(1);
-            replaceWith=" ";
+            tqreplaceWith=" ";
         }
         else
             toReplace=rx.cap(1);  // strip just tag
-        s=s.replace(s.find(toReplace),toReplace.length(),replaceWith); // do the deed
+        s=s.tqreplace(s.find(toReplace),toReplace.length(),tqreplaceWith); // do the deed
     }
     if (s.length()> 90)
         s=s.left(90)+"...";
diff --git a/akregator/src/article.h b/akregator/src/article.h
index e9dae588..4b4d480e 100644
--- a/akregator/src/article.h
+++ b/akregator/src/article.h
@@ -80,7 +80,7 @@ namespace Akregator
             bool isNull() const;
             
             int status() const;
-            void setStatus(int s);
+            void seStatus(int s);
 
             void offsetPubDate(int secs);
 
diff --git a/akregator/src/articlefilter.cpp b/akregator/src/articlefilter.cpp
index a8bf8a36..065a421a 100644
--- a/akregator/src/articlefilter.cpp
+++ b/akregator/src/articlefilter.cpp
@@ -43,35 +43,35 @@ TQString Criterion::subjectToString(Subject subj)
     switch (subj)
     {
         case Title:
-            return TQString::fromLatin1("Title");
+            return TQString::tqfromLatin1("Title");
         case Link:
-            return TQString::fromLatin1("Link");
+            return TQString::tqfromLatin1("Link");
         case Author:
-            return TQString::fromLatin1("Author");
+            return TQString::tqfromLatin1("Author");
         case Description:
-            return TQString::fromLatin1("Description");
+            return TQString::tqfromLatin1("Description");
         case Status:
-            return TQString::fromLatin1("Status");
+            return TQString::tqfromLatin1("Status");
         case KeepFlag:
-            return TQString::fromLatin1("KeepFlag");
+            return TQString::tqfromLatin1("KeepFlag");
         default: // should never happen (TM)
-            return TQString::fromLatin1("Description");
+            return TQString::tqfromLatin1("Description");
     }
 }
 
 Criterion::Subject Criterion::stringToSubject(const TQString& subjStr)
 {
-    if (subjStr == TQString::fromLatin1("Title"))
+    if (subjStr == TQString::tqfromLatin1("Title"))
         return Title;
-    else if (subjStr == TQString::fromLatin1("Link"))
+    else if (subjStr == TQString::tqfromLatin1("Link"))
         return Link;
-    else if (subjStr == TQString::fromLatin1("Description"))
+    else if (subjStr == TQString::tqfromLatin1("Description"))
         return Description;
-    else if (subjStr == TQString::fromLatin1("Author"))
+    else if (subjStr == TQString::tqfromLatin1("Author"))
         return Author;
-    else if (subjStr == TQString::fromLatin1("Status"))
+    else if (subjStr == TQString::tqfromLatin1("Status"))
         return Status;
-    else if (subjStr == TQString::fromLatin1("KeepFlag"))
+    else if (subjStr == TQString::tqfromLatin1("KeepFlag"))
         return KeepFlag;
 
     // hopefully never reached
@@ -83,27 +83,27 @@ TQString Criterion::predicateToString(Predicate pred)
     switch (pred)
     {
         case Contains:
-            return TQString::fromLatin1("Contains");
+            return TQString::tqfromLatin1("Contains");
         case Equals:
-            return TQString::fromLatin1("Equals");
+            return TQString::tqfromLatin1("Equals");
         case Matches:
-            return TQString::fromLatin1("Matches");
+            return TQString::tqfromLatin1("Matches");
         case Negation:
-            return TQString::fromLatin1("Negation");
+            return TQString::tqfromLatin1("Negation");
         default:// hopefully never reached
-            return TQString::fromLatin1("Contains");
+            return TQString::tqfromLatin1("Contains");
     }
 }
 
 Criterion::Predicate Criterion::stringToPredicate(const TQString& predStr)
 {
-    if (predStr == TQString::fromLatin1("Contains"))
+    if (predStr == TQString::tqfromLatin1("Contains"))
         return Contains;
-    else if (predStr == TQString::fromLatin1("Equals"))
+    else if (predStr == TQString::tqfromLatin1("Equals"))
         return Equals;
-    else if (predStr == TQString::fromLatin1("Matches"))
+    else if (predStr == TQString::tqfromLatin1("Matches"))
         return Matches;
-    else if (predStr == TQString::fromLatin1("Negation"))
+    else if (predStr == TQString::tqfromLatin1("Negation"))
         return Negation;
     
     // hopefully never reached
@@ -124,24 +124,24 @@ Criterion::Criterion( Subject subject, Predicate predicate, const TQVariant &obj
 
 void Criterion::writeConfig(KConfig* config) const
 {
-    config->writeEntry(TQString::fromLatin1("subject"), subjectToString(m_subject));
+    config->writeEntry(TQString::tqfromLatin1("subject"), subjectToString(m_subject));
 
-    config->writeEntry(TQString::fromLatin1("predicate"), predicateToString(m_predicate));
+    config->writeEntry(TQString::tqfromLatin1("predicate"), predicateToString(m_predicate));
 
-    config->writeEntry(TQString::fromLatin1("objectType"), TQString(m_object.typeName()));
+    config->writeEntry(TQString::tqfromLatin1("objectType"), TQString(m_object.typeName()));
 
-    config->writeEntry(TQString::fromLatin1("objectValue"), m_object);
+    config->writeEntry(TQString::tqfromLatin1("objectValue"), m_object);
 }
 
 void Criterion::readConfig(KConfig* config)
 {
-    m_subject = stringToSubject(config->readEntry(TQString::fromLatin1("subject")));
-    m_predicate = stringToPredicate(config->readEntry(TQString::fromLatin1("predicate")));
-    TQVariant::Type type = TQVariant::nameToType(config->readEntry(TQString::fromLatin1("objType")).ascii());
+    m_subject = stringToSubject(config->readEntry(TQString::tqfromLatin1("subject")));
+    m_predicate = stringToPredicate(config->readEntry(TQString::tqfromLatin1("predicate")));
+    TQVariant::Type type = TQVariant::nameToType(config->readEntry(TQString::tqfromLatin1("objType")).ascii());
 
     if (type != TQVariant::Invalid)
     {
-        m_object = config->readPropertyEntry(TQString::fromLatin1("objectValue"), type);
+        m_object = config->readPropertyEntry(TQString::tqfromLatin1("objectValue"), type);
     }
 }
 
@@ -269,15 +269,15 @@ bool ArticleMatcher::matches( const Article &a ) const
 
 void ArticleMatcher::writeConfig(KConfig* config) const
 {
-    config->writeEntry(TQString::fromLatin1("matcherAssociation"), associationToString(m_association));
+    config->writeEntry(TQString::tqfromLatin1("matcherAssociation"), associationToString(m_association));
     
-    config->writeEntry(TQString::fromLatin1("matcherCriteriaCount"), m_criteria.count());
+    config->writeEntry(TQString::tqfromLatin1("matcherCriteriaCount"), m_criteria.count());
 
     int index = 0;
 
     for (TQValueList<Criterion>::ConstIterator it = m_criteria.begin(); it != m_criteria.end(); ++it)
     {
-        config->setGroup(config->group()+TQString::fromLatin1("_Criterion")+TQString::number(index));
+        config->setGroup(config->group()+TQString::tqfromLatin1("_Criterion")+TQString::number(index));
         (*it).writeConfig(config);
         ++index;
     }
@@ -286,14 +286,14 @@ void ArticleMatcher::writeConfig(KConfig* config) const
 void ArticleMatcher::readConfig(KConfig* config)
 {
     m_criteria.clear();
-    m_association = stringToAssociation(config->readEntry(TQString::fromLatin1("matcherAssociation")));
+    m_association = stringToAssociation(config->readEntry(TQString::tqfromLatin1("matcherAssociation")));
 
-    int count =  config->readNumEntry(TQString::fromLatin1("matcherCriteriaCount"), 0);
+    int count =  config->readNumEntry(TQString::tqfromLatin1("matcherCriteriaCount"), 0);
     
     for (int i = 0; i < count; ++i)
     {
         Criterion c;
-        config->setGroup(config->group()+TQString::fromLatin1("_Criterion")+TQString::number(i));
+        config->setGroup(config->group()+TQString::tqfromLatin1("_Criterion")+TQString::number(i));
         c.readConfig(config);
         m_criteria.append(c);
     }
@@ -343,9 +343,9 @@ bool ArticleMatcher::allCriteriaMatch( const Article &a ) const
 
 ArticleMatcher::Association ArticleMatcher::stringToAssociation(const TQString& assocStr)
 {
-    if (assocStr == TQString::fromLatin1("LogicalAnd"))
+    if (assocStr == TQString::tqfromLatin1("LogicalAnd"))
         return LogicalAnd;
-    else if (assocStr == TQString::fromLatin1("LogicalOr"))
+    else if (assocStr == TQString::tqfromLatin1("LogicalOr"))
         return LogicalOr;
     else
         return None;
@@ -356,11 +356,11 @@ TQString ArticleMatcher::associationToString(Association association)
     switch (association)
     {
         case LogicalAnd:
-            return TQString::fromLatin1("LogicalAnd");
+            return TQString::tqfromLatin1("LogicalAnd");
         case LogicalOr:
-            return TQString::fromLatin1("LogicalOr");
+            return TQString::tqfromLatin1("LogicalOr");
         default:
-            return TQString::fromLatin1("None");
+            return TQString::tqfromLatin1("None");
     }
 }
 
@@ -408,13 +408,13 @@ TagMatcher::TagMatcher(const TagMatcher& other) : AbstractMatcher(other), d(0)
 
 void TagMatcher::writeConfig(KConfig* config) const
 {
-    config->writeEntry(TQString::fromLatin1("matcherType"), TQString::fromLatin1("TagMatcher"));
-    config->writeEntry(TQString::fromLatin1("matcherParams"), d->tagID);
+    config->writeEntry(TQString::tqfromLatin1("matcherType"), TQString::tqfromLatin1("TagMatcher"));
+    config->writeEntry(TQString::tqfromLatin1("matcherParams"), d->tagID);
 }
 
 void TagMatcher::readConfig(KConfig* config)
 {
-    d->tagID = config->readEntry(TQString::fromLatin1("matcherParams"));
+    d->tagID = config->readEntry(TQString::tqfromLatin1("matcherParams"));
 }
 
 bool TagMatcher::operator==(const AbstractMatcher& other) const
@@ -442,41 +442,41 @@ void DeleteAction::exec(Article& article)
         article.setDeleted();
 }
 
-SetStatusAction::SetStatusAction(int status) : m_status(status)
+SeStatusAction::SeStatusAction(int status) : m_status(status)
 {
 }
         
-void SetStatusAction::exec(Article& article)
+void SeStatusAction::exec(Article& article)
 {
     if (!article.isNull())
-        article.setStatus(m_status);
+        article.seStatus(m_status);
 }
 
-int SetStatusAction::status() const
+int SeStatusAction::status() const
 {
     return m_status;
 }
 
-void SetStatusAction::setStatus(int status)
+void SeStatusAction::seStatus(int status)
 {
     m_status = status;
 }
 
-void SetStatusAction::writeConfig(KConfig* config) const
+void SeStatusAction::writeConfig(KConfig* config) const
 {
-    config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("SetStatusAction"));
-    config->writeEntry(TQString::fromLatin1("actionParams"), m_status);
+    config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("SeStatusAction"));
+    config->writeEntry(TQString::tqfromLatin1("actionParams"), m_status);
 }
 
-void SetStatusAction::readConfig(KConfig* config)
+void SeStatusAction::readConfig(KConfig* config)
 {
-    m_status = config->readNumEntry(TQString::fromLatin1("actionParams"), Article::Read);
+    m_status = config->readNumEntry(TQString::tqfromLatin1("actionParams"), Article::Read);
 }
 
-bool SetStatusAction::operator==(const AbstractAction& other)
+bool SeStatusAction::operator==(const AbstractAction& other)
 {
     AbstractAction* ptr = const_cast<AbstractAction*>(&other);
-    SetStatusAction* o = dynamic_cast<SetStatusAction*>(ptr);
+    SeStatusAction* o = dynamic_cast<SeStatusAction*>(ptr);
     if (!o)
         return false;
     else
@@ -581,12 +581,12 @@ bool ArticleFilter::operator==(const ArticleFilter& other) const
 
 void ArticleFilterList::writeConfig(KConfig* config) const
 {
-    config->setGroup(TQString::fromLatin1("Filters"));
-    config->writeEntry(TQString::fromLatin1("count"), count());
+    config->setGroup(TQString::tqfromLatin1("Filters"));
+    config->writeEntry(TQString::tqfromLatin1("count"), count());
     int index = 0;
     for (ArticleFilterList::ConstIterator it = begin(); it != end(); ++it)
     {
-        config->setGroup(TQString::fromLatin1("Filters_")+TQString::number(index));
+        config->setGroup(TQString::tqfromLatin1("Filters_")+TQString::number(index));
         (*it).writeConfig(config);
         ++index;
     }
@@ -595,11 +595,11 @@ void ArticleFilterList::writeConfig(KConfig* config) const
 void ArticleFilterList::readConfig(KConfig* config)
 {
     clear();
-    config->setGroup(TQString::fromLatin1("Filters"));
-    int count = config->readNumEntry(TQString::fromLatin1("count"), 0);
+    config->setGroup(TQString::tqfromLatin1("Filters"));
+    int count = config->readNumEntry(TQString::tqfromLatin1("count"), 0);
     for (int i = 0; i < count; ++i)
     {
-        config->setGroup(TQString::fromLatin1("Filters_")+TQString::number(i));
+        config->setGroup(TQString::tqfromLatin1("Filters_")+TQString::number(i));
         ArticleFilter filter;
         filter.readConfig(config);
         append(filter);
@@ -609,13 +609,13 @@ void ArticleFilterList::readConfig(KConfig* config)
 
 void AssignTagAction::readConfig(KConfig* config)
 {
-    m_tagID = config->readEntry(TQString::fromLatin1("actionParams"));
+    m_tagID = config->readEntry(TQString::tqfromLatin1("actionParams"));
 }
 
 void AssignTagAction::writeConfig(KConfig* config) const
 {
-    config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("AssignTagAction"));
-    config->writeEntry(TQString::fromLatin1("actionParams"), m_tagID);
+    config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("AssignTagAction"));
+    config->writeEntry(TQString::tqfromLatin1("actionParams"), m_tagID);
 }
 
 bool AssignTagAction::operator==(const AbstractAction& other)
@@ -644,7 +644,7 @@ void DeleteAction::readConfig(KConfig* /*config*/)
 
 void DeleteAction::writeConfig(KConfig* config) const
 {
-    config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("DeleteAction"));
+    config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("DeleteAction"));
 }
 
 bool DeleteAction::operator==(const AbstractAction& other)
@@ -661,28 +661,28 @@ void ArticleFilter::readConfig(KConfig* config)
     delete d->action;
     d->action = 0;
 
-    d->name = config->readEntry(TQString::fromLatin1("name"));
-    d->id = config->readNumEntry(TQString::fromLatin1("id"), 0);
+    d->name = config->readEntry(TQString::tqfromLatin1("name"));
+    d->id = config->readNumEntry(TQString::tqfromLatin1("id"), 0);
 
-    TQString matcherType = config->readEntry(TQString::fromLatin1("matcherType"));
+    TQString matcherType = config->readEntry(TQString::tqfromLatin1("matcherType"));
 
-    if (matcherType == TQString::fromLatin1("TagMatcher"))
+    if (matcherType == TQString::tqfromLatin1("TagMatcher"))
         d->matcher = new TagMatcher();
-    else if (matcherType == TQString::fromLatin1("ArticleMatcher"))
+    else if (matcherType == TQString::tqfromLatin1("ArticleMatcher"))
         d->matcher = new ArticleMatcher();
 
     if (d->matcher)
         d->matcher->readConfig(config);
 
 
-        TQString actionType = config->readEntry(TQString::fromLatin1("actionType"));
+        TQString actionType = config->readEntry(TQString::tqfromLatin1("actionType"));
 
-    if (actionType == TQString::fromLatin1("AssignTagAction"))
+    if (actionType == TQString::tqfromLatin1("AssignTagAction"))
         d->action = new AssignTagAction();
-    else if (actionType == TQString::fromLatin1("DeleteAction"))
+    else if (actionType == TQString::tqfromLatin1("DeleteAction"))
         d->action = new DeleteAction();
-    else if (actionType == TQString::fromLatin1("SetStatusAction"))
-        d->action = new SetStatusAction();
+    else if (actionType == TQString::tqfromLatin1("SeStatusAction"))
+        d->action = new SeStatusAction();
 
     if (d->action)
         d->action->readConfig(config);
@@ -690,8 +690,8 @@ void ArticleFilter::readConfig(KConfig* config)
 
 void ArticleFilter::writeConfig(KConfig* config) const
 {
-    config->writeEntry(TQString::fromLatin1("name"), d->name);
-    config->writeEntry(TQString::fromLatin1("id"), d->id);
+    config->writeEntry(TQString::tqfromLatin1("name"), d->name);
+    config->writeEntry(TQString::tqfromLatin1("id"), d->id);
     d->matcher->writeConfig(config);
     d->action->writeConfig(config);
 }
diff --git a/akregator/src/articlefilter.h b/akregator/src/articlefilter.h
index 9a9b4a76..dee27da5 100644
--- a/akregator/src/articlefilter.h
+++ b/akregator/src/articlefilter.h
@@ -166,20 +166,20 @@ class DeleteAction : public AbstractAction
         virtual bool operator==(const AbstractAction& other);
 };
 
-class SetStatusAction : public AbstractAction
+class SeStatusAction : public AbstractAction
 {
     public:
-        SetStatusAction(int status=0);
+        SeStatusAction(int status=0);
         
         virtual void exec(Article& article);
         
         int status() const;
-        void setStatus(int status);
+        void seStatus(int status);
 
         virtual void writeConfig(KConfig* config) const;
         virtual void readConfig(KConfig* config);
 
-        virtual SetStatusAction* clone() const { return new SetStatusAction(*this); }
+        virtual SeStatusAction* clone() const { return new SeStatusAction(*this); }
         virtual bool operator==(const AbstractAction& other);
 
     private:
diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp
index 72527822..c9df8963 100644
--- a/akregator/src/articlelistview.cpp
+++ b/akregator/src/articlelistview.cpp
@@ -354,7 +354,7 @@ void ArticleListView::slotArticlesAdded(TreeNode* /*node*/, const TQValueList<Ar
     
     for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
     {
-        if (!d->articleMap.contains(*it))
+        if (!d->articleMap.tqcontains(*it))
         {
             if (!(*it).isNull() && !(*it).isDeleted())
             {
@@ -385,7 +385,7 @@ void ArticleListView::slotArticlesUpdated(TreeNode* /*node*/, const TQValueList<
     for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
     {
         
-        if (!(*it).isNull() && d->articleMap.contains(*it))
+        if (!(*it).isNull() && d->articleMap.tqcontains(*it))
         {
             ArticleItem* ali = d->articleMap[*it];
 
@@ -447,7 +447,7 @@ void ArticleListView::slotArticlesRemoved(TreeNode* /*node*/, const TQValueList<
     
     for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
     {
-        if (d->articleMap.contains(*it))
+        if (d->articleMap.tqcontains(*it))
         {
             ArticleItem* ali = d->articleMap[*it];
             d->articleMap.remove(*it);
@@ -564,9 +564,9 @@ void ArticleListView::paintInfoBox(const TQString &message)
     const uint x = (viewport()->width() - w - 30) / 2 ;
     const uint y = (viewport()->height() - h - 30) / 2 ;
 
-    p.setBrush( colorGroup().background() );
+    p.setBrush( tqcolorGroup().background() );
     p.drawRoundRect( x, y, w+30, h+30, (8*200)/w, (8*200)/h );
-    t.draw( &p, x+15, y+15, TQRect(), colorGroup() );
+    t.draw( &p, x+15, y+15, TQRect(), tqcolorGroup() );
 }
 
 void ArticleListView::viewportPaintEvent(TQPaintEvent *e)
diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp
index 147f4ab4..d456a415 100644
--- a/akregator/src/articleviewer.cpp
+++ b/akregator/src/articleviewer.cpp
@@ -87,7 +87,7 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
         {
             text += TQString("<div class=\"body\">");
             TQString url=node->xmlUrl();
-            TQString file = url.replace("/", "_").replace(":", "_");
+            TQString file = url.tqreplace("/", "_").tqreplace(":", "_");
             KURL u(m_view->m_imageDir);
             u.setFileName(file);
             text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(node->htmlUrl()).arg(u.url());
@@ -410,7 +410,7 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
         text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").arg(directionOf(Utils::stripTags(article.title())));
         if (article.link().isValid())
             text += "<a href=\""+article.link().url()+"\">";
-        text += article.title().replace("<", "&lt;").replace(">", "&gt;"); // TODO: better leave things escaped in the parser
+        text += article.title().tqreplace("<", "&lt;").tqreplace(">", "&gt;"); // TODO: better leave things escaped in the parser
         if (article.link().isValid())
             text += "</a>";
         text += "</div>\n";
@@ -505,7 +505,7 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art
         text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").arg(directionOf(Utils::stripTags(article.title())));
         if (link.isValid())
             text += "<a href=\""+link.url()+"\">";
-        text += article.title().replace("<", "&lt;").replace(">", "&gt;"); // TODO: better leave things escaped in the parser
+        text += article.title().tqreplace("<", "&lt;").tqreplace(">", "&gt;"); // TODO: better leave things escaped in the parser
         if (link.isValid())
             text += "</a>";
         text += "</div>\n";
diff --git a/akregator/src/dragobjects.cpp b/akregator/src/dragobjects.cpp
index 679166e1..02074891 100644
--- a/akregator/src/dragobjects.cpp
+++ b/akregator/src/dragobjects.cpp
@@ -43,7 +43,7 @@ bool ArticleDrag::canDecode(const TQMimeSource* e)
 bool ArticleDrag::decode(const TQMimeSource* e, TQValueList<ArticleDragItem>& articles)
 {
     articles.clear();
-    TQByteArray array = e->encodedData("akregator/articles");
+    TQByteArray array = e->tqencodedData("akregator/articles");
     
     TQDataStream stream(array, IO_ReadOnly);
 
@@ -68,7 +68,7 @@ const char* ArticleDrag::format(int i) const
     return 0;
 }
 
-TQByteArray ArticleDrag::encodedData(const char* mime) const
+TQByteArray ArticleDrag::tqencodedData(const char* mime) const
 {
     TQCString mimetype(mime);
     if (mimetype == "akregator/articles")
@@ -86,7 +86,7 @@ TQByteArray ArticleDrag::encodedData(const char* mime) const
     }
     else
     {
-        return KURLDrag::encodedData(mime);
+        return KURLDrag::tqencodedData(mime);
     }
 }
 
diff --git a/akregator/src/dragobjects.h b/akregator/src/dragobjects.h
index cc1be89f..88531d36 100644
--- a/akregator/src/dragobjects.h
+++ b/akregator/src/dragobjects.h
@@ -57,7 +57,7 @@ public:
 
 protected:
 
-    virtual TQByteArray encodedData(const char* mime) const;
+    virtual TQByteArray tqencodedData(const char* mime) const;
     virtual const char* format(int i) const;
 
 private:
diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp
index f0574c31..edf1a790 100644
--- a/akregator/src/feed.cpp
+++ b/akregator/src/feed.cpp
@@ -87,7 +87,7 @@ class Feed::FeedPrivate
         /** caches guids of tagged articles. key: tag, value: list of guids */
         TQMap<TQString, TQStringList> taggedArticles;
 
-        /** list of deleted articles. This contains **/
+        /** list of deleted articles. This tqcontains **/
         TQValueList<Article> deletedArticles;
         
         /** caches guids of deleted articles for notification */
@@ -402,7 +402,7 @@ void Feed::slotMarkAllArticlesAsRead()
         TQValueList<Article>::Iterator en = tarticles.end();
 
         for (it = tarticles.begin(); it != en; ++it)
-            (*it).setStatus(Article::Read);
+            (*it).seStatus(Article::Read);
         setNotificationMode(true, true);
     }
 }
@@ -412,7 +412,7 @@ void Feed::slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchOnly)
         queue->addFeed(this);
     else
     {
-        uint now = TQDateTime::currentDateTime().toTime_t();
+        uint now = TQDateTime::tqcurrentDateTime().toTime_t();
 
         // workaround for 3.5.x: if the last fetch went wrong, try again after 30 minutes
         // this fixes annoying behaviour of akregator, especially when the host is reachable
@@ -450,7 +450,7 @@ void Feed::appendArticles(const RSS::Document &doc)
 
     for (it = d_articles.begin(); it != en; ++it)
     {
-        if ( !d->articles.contains((*it).guid()) ) // article not in list
+        if ( !d->articles.tqcontains((*it).guid()) ) // article not in list
         {
             Article mya(*it, this);
             mya.offsetPubDate(nudge);
@@ -464,9 +464,9 @@ void Feed::appendArticles(const RSS::Document &doc)
             d->addedArticlesNotify.append(mya);
             
             if (!mya.isDeleted() && !markImmediatelyAsRead())
-                mya.setStatus(Article::New);
+                mya.seStatus(Article::New);
             else
-                mya.setStatus(Article::Read);
+                mya.seStatus(Article::Read);
                 
             changed = true;
         }
@@ -479,12 +479,12 @@ void Feed::appendArticles(const RSS::Document &doc)
             {
                 mya.setKeep(old.keep());
                 int oldstatus = old.status();
-                old.setStatus(Article::Read);
+                old.seStatus(Article::Read);
 
                 d->articles.remove(old.guid());
                 appendArticle(mya);
 
-                mya.setStatus(oldstatus);
+                mya.seStatus(oldstatus);
 
                 d->updatedArticlesNotify.append(mya);
                 changed = true;
@@ -519,7 +519,7 @@ bool Feed::usesExpiryByAge() const
 
 bool Feed::isExpired(const Article& a) const
 {
-    TQDateTime now = TQDateTime::currentDateTime();
+    TQDateTime now = TQDateTime::tqcurrentDateTime();
     int expiryAge = -1;
 // check whether the feed uses the global default and the default is limitArticleAge
     if ( d->archiveMode == globalDefault && Settings::archiveMode() == Settings::EnumArchiveMode::limitArticleAge)
@@ -535,7 +535,7 @@ void Feed::appendArticle(const Article& a)
 {
     if ( (a.keep() && Settings::doNotExpireImportantArticles()) || ( !usesExpiryByAge() || !isExpired(a) ) ) // if not expired
     {
-        if (!d->articles.contains(a.guid()))
+        if (!d->articles.tqcontains(a.guid()))
         {
             d->articles[a.guid()] = a;
             if (!a.isDeleted() && a.status() != Article::Read)
@@ -558,7 +558,7 @@ void Feed::fetch(bool followDiscovery)
     {
         if ((*it).status() == Article::New)
         {
-            (*it).setStatus(Article::Unread);
+            (*it).seStatus(Article::Unread);
         }
     }
 
@@ -618,7 +618,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status)
         else
         {
             d->fetchError = true;
-            d->lastErrorFetch = TQDateTime::currentDateTime().toTime_t();
+            d->lastErrorFetch = TQDateTime::tqcurrentDateTime().toTime_t();
             emit fetchError(this);
         }
         return;
@@ -647,7 +647,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status)
 
     appendArticles(doc);
 
-    d->archive->setLastFetch( TQDateTime::currentDateTime().toTime_t());
+    d->archive->setLastFetch( TQDateTime::tqcurrentDateTime().toTime_t());
     emit fetched(this);
 }
 
@@ -726,10 +726,10 @@ void Feed::setUnread(int unread)
 
 void Feed::setArticleDeleted(Article& a)
 {
-    if (!d->deletedArticles.contains(a))
+    if (!d->deletedArticles.tqcontains(a))
         d->deletedArticles.append(a);
 
-    if (!d->removedArticlesNotify.contains(a))
+    if (!d->removedArticlesNotify.tqcontains(a))
         d->removedArticlesNotify.append(a);
 
     articlesModified();
diff --git a/akregator/src/feed.h b/akregator/src/feed.h
index 86c98bd8..d94eecac 100644
--- a/akregator/src/feed.h
+++ b/akregator/src/feed.h
@@ -264,7 +264,7 @@ namespace Akregator
             void setArticleDeleted(Article& a);
 
             /** notifies that article @c mya was changed
-                @param oldStatus if the status was changed, it contains the old status, -1 otherwise
+                @param oldStatus if the status was changed, it tqcontains the old status, -1 otherwise
                 To be called by @ref Article
              */
             void setArticleChanged(Article& a, int oldStatus=-1);
diff --git a/akregator/src/feediconmanager.cpp b/akregator/src/feediconmanager.cpp
index 13e65d51..88433706 100644
--- a/akregator/src/feediconmanager.cpp
+++ b/akregator/src/feediconmanager.cpp
@@ -59,7 +59,7 @@ FeedIconManager* FeedIconManager::self()
 
 void FeedIconManager::fetchIcon(Feed* feed)
 {
-    if (!d->registeredFeeds.contains(feed))
+    if (!d->registeredFeeds.tqcontains(feed))
     {
         d->registeredFeeds.append(feed);
         connect(feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotFeedDestroyed(TreeNode*)));
@@ -133,7 +133,7 @@ void FeedIconManager::slotFeedDestroyed(TreeNode* node)
 {
     Feed* feed = dynamic_cast<Feed*>(node);
     if (feed)
-        while (d->registeredFeeds.contains(feed))
+        while (d->registeredFeeds.tqcontains(feed))
             d->registeredFeeds.remove(d->registeredFeeds.find(feed));
 }
 
@@ -147,7 +147,7 @@ void FeedIconManager::slotIconChanged(bool /*isHost*/, const TQString& hostOrURL
     if (!p.isNull()) // we don't set null pixmaps, as feed checks pixmap.isNull() to find out whether the icon was already loaded or not. It would request the icon another time, resulting an infinite loop (until stack overflow that is
     {
         while (( f = d->urlDict.take(hostOrURL) ))
-            if (d->registeredFeeds.contains(f))
+            if (d->registeredFeeds.tqcontains(f))
                 f->setFavicon(p);
     }
     emit signalIconChanged(hostOrURL, iconFile);
diff --git a/akregator/src/feedlist.cpp b/akregator/src/feedlist.cpp
index 4076c623..1195b5dd 100644
--- a/akregator/src/feedlist.cpp
+++ b/akregator/src/feedlist.cpp
@@ -117,7 +117,7 @@ void FeedList::parseChildNodes(TQDomNode &node, Folder* parent)
             Feed* feed = Feed::fromOPML(e);
             if (feed)
             {
-                if (!d->urlMap[feed->xmlUrl()].contains(feed))
+                if (!d->urlMap[feed->xmlUrl()].tqcontains(feed))
                     d->urlMap[feed->xmlUrl()].append(feed);
                 parent->appendChild(feed);
             }
@@ -219,7 +219,7 @@ void FeedList::append(FeedList* list, Folder* parent, TreeNode* after)
     if ( list == this )
         return;
 
-    if ( !flatList()->contains(parent) )
+    if ( !flatList()->tqcontains(parent) )
         parent = rootNode();
 
     TQValueList<TreeNode*> children = list->rootNode()->children();
diff --git a/akregator/src/feedlist.h b/akregator/src/feedlist.h
index 10e49217..c0ba14cc 100644
--- a/akregator/src/feedlist.h
+++ b/akregator/src/feedlist.h
@@ -64,7 +64,7 @@ public:
     /** exports the feed list as OPML. The root node ("All Feeds") is ignored! */
     virtual TQDomDocument toXML() const;
 
-    /** returns a feed object for a given feed URL. If the feed list does not contain a feed with @c url, NULL is returned. If it contains the same feed multiple times, any of the Feed objects is returned. */
+    /** returns a feed object for a given feed URL. If the feed list does not contain a feed with @c url, NULL is returned. If it tqcontains the same feed multiple times, any of the Feed objects is returned. */
     Feed* findByURL(const TQString& feedURL) const;
 
     Article findArticle(const TQString& feedURL, const TQString& guid) const;
diff --git a/akregator/src/feedstorage.h b/akregator/src/feedstorage.h
index 5b2f2a50..bbf36207 100644
--- a/akregator/src/feedstorage.h
+++ b/akregator/src/feedstorage.h
@@ -80,7 +80,7 @@ class AKREGATOR_EXPORT FeedStorage : public QObject
         /** returns the guid of the articles in a given category */
         virtual TQStringList articles(const Category& cat) = 0;
 
-        /** Appends all articles from another storage. If there is already an article in this feed with the same guid, it is replaced by the article from the source
+        /** Appends all articles from another storage. If there is already an article in this feed with the same guid, it is tqreplaced by the article from the source
         @param source the archive which articles should be appended
         */
         virtual void add(FeedStorage* source) = 0;
@@ -92,7 +92,7 @@ class AKREGATOR_EXPORT FeedStorage : public QObject
         virtual void clear() = 0;
 
         
-        virtual bool contains(const TQString& guid) = 0;
+        virtual bool tqcontains(const TQString& guid) = 0;
         virtual void addEntry(const TQString& guid) = 0;
         virtual void deleteArticle(const TQString& guid) = 0;
         virtual int comments(const TQString& guid) = 0;
@@ -111,7 +111,7 @@ class AKREGATOR_EXPORT FeedStorage : public QObject
         virtual uint pubDate(const TQString& guid) = 0;
         virtual void setPubDate(const TQString& guid, uint pubdate) = 0;
         virtual int status(const TQString& guid) = 0;
-        virtual void setStatus(const TQString& guid, int status) = 0;
+        virtual void seStatus(const TQString& guid, int status) = 0;
         virtual TQString title(const TQString& guid) = 0;
         virtual void setTitle(const TQString& guid, const TQString& title) = 0;
         virtual TQString description(const TQString& guid) = 0;
diff --git a/akregator/src/feedstoragedummyimpl.cpp b/akregator/src/feedstoragedummyimpl.cpp
index 6712d748..b7200b0e 100644
--- a/akregator/src/feedstoragedummyimpl.cpp
+++ b/akregator/src/feedstoragedummyimpl.cpp
@@ -147,21 +147,21 @@ TQStringList FeedStorageDummyImpl::articles(const Category& cat)
 
 void FeedStorageDummyImpl::addEntry(const TQString& guid)
 {
-    if (!d->entries.contains(guid))
+    if (!d->entries.tqcontains(guid))
     {
         d->entries[guid] = FeedStorageDummyImplPrivate::Entry();
         setTotalCount(totalCount()+1);
     }
 }
 
-bool FeedStorageDummyImpl::contains(const TQString& guid)
+bool FeedStorageDummyImpl::tqcontains(const TQString& guid)
 {
-    return d->entries.contains(guid);
+    return d->entries.tqcontains(guid);
 }
 
 void FeedStorageDummyImpl::deleteArticle(const TQString& guid)
 {
-    if (!d->entries.contains(guid))
+    if (!d->entries.tqcontains(guid))
         return;
 
     setDeleted(guid);
@@ -172,33 +172,33 @@ void FeedStorageDummyImpl::deleteArticle(const TQString& guid)
 int FeedStorageDummyImpl::comments(const TQString& guid)
 {
     
-    return contains(guid) ? d->entries[guid].comments : 0;
+    return tqcontains(guid) ? d->entries[guid].comments : 0;
 }
 
 TQString FeedStorageDummyImpl::commentsLink(const TQString& guid)
 {
-    return contains(guid) ? d->entries[guid].commentsLink : "";
+    return tqcontains(guid) ? d->entries[guid].commentsLink : "";
 }
 
 bool FeedStorageDummyImpl::guidIsHash(const TQString& guid)
 {
-    return contains(guid) ? d->entries[guid].guidIsHash : false;
+    return tqcontains(guid) ? d->entries[guid].guidIsHash : false;
 }
 
 bool FeedStorageDummyImpl::guidIsPermaLink(const TQString& guid)
 {
-    return contains(guid) ? d->entries[guid].guidIsPermaLink : false;
+    return tqcontains(guid) ? d->entries[guid].guidIsPermaLink : false;
 }
 
 uint FeedStorageDummyImpl::hash(const TQString& guid)
 {
-    return contains(guid) ? d->entries[guid].hash : 0;
+    return tqcontains(guid) ? d->entries[guid].hash : 0;
 }
 
 
 void FeedStorageDummyImpl::setDeleted(const TQString& guid)
 {
-    if (!contains(guid))
+    if (!tqcontains(guid))
         return;
 
     FeedStorageDummyImplPrivate::Entry entry = d->entries[guid];
@@ -233,99 +233,99 @@ void FeedStorageDummyImpl::setDeleted(const TQString& guid)
 
 TQString FeedStorageDummyImpl::link(const TQString& guid)
 {
-    return contains(guid) ? d->entries[guid].link : "";
+    return tqcontains(guid) ? d->entries[guid].link : "";
 }
 
 uint FeedStorageDummyImpl::pubDate(const TQString& guid)
 {
-    return contains(guid) ? d->entries[guid].pubDate : 0;
+    return tqcontains(guid) ? d->entries[guid].pubDate : 0;
 }
 
 int FeedStorageDummyImpl::status(const TQString& guid)
 {
-    return contains(guid) ? d->entries[guid].status : 0;
+    return tqcontains(guid) ? d->entries[guid].status : 0;
 }
 
-void FeedStorageDummyImpl::setStatus(const TQString& guid, int status)
+void FeedStorageDummyImpl::seStatus(const TQString& guid, int status)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
         d->entries[guid].status = status;
 }
 
 TQString FeedStorageDummyImpl::title(const TQString& guid)
 {
-    return contains(guid) ? d->entries[guid].title : "";
+    return tqcontains(guid) ? d->entries[guid].title : "";
 }
 
 TQString FeedStorageDummyImpl::description(const TQString& guid)
 {
-    return contains(guid) ? d->entries[guid].description : "";
+    return tqcontains(guid) ? d->entries[guid].description : "";
 }
 
 
 void FeedStorageDummyImpl::setPubDate(const TQString& guid, uint pubdate)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
         d->entries[guid].pubDate = pubdate;
 }
 
 void FeedStorageDummyImpl::setGuidIsHash(const TQString& guid, bool isHash)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
         d->entries[guid].guidIsHash = isHash;
 }
 
 void FeedStorageDummyImpl::setLink(const TQString& guid, const TQString& link)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
         d->entries[guid].link = link;
 }
 
 void FeedStorageDummyImpl::setHash(const TQString& guid, uint hash)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
         d->entries[guid].hash = hash;
 }
 
 void FeedStorageDummyImpl::setTitle(const TQString& guid, const TQString& title)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
         d->entries[guid].title = title;
 }
 
 void FeedStorageDummyImpl::setDescription(const TQString& guid, const TQString& description)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
         d->entries[guid].description = description;
 }
 
 void FeedStorageDummyImpl::setCommentsLink(const TQString& guid, const TQString& commentsLink)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
         d->entries[guid].commentsLink = commentsLink;
 }
 
 void FeedStorageDummyImpl::setComments(const TQString& guid, int comments)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
         d->entries[guid].comments = comments;
 }
 
 
 void FeedStorageDummyImpl::setGuidIsPermaLink(const TQString& guid, bool isPermaLink)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
         d->entries[guid].guidIsPermaLink = isPermaLink;
 }
 
 void FeedStorageDummyImpl::addTag(const TQString& guid, const TQString& tag)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
     {
         d->entries[guid].tags.append(tag);
-        if (!d->taggedArticles[tag].contains(guid))
+        if (!d->taggedArticles[tag].tqcontains(guid))
             d->taggedArticles[tag].append(guid);
-        if (!d->tags.contains(tag))
+        if (!d->tags.tqcontains(tag))
             d->tags.append(tag);
     }
 
@@ -333,7 +333,7 @@ void FeedStorageDummyImpl::addTag(const TQString& guid, const TQString& tag)
 
 void FeedStorageDummyImpl::addCategory(const TQString& guid, const Category& cat)
 {
-    if (!contains(guid))
+    if (!tqcontains(guid))
         return;
 
     d->entries[guid].categories.append(cat);
@@ -345,19 +345,19 @@ void FeedStorageDummyImpl::addCategory(const TQString& guid, const Category& cat
 
 void FeedStorageDummyImpl::setAuthor(const TQString& guid, const TQString& author)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
         d->entries[guid].author = author;
 }
 
 TQString FeedStorageDummyImpl::author(const TQString& guid)
 {
-    return contains(guid) ? d->entries[guid].author : TQString();
+    return tqcontains(guid) ? d->entries[guid].author : TQString();
 }
 
 TQValueList<Category> FeedStorageDummyImpl::categories(const TQString& guid)
 {
   if (!guid.isNull())
-        return contains(guid) ? d->entries[guid].categories : TQValueList<Category>();
+        return tqcontains(guid) ? d->entries[guid].categories : TQValueList<Category>();
     else
         return d->categories;
 }
@@ -365,7 +365,7 @@ TQValueList<Category> FeedStorageDummyImpl::categories(const TQString& guid)
 
 void FeedStorageDummyImpl::removeTag(const TQString& guid, const TQString& tag)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
     {
         d->entries[guid].tags.remove(tag);
         d->taggedArticles[tag].remove(guid);
@@ -377,7 +377,7 @@ void FeedStorageDummyImpl::removeTag(const TQString& guid, const TQString& tag)
 TQStringList FeedStorageDummyImpl::tags(const TQString& guid)
 {
     if (!guid.isNull())
-        return contains(guid) ? d->entries[guid].tags : TQStringList();
+        return tqcontains(guid) ? d->entries[guid].tags : TQStringList();
     else
     {
         return d->tags;
@@ -396,7 +396,7 @@ void FeedStorageDummyImpl::add(FeedStorage* source)
 
 void FeedStorageDummyImpl::copyArticle(const TQString& guid, FeedStorage* source)
 {
-    if (!contains(guid))
+    if (!tqcontains(guid))
         addEntry(guid);
 
     setComments(guid, source->comments(guid));
@@ -407,7 +407,7 @@ void FeedStorageDummyImpl::copyArticle(const TQString& guid, FeedStorage* source
     setHash(guid, source->hash(guid));
     setLink(guid, source->link(guid));
     setPubDate(guid, source->pubDate(guid));
-    setStatus(guid, source->status(guid));
+    seStatus(guid, source->status(guid));
     setTitle(guid, source->title(guid));
     TQStringList tags = source->tags(guid);
     
@@ -424,7 +424,7 @@ void FeedStorageDummyImpl::clear()
 
 void FeedStorageDummyImpl::setEnclosure(const TQString& guid, const TQString& url, const TQString& type, int length)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
     {
         FeedStorageDummyImplPrivate::Entry entry = d->entries[guid];
         entry.hasEnclosure = true;
@@ -436,7 +436,7 @@ void FeedStorageDummyImpl::setEnclosure(const TQString& guid, const TQString& ur
 
 void FeedStorageDummyImpl::removeEnclosure(const TQString& guid)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
     {
         FeedStorageDummyImplPrivate::Entry entry = d->entries[guid];
         entry.hasEnclosure = false;
@@ -448,7 +448,7 @@ void FeedStorageDummyImpl::removeEnclosure(const TQString& guid)
 
 void FeedStorageDummyImpl::enclosure(const TQString& guid, bool& hasEnclosure, TQString& url, TQString& type, int& length)
 {
-    if (contains(guid))
+    if (tqcontains(guid))
     {
         FeedStorageDummyImplPrivate::Entry entry = d->entries[guid];
         hasEnclosure = entry.hasEnclosure;
diff --git a/akregator/src/feedstoragedummyimpl.h b/akregator/src/feedstoragedummyimpl.h
index 60c70857..d15f45bd 100644
--- a/akregator/src/feedstoragedummyimpl.h
+++ b/akregator/src/feedstoragedummyimpl.h
@@ -50,7 +50,7 @@ class FeedStorageDummyImpl : public FeedStorage
         virtual TQStringList articles(const Category& cat);
 
 
-        virtual bool contains(const TQString& guid);
+        virtual bool tqcontains(const TQString& guid);
         virtual void addEntry(const TQString& guid);
         virtual void deleteArticle(const TQString& guid);
         virtual int comments(const TQString& guid);
@@ -69,7 +69,7 @@ class FeedStorageDummyImpl : public FeedStorage
         virtual uint pubDate(const TQString& guid);
         virtual void setPubDate(const TQString& guid, uint pubdate);
         virtual int status(const TQString& guid);
-        virtual void setStatus(const TQString& guid, int status);
+        virtual void seStatus(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);
diff --git a/akregator/src/fetchqueue.cpp b/akregator/src/fetchqueue.cpp
index 63c4a4c4..6093cb51 100644
--- a/akregator/src/fetchqueue.cpp
+++ b/akregator/src/fetchqueue.cpp
@@ -72,7 +72,7 @@ void FetchQueue::slotAbort()
 
 void FetchQueue::addFeed(Feed *f)
 {
-    if (!d->queuedFeeds.contains(f) && !d->fetchingFeeds.contains(f))
+    if (!d->queuedFeeds.tqcontains(f) && !d->fetchingFeeds.tqcontains(f))
     {
         connectToFeed(f);
         d->queuedFeeds.append(f);
diff --git a/akregator/src/folder.cpp b/akregator/src/folder.cpp
index f3a583a6..fac9bd2e 100644
--- a/akregator/src/folder.cpp
+++ b/akregator/src/folder.cpp
@@ -62,9 +62,9 @@ bool Folder::accept(TreeNodeVisitor* visitor)
 
 Folder* Folder::fromOPML(TQDomElement e)
 {
-    Folder* fg = new Folder(e.hasAttribute(TQString::fromLatin1("text")) ? e.attribute(TQString::fromLatin1("text")) : e.attribute(TQString::fromLatin1("title")));
-    fg->setOpen( e.attribute(TQString::fromLatin1("isOpen")) != TQString::fromLatin1(("false")));
-    fg->setId( e.attribute(TQString::fromLatin1("id")).toUInt() );
+    Folder* fg = new Folder(e.hasAttribute(TQString::tqfromLatin1("text")) ? e.attribute(TQString::tqfromLatin1("text")) : e.attribute(TQString::tqfromLatin1("title")));
+    fg->setOpen( e.attribute(TQString::tqfromLatin1("isOpen")) != TQString::tqfromLatin1(("false")));
+    fg->setId( e.attribute(TQString::tqfromLatin1("id")).toUInt() );
     return fg;
 }
 
@@ -99,7 +99,7 @@ TQStringList Folder::tags() const
         // intersect tag sets instead of appending lists, to avoid dupes. This sucks. Definitely. I want QSet. Now.
         TQStringList t2 = (*it)->tags();
         for (TQStringList::ConstIterator it2 = t2.begin(); it2 != t2.end(); ++it2)
-            if (!t.contains(*it2))
+            if (!t.tqcontains(*it2))
                 t.append(*it2);
     } 
     return t;
@@ -202,7 +202,7 @@ void Folder::prependChild(TreeNode* node)
 void Folder::removeChild(TreeNode* node)
 {
 //    kdDebug() << "enter Folder::removeChild() node:" << (node ? node->title() : "null") << endl;
-    if (node && d->children.contains(node))
+    if (node && d->children.tqcontains(node))
     {    
         node->setParent(0);
         d->children.remove(node);
diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp
index c8780462..85419931 100644
--- a/akregator/src/frame.cpp
+++ b/akregator/src/frame.cpp
@@ -51,7 +51,7 @@ Frame::Frame(TQObject * parent, KParts::ReadOnlyPart *p, TQWidget *visWidget, co
     if (watchSignals) // e.g, articles tab has no part
     {
         connect(m_part, TQT_SIGNAL(setWindowCaption (const TQString &)), this, TQT_SLOT(setCaption (const TQString &)));
-        connect(m_part, TQT_SIGNAL(setStatusBarText (const TQString &)), this, TQT_SLOT(setStatusText (const TQString &)));
+        connect(m_part, TQT_SIGNAL(seStatusBarText (const TQString &)), this, TQT_SLOT(seStatusText (const TQString &)));
 
         KParts::BrowserExtension *ext=KParts::BrowserExtension::childObject( p );
         if (ext)
@@ -120,10 +120,10 @@ void Frame::setCaption(const TQString &s)
     emit captionChanged(s);
 }
 
-void Frame::setStatusText(const TQString &s)
+void Frame::seStatusText(const TQString &s)
 {
     m_statusText=s;
-    m_statusText.replace(TQRegExp("<[^>]*>"), "");
+    m_statusText.tqreplace(TQRegExp("<[^>]*>"), "");
     emit statusText(m_statusText);
 }
 
@@ -175,7 +175,7 @@ void Frame::setStarted()
 {
     if(m_progressId.isNull() || m_progressId.isEmpty()) m_progressId = KPIM::ProgressManager::getUniqueID();
     m_progressItem = KPIM::ProgressManager::createProgressItem(m_progressId, TQStyleSheet::escape( title() ), TQString::null, false);
-    m_progressItem->setStatus(i18n("Loading..."));
+    m_progressItem->seStatus(i18n("Loading..."));
     //connect(m_progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQT_SLOT(slotAbortFetch()));
     m_state=Started;
     emit started();
@@ -184,7 +184,7 @@ void Frame::setStarted()
 void Frame::setCanceled(const TQString &s)
 {
     if(m_progressItem) {
-        m_progressItem->setStatus(i18n("Loading canceled"));
+        m_progressItem->seStatus(i18n("Loading canceled"));
         m_progressItem->setComplete();
         m_progressItem = 0;
     }
@@ -195,7 +195,7 @@ void Frame::setCanceled(const TQString &s)
 void Frame::setCompleted()
 {
     if(m_progressItem) {
-        m_progressItem->setStatus(i18n("Loading completed"));
+        m_progressItem->seStatus(i18n("Loading completed"));
         m_progressItem->setComplete();
         m_progressItem = 0;
     }
diff --git a/akregator/src/frame.h b/akregator/src/frame.h
index 1649722d..27418402 100644
--- a/akregator/src/frame.h
+++ b/akregator/src/frame.h
@@ -69,7 +69,7 @@ namespace Akregator
             void setProgress(int);
             void setCaption(const TQString &);
             void setTitle(const TQString &);
-            void setStatusText(const TQString &); 
+            void seStatusText(const TQString &); 
 
         signals:
             void captionChanged(const TQString &);
diff --git a/akregator/src/kcursorsaver.h b/akregator/src/kcursorsaver.h
index 50e49aa8..da38eec5 100644
--- a/akregator/src/kcursorsaver.h
+++ b/akregator/src/kcursorsaver.h
@@ -17,9 +17,9 @@ namespace Akregator {
 class KCursorSaver : public Qt
 {
 public:
-    /// constructor taking TQCursor shapes
-    KCursorSaver(Qt::CursorShape shape) {
-        TQApplication::setOverrideCursor( TQCursor(shape) );
+    /// constructor taking TQCursor tqshapes
+    KCursorSaver(Qt::tqCursorShape tqshape) {
+        TQApplication::setOverrideCursor( TQCursor(tqshape) );
         inited = true;
     }
 
diff --git a/akregator/src/librss/article.cpp b/akregator/src/librss/article.cpp
index 24413053..59949244 100644
--- a/akregator/src/librss/article.cpp
+++ b/akregator/src/librss/article.cpp
@@ -78,35 +78,35 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
 		TQDomNode n;
 		for (n = node.firstChild(); !n.isNull(); n = n.nextSibling()) {
 			const TQDomElement e = n.toElement();
-			if ( (e.tagName()==TQString::fromLatin1("link")) &&
-				(e.attribute(TQString::fromLatin1("rel"), TQString::fromLatin1("alternate")) == TQString::fromLatin1("alternate")))
+			if ( (e.tagName()==TQString::tqfromLatin1("link")) &&
+				(e.attribute(TQString::tqfromLatin1("rel"), TQString::tqfromLatin1("alternate")) == TQString::tqfromLatin1("alternate")))
 				{   
-					d->link=n.toElement().attribute(TQString::fromLatin1("href"));
+					d->link=n.toElement().attribute(TQString::tqfromLatin1("href"));
 					break;
 				}
 		}
 	}
 	else
 	{
-		if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull())
+		if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull())
 			d->link = elemText;
 	}
 
 
     // prefer content/content:encoded over summary/description for feeds that provide it
-    TQString tagName=(format==AtomFeed)? TQString::fromLatin1("content"): TQString::fromLatin1("content:encoded");
+    TQString tagName=(format==AtomFeed)? TQString::tqfromLatin1("content"): TQString::tqfromLatin1("content:encoded");
     
     if (!(elemText = extractNode(node, tagName, false)).isNull())
         d->description = elemText;
     
     if (d->description.isEmpty())
     {
-		if (!(elemText = extractNode(node, TQString::fromLatin1("body"), false)).isNull())
+		if (!(elemText = extractNode(node, TQString::tqfromLatin1("body"), false)).isNull())
 			d->description = elemText;
     
 		if (d->description.isEmpty())  // 3rd try: see http://www.intertwingly.net/blog/1299.html
 		{
-			if (!(elemText = extractNode(node, TQString::fromLatin1((format==AtomFeed)? "summary" : "description"), false)).isNull())
+			if (!(elemText = extractNode(node, TQString::tqfromLatin1((format==AtomFeed)? "summary" : "description"), false)).isNull())
 				d->description = elemText;
 		}
 	}
@@ -116,21 +116,21 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
 	if (format == AtomFeed)
 	{
         if (version == vAtom_1_0)
-            elemText = extractNode(node, TQString::fromLatin1("updated"));
+            elemText = extractNode(node, TQString::tqfromLatin1("updated"));
         else
-           elemText = extractNode(node, TQString::fromLatin1("issued"));
+           elemText = extractNode(node, TQString::tqfromLatin1("issued"));
 
 		if (!elemText.isNull())
 			time = parseISO8601Date(elemText); 	
 	}
 	else 
 	{
-		elemText = extractNode(node, TQString::fromLatin1("pubDate"));
+		elemText = extractNode(node, TQString::tqfromLatin1("pubDate"));
 		if (!elemText.isNull())
 			time = KRFCDate::parseDate(elemText);
 	}
 	
-	if (!(elemText = extractNode(node, TQString::fromLatin1("dc:date"))).isNull())
+	if (!(elemText = extractNode(node, TQString::tqfromLatin1("dc:date"))).isNull())
 	{
 		time = parseISO8601Date(elemText);
 	}
@@ -139,11 +139,11 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
         if (time != 0)
 		d->pubDate.setTime_t(time);
 
-	if (!(elemText = extractNode(node, TQString::fromLatin1("wfw:comment"))).isNull()) {
+	if (!(elemText = extractNode(node, TQString::tqfromLatin1("wfw:comment"))).isNull()) {
 		d->commentsLink = elemText;
 	}
 
-    if (!(elemText = extractNode(node, TQString::fromLatin1("slash:comments"))).isNull()) {
+    if (!(elemText = extractNode(node, TQString::tqfromLatin1("slash:comments"))).isNull()) {
         d->numComments = elemText.toInt();
     }
 
@@ -152,19 +152,19 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
     // in RSS 1.0, we use <item about> attribute as ID
     // FIXME: pass format version instead of checking for attribute
 
-    if (!element.isNull() && element.hasAttribute(TQString::fromLatin1("rdf:about")))
+    if (!element.isNull() && element.hasAttribute(TQString::tqfromLatin1("rdf:about")))
     {
-        d->guid = element.attribute(TQString::fromLatin1("rdf:about")); // HACK: using ns properly did not work
+        d->guid = element.attribute(TQString::tqfromLatin1("rdf:about")); // HACK: using ns properly did not work
         d->guidIsPermaLink = false;
     }
     else
     {
-        tagName=(format==AtomFeed)? TQString::fromLatin1("id"): TQString::fromLatin1("guid");
+        tagName=(format==AtomFeed)? TQString::tqfromLatin1("id"): TQString::tqfromLatin1("guid");
         TQDomNode n = node.namedItem(tagName);
 	    if (!n.isNull())
         {
             d->guidIsPermaLink = (format==AtomFeed)? false : true;
-            if (n.toElement().attribute(TQString::fromLatin1("isPermaLink"), "true") == "false") d->guidIsPermaLink = false;
+            if (n.toElement().attribute(TQString::tqfromLatin1("isPermaLink"), "true") == "false") d->guidIsPermaLink = false;
             if (!(elemText = extractNode(node, tagName)).isNull())
                 d->guid = elemText;
         }
@@ -178,10 +178,10 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
 		md5Machine.update(d->title.utf8());
 		md5Machine.update(d->description.utf8());
 		d->guid = TQString(md5Machine.hexDigest().data());
-        d->meta[TQString::fromLatin1("guidIsHash")] = TQString::fromLatin1("true");
+        d->meta[TQString::tqfromLatin1("guidIsHash")] = TQString::tqfromLatin1("true");
 	}
 
-    TQDomNode enclosure = element.namedItem(TQString::fromLatin1("enclosure"));
+    TQDomNode enclosure = element.namedItem(TQString::tqfromLatin1("enclosure"));
     if (enclosure.isElement())
         d->enclosure = Enclosure::fromXML(enclosure.toElement());
 
@@ -191,12 +191,12 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
     {
         if (i.isElement())
         {
-            if (i.toElement().tagName() == TQString::fromLatin1("metaInfo:meta"))
+            if (i.toElement().tagName() == TQString::tqfromLatin1("metaInfo:meta"))
             {
-                TQString type = i.toElement().attribute(TQString::fromLatin1("type"));
+                TQString type = i.toElement().attribute(TQString::tqfromLatin1("type"));
                 d->meta[type] = i.toElement().text();
             }
-            else if (i.toElement().tagName() == TQString::fromLatin1("category"))
+            else if (i.toElement().tagName() == TQString::tqfromLatin1("category"))
             {
                 d->categories.append(Category::fromXML(i.toElement()));
             }
diff --git a/akregator/src/librss/article.h b/akregator/src/librss/article.h
index 2cbbca06..611dd408 100644
--- a/akregator/src/librss/article.h
+++ b/akregator/src/librss/article.h
@@ -148,7 +148,7 @@ namespace RSS
           * @param parent The parent widget for the KURLLabel.
           * @param name A name for the widget which will be used internally.
           * @return a widget (a KURLLabel in this case) for the Article.
-          * This makes building a user-interface which contains the
+          * This makes building a user-interface which tqcontains the
           * information in this Article object more convenient.
           * The returned KURLLabel's caption will be the title(), clicking
           * on it will emit the URL link(), and it has a TQToolTip attached
diff --git a/akregator/src/librss/category.cpp b/akregator/src/librss/category.cpp
index ae757714..6dc63d3b 100644
--- a/akregator/src/librss/category.cpp
+++ b/akregator/src/librss/category.cpp
@@ -64,8 +64,8 @@ bool Category::isNull() const
 Category Category::fromXML(const TQDomElement& e)
 {
     Category obj;
-    if (e.hasAttribute(TQString::fromLatin1("domain")))
-        obj.d->domain = e.attribute(TQString::fromLatin1("domain"));
+    if (e.hasAttribute(TQString::tqfromLatin1("domain")))
+        obj.d->domain = e.attribute(TQString::tqfromLatin1("domain"));
     obj.d->category = e.text();
     obj.d->isNull = false;
     return obj;
diff --git a/akregator/src/librss/document.cpp b/akregator/src/librss/document.cpp
index b52ea87c..170ceaa7 100644
--- a/akregator/src/librss/document.cpp
+++ b/akregator/src/librss/document.cpp
@@ -79,15 +79,15 @@ static TQString extractLink(const TQDomNode& node, Format format)
         TQDomNode n;
         for (n = node.firstChild(); !n.isNull(); n = n.nextSibling()) {
             const TQDomElement e = n.toElement();
-            if ( (e.tagName() == TQString::fromLatin1("link")) 
-                  && (e.attribute(TQString::fromLatin1("rel"), TQString::fromLatin1("alternate")) == TQString::fromLatin1("alternate")))
+            if ( (e.tagName() == TQString::tqfromLatin1("link")) 
+                  && (e.attribute(TQString::tqfromLatin1("rel"), TQString::tqfromLatin1("alternate")) == TQString::tqfromLatin1("alternate")))
             {   
-                return n.toElement().attribute(TQString::fromLatin1("href"));
+                return n.toElement().attribute(TQString::tqfromLatin1("href"));
             }
         }
     }
 
-    return extractNode(node, TQString::fromLatin1("link"));
+    return extractNode(node, TQString::tqfromLatin1("link"));
     
 }
 
@@ -100,20 +100,20 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
     TQString attr;
 
     // we should probably check that it ISN'T feed or rss, rather than check if it is xhtml
-    if (rootNode.toElement().tagName()==TQString::fromLatin1("html"))
+    if (rootNode.toElement().tagName()==TQString::tqfromLatin1("html"))
         d->valid=false;
     else
         d->valid=true;
     
-    attr = rootNode.toElement().attribute(TQString::fromLatin1("version"), TQString::null);
-    if (rootNode.toElement().tagName()==TQString::fromLatin1("feed"))
+    attr = rootNode.toElement().attribute(TQString::tqfromLatin1("version"), TQString::null);
+    if (rootNode.toElement().tagName()==TQString::tqfromLatin1("feed"))
     {
         d->format=AtomFeed;
-        if (attr == TQString::fromLatin1("0.3"))
+        if (attr == TQString::tqfromLatin1("0.3"))
             d->version = vAtom_0_3;
-        else if (attr == TQString::fromLatin1("0.2")) /* smt -> review */
+        else if (attr == TQString::tqfromLatin1("0.2")) /* smt -> review */
             d->version = vAtom_0_2;
-        else if (attr == TQString::fromLatin1("0.1")) /* smt -> review */
+        else if (attr == TQString::tqfromLatin1("0.1")) /* smt -> review */
             d->version = vAtom_0_1;
         else
             d->version = vAtom_1_0;
@@ -121,13 +121,13 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
     else
     {
         d->format=RSSFeed;
-        if (attr == TQString::fromLatin1("0.91"))
+        if (attr == TQString::tqfromLatin1("0.91"))
             d->version = v0_91;
-        else if (attr == TQString::fromLatin1("0.92"))
+        else if (attr == TQString::tqfromLatin1("0.92"))
             d->version = v0_92;
-        else if (attr == TQString::fromLatin1("0.93"))
+        else if (attr == TQString::tqfromLatin1("0.93"))
             d->version = v0_93;
-        else if (attr == TQString::fromLatin1("0.94"))
+        else if (attr == TQString::tqfromLatin1("0.94"))
             d->version = v0_94;
         else // otherwise, we just assume a RSS2 compatible feed. As rss2 is generally
              // backward-compatible, this should work
@@ -137,7 +137,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
     
     if (d->format==UnknownFormat)
     {
-        attr = rootNode.toElement().attribute(TQString::fromLatin1("xmlns"), TQString::null);
+        attr = rootNode.toElement().attribute(TQString::tqfromLatin1("xmlns"), TQString::null);
         if (!attr.isNull()) {
         /*
          * Hardcoding these URLs is actually a bad idea, since the DTD doesn't
@@ -147,11 +147,11 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
          * distinguish the RSS versions by analyzing the relationship between
          * the nodes.
          */
-            if (attr == TQString::fromLatin1("http://my.netscape.com/rdf/simple/0.9/")) {
+            if (attr == TQString::tqfromLatin1("http://my.netscape.com/rdf/simple/0.9/")) {
                 d->format=RSSFeed;
                 d->version = v0_90;
              }
-            else if (attr == TQString::fromLatin1("http://purl.org/rss/1.0/")) {
+            else if (attr == TQString::tqfromLatin1("http://purl.org/rss/1.0/")) {
                 d->format=RSSFeed;
                 d->version = v1_0;
             }
@@ -163,7 +163,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
     if (d->format == AtomFeed)
         channelNode=rootNode;
     else
-        channelNode=rootNode.namedItem(TQString::fromLatin1("channel"));
+        channelNode=rootNode.namedItem(TQString::tqfromLatin1("channel"));
 
     if (!(elemText = extractTitle(channelNode)).isNull())
         d->title = elemText;
@@ -192,27 +192,27 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
     else
     {
 	// following is a HACK for broken 0.91 feeds like xanga.com's
-	if (!rootNode.namedItem(TQString::fromLatin1("item")).isNull())
+	if (!rootNode.namedItem(TQString::tqfromLatin1("item")).isNull())
 	    parentNode = rootNode;
 	else
             parentNode = channelNode;
     }
     
     // image and textinput aren't supported by Atom.. handle in case feed provides
-    TQDomNode n = parentNode.namedItem(TQString::fromLatin1("image"));
+    TQDomNode n = parentNode.namedItem(TQString::tqfromLatin1("image"));
     if (!n.isNull())
         d->image = new Image(n);
 
-    n = parentNode.namedItem(TQString::fromLatin1("textinput"));
+    n = parentNode.namedItem(TQString::tqfromLatin1("textinput"));
     if (!n.isNull())
         d->textInput = new TextInput(n);
 
     // Our (hopefully faster) version of elementsByTagName()
     TQString tagName;
     if (d->format == AtomFeed)
-        tagName=TQString::fromLatin1("entry");
+        tagName=TQString::tqfromLatin1("entry");
     else
-        tagName=TQString::fromLatin1("item");
+        tagName=TQString::tqfromLatin1("item");
 
     for (n = parentNode.firstChild(); !n.isNull(); n = n.nextSibling()) {
         const TQDomElement e = n.toElement();
@@ -220,212 +220,212 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
             d->articles.append(Article(e, d->format, d->version));
     }
 
-    if (!(elemText = extractNode(channelNode, TQString::fromLatin1("copyright"))).isNull())
+    if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("copyright"))).isNull())
         d->copyright = elemText;
 
     if (d->format == AtomFeed)
-        elemText = rootNode.toElement().attribute(TQString::fromLatin1("xml:lang"), TQString::null);
+        elemText = rootNode.toElement().attribute(TQString::tqfromLatin1("xml:lang"), TQString::null);
     else
-        elemText = extractNode(channelNode, TQString::fromLatin1("language"));
+        elemText = extractNode(channelNode, TQString::tqfromLatin1("language"));
 
     if (!elemText.isNull()){
-        if (elemText == TQString::fromLatin1("af"))
+        if (elemText == TQString::tqfromLatin1("af"))
             d->language = af;
-        else if (elemText == TQString::fromLatin1("sq"))
+        else if (elemText == TQString::tqfromLatin1("sq"))
             d->language = sq;
-        else if (elemText == TQString::fromLatin1("eu"))
+        else if (elemText == TQString::tqfromLatin1("eu"))
             d->language = eu;
-        else if (elemText == TQString::fromLatin1("be"))
+        else if (elemText == TQString::tqfromLatin1("be"))
             d->language = be;
-        else if (elemText == TQString::fromLatin1("bg"))
+        else if (elemText == TQString::tqfromLatin1("bg"))
             d->language = bg;
-        else if (elemText == TQString::fromLatin1("ca"))
+        else if (elemText == TQString::tqfromLatin1("ca"))
             d->language = ca;
-        else if (elemText == TQString::fromLatin1("zh-cn"))
+        else if (elemText == TQString::tqfromLatin1("zh-cn"))
             d->language = zh_cn;
-        else if (elemText == TQString::fromLatin1("zh-tw"))
+        else if (elemText == TQString::tqfromLatin1("zh-tw"))
             d->language = zh_tw;
-        else if (elemText == TQString::fromLatin1("hr"))
+        else if (elemText == TQString::tqfromLatin1("hr"))
             d->language = hr;
-        else if (elemText == TQString::fromLatin1("cs"))
+        else if (elemText == TQString::tqfromLatin1("cs"))
             d->language = cs;
-        else if (elemText == TQString::fromLatin1("da"))
+        else if (elemText == TQString::tqfromLatin1("da"))
             d->language = da;
-        else if (elemText == TQString::fromLatin1("nl"))
+        else if (elemText == TQString::tqfromLatin1("nl"))
             d->language = nl;
-        else if (elemText == TQString::fromLatin1("nl-be"))
+        else if (elemText == TQString::tqfromLatin1("nl-be"))
             d->language = nl_be;
-        else if (elemText == TQString::fromLatin1("nl-nl"))
+        else if (elemText == TQString::tqfromLatin1("nl-nl"))
             d->language = nl_nl;
-        else if (elemText == TQString::fromLatin1("en"))
+        else if (elemText == TQString::tqfromLatin1("en"))
             d->language = en;
-        else if (elemText == TQString::fromLatin1("en-au"))
+        else if (elemText == TQString::tqfromLatin1("en-au"))
             d->language = en_au;
-        else if (elemText == TQString::fromLatin1("en-bz"))
+        else if (elemText == TQString::tqfromLatin1("en-bz"))
             d->language = en_bz;
-        else if (elemText == TQString::fromLatin1("en-ca"))
+        else if (elemText == TQString::tqfromLatin1("en-ca"))
             d->language = en_ca;
-        else if (elemText == TQString::fromLatin1("en-ie"))
+        else if (elemText == TQString::tqfromLatin1("en-ie"))
             d->language = en_ie;
-        else if (elemText == TQString::fromLatin1("en-jm"))
+        else if (elemText == TQString::tqfromLatin1("en-jm"))
             d->language = en_jm;
-        else if (elemText == TQString::fromLatin1("en-nz"))
+        else if (elemText == TQString::tqfromLatin1("en-nz"))
             d->language = en_nz;
-        else if (elemText == TQString::fromLatin1("en-ph"))
+        else if (elemText == TQString::tqfromLatin1("en-ph"))
             d->language = en_ph;
-        else if (elemText == TQString::fromLatin1("en-za"))
+        else if (elemText == TQString::tqfromLatin1("en-za"))
             d->language = en_za;
-        else if (elemText == TQString::fromLatin1("en-tt"))
+        else if (elemText == TQString::tqfromLatin1("en-tt"))
             d->language = en_tt;
-        else if (elemText == TQString::fromLatin1("en-gb"))
+        else if (elemText == TQString::tqfromLatin1("en-gb"))
             d->language = en_gb;
-        else if (elemText == TQString::fromLatin1("en-us"))
+        else if (elemText == TQString::tqfromLatin1("en-us"))
             d->language = en_us;
-        else if (elemText == TQString::fromLatin1("en-zw"))
+        else if (elemText == TQString::tqfromLatin1("en-zw"))
             d->language = en_zw;
-        else if (elemText == TQString::fromLatin1("fo"))
+        else if (elemText == TQString::tqfromLatin1("fo"))
             d->language = fo;
-        else if (elemText == TQString::fromLatin1("fi"))
+        else if (elemText == TQString::tqfromLatin1("fi"))
             d->language = fi;
-        else if (elemText == TQString::fromLatin1("fr"))
+        else if (elemText == TQString::tqfromLatin1("fr"))
             d->language = fr;
-        else if (elemText == TQString::fromLatin1("fr-be"))
+        else if (elemText == TQString::tqfromLatin1("fr-be"))
             d->language = fr_be;
-        else if (elemText == TQString::fromLatin1("fr-ca"))
+        else if (elemText == TQString::tqfromLatin1("fr-ca"))
             d->language = fr_ca;
-        else if (elemText == TQString::fromLatin1("fr-fr"))
+        else if (elemText == TQString::tqfromLatin1("fr-fr"))
             d->language = fr_fr;
-        else if (elemText == TQString::fromLatin1("fr-lu"))
+        else if (elemText == TQString::tqfromLatin1("fr-lu"))
             d->language = fr_lu;
-        else if (elemText == TQString::fromLatin1("fr-mc"))
+        else if (elemText == TQString::tqfromLatin1("fr-mc"))
             d->language = fr_mc;
-        else if (elemText == TQString::fromLatin1("fr-ch"))
+        else if (elemText == TQString::tqfromLatin1("fr-ch"))
             d->language = fr_ch;
-        else if (elemText == TQString::fromLatin1("gl"))
+        else if (elemText == TQString::tqfromLatin1("gl"))
             d->language = gl;
-        else if (elemText == TQString::fromLatin1("gd"))
+        else if (elemText == TQString::tqfromLatin1("gd"))
             d->language = gd;
-        else if (elemText == TQString::fromLatin1("de"))
+        else if (elemText == TQString::tqfromLatin1("de"))
             d->language = de;
-        else if (elemText == TQString::fromLatin1("de-at"))
+        else if (elemText == TQString::tqfromLatin1("de-at"))
             d->language = de_at;
-        else if (elemText == TQString::fromLatin1("de-de"))
+        else if (elemText == TQString::tqfromLatin1("de-de"))
             d->language = de_de;
-        else if (elemText == TQString::fromLatin1("de-li"))
+        else if (elemText == TQString::tqfromLatin1("de-li"))
             d->language = de_li;
-        else if (elemText == TQString::fromLatin1("de-lu"))
+        else if (elemText == TQString::tqfromLatin1("de-lu"))
             d->language = de_lu;
-        else if (elemText == TQString::fromLatin1("de-ch"))
+        else if (elemText == TQString::tqfromLatin1("de-ch"))
             d->language = de_ch;
-        else if (elemText == TQString::fromLatin1("el"))
+        else if (elemText == TQString::tqfromLatin1("el"))
             d->language = el;
-        else if (elemText == TQString::fromLatin1("hu"))
+        else if (elemText == TQString::tqfromLatin1("hu"))
             d->language = hu;
-        else if (elemText == TQString::fromLatin1("is"))
+        else if (elemText == TQString::tqfromLatin1("is"))
             d->language = is;
-        else if (elemText == TQString::fromLatin1("id"))
+        else if (elemText == TQString::tqfromLatin1("id"))
             d->language = id;
-        else if (elemText == TQString::fromLatin1("ga"))
+        else if (elemText == TQString::tqfromLatin1("ga"))
             d->language = ga;
-        else if (elemText == TQString::fromLatin1("it"))
+        else if (elemText == TQString::tqfromLatin1("it"))
             d->language = it;
-        else if (elemText == TQString::fromLatin1("it-it"))
+        else if (elemText == TQString::tqfromLatin1("it-it"))
             d->language = it_it;
-        else if (elemText == TQString::fromLatin1("it-ch"))
+        else if (elemText == TQString::tqfromLatin1("it-ch"))
             d->language = it_ch;
-        else if (elemText == TQString::fromLatin1("ja"))
+        else if (elemText == TQString::tqfromLatin1("ja"))
             d->language = ja;
-        else if (elemText == TQString::fromLatin1("ko"))
+        else if (elemText == TQString::tqfromLatin1("ko"))
             d->language = ko;
-        else if (elemText == TQString::fromLatin1("mk"))
+        else if (elemText == TQString::tqfromLatin1("mk"))
             d->language = mk;
-        else if (elemText == TQString::fromLatin1("no"))
+        else if (elemText == TQString::tqfromLatin1("no"))
             d->language = no;
-        else if (elemText == TQString::fromLatin1("pl"))
+        else if (elemText == TQString::tqfromLatin1("pl"))
             d->language = pl;
-        else if (elemText == TQString::fromLatin1("pt"))
+        else if (elemText == TQString::tqfromLatin1("pt"))
             d->language = pt;
-        else if (elemText == TQString::fromLatin1("pt-br"))
+        else if (elemText == TQString::tqfromLatin1("pt-br"))
             d->language = pt_br;
-        else if (elemText == TQString::fromLatin1("pt-pt"))
+        else if (elemText == TQString::tqfromLatin1("pt-pt"))
             d->language = pt_pt;
-        else if (elemText == TQString::fromLatin1("ro"))
+        else if (elemText == TQString::tqfromLatin1("ro"))
             d->language = ro;
-        else if (elemText == TQString::fromLatin1("ro-mo"))
+        else if (elemText == TQString::tqfromLatin1("ro-mo"))
             d->language = ro_mo;
-        else if (elemText == TQString::fromLatin1("ro-ro"))
+        else if (elemText == TQString::tqfromLatin1("ro-ro"))
             d->language = ro_ro;
-        else if (elemText == TQString::fromLatin1("ru"))
+        else if (elemText == TQString::tqfromLatin1("ru"))
             d->language = ru;
-        else if (elemText == TQString::fromLatin1("ru-mo"))
+        else if (elemText == TQString::tqfromLatin1("ru-mo"))
             d->language = ru_mo;
-        else if (elemText == TQString::fromLatin1("ru-ru"))
+        else if (elemText == TQString::tqfromLatin1("ru-ru"))
             d->language = ru_ru;
-        else if (elemText == TQString::fromLatin1("sr"))
+        else if (elemText == TQString::tqfromLatin1("sr"))
             d->language = sr;
-        else if (elemText == TQString::fromLatin1("sk"))
+        else if (elemText == TQString::tqfromLatin1("sk"))
             d->language = sk;
-        else if (elemText == TQString::fromLatin1("sl"))
+        else if (elemText == TQString::tqfromLatin1("sl"))
             d->language = sl;
-        else if (elemText == TQString::fromLatin1("es"))
+        else if (elemText == TQString::tqfromLatin1("es"))
             d->language = es;
-        else if (elemText == TQString::fromLatin1("es-ar"))
+        else if (elemText == TQString::tqfromLatin1("es-ar"))
             d->language = es_ar;
-        else if (elemText == TQString::fromLatin1("es-bo"))
+        else if (elemText == TQString::tqfromLatin1("es-bo"))
             d->language = es_bo;
-        else if (elemText == TQString::fromLatin1("es-cl"))
+        else if (elemText == TQString::tqfromLatin1("es-cl"))
             d->language = es_cl;
-        else if (elemText == TQString::fromLatin1("es-co"))
+        else if (elemText == TQString::tqfromLatin1("es-co"))
             d->language = es_co;
-        else if (elemText == TQString::fromLatin1("es-cr"))
+        else if (elemText == TQString::tqfromLatin1("es-cr"))
             d->language = es_cr;
-        else if (elemText == TQString::fromLatin1("es-do"))
+        else if (elemText == TQString::tqfromLatin1("es-do"))
             d->language = es_do;
-        else if (elemText == TQString::fromLatin1("es-ec"))
+        else if (elemText == TQString::tqfromLatin1("es-ec"))
             d->language = es_ec;
-        else if (elemText == TQString::fromLatin1("es-sv"))
+        else if (elemText == TQString::tqfromLatin1("es-sv"))
             d->language = es_sv;
-        else if (elemText == TQString::fromLatin1("es-gt"))
+        else if (elemText == TQString::tqfromLatin1("es-gt"))
             d->language = es_gt;
-        else if (elemText == TQString::fromLatin1("es-hn"))
+        else if (elemText == TQString::tqfromLatin1("es-hn"))
             d->language = es_hn;
-        else if (elemText == TQString::fromLatin1("es-mx"))
+        else if (elemText == TQString::tqfromLatin1("es-mx"))
             d->language = es_mx;
-        else if (elemText == TQString::fromLatin1("es-ni"))
+        else if (elemText == TQString::tqfromLatin1("es-ni"))
             d->language = es_ni;
-        else if (elemText == TQString::fromLatin1("es-pa"))
+        else if (elemText == TQString::tqfromLatin1("es-pa"))
             d->language = es_pa;
-        else if (elemText == TQString::fromLatin1("es-py"))
+        else if (elemText == TQString::tqfromLatin1("es-py"))
             d->language = es_py;
-        else if (elemText == TQString::fromLatin1("es-pe"))
+        else if (elemText == TQString::tqfromLatin1("es-pe"))
             d->language = es_pe;
-        else if (elemText == TQString::fromLatin1("es-pr"))
+        else if (elemText == TQString::tqfromLatin1("es-pr"))
             d->language = es_pr;
-        else if (elemText == TQString::fromLatin1("es-es"))
+        else if (elemText == TQString::tqfromLatin1("es-es"))
             d->language = es_es;
-        else if (elemText == TQString::fromLatin1("es-uy"))
+        else if (elemText == TQString::tqfromLatin1("es-uy"))
             d->language = es_uy;
-        else if (elemText == TQString::fromLatin1("es-ve"))
+        else if (elemText == TQString::tqfromLatin1("es-ve"))
             d->language = es_ve;
-        else if (elemText == TQString::fromLatin1("sv"))
+        else if (elemText == TQString::tqfromLatin1("sv"))
             d->language = sv;
-        else if (elemText == TQString::fromLatin1("sv-fi"))
+        else if (elemText == TQString::tqfromLatin1("sv-fi"))
             d->language = sv_fi;
-        else if (elemText == TQString::fromLatin1("sv-se"))
+        else if (elemText == TQString::tqfromLatin1("sv-se"))
             d->language = sv_se;
-        else if (elemText == TQString::fromLatin1("tr"))
+        else if (elemText == TQString::tqfromLatin1("tr"))
             d->language = tr;
-        else if (elemText == TQString::fromLatin1("uk"))
+        else if (elemText == TQString::tqfromLatin1("uk"))
             d->language = uk;
         else
             d->language = UndefinedLanguage;
     }
 
     if (d->format == AtomFeed)
-        tagName=TQString::fromLatin1("issued"); // atom doesn't specify this for feeds
+        tagName=TQString::tqfromLatin1("issued"); // atom doesn't specify this for feeds
                                                // but some broken feeds do this
     else
-        tagName=TQString::fromLatin1("pubDate");
+        tagName=TQString::tqfromLatin1("pubDate");
 
     if (!(elemText = extractNode(channelNode, tagName)).isNull()) {
         time_t _time;
@@ -441,7 +441,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
         d->pubDate.setTime_t(_time);
     }
 
-    if (!(elemText = extractNode(channelNode, TQString::fromLatin1("dc:date"))).isNull()) {
+    if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("dc:date"))).isNull()) {
         time_t _time = parseISO8601Date(elemText);
         /* \bug This isn't really the right way since it will set the date to
          * Jan 1 1970, 1:00:00 if the passed date was invalid; this means that
@@ -451,9 +451,9 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
     }
 
     if (d->format == AtomFeed)
-        tagName=TQString::fromLatin1("modified");
+        tagName=TQString::tqfromLatin1("modified");
     else
-        tagName=TQString::fromLatin1("lastBuildDate");
+        tagName=TQString::tqfromLatin1("lastBuildDate");
     if (!(elemText = extractNode(channelNode, tagName)).isNull()) {
         time_t _time;
         if (d->format == AtomFeed)
@@ -463,44 +463,44 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
         d->lastBuildDate.setTime_t(_time);
     }
 
-    if (!(elemText = extractNode(channelNode, TQString::fromLatin1("rating"))).isNull())
+    if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("rating"))).isNull())
         d->rating = elemText;
-    if (!(elemText = extractNode(channelNode, TQString::fromLatin1("docs"))).isNull())
+    if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("docs"))).isNull())
         d->docs = elemText;
-    if (!(elemText = extractNode(channelNode, TQString::fromLatin1((d->format == AtomFeed) ? "author" : "managingEditor"))).isNull())
+    if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1((d->format == AtomFeed) ? "author" : "managingEditor"))).isNull())
         d->managingEditor = elemText;
-    if (!(elemText = extractNode(channelNode, TQString::fromLatin1("webMaster"))).isNull())
+    if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("webMaster"))).isNull())
         d->webMaster = elemText;
 
-	if (!(elemText = extractNode(channelNode, TQString::fromLatin1("ttl"))).isNull())
+	if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("ttl"))).isNull())
         d->ttl = elemText.toUInt();
 
-    n = channelNode.namedItem(TQString::fromLatin1("skipHours"));
+    n = channelNode.namedItem(TQString::tqfromLatin1("skipHours"));
     if (!n.isNull())
         for (TQDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement())
-            if (e.tagName() == TQString::fromLatin1("hour"))
+            if (e.tagName() == TQString::tqfromLatin1("hour"))
                 d->skipHours.append(e.text().toUInt());
 
-    n = channelNode.namedItem(TQString::fromLatin1("skipDays"));
+    n = channelNode.namedItem(TQString::tqfromLatin1("skipDays"));
     if (!n.isNull()) {
         Day day;
         TQString elemText;
         for (TQDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement())
-            if (e.tagName() == TQString::fromLatin1("day")) {
+            if (e.tagName() == TQString::tqfromLatin1("day")) {
                 elemText = e.text().lower();
-                if (elemText == TQString::fromLatin1("monday"))
+                if (elemText == TQString::tqfromLatin1("monday"))
                     day = Monday;
-                else if (elemText == TQString::fromLatin1("tuesday"))
+                else if (elemText == TQString::tqfromLatin1("tuesday"))
                     day = Tuesday;
-                else if (elemText == TQString::fromLatin1("wednesday"))
+                else if (elemText == TQString::tqfromLatin1("wednesday"))
                     day = Wednesday;
-                else if (elemText == TQString::fromLatin1("thursday"))
+                else if (elemText == TQString::tqfromLatin1("thursday"))
                     day = Thursday;
-                else if (elemText == TQString::fromLatin1("friday"))
+                else if (elemText == TQString::tqfromLatin1("friday"))
                     day = Friday;
-                else if (elemText == TQString::fromLatin1("saturday"))
+                else if (elemText == TQString::tqfromLatin1("saturday"))
                     day = Saturday;
-                else if (elemText == TQString::fromLatin1("sunday"))
+                else if (elemText == TQString::tqfromLatin1("sunday"))
                     day = Sunday;
                 else
                     day = UndefinedDay;
@@ -529,17 +529,17 @@ Version Document::version() const
 TQString Document::verbVersion() const
 {
     switch (d->version) {
-        case v0_90: return TQString::fromLatin1("0.90");
-        case v0_91: return TQString::fromLatin1("0.91");
-        case v0_92: return TQString::fromLatin1("0.92");
-        case v0_93: return TQString::fromLatin1("0.93");
-        case v0_94: return TQString::fromLatin1("0.94");
-        case v1_0: return TQString::fromLatin1("1.0");
-        case v2_0: return TQString::fromLatin1("2.0");
-        case vAtom_0_3: return TQString::fromLatin1("0.3");
-        case vAtom_0_2: return TQString::fromLatin1("0.2");
-        case vAtom_0_1: return TQString::fromLatin1("0.1");
-        case vAtom_1_0: return TQString::fromLatin1("1.0");
+        case v0_90: return TQString::tqfromLatin1("0.90");
+        case v0_91: return TQString::tqfromLatin1("0.91");
+        case v0_92: return TQString::tqfromLatin1("0.92");
+        case v0_93: return TQString::tqfromLatin1("0.93");
+        case v0_94: return TQString::tqfromLatin1("0.94");
+        case v1_0: return TQString::tqfromLatin1("1.0");
+        case v2_0: return TQString::tqfromLatin1("2.0");
+        case vAtom_0_3: return TQString::tqfromLatin1("0.3");
+        case vAtom_0_2: return TQString::tqfromLatin1("0.2");
+        case vAtom_0_1: return TQString::tqfromLatin1("0.1");
+        case vAtom_1_0: return TQString::tqfromLatin1("1.0");
     }
     return TQString::null;
 }
diff --git a/akregator/src/librss/enclosure.cpp b/akregator/src/librss/enclosure.cpp
index 602a2558..864c19fc 100644
--- a/akregator/src/librss/enclosure.cpp
+++ b/akregator/src/librss/enclosure.cpp
@@ -57,30 +57,30 @@ Enclosure Enclosure::fromXML(const TQDomElement& e)
     TQString url, type;
     int length = -1;
 
-    if (e.hasAttribute(TQString::fromLatin1("url")))
-        url = e.attribute(TQString::fromLatin1("url"));
+    if (e.hasAttribute(TQString::tqfromLatin1("url")))
+        url = e.attribute(TQString::tqfromLatin1("url"));
     
-    if (e.hasAttribute(TQString::fromLatin1("length")))
+    if (e.hasAttribute(TQString::tqfromLatin1("length")))
     {
         bool ok;
-        int c = e.attribute(TQString::fromLatin1("length")).toInt(&ok);
+        int c = e.attribute(TQString::tqfromLatin1("length")).toInt(&ok);
         length = ok ? c : -1;
     }
-    if (e.hasAttribute(TQString::fromLatin1("type")))
-        type = e.attribute(TQString::fromLatin1("type"));
+    if (e.hasAttribute(TQString::tqfromLatin1("type")))
+        type = e.attribute(TQString::tqfromLatin1("type"));
 
     return Enclosure(url, length, type);
 }
 
 TQDomElement Enclosure::toXML(TQDomDocument document) const
 {
-    TQDomElement e = document.createElement(TQString::fromLatin1("enclosure"));
+    TQDomElement e = document.createElement(TQString::tqfromLatin1("enclosure"));
     if (!d->url.isNull())
-        e.setAttribute(TQString::fromLatin1("url"), d->url);
+        e.setAttribute(TQString::tqfromLatin1("url"), d->url);
     if (d->length != -1)
-        e.setAttribute(TQString::fromLatin1("length"), TQString::number(d->length));
+        e.setAttribute(TQString::tqfromLatin1("length"), TQString::number(d->length));
     if (!d->type.isNull())
-        e.setAttribute(TQString::fromLatin1("type"), d->type);
+        e.setAttribute(TQString::tqfromLatin1("type"), d->type);
 
     return e;
 }
diff --git a/akregator/src/librss/image.cpp b/akregator/src/librss/image.cpp
index cb8d7c86..98074be3 100644
--- a/akregator/src/librss/image.cpp
+++ b/akregator/src/librss/image.cpp
@@ -48,17 +48,17 @@ Image::Image(const TQDomNode &node) : TQObject(), d(new Private)
 {
 	TQString elemText;
 
-	if (!(elemText = extractNode(node, TQString::fromLatin1("title"))).isNull())
+	if (!(elemText = extractNode(node, TQString::tqfromLatin1("title"))).isNull())
 		d->title = elemText;
-	if (!(elemText = extractNode(node, TQString::fromLatin1("url"))).isNull())
+	if (!(elemText = extractNode(node, TQString::tqfromLatin1("url"))).isNull())
 		d->url = elemText;
-	if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull())
+	if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull())
 		d->link = elemText;
-	if (!(elemText = extractNode(node, TQString::fromLatin1("description"))).isNull())
+	if (!(elemText = extractNode(node, TQString::tqfromLatin1("description"))).isNull())
 		d->description = elemText;
-	if (!(elemText = extractNode(node, TQString::fromLatin1("height"))).isNull())
+	if (!(elemText = extractNode(node, TQString::tqfromLatin1("height"))).isNull())
 		d->height = elemText.toUInt();
-	if (!(elemText = extractNode(node, TQString::fromLatin1("width"))).isNull())
+	if (!(elemText = extractNode(node, TQString::tqfromLatin1("width"))).isNull())
 		d->width = elemText.toUInt();
 }
 
diff --git a/akregator/src/librss/textinput.cpp b/akregator/src/librss/textinput.cpp
index 04799fca..a12442fa 100644
--- a/akregator/src/librss/textinput.cpp
+++ b/akregator/src/librss/textinput.cpp
@@ -38,13 +38,13 @@ TextInput::TextInput(const TQDomNode &node) : d(new Private)
 {
 	TQString elemText;
 
-	if (!(elemText = extractNode(node, TQString::fromLatin1("title"))).isNull())
+	if (!(elemText = extractNode(node, TQString::tqfromLatin1("title"))).isNull())
 		d->title = elemText;
-	if (!(elemText = extractNode(node, TQString::fromLatin1("description"))).isNull())
+	if (!(elemText = extractNode(node, TQString::tqfromLatin1("description"))).isNull())
 		d->description = elemText;
-	if (!(elemText = extractNode(node, TQString::fromLatin1("name"))))
+	if (!(elemText = extractNode(node, TQString::tqfromLatin1("name"))))
 		d->name = elemText;
-	if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull())
+	if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull())
 		d->link = elemText;
 }
 
diff --git a/akregator/src/librss/tools_p.cpp b/akregator/src/librss/tools_p.cpp
index 41996fd8..e12bea88 100644
--- a/akregator/src/librss/tools_p.cpp
+++ b/akregator/src/librss/tools_p.cpp
@@ -43,11 +43,11 @@ TQString childNodesAsXML(const TQDomNode& parent)
 static TQString plainTextToHtml(const TQString& plainText)
 {
     TQString str(plainText);
-    str.replace("&", "&amp;");
-    str.replace("\"", "&quot;");
-    str.replace("<", "&lt;");
-    //str.replace(">", "&gt;");
-    str.replace("\n", "<br/>");
+    str.tqreplace("&", "&amp;");
+    str.tqreplace("\"", "&quot;");
+    str.tqreplace("<", "&lt;");
+    //str.tqreplace(">", "&gt;");
+    str.tqreplace("\n", "<br/>");
     return str;
 }
 
@@ -84,7 +84,7 @@ static ContentFormat mapTypeToFormat(const TQString& modep, const TQString& type
     xmltypes.append(TQString::fromUtf8("application/xml-dtd"));
     
     
-    if (xmltypes.contains(type)
+    if (xmltypes.tqcontains(type)
         || type.endsWith(TQString::fromUtf8("+xml"), false)
         || type.endsWith(TQString::fromUtf8("/xml"), false))
         return XML;
@@ -102,7 +102,7 @@ static TQString extractAtomContent(const TQDomElement& e)
     {
         case HTML:
         {
-            const bool hasPre = e.text().contains( "<pre>", false ) || e.text().contains( "<pre ", false );
+            const bool hasPre = e.text().tqcontains( "<pre>", false ) || e.text().tqcontains( "<pre ", false );
             return KCharsets::resolveEntities( hasPre ? e.text() : e.text().simplifyWhiteSpace() );
         }
         case Text:
@@ -132,10 +132,10 @@ TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isI
         }        
         else // check for HTML; not necessary for Atom:content
         {
-            bool hasPre = result.contains("<pre>", false) || result.contains("<pre ", false);
-            bool hasHtml = hasPre || result.contains("<");	// FIXME: test if we have html, should be more clever -> regexp
+            bool hasPre = result.tqcontains("<pre>", false) || result.tqcontains("<pre ", false);
+            bool hasHtml = hasPre || result.tqcontains("<");	// FIXME: test if we have html, should be more clever -> regexp
             if(!isInlined && !hasHtml)						// perform nl2br if not a inline elt and it has no html elts
-                    result = result = result.replace(TQChar('\n'), "<br />");
+                    result = result = result.tqreplace(TQChar('\n'), "<br />");
             if(!hasPre)										// strip white spaces if no <pre>
                     result = result.simplifyWhiteSpace();
         }
@@ -145,13 +145,13 @@ TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isI
 
 TQString extractTitle(const TQDomNode & parent)
 {
-    TQDomNode node = parent.namedItem(TQString::fromLatin1("title"));
+    TQDomNode node = parent.namedItem(TQString::tqfromLatin1("title"));
     if (node.isNull())
         return TQString::null;
 
     TQString result = node.toElement().text();
 
-    result = KCharsets::resolveEntities(KCharsets::resolveEntities(result).replace(TQRegExp("<[^>]*>"), "").remove("\\"));
+    result = KCharsets::resolveEntities(KCharsets::resolveEntities(result).tqreplace(TQRegExp("<[^>]*>"), "").remove("\\"));
 	result = result.simplifyWhiteSpace();
 
     if (result.isEmpty())
@@ -177,7 +177,7 @@ static void authorFromString(const TQString& strp, TQString& name, TQString& ema
     {
         TQString all = remail.cap(0);
         email = remail.cap(1);
-        str.replace(all, ""); // remove mail address
+        str.tqreplace(all, ""); // remove mail address
     }
     
     // simplify the rest and use it as name
diff --git a/akregator/src/listtabwidget.cpp b/akregator/src/listtabwidget.cpp
index 5434a4a6..608d36a0 100644
--- a/akregator/src/listtabwidget.cpp
+++ b/akregator/src/listtabwidget.cpp
@@ -52,7 +52,7 @@ public:
     int currentID;
     TQValueList<NodeListView*> views;
     TQMap<int, NodeListView*> idToView;
-    TQHBoxLayout* layout;
+    TQHBoxLayout* tqlayout;
     ViewMode viewMode;
     TQMap<TQWidget*, TQString> captions;
 };
@@ -158,17 +158,17 @@ ListTabWidget::ListTabWidget(TQWidget* parent, const char* name) : TQWidget(pare
     d->current = 0;
     d->currentID = -1;
     d->viewMode = verticalTabs;
-    d->layout = new TQHBoxLayout(this);
-    //d->layout = new TQGridLayout(this, 1, 2);
+    d->tqlayout = new TQHBoxLayout(this);
+    //d->tqlayout = new TQGridLayout(this, 1, 2);
     d->tabBar = new KMultiTabBar(KMultiTabBar::Vertical, this); 
     d->tabBar->setStyle(KMultiTabBar::KDEV3ICON);
     //d->tabBar->setStyle(KMultiTabBar::KDEV3);
     d->tabBar->showActiveTabTexts(true);
     d->tabBar->setPosition(KMultiTabBar::Left);
-    d->layout->addWidget(d->tabBar/*, 0, 0*/);
+    d->tqlayout->addWidget(d->tabBar/*, 0, 0*/);
 
     d->stack = new TQWidgetStack(this);
-    d->layout->addWidget(d->stack/*, 0, 1*/);
+    d->tqlayout->addWidget(d->stack/*, 0, 1*/);
     
 //    connect(d->tabBar, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(slotCurrentChanged(TQWidget*)));
 }
diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp
index 8271994f..255309ff 100644
--- a/akregator/src/mainwindow.cpp
+++ b/akregator/src/mainwindow.cpp
@@ -85,7 +85,7 @@ MainWindow::MainWindow()
     int statH=fontMetrics().height()+2;
     m_statusLabel = new KSqueezedTextLabel(this);
     m_statusLabel->setTextFormat(Qt::RichText);
-    m_statusLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
+    m_statusLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
     m_statusLabel->setMinimumWidth( 0 );
     m_statusLabel->setFixedHeight( statH );
     statusBar()->addWidget (m_statusLabel, 1, false);
@@ -277,7 +277,7 @@ void MainWindow::slotClearStatusText()
     m_statusLabel->setText(TQString());
 }
 
-void MainWindow::slotSetStatusBarText( const TQString & text )
+void MainWindow::slotSeStatusBarText( const TQString & text )
 {
     m_statusLabel->setText(text);
 }
diff --git a/akregator/src/mainwindow.h b/akregator/src/mainwindow.h
index 3c52cdc5..84306282 100644
--- a/akregator/src/mainwindow.h
+++ b/akregator/src/mainwindow.h
@@ -93,7 +93,7 @@ public:
     
 public slots:
     void slotClearStatusText();
-    void slotSetStatusBarText(const TQString &c);
+    void slotSeStatusBarText(const TQString &c);
 
 protected:
     /**
diff --git a/akregator/src/mk4storage/Makefile.am b/akregator/src/mk4storage/Makefile.am
index 4f2ebfae..badfa183 100644
--- a/akregator/src/mk4storage/Makefile.am
+++ b/akregator/src/mk4storage/Makefile.am
@@ -12,7 +12,9 @@ libakregator_mk4storage_plugin_la_LIBADD = \
     $(top_builddir)/akregator/src/librss/librsslocal.la \
     ../libakregatorprivate.la \
     $(LIB_KFILE) \
-    $(LIB_KDECORE)
+    $(LIB_KDECORE) \
+    $(LIB_QT) \
+    $(LIB_KDEUI)
 
 libakregator_mk4storage_plugin_la_LDFLAGS = \
     $(KDE_PLUGIN) \
diff --git a/akregator/src/mk4storage/feedstoragemk4impl.cpp b/akregator/src/mk4storage/feedstoragemk4impl.cpp
index b03f0438..a535197f 100644
--- a/akregator/src/mk4storage/feedstoragemk4impl.cpp
+++ b/akregator/src/mk4storage/feedstoragemk4impl.cpp
@@ -147,8 +147,8 @@ FeedStorageMK4Impl::FeedStorageMK4Impl(const TQString& url, StorageMK4Impl* main
     kdDebug() << url2 << endl;
     TQString t = url2;
     TQString t2 = url2;
-    TQString filePath = main->archivePath() +"/"+ t.replace("/", "_").replace(":", "_");
-    d->oldArchivePath = KGlobal::dirs()->saveLocation("data", "akregator/Archive/") + t2.replace("/", "_").replace(":", "_") + ".xml";
+    TQString filePath = main->archivePath() +"/"+ t.tqreplace("/", "_").tqreplace(":", "_");
+    d->oldArchivePath = KGlobal::dirs()->saveLocation("data", "akregator/Archive/") + t2.tqreplace("/", "_").tqreplace(":", "_") + ".xml";
 
     d->convert = !TQFile::exists(filePath + ".mk4") && TQFile::exists(d->oldArchivePath);
     d->storage = new c4_Storage((filePath + ".mk4").local8Bit(), true);
@@ -297,7 +297,7 @@ void FeedStorageMK4Impl::addEntry(const TQString& guid)
 {
     c4_Row row;
     d->pguid(row) = guid.ascii();
-    if (!contains(guid))
+    if (!tqcontains(guid))
     {
         d->archiveView.Add(row);
         markDirty();
@@ -305,7 +305,7 @@ void FeedStorageMK4Impl::addEntry(const TQString& guid)
     }
 }
 
-bool FeedStorageMK4Impl::contains(const TQString& guid)
+bool FeedStorageMK4Impl::tqcontains(const TQString& guid)
 {
     return findArticle(guid) != -1;
 }
@@ -401,7 +401,7 @@ int FeedStorageMK4Impl::status(const TQString& guid)
     return findidx != -1 ? d->pstatus(d->archiveView.GetAt(findidx)) : 0;
 }
 
-void FeedStorageMK4Impl::setStatus(const TQString& guid, int status)
+void FeedStorageMK4Impl::seStatus(const TQString& guid, int status)
 {
     int findidx = findArticle(guid);
     if (findidx == -1)
@@ -789,7 +789,7 @@ void FeedStorageMK4Impl::add(FeedStorage* source)
 
 void FeedStorageMK4Impl::copyArticle(const TQString& guid, FeedStorage* source)
 {
-    if (!contains(guid))
+    if (!tqcontains(guid))
         addEntry(guid);
     setComments(guid, source->comments(guid));
     setCommentsLink(guid, source->commentsLink(guid));
@@ -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));
-    setStatus(guid, source->status(guid));
+    seStatus(guid, source->status(guid));
     setTitle(guid, source->title(guid));
     setAuthor(guid, source->author(guid));
 
diff --git a/akregator/src/mk4storage/feedstoragemk4impl.h b/akregator/src/mk4storage/feedstoragemk4impl.h
index b6fea2e8..df60b29c 100644
--- a/akregator/src/mk4storage/feedstoragemk4impl.h
+++ b/akregator/src/mk4storage/feedstoragemk4impl.h
@@ -50,7 +50,7 @@ class FeedStorageMK4Impl : public FeedStorage
 
         virtual TQStringList articles(const Category& cat);
 
-        virtual bool contains(const TQString& guid);
+        virtual bool tqcontains(const TQString& guid);
         virtual void addEntry(const TQString& guid);
         virtual void deleteArticle(const TQString& guid);
         virtual int comments(const TQString& guid);
@@ -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 setStatus(const TQString& guid, int status);
+        virtual void seStatus(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);
diff --git a/akregator/src/mk4storage/metakit/include/mk4str.h b/akregator/src/mk4storage/metakit/include/mk4str.h
index 7124a29e..88b7a39d 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 replacement classes
+#else                           // Universal tqreplacement classes
 
     /// An efficient string class, modeled after the MFC version
 class c4_String
diff --git a/akregator/src/mk4storage/metakit/src/column.cpp b/akregator/src/mk4storage/metakit/src/column.cpp
index 2d191c64..0873ac83 100644
--- a/akregator/src/mk4storage/metakit/src/column.cpp
+++ b/akregator/src/mk4storage/metakit/src/column.cpp
@@ -770,7 +770,7 @@ void c4_Column::StoreBytes(t4_i32 pos_, const c4_Bytes& buffer_)
       
 t4_i32 c4_Column::PullValue(const t4_byte*& ptr_)
 {
-  t4_i32 mask = *ptr_ ? 0 : ~0;
+  t4_i32 tqmask = *ptr_ ? 0 : ~0;
 
   t4_i32 v = 0;
   for (;;) {
@@ -779,7 +779,7 @@ t4_i32 c4_Column::PullValue(const t4_byte*& ptr_)
       break;      
   }
   
-  return mask ^ (v - 0x80);   // oops, last byte had bit 7 set
+  return tqmask ^ (v - 0x80);   // oops, last byte had bit 7 set
 }
 
 void c4_Column::PushValue(t4_byte*& ptr_, t4_i32 v_)
@@ -1398,30 +1398,30 @@ void c4_ColOfInts::ResizeData(int index_, int count_, bool clear_)
 
     /*  _currwidth    1:  2:  4:
      *    shiftPos     3   2   1    shift the offset right this much
-     *    maskPos      7   3   1    mask the offset with this
+     *    tqmaskPos      7   3   1    tqmask the offset with this
      */
 
   const int shiftPos = _currWidth == 4 ? 1 : 4 - _currWidth;
-  const int maskPos = (1 << shiftPos) - 1;
+  const int tqmaskPos = (1 << shiftPos) - 1;
 
   // the following code is similar to c4_Column::Resize, but at bit level
 
     // turn insertion into deletion by inserting entire bytes
   if (count_ > 0) {
     unsigned off = (unsigned) index_ >> shiftPos;
-    int gapBytes = (count_ + maskPos) >> shiftPos;
+    int gapBytes = (count_ + tqmaskPos) >> shiftPos;
 
     InsertData(off, gapBytes, clear_);
 
       // oops, we might have inserted too low by a few entries
-    const int bits = (index_ & maskPos) * _currWidth;
+    const int bits = (index_ & tqmaskPos) * _currWidth;
     if (bits) {
-      const int maskLow = (1 << bits) - 1;
+      const int tqmaskLow = (1 << bits) - 1;
 
         // move the first few bits to start of inserted range
       t4_byte* p = CopyNow(off + gapBytes);
-      t4_byte one = *p & maskLow;
-      *p &= ~maskLow;
+      t4_byte one = *p & tqmaskLow;
+      *p &= ~tqmaskLow;
 
       * CopyNow(off) = one;
     }
diff --git a/akregator/src/mk4storage/metakit/src/column.h b/akregator/src/mk4storage/metakit/src/column.h
index 3f6e4f15..96d1622e 100644
--- a/akregator/src/mk4storage/metakit/src/column.h
+++ b/akregator/src/mk4storage/metakit/src/column.h
@@ -169,7 +169,7 @@ private:
   tSetter _setter;
 
   union {
-  t4_byte _item[8]; // holds temp result (careful with alignment!)
+  t4_byte _item[8]; // holds temp result (careful with tqalignment!)
   double _aligner;  // needed for SPARC
   };
 
diff --git a/akregator/src/mk4storage/metakit/src/field.h b/akregator/src/mk4storage/metakit/src/field.h
index 5dfc2573..8bf3dc8c 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 contains subtables.
+    //: Returns true if this field tqcontains 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 aa23e739..49c45bce 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 contains data
+    // big oops: a root handler already tqcontains data
     
     for (int i = 0; i < _subSeqs.GetSize(); ++i)
       ForgetSubview(i);
diff --git a/akregator/src/mk4storage/metakit/src/handler.h b/akregator/src/mk4storage/metakit/src/handler.h
index 6003f625..353d0517 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 replaced.
+    //: Used for backward compatibility, should probably be tqreplaced.
   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;
diff --git a/akregator/src/mk4storage/metakit/src/persist.cpp b/akregator/src/mk4storage/metakit/src/persist.cpp
index 65a9e94e..743f4757 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 contains only integers, it could be stored.
+//    * Allocation info tqcontains 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)
-  * replace header with one pointing to that internal new one (equivalent)
+  * tqreplace 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 cc8175df..243eca04 100644
--- a/akregator/src/mk4storage/metakit/src/remap.cpp
+++ b/akregator/src/mk4storage/metakit/src/remap.cpp
@@ -79,7 +79,7 @@ public:
 };
 
 /////////////////////////////////////////////////////////////////////////////
-// The following contains code derived froms Python's dictionaries, hence:
+// The following tqcontains 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:
@@ -258,10 +258,10 @@ t4_i32 c4_HashViewer::CalcHash(c4_Cursor cursor_) const
 
 int c4_HashViewer::LookDict(t4_i32 hash_, c4_Cursor cursor_) const
 {
-  const unsigned int mask = _map.GetSize() - 2;
+  const unsigned int tqmask = _map.GetSize() - 2;
   /* We must come up with (i, incr) such that 0 <= i < _size
      and 0 < incr < _size and both are a function of hash */
-  int i = mask & ~hash_;
+  int i = tqmask & ~hash_;
   /* We use ~hash_ instead of hash_, as degenerate hash functions, such
      as for ints <sigh>, can have lots of leading zeros. It's not
      really a performance risk, but better safe than sorry. */
@@ -272,14 +272,14 @@ int c4_HashViewer::LookDict(t4_i32 hash_, c4_Cursor cursor_) const
 
   /* Derive incr from hash_, just to make it more arbitrary. Note that
      incr must not be 0, or we will get into an infinite loop.*/
-  unsigned incr = (hash_ ^ ((unsigned long) hash_ >> 3)) & mask;
+  unsigned incr = (hash_ ^ ((unsigned long) hash_ >> 3)) & tqmask;
   if (!incr)
-    incr = mask;
+    incr = tqmask;
 
   int poly = GetPoly();
   for (;;)
   {
-    i = (i+incr) & mask;
+    i = (i+incr) & tqmask;
     if (IsUnused(i))
       break;
     if (Hash(i) == hash_ && KeySame(Row(i), cursor_))
@@ -288,7 +288,7 @@ int c4_HashViewer::LookDict(t4_i32 hash_, c4_Cursor cursor_) const
       freeslot = i;
       /* Cycle through GF(2^n)-{0} */
     incr = incr << 1;
-    if (incr > mask)
+    if (incr > tqmask)
       incr ^= poly; /* This will implicitely clear the highest bit */
   }
 
@@ -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_); // replace existing
+    _base.SetAt(i, *value_); // tqreplace 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_); // replace existing
+    _base.SetAt(i, *value_); // tqreplace 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_); // replace existing
+    _base.SetAt(i, *value_); // tqreplace existing
   }
 
   return true;
diff --git a/akregator/src/mk4storage/metakit/src/store.cpp b/akregator/src/mk4storage/metakit/src/store.cpp
index a32de665..f43bc0e3 100644
--- a/akregator/src/mk4storage/metakit/src/store.cpp
+++ b/akregator/src/mk4storage/metakit/src/store.cpp
@@ -161,7 +161,7 @@ void c4_Notifier::Notify()
  *  Manager for persistent storage of view structures.
  *
  *  The storage class uses a view, with additional functionality to be able 
- *  to store and reload the data it contains (including nested subviews).
+ *  to store and reload the data it tqcontains (including nested subviews).
  *
  *  By default, data is loaded on demand, i.e. whenever data which has
  *  not yet been referenced is used for the first time.  Loading is limited
@@ -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 replaced
+  // adjust our copy when the root view has been tqreplaced
   *(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 replaced
+  // adjust our copy when the root view has been tqreplaced
   *(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 af2fc9fa..11e384ee 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 replaces the previous use of TLS, which cannot
+ *  This implementation tqreplaces 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/regress.cpp b/akregator/src/mk4storage/metakit/tests/regress.cpp
index 0725f57f..4e210444 100644
--- a/akregator/src/mk4storage/metakit/tests/regress.cpp
+++ b/akregator/src/mk4storage/metakit/tests/regress.cpp
@@ -100,7 +100,7 @@ main()
 }
 
 // Recursively display the entire view contents. The results shown do not
-// depend on file layout (free space, file positions, flat vs. on-demand).
+// depend on file tqlayout (free space, file positions, flat vs. on-demand).
 
 static void ViewDisplay(const c4_View& v_, FILE* fp, int l_ =0)
 {
@@ -219,9 +219,9 @@ void FailExpr(const char* expr)
   Fail(buffer);
 }
 
-int StartTest(int mask_, const char* name_, const char* desc_)
+int StartTest(int tqmask_, const char* name_, const char* desc_)
 {
-  if (mask_)
+  if (tqmask_)
   {
     #if q4_MFC && defined(_DEBUG)
       TRACE("%s - %-40s *** DISABLED ***\n", name_, desc_);
diff --git a/akregator/src/mk4storage/mk4confwidgetbase.ui b/akregator/src/mk4storage/mk4confwidgetbase.ui
index cc91559a..c8960237 100644
--- a/akregator/src/mk4storage/mk4confwidgetbase.ui
+++ b/akregator/src/mk4storage/mk4confwidgetbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>MK4ConfWidgetBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -27,7 +27,7 @@
         </property>
         <widget class="QLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -46,7 +46,7 @@
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -74,7 +74,7 @@
         </widget>
         <widget class="QLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -90,7 +90,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>140</width>
                             <height>20</height>
@@ -169,7 +169,7 @@
         <slot>&lt;No)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/akregator/src/mk4storage/storagemk4impl.cpp b/akregator/src/mk4storage/storagemk4impl.cpp
index 4fc9ecec..8fd93c55 100644
--- a/akregator/src/mk4storage/storagemk4impl.cpp
+++ b/akregator/src/mk4storage/storagemk4impl.cpp
@@ -276,7 +276,7 @@ void StorageMK4Impl::slotCommit()
 
 FeedStorage* StorageMK4Impl::archiveFor(const TQString& url)
 {
-    if (!d->feeds.contains(url))
+    if (!d->feeds.tqcontains(url))
     {
         FeedStorage* fs = new FeedStorageMK4Impl(url, this);
         d->feeds[url] = fs;
diff --git a/akregator/src/mk4storage/storagemk4impl.h b/akregator/src/mk4storage/storagemk4impl.h
index bf50efc6..37e31764 100644
--- a/akregator/src/mk4storage/storagemk4impl.h
+++ b/akregator/src/mk4storage/storagemk4impl.h
@@ -105,7 +105,7 @@ class StorageMK4Impl : public Storage
         virtual TQString restoreTagSet() const; 
   
         /** adds all feed storages from a source to this storage
-            existing articles are replaced
+            existing articles are tqreplaced
         */
         virtual void add(Storage* source);
         
diff --git a/akregator/src/nodelist.cpp b/akregator/src/nodelist.cpp
index 95242840..fd49c060 100644
--- a/akregator/src/nodelist.cpp
+++ b/akregator/src/nodelist.cpp
@@ -216,7 +216,7 @@ int NodeList::generateID()
 void NodeList::slotNodeAdded(TreeNode* node)
 {
     Folder* parent = node->parent();
-    if ( !node || !d->flatList.contains(parent) || d->flatList.contains(node) )
+    if ( !node || !d->flatList.tqcontains(parent) || d->flatList.tqcontains(node) )
         return;
 
     addNode(node, false);
@@ -224,7 +224,7 @@ void NodeList::slotNodeAdded(TreeNode* node)
 
 void NodeList::slotNodeDestroyed(TreeNode* node)
 {
-    if ( !node || !d->flatList.contains(node) )
+    if ( !node || !d->flatList.tqcontains(node) )
         return;
 
     removeNode(node);
@@ -232,7 +232,7 @@ void NodeList::slotNodeDestroyed(TreeNode* node)
 
 void NodeList::slotNodeRemoved(Folder* /*parent*/, TreeNode* node)
 {
-    if ( !node || !d->flatList.contains(node) )
+    if ( !node || !d->flatList.tqcontains(node) )
         return;
 
     removeNode(node);
diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp
index 9f1e5591..90bf6008 100644
--- a/akregator/src/pageviewer.cpp
+++ b/akregator/src/pageviewer.cpp
@@ -356,7 +356,7 @@ void PageViewer::slotCancelled( const TQString & /*errMsg*/ )
 
 void PageViewer::urlSelected(const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args)
 {
-    if (url.startsWith(TQString::fromLatin1( "javascript:" ), /*case-sensitive=*/false) )
+    if (url.startsWith(TQString::tqfromLatin1( "javascript:" ), /*case-sensitive=*/false) )
     {
         KHTMLPart::urlSelected(url,button,state,_target,args);
     }
@@ -390,7 +390,7 @@ void PageViewer::slotPaletteOrFontChanged()
     if ( !obj ) // not all views have a browser extension !
         return;
     
-    int id = obj->metaObject()->findSlot("reparseConfiguration()");
+    int id = obj->tqmetaObject()->findSlot("reparseConfiguration()");
     if (id == -1)
         return;
     QUObject o[1];
diff --git a/akregator/src/progressmanager.cpp b/akregator/src/progressmanager.cpp
index 6146ddd8..6535896b 100644
--- a/akregator/src/progressmanager.cpp
+++ b/akregator/src/progressmanager.cpp
@@ -102,7 +102,7 @@ void ProgressManager::slotNodeAdded(TreeNode* node)
     Feed* feed = dynamic_cast<Feed*>(node);
     if (feed)
     {
-        if (!d->handlers.contains(feed))
+        if (!d->handlers.tqcontains(feed))
         d->handlers[feed] = new ProgressItemHandler(feed);
         connect(feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotNodeDestroyed(TreeNode*)));
     }
@@ -178,7 +178,7 @@ void ProgressItemHandler::slotFetchCompleted()
 {
     if (d->progressItem)
     {
-        d->progressItem->setStatus(i18n("Fetch completed"));
+        d->progressItem->seStatus(i18n("Fetch completed"));
         d->progressItem->setComplete();
         d->progressItem = 0;
     }
@@ -188,7 +188,7 @@ void ProgressItemHandler::slotFetchError()
 {
     if (d->progressItem)
     {
-        d->progressItem->setStatus(i18n("Fetch error"));
+        d->progressItem->seStatus(i18n("Fetch error"));
         d->progressItem->setComplete();
         d->progressItem = 0;
     }
@@ -198,7 +198,7 @@ void ProgressItemHandler::slotFetchAborted()
 {
     if (d->progressItem)
     {
-        d->progressItem->setStatus(i18n("Fetch aborted"));
+        d->progressItem->seStatus(i18n("Fetch aborted"));
         d->progressItem->setComplete();
         d->progressItem = 0;
     }
diff --git a/akregator/src/propertieswidgetbase.ui b/akregator/src/propertieswidgetbase.ui
index eb7d3962..3e94c7ed 100644
--- a/akregator/src/propertieswidgetbase.ui
+++ b/akregator/src/propertieswidgetbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>FeedPropertiesWidget</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -39,7 +39,7 @@
                     </property>
                     <widget class="QLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>layout8</cstring>
+                            <cstring>tqlayout8</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -100,7 +100,7 @@
                     </widget>
                     <widget class="QLayoutWidget" row="2" column="0">
                         <property name="name">
-                            <cstring>layout9</cstring>
+                            <cstring>tqlayout9</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -116,7 +116,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>31</width>
                                         <height>20</height>
@@ -282,7 +282,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>99</width>
                                         <height>20</height>
@@ -299,7 +299,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>100</width>
                                         <height>20</height>
@@ -362,7 +362,7 @@
                     </property>
                     <widget class="QLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>layout4</cstring>
+                            <cstring>tqlayout4</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -396,7 +396,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>71</height>
@@ -456,7 +456,7 @@
     <slot access="protected" specifier="pure virtual">slotUpdateComboBoxActivated( int )</slot>
     <slot access="protected" specifier="pure virtual">slotUpdateCheckBoxToggled( bool )</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/akregator/src/searchbar.cpp b/akregator/src/searchbar.cpp
index eb5b7cff..f2dd33e7 100644
--- a/akregator/src/searchbar.cpp
+++ b/akregator/src/searchbar.cpp
@@ -65,7 +65,7 @@ SearchBar::SearchBar(TQWidget* parent, const char* name) : TQHBox(parent, name),
     d->delay = 400;
     setMargin(2);
     setSpacing(5);
-    setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
+    tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
     TQToolButton *clearButton = new TQToolButton(this);
     clearButton->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase" ) );
 
@@ -144,7 +144,7 @@ void SearchBar::slotClearSearch()
     }
 }
 
-void SearchBar::slotSetStatus(int status)
+void SearchBar::slotSeStatus(int status)
 {
      d->searchCombo->setCurrentItem(status);
      slotSearchComboChanged(status);
diff --git a/akregator/src/searchbar.h b/akregator/src/searchbar.h
index 93227578..8227f83f 100644
--- a/akregator/src/searchbar.h
+++ b/akregator/src/searchbar.h
@@ -58,7 +58,7 @@ class SearchBar : public QHBox
 
     public slots:
         void slotClearSearch();
-        void slotSetStatus(int status);
+        void slotSeStatus(int status);
         void slotSetText(const TQString& text);
 
     private slots:
diff --git a/akregator/src/settings_advancedbase.ui b/akregator/src/settings_advancedbase.ui
index 0fc99295..3cb48868 100644
--- a/akregator/src/settings_advancedbase.ui
+++ b/akregator/src/settings_advancedbase.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>SettingsAdvanced</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -89,7 +89,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>174</width>
                             <height>20</height>
@@ -133,7 +133,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>260</height>
@@ -150,7 +150,7 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
 </includehints>
diff --git a/akregator/src/settings_appearance.ui b/akregator/src/settings_appearance.ui
index 48985a87..2f40bcd5 100644
--- a/akregator/src/settings_appearance.ui
+++ b/akregator/src/settings_appearance.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>SettingsAppearance</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -197,7 +197,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>41</height>
@@ -234,7 +234,7 @@
         <slot>setValue(int)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/akregator/src/settings_archive.ui b/akregator/src/settings_archive.ui
index 4fcfc4e5..86e0a303 100644
--- a/akregator/src/settings_archive.ui
+++ b/akregator/src/settings_archive.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>SettingsArchive</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -25,7 +25,7 @@
         </property>
         <widget class="QLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -143,7 +143,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>30</height>
@@ -168,7 +168,7 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/akregator/src/settings_browser.ui b/akregator/src/settings_browser.ui
index 52729a16..af9798e3 100644
--- a/akregator/src/settings_browser.ui
+++ b/akregator/src/settings_browser.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>SettingsBrowser</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -87,7 +87,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>31</width>
                     <height>16</height>
@@ -96,7 +96,7 @@
         </spacer>
         <widget class="QLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -202,5 +202,5 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/akregator/src/settings_general.ui b/akregator/src/settings_general.ui
index dc0e559d..26ef9299 100644
--- a/akregator/src/settings_general.ui
+++ b/akregator/src/settings_general.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>SettingsGeneral</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -139,7 +139,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -183,5 +183,5 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/akregator/src/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp
index 5c3272a1..cd991a49 100644
--- a/akregator/src/simplenodeselector.cpp
+++ b/akregator/src/simplenodeselector.cpp
@@ -142,8 +142,8 @@ SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, TQWidget* parent, con
     
     connect(d->view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotItemSelected(TQListViewItem*)));
 
-    TQGridLayout* layout = new TQGridLayout(this, 1, 1);
-    layout->addWidget(d->view, 0, 0);
+    TQGridLayout* tqlayout = new TQGridLayout(this, 1, 1);
+    tqlayout->addWidget(d->view, 0, 0);
 
     d->visitor = new NodeVisitor(this);
 
@@ -185,7 +185,7 @@ void SimpleNodeSelector::slotItemSelected(TQListViewItem* item)
 
 void SimpleNodeSelector::slotNodeDestroyed(TreeNode* node)
 {
-    if (d->nodeToItem.contains(node))
+    if (d->nodeToItem.tqcontains(node))
     {
         TQListViewItem* item = d->nodeToItem[node];
         d->nodeToItem.remove(node);
diff --git a/akregator/src/speechclient.cpp b/akregator/src/speechclient.cpp
index 4f98df2c..6263c11f 100644
--- a/akregator/src/speechclient.cpp
+++ b/akregator/src/speechclient.cpp
@@ -135,7 +135,7 @@ void SpeechClient::slotAbortJobs()
 ASYNC SpeechClient::textRemoved(const TQCString& /*appId*/, uint jobNum)
 {
     kdDebug() << "SpeechClient::textRemoved() called" << endl;
-    if (d->pendingJobs.contains(jobNum))
+    if (d->pendingJobs.tqcontains(jobNum))
     {
         d->pendingJobs.remove(jobNum);
         if (d->pendingJobs.isEmpty())
diff --git a/akregator/src/storage.h b/akregator/src/storage.h
index 8c02a9f7..2c6a9ceb 100644
--- a/akregator/src/storage.h
+++ b/akregator/src/storage.h
@@ -105,7 +105,7 @@ class AKREGATOR_EXPORT Storage : public QObject
         virtual TQStringList feeds() const = 0;
 
         /** adds all feed storages from a source to this storage
-            existing articles are replaced
+            existing articles are tqreplaced
         */
         virtual void add(Storage* source) = 0;
         
diff --git a/akregator/src/storagedummyimpl.cpp b/akregator/src/storagedummyimpl.cpp
index 25d3f320..43b8788d 100644
--- a/akregator/src/storagedummyimpl.cpp
+++ b/akregator/src/storagedummyimpl.cpp
@@ -100,12 +100,12 @@ bool StorageDummyImpl::rollback()
 
 int StorageDummyImpl::unreadFor(const TQString &url)
 {
-    return d->feeds.contains(url) ? d->feeds[url].unread : 0;
+    return d->feeds.tqcontains(url) ? d->feeds[url].unread : 0;
 }
 
 void StorageDummyImpl::setUnreadFor(const TQString &url, int unread)
 {
-    if (!d->feeds.contains(url))
+    if (!d->feeds.tqcontains(url))
        d->addEntry(url, unread, unread, 0);
     else
        d->feeds[url].unread = unread;
@@ -113,12 +113,12 @@ void StorageDummyImpl::setUnreadFor(const TQString &url, int unread)
 
 int StorageDummyImpl::totalCountFor(const TQString &url)
 {
-    return d->feeds.contains(url) ? d->feeds[url].totalCount : 0;
+    return d->feeds.tqcontains(url) ? d->feeds[url].totalCount : 0;
 }
 
 void StorageDummyImpl::setTotalCountFor(const TQString &url, int total)
 {
-    if (!d->feeds.contains(url))
+    if (!d->feeds.tqcontains(url))
        d->addEntry(url, 0, total, 0);
     else
        d->feeds[url].totalCount = total;
@@ -126,12 +126,12 @@ void StorageDummyImpl::setTotalCountFor(const TQString &url, int total)
 
 int StorageDummyImpl::lastFetchFor(const TQString& url)
 {
-    return d->feeds.contains(url) ? d->feeds[url].lastFetch : 0;
+    return d->feeds.tqcontains(url) ? d->feeds[url].lastFetch : 0;
 }
 
 void StorageDummyImpl::setLastFetchFor(const TQString& url, int lastFetch)
 {
-    if (!d->feeds.contains(url))
+    if (!d->feeds.tqcontains(url))
        d->addEntry(url, 0, 0, lastFetch);
     else 
        d->feeds[url].lastFetch = lastFetch;
@@ -143,7 +143,7 @@ void StorageDummyImpl::slotCommit()
 
 FeedStorage* StorageDummyImpl::archiveFor(const TQString& url)
 {
-    if (!d->feeds.contains(url))
+    if (!d->feeds.tqcontains(url))
         d->feeds[url].feedStorage = new FeedStorageDummyImpl(url, this);
 
     return d->feeds[url].feedStorage;
diff --git a/akregator/src/storagedummyimpl.h b/akregator/src/storagedummyimpl.h
index e5ef8cd8..35cbdda4 100644
--- a/akregator/src/storagedummyimpl.h
+++ b/akregator/src/storagedummyimpl.h
@@ -88,7 +88,7 @@ class StorageDummyImpl : public Storage
         virtual TQString restoreTagSet() const;
 
         /** adds all feed storages from a source to this storage
-            existing articles are replaced
+            existing articles are tqreplaced
         */
         virtual void add(Storage* source);
         
diff --git a/akregator/src/storagefactoryregistry.cpp b/akregator/src/storagefactoryregistry.cpp
index a175df9d..f6162ef9 100644
--- a/akregator/src/storagefactoryregistry.cpp
+++ b/akregator/src/storagefactoryregistry.cpp
@@ -52,7 +52,7 @@ StorageFactoryRegistry* StorageFactoryRegistry::self()
 	
 bool StorageFactoryRegistry::registerFactory(StorageFactory* factory, const TQString& typestr)
 {
-    if (containsFactory(typestr))
+    if (tqcontainsFactory(typestr))
         return false;
     d->map[typestr] = factory;
     return true; 
@@ -68,9 +68,9 @@ StorageFactory* StorageFactoryRegistry::getFactory(const TQString& typestr)
     return d->map[typestr];
 }
 
-bool StorageFactoryRegistry::containsFactory(const TQString& typestr) const
+bool StorageFactoryRegistry::tqcontainsFactory(const TQString& typestr) const
 {
-    return d->map.contains(typestr);
+    return d->map.tqcontains(typestr);
 }
 
 TQStringList StorageFactoryRegistry::list() const
diff --git a/akregator/src/storagefactoryregistry.h b/akregator/src/storagefactoryregistry.h
index 75976e26..64567840 100644
--- a/akregator/src/storagefactoryregistry.h
+++ b/akregator/src/storagefactoryregistry.h
@@ -45,7 +45,7 @@ class AKREGATOR_EXPORT StorageFactoryRegistry
         bool registerFactory(StorageFactory* factory, const TQString& typestr);
         void unregisterFactory(const TQString& typestr);
         StorageFactory* getFactory(const TQString& typestr);
-        bool containsFactory(const TQString& typestr) const;
+        bool tqcontainsFactory(const TQString& typestr) const;
         TQStringList list() const;
         
 
diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp
index df969aac..3f86fa1d 100644
--- a/akregator/src/tabwidget.cpp
+++ b/akregator/src/tabwidget.cpp
@@ -166,8 +166,8 @@ void TabWidget::removeFrame(Frame *f)
 uint TabWidget::tabBarWidthForMaxChars( uint maxLength )
 {
     int hframe, overlap;
-    hframe = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabHSpace, this );
-    overlap = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabOverlap, this );
+    hframe = tabBar()->style().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, this );
+    overlap = tabBar()->style().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, this );
 
     TQFontMetrics fm = tabBar()->fontMetrics();
     int x = 0;
@@ -198,7 +198,7 @@ void TabWidget::setTitle( const TQString &title , TQWidget* sender)
     removeTabToolTip( sender );
    
     uint lcw=0, rcw=0;
-    int tabBarHeight = tabBar()->sizeHint().height();
+    int tabBarHeight = tabBar()->tqsizeHint().height();
     if ( cornerWidget( TopLeft ) && cornerWidget( TopLeft )->isVisible() )
         lcw = QMAX( cornerWidget( TopLeft )->width(), tabBarHeight );
     if ( cornerWidget( TopRight ) && cornerWidget( TopRight )->isVisible() )
@@ -218,7 +218,7 @@ void TabWidget::setTitle( const TQString &title , TQWidget* sender)
         newTitle = newTitle.left( newMaxLength-3 ) + "...";
     }
 
-    newTitle.replace( '&', "&&" );
+    newTitle.tqreplace( '&', "&&" );
     if ( tabLabel( sender ) != newTitle )
         changeTab( sender, newTitle );
 
@@ -235,7 +235,7 @@ void TabWidget::setTitle( const TQString &title , TQWidget* sender)
                 newTitle = newTitle.left( newMaxLength-3 ) + "...";
             }
 
-            newTitle.replace( '&', "&&" );
+            newTitle.tqreplace( '&', "&&" );
             if ( newTitle != tabLabel( page( i ) ) )
                     changeTab( page( i ), newTitle );
         }
diff --git a/akregator/src/tag.h b/akregator/src/tag.h
index 01c0f4e2..a865b6ec 100644
--- a/akregator/src/tag.h
+++ b/akregator/src/tag.h
@@ -81,7 +81,7 @@ class Tag
 
     bool isNull() const;
     
-    /** tag identifier, used as key throughout the app and archive. Must be unique in the tag set. Can be an arbitrary unicode string, an URI etc. */
+    /** tag identifier, used as key throughout the app and archive. Must be unique in the tag set. Can be an arbitrary tqunicode string, an URI etc. */
     TQString id() const;
 
     /** user-visible name of the tag */
diff --git a/akregator/src/tagaction.cpp b/akregator/src/tagaction.cpp
index eba476c5..20a68eb4 100644
--- a/akregator/src/tagaction.cpp
+++ b/akregator/src/tagaction.cpp
@@ -90,7 +90,7 @@ int TagAction::plug(TQWidget* widget, int index)
         return -1;
     
    TagMenuItem* item = new TagMenuItem(d->tag);
-    int id = popup->insertItem(TagMenuItem::checkBoxIconSet(isChecked(), popup->colorGroup()), item, -1, index);
+    int id = popup->insertItem(TagMenuItem::checkBoxIconSet(isChecked(), popup->tqcolorGroup()), item, -1, index);
    
     
     popup->connectItem (id, this, TQT_SLOT(slotActivated()));
diff --git a/akregator/src/tagnode.cpp b/akregator/src/tagnode.cpp
index b351d668..3b4939cd 100644
--- a/akregator/src/tagnode.cpp
+++ b/akregator/src/tagnode.cpp
@@ -162,7 +162,7 @@ void TagNode::slotMarkAllArticlesAsRead()
     setNotificationMode(false);
     TQValueList<Article>::Iterator en = d->articles.end();
     for (TQValueList<Article>::Iterator it = d->articles.begin(); it != en; ++it)
-        (*it).setStatus(Article::Read);
+        (*it).seStatus(Article::Read);
     setNotificationMode(true);
 }
     
@@ -196,7 +196,7 @@ void TagNode::slotArticlesAdded(TreeNode* node, const TQValueList<Article>& list
     bool added = false;
     for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
     {
-        if (!d->articles.contains(*it) && d->filter.matches(*it))
+        if (!d->articles.tqcontains(*it) && d->filter.matches(*it))
         {
             d->articles.append(*it);
             d->addedArticlesNotify.append(*it);
@@ -216,7 +216,7 @@ void TagNode::slotArticlesUpdated(TreeNode* node, const TQValueList<Article>& li
     bool updated = false;
     for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
     {
-        if (d->articles.contains(*it))
+        if (d->articles.tqcontains(*it))
         {
             if (!d->filter.matches(*it)) // articles is in list, but doesn't match our criteria anymore -> remove it
 	    {
@@ -252,7 +252,7 @@ void TagNode::slotArticlesRemoved(TreeNode* node, const TQValueList<Article>& li
     bool removed = false;
     for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
     {
-        if (d->articles.contains(*it))
+        if (d->articles.tqcontains(*it))
         {
             d->articles.remove(*it);
             d->removedArticlesNotify.append(*it);
diff --git a/akregator/src/tagnode.h b/akregator/src/tagnode.h
index efe54ae9..30630f86 100644
--- a/akregator/src/tagnode.h
+++ b/akregator/src/tagnode.h
@@ -75,7 +75,7 @@ public:
     virtual int totalCount() const;
 
     
-    /** Returns a sequence of the articles this node contains. For feed groups, this returns a concatenated list of all articles in the sub tree.
+    /** Returns a sequence of the articles this node tqcontains. For feed groups, this returns a concatenated list of all articles in the sub tree.
     If @c tag is not null, only articles tagged with @c tag are returned
     @return sequence of articles */
     
diff --git a/akregator/src/tagnodelist.cpp b/akregator/src/tagnodelist.cpp
index c53e5be3..f1a98b62 100644
--- a/akregator/src/tagnodelist.cpp
+++ b/akregator/src/tagnodelist.cpp
@@ -92,7 +92,7 @@ bool TagNodeList::insert(TagNode* tagNode)
 {
     tagNode->setId(KApplication::random());
     TQString id = tagNode->tag().id();
-    if (!containsTagId(id))
+    if (!tqcontainsTagId(id))
     {
         rootNode()->appendChild(tagNode); // TODO: maintain sorting
         d->tagIdToNodeMap[id] = tagNode;
@@ -105,7 +105,7 @@ bool TagNodeList::insert(TagNode* tagNode)
 bool TagNodeList::remove(TagNode* tagNode)
 {
     TQString id = tagNode->tag().id();
-    if (containsTagId(id))
+    if (tqcontainsTagId(id))
     {
         rootNode()->removeChild(tagNode);
         d->tagIdToNodeMap.remove(id);
@@ -120,7 +120,7 @@ void TagNodeList::slotNodeDestroyed(TreeNode* node)
     TagNode* tagNode = dynamic_cast<TagNode*>(node);
     TQString id = tagNode ? tagNode->tag().id() : TQString::null;
     
-    if (tagNode != 0 && containsTagId(id))
+    if (tagNode != 0 && tqcontainsTagId(id))
     {
         rootNode()->removeChild(tagNode);
         d->tagIdToNodeMap.remove(id);
@@ -135,7 +135,7 @@ void TagNodeList::slotNodeAdded(TreeNode* node)
     TagNode* tagNode = dynamic_cast<TagNode*>(node);
     TQString id = tagNode ? tagNode->tag().id() : TQString::null;
     
-    if (tagNode != 0L && !containsTagId(id))
+    if (tagNode != 0L && !tqcontainsTagId(id))
     {
        d->tagIdToNodeMap[id] = tagNode;
        emit signalTagNodeAdded(tagNode);
@@ -149,16 +149,16 @@ void TagNodeList::slotNodeRemoved(Folder* parent, TreeNode* node)
     TagNode* tagNode = dynamic_cast<TagNode*>(node);
     TQString id = tagNode ? tagNode->tag().id() : TQString::null;
     
-    if (parent == rootNode() && tagNode != 0L && containsTagId(id))
+    if (parent == rootNode() && tagNode != 0L && tqcontainsTagId(id))
     {
         d->tagIdToNodeMap.remove(id);
         emit signalTagNodeRemoved(tagNode);
     }
 }
 
-bool TagNodeList::containsTagId(const TQString& tagId)
+bool TagNodeList::tqcontainsTagId(const TQString& tagId)
 {
-    return d->tagIdToNodeMap.contains(tagId);
+    return d->tagIdToNodeMap.tqcontains(tagId);
 }
 
 TQValueList<TagNode*> TagNodeList::toList() const
@@ -178,7 +178,7 @@ TQDomDocument TagNodeList::toXML() const
 
 void TagNodeList::slotTagAdded(const Tag& tag)
 {
-    if (!containsTagId(tag.id()))
+    if (!tqcontainsTagId(tag.id()))
     {
         insert(new TagNode(tag, d->feedList->rootNode()));
     }
@@ -186,14 +186,14 @@ void TagNodeList::slotTagAdded(const Tag& tag)
 
 void TagNodeList::slotTagUpdated(const Tag& tag)
 {
-    if (containsTagId(tag.id()))
+    if (tqcontainsTagId(tag.id()))
     {
         d->tagIdToNodeMap[tag.id()]->tagChanged();
     }
 }
 void TagNodeList::slotTagRemoved(const Tag& tag)
 {
-    if (containsTagId(tag.id()))
+    if (tqcontainsTagId(tag.id()))
     {
         delete d->tagIdToNodeMap[tag.id()];
         d->tagIdToNodeMap[tag.id()] = 0;
diff --git a/akregator/src/tagnodelist.h b/akregator/src/tagnodelist.h
index f909c827..9e67b197 100644
--- a/akregator/src/tagnodelist.h
+++ b/akregator/src/tagnodelist.h
@@ -53,7 +53,7 @@ namespace Akregator {
        FeedList* feedList() const;
        bool insert(TagNode* tagNode);
        bool remove(TagNode* tagNode);
-       bool containsTagId(const TQString& tagId);
+       bool tqcontainsTagId(const TQString& tagId);
        TQValueList<TagNode*> toList() const;
        
        TagNode* findByTagID(const TQString& tagID);
diff --git a/akregator/src/tagpropertieswidgetbase.ui b/akregator/src/tagpropertieswidgetbase.ui
index 68bc09c1..d96744bb 100644
--- a/akregator/src/tagpropertieswidgetbase.ui
+++ b/akregator/src/tagpropertieswidgetbase.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>Form1</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -22,7 +22,7 @@
         </property>
         <widget class="QLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -53,7 +53,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>31</height>
@@ -62,7 +62,7 @@
         </spacer>
         <widget class="QLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>layout9</cstring>
+                <cstring>tqlayout9</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -91,7 +91,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>40</width>
                             <height>40</height>
@@ -117,7 +117,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>200</width>
                             <height>21</height>
@@ -128,7 +128,7 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kicondialog.h</includehint>
 </includehints>
diff --git a/akregator/src/tagset.cpp b/akregator/src/tagset.cpp
index e3a8d60e..4cfb787a 100644
--- a/akregator/src/tagset.cpp
+++ b/akregator/src/tagset.cpp
@@ -54,7 +54,7 @@ TagSet::~TagSet()
 
 void TagSet::insert(const Tag& tag)
 {
-    if (!d->map.contains(tag.id()))
+    if (!d->map.tqcontains(tag.id()))
     {
         d->map.insert(tag.id(), tag);
         tag.addedToTagSet(this);
@@ -64,7 +64,7 @@ void TagSet::insert(const Tag& tag)
 
 void TagSet::remove(const Tag& tag)
 {
-    if (d->map.contains(tag.id()))
+    if (d->map.tqcontains(tag.id()))
     {
         d->map.remove(tag.id());
         tag.removedFromTagSet(this);
@@ -72,19 +72,19 @@ void TagSet::remove(const Tag& tag)
     }
 }
 
-bool TagSet::containsID(const TQString& id) const
+bool TagSet::tqcontainsID(const TQString& id) const
 {
-    return d->map.contains(id);
+    return d->map.tqcontains(id);
 }
 
-bool TagSet::contains(const Tag& tag) const
+bool TagSet::tqcontains(const Tag& tag) const
 {
-    return d->map.contains(tag.id());
+    return d->map.tqcontains(tag.id());
 }
 
 Tag TagSet::findByID(const TQString& id) const
 {
-    return d->map.contains(id) ? d->map[id] : Tag();
+    return d->map.tqcontains(id) ? d->map[id] : Tag();
 }
 
 TQMap<TQString,Tag> TagSet::toMap() const
@@ -99,21 +99,21 @@ void TagSet::readFromXML(const TQDomDocument& doc)
     if (root.isNull())
         return;
 
-    TQDomNodeList list = root.elementsByTagName(TQString::fromLatin1("tag"));
+    TQDomNodeList list = root.elementsByTagName(TQString::tqfromLatin1("tag"));
 
     for (uint i = 0; i < list.length(); ++i)
     {
         TQDomElement e = list.item(i).toElement();
         if (!e.isNull())
         {
-            if (e.hasAttribute(TQString::fromLatin1("id")))
+            if (e.hasAttribute(TQString::tqfromLatin1("id")))
             {
-                TQString id = e.attribute(TQString::fromLatin1("id"));
+                TQString id = e.attribute(TQString::tqfromLatin1("id"));
                 TQString name = e.text();
-                TQString scheme = e.attribute(TQString::fromLatin1("scheme"));
+                TQString scheme = e.attribute(TQString::tqfromLatin1("scheme"));
                 Tag tag(id, name, scheme);
                 
-                TQString icon = e.attribute(TQString::fromLatin1("icon"));
+                TQString icon = e.attribute(TQString::tqfromLatin1("icon"));
                 if (!icon.isEmpty())
                     tag.setIcon(icon);
 
@@ -145,11 +145,11 @@ TQDomDocument TagSet::toXML() const
         TQDomElement tn = doc.createElement("tag");
         
         TQDomText text = doc.createTextNode((*it).name());
-        tn.setAttribute(TQString::fromLatin1("id"),(*it).id());
+        tn.setAttribute(TQString::tqfromLatin1("id"),(*it).id());
         if (!(*it).scheme().isEmpty())
-            tn.setAttribute(TQString::fromLatin1("scheme"),(*it).scheme());
+            tn.setAttribute(TQString::tqfromLatin1("scheme"),(*it).scheme());
         if (!(*it).icon().isEmpty())
-            tn.setAttribute(TQString::fromLatin1("icon"),(*it).icon());
+            tn.setAttribute(TQString::tqfromLatin1("icon"),(*it).icon());
         tn.appendChild(text);
         root.appendChild(tn);
     }
diff --git a/akregator/src/tagset.h b/akregator/src/tagset.h
index aea004c8..febb47d3 100644
--- a/akregator/src/tagset.h
+++ b/akregator/src/tagset.h
@@ -62,11 +62,11 @@ class TagSet : public QObject
         /** returns the tag set as map ((id, Tag) pairs) */
         TQMap<TQString,Tag> toMap() const;
 
-        /** returns @c true if this set contains @c tag */
-        bool contains(const Tag& tag) const;
+        /** returns @c true if this set tqcontains @c tag */
+        bool tqcontains(const Tag& tag) const;
 
-        /** returns @c true if this set contains a tag with a given ID */
-        bool containsID(const TQString& id) const;
+        /** returns @c true if this set tqcontains a tag with a given ID */
+        bool tqcontainsID(const TQString& id) const;
 
         /** returns the tag with the given ID if the tag is element of the set, or a null tag if not */
         Tag findByID(const TQString& id) const;
diff --git a/akregator/src/treenode.h b/akregator/src/treenode.h
index 1e8a1cf6..366677d3 100644
--- a/akregator/src/treenode.h
+++ b/akregator/src/treenode.h
@@ -111,7 +111,7 @@ public:
     virtual void setParent(Folder* parent);
     
     
-    /** Returns a sequence of the articles this node contains. For feed groups, this returns a concatenated list of all articles in the sub tree.
+    /** Returns a sequence of the articles this node tqcontains. For feed groups, this returns a concatenated list of all articles in the sub tree.
     If @c tag is not null, only articles tagged with @c tag are returned
     @return sequence of articles */
     
diff --git a/akregator/src/treenodeitem.cpp b/akregator/src/treenodeitem.cpp
index 92a36859..02361f37 100644
--- a/akregator/src/treenodeitem.cpp
+++ b/akregator/src/treenodeitem.cpp
@@ -105,7 +105,7 @@ FolderItem* TreeNodeItem::parent() const
 } 
     
 
-// TODO: reverse for reverse layout
+// TODO: reverse for reverse tqlayout
 void TreeNodeItem::paintCell( TQPainter * p, const TQColorGroup & cg,
                                int column, int width, int align )
 
diff --git a/akregator/src/utils.cpp b/akregator/src/utils.cpp
index e4a24209..eb555a75 100644
--- a/akregator/src/utils.cpp
+++ b/akregator/src/utils.cpp
@@ -30,7 +30,7 @@ namespace Akregator {
 
 TQString Utils::stripTags(const TQString& str)
 {
-    return TQString(str).replace(TQRegExp("<[^>]*>"), "");
+    return TQString(str).tqreplace(TQRegExp("<[^>]*>"), "");
 }
 
 uint Utils::calcHash(const TQString& str)
@@ -48,7 +48,7 @@ TQString Utils::fileNameForUrl(const TQString& url_p)
 {
     TQString url2(url_p);
     
-    url2 = url2.replace("/", "_").replace(":", "_");
+    url2 = url2.tqreplace("/", "_").tqreplace(":", "_");
     
     if (url2.length() > 255)
         url2 = url2.left(200) + TQString::number(Akregator::Utils::calcHash(url2), 16);
diff --git a/akregator/src/utils.h b/akregator/src/utils.h
index 8ab0fea1..7a65915b 100644
--- a/akregator/src/utils.h
+++ b/akregator/src/utils.h
@@ -46,7 +46,7 @@ class Utils
     
     /**
      * returns a file name for a URL, with chars like "/" ":"
-     * replaced by "_". Too long URLs (>255 chars) are shortened and
+     * tqreplaced by "_". Too long URLs (>255 chars) are shortened and
      * appended with a hash value.
      * 
      */
diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp
index 55e9b758..6926a151 100644
--- a/akregator/src/viewer.cpp
+++ b/akregator/src/viewer.cpp
@@ -112,7 +112,7 @@ void Viewer::displayInExternalBrowser(const KURL &url, const TQString &mimetype)
    {
        TQString cmd = Settings::externalBrowserCustomCommand();
        TQString urlStr = url.url();
-       cmd.replace(TQRegExp("%u"), urlStr);
+       cmd.tqreplace(TQRegExp("%u"), urlStr);
        KProcess *proc = new KProcess;
        TQStringList cmdAndArgs = KShell::splitArgs(cmd);
        *proc << cmdAndArgs;
@@ -202,7 +202,7 @@ void Viewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kurl, c
 void Viewer::slotCopy()
 {
     TQString text = selectedText();
-    text.replace( TQChar( 0xa0 ), ' ' );
+    text.tqreplace( TQChar( 0xa0 ), ' ' );
     QClipboard *cb = TQApplication::clipboard();
     disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
     cb->setText(text);
diff --git a/certmanager/certificateinfowidget.ui b/certmanager/certificateinfowidget.ui
index 967d3298..f907e37d 100644
--- a/certmanager/certificateinfowidget.ui
+++ b/certmanager/certificateinfowidget.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>CertificateInfoWidget</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -12,7 +12,7 @@
             <height>403</height>
         </rect>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>250</width>
             <height>0</height>
@@ -181,7 +181,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>291</width>
                     <height>16</height>
@@ -211,5 +211,5 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="0"/>
+<tqlayoutdefaults spacing="6" margin="0"/>
 </UI>
diff --git a/certmanager/certificateinfowidgetimpl.cpp b/certmanager/certificateinfowidgetimpl.cpp
index 4367cd66..4932b6bd 100644
--- a/certmanager/certificateinfowidgetimpl.cpp
+++ b/certmanager/certificateinfowidgetimpl.cpp
@@ -155,7 +155,7 @@ void CertificateInfoWidgetImpl::setKey( const GpgME::Key & key  ) {
 
   for ( Kleo::DN::const_iterator dnit = dn.begin() ; dnit != dn.end() ; ++dnit ) {
 	TQString displayName = (*dnit).name();
-	if( dnComponentNames.contains(displayName) ) displayName = dnComponentNames[displayName];
+	if( dnComponentNames.tqcontains(displayName) ) displayName = dnComponentNames[displayName];
 	item = new TQListViewItem( listView, item, displayName, (*dnit).value() );
   }
 
diff --git a/certmanager/certificatewizard.ui b/certmanager/certificatewizard.ui
index 7edbd1a7..3cf42adb 100644
--- a/certmanager/certificatewizard.ui
+++ b/certmanager/certificatewizard.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>CertificateWizard</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -55,7 +55,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>20</width>
                         <height>40</height>
@@ -82,7 +82,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
                 <property name="text">
                     <string>On this page, you will configure the cryptographic key length and the type of certificate to create.</string>
                 </property>
-                <property name="alignment">
+                <property name="tqalignment">
                     <set>WordBreak|AlignVCenter</set>
                 </property>
             </widget>
@@ -96,7 +96,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>20</width>
                         <height>31</height>
@@ -140,7 +140,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>61</width>
                                 <height>20</height>
@@ -199,7 +199,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>21</width>
                         <height>60</height>
@@ -226,7 +226,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
                 <property name="text">
                     <string>On this page, you will enter some personal data that will be stored in your certificate and that will help other people to determine that it is actually you who is sending a message.</string>
                 </property>
-                <property name="alignment">
+                <property name="tqalignment">
                     <set>WordBreak|AlignVCenter</set>
                 </property>
             </widget>
@@ -240,7 +240,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>440</width>
                         <height>20</height>
@@ -268,7 +268,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>20</width>
                         <height>40</height>
@@ -322,7 +322,7 @@ Once you are done with your settings, click
 a kmail composer will be opened; you can add detailed information for the CA
 there.&lt;/p&gt;&lt;qt&gt;</string>
                 </property>
-                <property name="alignment">
+                <property name="tqalignment">
                     <set>WordBreak|AlignVCenter</set>
                 </property>
             </widget>
@@ -336,7 +336,7 @@ there.&lt;/p&gt;&lt;qt&gt;</string>
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>21</width>
                         <height>31</height>
@@ -411,7 +411,7 @@ there.&lt;/p&gt;&lt;qt&gt;</string>
                 <property name="name">
                     <cstring>generatePB</cstring>
                 </property>
-                <property name="minimumSize">
+                <property name="tqminimumSize">
                     <size>
                         <width>0</width>
                         <height>30</height>
@@ -431,7 +431,7 @@ there.&lt;/p&gt;&lt;qt&gt;</string>
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>118</width>
                         <height>16</height>
@@ -448,7 +448,7 @@ there.&lt;/p&gt;&lt;qt&gt;</string>
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>119</width>
                         <height>16</height>
@@ -485,7 +485,7 @@ Your key pair has now been created and stored locally. The corresponding certifi
 If you want to change anything, press Back and make your changes; otherwise, press Finish to send the certificate request to the CA.
 &lt;/qt&gt;</string>
                 </property>
-                <property name="alignment">
+                <property name="tqalignment">
                     <set>WordBreak|AlignVCenter</set>
                 </property>
             </widget>
@@ -550,7 +550,7 @@ If you want to change anything, press Back and make your changes; otherwise, pre
     <slot access="protected">slotEmailAddressChanged(const QString&amp;)</slot>
     <slot access="protected">slotGenerateCertificate()</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp
index bb31d5c3..7127b3c2 100644
--- a/certmanager/certificatewizardimpl.cpp
+++ b/certmanager/certificatewizardimpl.cpp
@@ -278,7 +278,7 @@ void CertificateWizardImpl::slotResult( const GpgME::KeyGenerationResult & res,
 	  if ( !res.error().isCanceled() )
 	    KMessageBox::error( this,
 				i18n( "Could not generate certificate: %1" )
-				.arg( TQString::fromLatin1( res.error().asString() ) ),
+				.arg( TQString::tqfromLatin1( res.error().asString() ) ),
 				i18n( "Certificate Manager Error" ) );
     } else {
         // next will stay enabled until the user clicks Generate
@@ -429,7 +429,7 @@ void CertificateWizardImpl::sendCertificate( const TQString& email, const TQByte
   TQString error;
   TQCString dcopService;
   int result = KDCOPServiceStarter::self()->
-    findServiceFor( "DCOP/Mailer", TQString::null,
+    tqfindServiceFor( "DCOP/Mailer", TQString::null,
                     TQString::null, &error, &dcopService );
   if ( result != 0 ) {
     kdDebug() << "Couldn't connect to KMail\n";
@@ -441,11 +441,11 @@ void CertificateWizardImpl::sendCertificate( const TQString& email, const TQByte
   TQCString dummy;
   // OK, so kmail (or kontact) is running. Now ensure the object we want is available.
   // [that's not the case when kontact was already running, but kmail not loaded into it... in theory.]
-  if ( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
+  if ( !kapp->dcopClient()->tqfindObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
     DCOPRef ref( dcopService, dcopService ); // talk to the KUniqueApplication or its kontact wrapper
     DCOPReply reply = ref.call( "load()" );
     if ( reply.isValid() && (bool)reply ) {
-      Q_ASSERT( kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
+      Q_ASSERT( kapp->dcopClient()->tqfindObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
     } else
       kdWarning() << "Error loading " << dcopService << endl;
   }
diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index c078315b..aebfa366 100644
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@@ -412,7 +412,7 @@ void CertManager::slotConfigureGpgME() {
 
 void CertManager::slotRepaint()
 {
-  mKeyListView->repaintContents();
+  mKeyListView->tqrepaintContents();
 }
 
 void CertManager::slotToggleRemote( int idx ) {
@@ -500,7 +500,7 @@ static TQStringList stringlistFromSet( const std::set<std::string> & set ) {
   TQStringList sl;
   for ( std::set<std::string>::const_iterator it = set.begin() ; it != set.end() ; ++it )
     // let's make extra sure, maybe someone tries to make Qt not support std::string->TQString conversion
-    sl.push_back( TQString::fromLatin1( it->c_str() ) );
+    sl.push_back( TQString::tqfromLatin1( it->c_str() ) );
   return sl;
 }
 
@@ -1338,7 +1338,7 @@ void CertManager::startSecretKeyExport( const TQString & fingerprint ) {
     };
     TQStringList charsetList;
     for ( const char** c = charsets; *c; ++c ) {
-      charsetList.append( TQString::fromLatin1( *c ) );
+      charsetList.append( TQString::tqfromLatin1( *c ) );
     }
 
     // TODO this selection could be done in a derived KeySelectionDialog which would add a combobox,
diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h
index fb9308ee..bee15704 100644
--- a/certmanager/certmanager.h
+++ b/certmanager/certmanager.h
@@ -136,7 +136,7 @@ private slots:
     void slotConfigureGpgME();
     void slotContextMenu(Kleo::KeyListViewItem*, const TQPoint& point);
     void slotDropped(const KURL::List&);
-    /** Schedule a repaint for the listview items. E.g. when the
+    /** Schedule a tqrepaint for the listview items. E.g. when the
 	colour config has changed */
     void slotRepaint();
     /** Schedule a validating keylisting for the selected items (or
diff --git a/certmanager/conf/appearanceconfigwidget.cpp b/certmanager/conf/appearanceconfigwidget.cpp
index 27797dfe..77a97bb4 100644
--- a/certmanager/conf/appearanceconfigwidget.cpp
+++ b/certmanager/conf/appearanceconfigwidget.cpp
@@ -139,7 +139,7 @@ private:
     setText( 0, name );
   }
 
-  void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
+  void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment );
 
 private:
   TQColor mForegroundColor, mBackgroundColor;
@@ -152,7 +152,7 @@ private:
   bool mDirty;
 };
 
-void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
+void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) {
   TQColorGroup _cg = cg;
   TQFont font = p->font();
   if ( mHasFont )
@@ -172,7 +172,7 @@ void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, in
   if ( mBackgroundColor.isValid() )
     _cg.setColor( TQColorGroup::Base, mBackgroundColor );
 
-  TQListViewItem::paintCell( p, _cg, column, width, alignment );
+  TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
 }
 
 ////
@@ -227,7 +227,7 @@ void AppearanceConfigWidget::slotDefaultClicked()
   if ( !item )
     return;
   item->setDefaultAppearance();
-  item->repaint();
+  item->tqrepaint();
   slotSelectionChanged( item );
   emit changed();
 }
@@ -280,7 +280,7 @@ void AppearanceConfigWidget::slotForegroundClicked() {
   int result = KColorDialog::getColor( fg );
   if ( result == KColorDialog::Accepted ) {
     item->setForegroundColor( fg );
-    item->repaint();
+    item->tqrepaint();
     emit changed();
   }
 }
@@ -294,7 +294,7 @@ void AppearanceConfigWidget::slotBackgroundClicked() {
   int result = KColorDialog::getColor( bg );
   if ( result == KColorDialog::Accepted ) {
     item->setBackgroundColor( bg );
-    item->repaint();
+    item->tqrepaint();
     emit changed();
   }
 }
@@ -308,7 +308,7 @@ void AppearanceConfigWidget::slotFontClicked() {
   int result = KFontDialog::getFont( font );
   if ( result == KFontDialog::Accepted ) {
     item->setFont( font );
-    item->repaint();
+    item->tqrepaint();
     emit changed();
   }
 }
@@ -320,7 +320,7 @@ void AppearanceConfigWidget::defaults()
   for ( ; lvit.current() ; ++lvit ) {
     CategoryListViewItem* item = static_cast<CategoryListViewItem *>( lvit.current() );
     item->setDefaultAppearance();
-    item->repaint();
+    item->tqrepaint();
   }
   emit changed();
 }
@@ -330,7 +330,7 @@ void AppearanceConfigWidget::slotItalicClicked()
   CategoryListViewItem* item = static_cast<CategoryListViewItem*>(categoriesLV->selectedItem() );
   if ( item ) {
     item->toggleItalic();
-    item->repaint();
+    item->tqrepaint();
     emit changed();
   }
 }
@@ -340,7 +340,7 @@ void AppearanceConfigWidget::slotBoldClicked()
   CategoryListViewItem* item = static_cast<CategoryListViewItem*>(categoriesLV->selectedItem() );
   if ( item ) {
     item->toggleBold();
-    item->repaint();
+    item->tqrepaint();
     emit changed();
   }
 }
@@ -350,7 +350,7 @@ void AppearanceConfigWidget::slotStrikeoutClicked()
   CategoryListViewItem* item = static_cast<CategoryListViewItem*>(categoriesLV->selectedItem() );
   if ( item ) {
     item->toggleStrikeout();
-    item->repaint();
+    item->tqrepaint();
     emit changed();
   }
 }
diff --git a/certmanager/conf/appearanceconfigwidgetbase.ui b/certmanager/conf/appearanceconfigwidgetbase.ui
index b432ac8c..60e10c21 100644
--- a/certmanager/conf/appearanceconfigwidgetbase.ui
+++ b/certmanager/conf/appearanceconfigwidgetbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>AppearanceConfigWidgetBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -37,7 +37,7 @@
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -119,7 +119,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>100</height>
@@ -211,5 +211,5 @@
     <slot access="protected">slotBoldClicked()</slot>
     <slot access="protected">slotStrikeoutClicked()</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/certmanager/conf/configuredialog.cpp b/certmanager/conf/configuredialog.cpp
index e9f16f10..aa161fc7 100644
--- a/certmanager/conf/configuredialog.cpp
+++ b/certmanager/conf/configuredialog.cpp
@@ -52,9 +52,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
   // the KCMultiDialog starts with the size of the first kcm, not
   // the largest one. This way at least after the first showing of
   // the largest kcm the size is kept.
-  const KConfigGroup geometry( KGlobal::config(), "Geometry" );
-  const int width = geometry.readNumEntry( "ConfigureDialogWidth" );
-  const int height = geometry.readNumEntry( "ConfigureDialogHeight" );
+  const KConfigGroup tqgeometry( KGlobal::config(), "Geometry" );
+  const int width = tqgeometry.readNumEntry( "ConfigureDialogWidth" );
+  const int height = tqgeometry.readNumEntry( "ConfigureDialogHeight" );
   if ( width != 0 && height != 0 ) {
      setMinimumSize( width, height );
   }
@@ -62,9 +62,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
 }
 
 void ConfigureDialog::hideEvent( TQHideEvent * ) {
-  KConfigGroup geometry( KGlobal::config(), "Geometry" );
-  geometry.writeEntry( "ConfigureDialogWidth", width() );
-  geometry.writeEntry( "ConfigureDialogHeight",height() );
+  KConfigGroup tqgeometry( KGlobal::config(), "Geometry" );
+  tqgeometry.writeEntry( "ConfigureDialogWidth", width() );
+  tqgeometry.writeEntry( "ConfigureDialogHeight",height() );
 }
 
 ConfigureDialog::~ConfigureDialog() {
diff --git a/certmanager/hierarchyanalyser.cpp b/certmanager/hierarchyanalyser.cpp
index 380c48a5..ed7809a7 100644
--- a/certmanager/hierarchyanalyser.cpp
+++ b/certmanager/hierarchyanalyser.cpp
@@ -69,7 +69,7 @@ const std::vector<GpgME::Key> & HierarchyAnalyser::subjectsForIssuer( const char
 
 std::vector<GpgME::Key> HierarchyAnalyser::subjectsForIssuerRecursive( const char * issuer_dn ) const {
   std::vector<GpgME::Key> keys = subjectsForIssuer( issuer_dn );
-  for ( unsigned int i = 0 ; i < keys.size() ; ++i ) // can't use iterators here, since appending would invalidate them
+  for ( unsigned int i = 0 ; i < keys.size() ; ++i ) // can't use iterators here, since appending would tqinvalidate them
     if ( const char * fpr = keys[i].primaryFingerprint() ) {
       const std::vector<GpgME::Key> & tmp = subjectsForIssuer( fpr );
       std::copy( tmp.begin(), tmp.end(), std::back_inserter( keys ) );
diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
index aa8e52f7..c22be6b7 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
@@ -80,7 +80,7 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name )
   TQVBoxLayout * vlay = new TQVBoxLayout( top, 0, spacingHint() );
 
   group = new TQVGroupBox( i18n("WatchGnuPG"), top );
-  group->layout()->setSpacing( spacingHint() );
+  group->tqlayout()->setSpacing( spacingHint() );
 
   w = new TQWidget( group );
 
@@ -116,7 +116,7 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name )
 
   /******************* Log Window group *******************/
   group = new TQVGroupBox( i18n("Log Window"), top );
-  group->layout()->setSpacing( spacingHint() );
+  group->tqlayout()->setSpacing( spacingHint() );
 
   w = new TQWidget( group );
 
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
index 234973b6..3b856ca1 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
@@ -90,7 +90,7 @@ KWatchGnuPGMainWindow::~KWatchGnuPGMainWindow()
 void KWatchGnuPGMainWindow::slotClear()
 {
   mCentralWidget->clear();
-  mCentralWidget->append( tr("[%1] Log cleared").arg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) );
+  mCentralWidget->append( tr("[%1] Log cleared").arg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) ) );
 }
 
 void KWatchGnuPGMainWindow::createActions()
@@ -106,7 +106,7 @@ void KWatchGnuPGMainWindow::createActions()
   ( void )KStdAction::configureToolbars(this, TQT_SLOT(slotConfigureToolbars()), actionCollection());
 
 #if 0
-  (void)new KAction( i18n("Configure KWatchGnuPG..."), TQString::fromLatin1("configure"),
+  (void)new KAction( i18n("Configure KWatchGnuPG..."), TQString::tqfromLatin1("configure"),
 					 0, this, TQT_SLOT( slotConfigure() ),
 					 actionCollection(), "configure" );
 #endif
@@ -135,7 +135,7 @@ void KWatchGnuPGMainWindow::startWatcher()
 	  kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
 	}
 	mCentralWidget->append(tr("[%1] Log stopped")
-						   .arg( TQDateTime::currentDateTime().toString(Qt::ISODate)));
+						   .arg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)));
   }
   mWatcher->clearArguments();
   KConfig* config = kapp->config();
@@ -148,7 +148,7 @@ void KWatchGnuPGMainWindow::startWatcher()
 	KMessageBox::sorry( this, i18n("The watchgnupg logging process could not be started.\nPlease install watchgnupg somewhere in your $PATH.\nThis log window is now completely useless." ) );
   } else {
 	mCentralWidget->append( tr("[%1] Log started")
-							.arg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) );
+							.arg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) ) );
   }
   connect( mWatcher, TQT_SIGNAL( processExited(KProcess*) ),
 		   this, TQT_SLOT( slotWatcherExited() ) );
diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
index aad0701a..2804cca1 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
@@ -224,9 +224,9 @@ namespace {
         return TQVariant( data.defaults.boolean.value, int() );
     case ArgType_String:
       if ( isList() )
-        return TQStringList( TQString::fromLatin1( data.defaults.string ) );
+        return TQStringList( TQString::tqfromLatin1( data.defaults.string ) );
       else
-        return TQString::fromLatin1( data.defaults.string );
+        return TQString::tqfromLatin1( data.defaults.string );
     case ArgType_Int:
       if ( isList() )
         return TQValueList<TQVariant>() << data.defaults.integer;
@@ -240,15 +240,15 @@ namespace {
     case ArgType_Path:
     case ArgType_DirPath:
       if ( isList() )
-        return TQValueList<TQVariant>() << TQString::fromLatin1( data.defaults.path );
+        return TQValueList<TQVariant>() << TQString::tqfromLatin1( data.defaults.path );
       else
-        return TQString::fromLatin1( data.defaults.path );
+        return TQString::tqfromLatin1( data.defaults.path );
     case ArgType_URL:
     case ArgType_LDAPURL:
       if ( isList() )
-        return TQValueList<TQVariant>() << TQString::fromLatin1( data.defaults.url );
+        return TQValueList<TQVariant>() << TQString::tqfromLatin1( data.defaults.url );
       else
-        return TQString::fromLatin1( data.defaults.url );
+        return TQString::tqfromLatin1( data.defaults.url );
     }
   }
 
diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
index ae45d683..6dc5c5e3 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
@@ -357,15 +357,15 @@ static TQString gpgconf_escape( const TQString& str )
   // Escape special chars (including ':' and '%')
   TQString enc = KURL::encode_string( str, 106 ); // and convert to utf8 first (to get %12%34 for one special char)
   // Also encode commas, for lists.
-  enc.replace( ',', "%2c" );
+  enc.tqreplace( ',', "%2c" );
   return enc;
 }
 
 static TQString urlpart_encode( const TQString& str )
 {
   TQString enc( str );
-  enc.replace( '%', "%25" ); // first!
-  enc.replace( ':', "%3a" );
+  enc.tqreplace( '%', "%25" ); // first!
+  enc.tqreplace( ':', "%3a" );
   //kdDebug() << "  urlpart_encode: " << str << " -> " << enc << endl;
   return enc;
 }
@@ -809,7 +809,7 @@ TQString QGpgMECryptoConfigEntry::toString( bool escape ) const
   if ( !isList() ) // non-list non-string
   {
     if ( mArgType == ArgType_None ) {
-      return mValue.toBool() ? TQString::fromLatin1( "1" ) : TQString::null;
+      return mValue.toBool() ? TQString::tqfromLatin1( "1" ) : TQString::null;
     } else { // some int
       Q_ASSERT( mArgType == ArgType_Int || mArgType == ArgType_UInt );
       return mValue.toString(); // int to string conversion
diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.h b/certmanager/lib/backends/qgpgme/qgpgmejob.h
index 0681c165..4a03d7d9 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmejob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmejob.h
@@ -63,10 +63,10 @@ class TQStringList;
 namespace Kleo {
 
   /** This is a hackish helper class to avoid code duplication in this
-      backend's Kleo::Job subclasses. It contains several workarounds
-      for moc/signal/slot shortcomings, most of which the author of
+      backend's Kleo::Job subclasses. It tqcontains several workarounds
+      for tqmoc/signal/slot shortcomings, most of which the author of
       this thinks are Qt bugs (lazy implementations), first and
-      foremost the inability of moc to handle inheritance from
+      foremost the inability of tqmoc to handle inheritance from
       multiple QObject-derived subclasses.
 
       To use it, inherit from the Job-subclass, then from this class,
@@ -140,7 +140,7 @@ namespace Kleo {
     QGpgME::QByteArrayDataProvider * mOutDataDataProvider;
   private:
     const char* * mPatterns;
-    // holds the entry - if any - in mPattern that was replaced with
+    // holds the entry - if any - in mPattern that was tqreplaced with
     // NULL to create a temporary end-of-array marker for gpgme:
     const char * mReplacedPattern;
     unsigned int mNumPatterns;
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
index 6cb71dba..89d9dda3 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
@@ -114,7 +114,7 @@ static const Map & makeMap() { // return a reference to a static to avoid copyin
   static Map map;
   for ( unsigned int i = 0 ; i < sizeof tokens / sizeof *tokens ; ++i ) {
     assert( tokens[i].token );
-    const TQString token = TQString::fromLatin1( tokens[i].token ).lower();
+    const TQString token = TQString::tqfromLatin1( tokens[i].token ).lower();
     for ( unsigned int j = 0 ; j < tokens[i].numDesc ; ++j ) {
       const Desc & desc = tokens[i].desc[j];
       assert( desc.display );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
index 911afcd6..7517b2a8 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
@@ -112,7 +112,7 @@ GpgME::Error Kleo::QGpgMERefreshKeysJob::startAProcess() {
   connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
 	   TQT_SLOT(slotStderr(KProcess*,char*,int)) );
   connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
-	   TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+	   TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
 
   if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) {
     mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else?
@@ -129,7 +129,7 @@ void Kleo::QGpgMERefreshKeysJob::slotCancel() {
   mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED );
 }
 
-void Kleo::QGpgMERefreshKeysJob::slotStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
+void Kleo::QGpgMERefreshKeysJob::sloStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
   if ( proc != mProcess )
     return;
   TQStringList::const_iterator it = args.begin();
@@ -139,18 +139,18 @@ void Kleo::QGpgMERefreshKeysJob::slotStatus( GnuPGProcessBase * proc, const TQSt
 
 
     if ( args.size() < 2 ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() not recognising ERROR with < 2 args!" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() not recognising ERROR with < 2 args!" << endl;
       return;
     }
     const int source = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() expected number for first ERROR arg, got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for first ERROR arg, got something else" << endl;
       return;
     }
     ok = false;
     const int code = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() expected number for second ERROR arg, got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for second ERROR arg, got something else" << endl;
       return;
     }
     mError = gpg_err_make( (gpg_err_source_t)source, (gpg_err_code_t)code );
@@ -160,20 +160,20 @@ void Kleo::QGpgMERefreshKeysJob::slotStatus( GnuPGProcessBase * proc, const TQSt
 
 
     if ( args.size() < 4 ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() not recognising PROGRESS with < 4 args!" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() not recognising PROGRESS with < 4 args!" << endl;
       return;
     }
     const TQString what = *++it;
     ++it; // don't use "type"...
     const int cur = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() expected number for \"cur\", got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for \"cur\", got something else" << endl;
       return;
     }
     ok = false;
     const int total = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() expected number for \"total\", got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for \"total\", got something else" << endl;
       return;
     }
     emit progress( QGpgMEProgressTokenMapper::instance()->map( what, 0, cur, total ), cur, total );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
index 7ed47686..7246f0a3 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
@@ -62,7 +62,7 @@ namespace Kleo {
     /*! \reimp from Job */
     void slotCancel();
 
-    void slotStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
+    void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
     void slotStderr( KProcess *, char *, int );
     void slotProcessExited( KProcess * );
 
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
index aeb7b010..d73b4cb1 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
@@ -95,7 +95,7 @@ GpgME::Error Kleo::QGpgMESecretKeyExportJob::start( const TQStringList & pattern
   connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
 	   TQT_SLOT(slotStderr(KProcess*,char*,int)) );
   connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
-	   TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+	   TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
 
   if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
     mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else?
@@ -112,7 +112,7 @@ void Kleo::QGpgMESecretKeyExportJob::slotCancel() {
   mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED );
 }
 
-void Kleo::QGpgMESecretKeyExportJob::slotStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
+void Kleo::QGpgMESecretKeyExportJob::sloStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
   if ( proc != mProcess )
     return;
   TQStringList::const_iterator it = args.begin();
@@ -122,18 +122,18 @@ void Kleo::QGpgMESecretKeyExportJob::slotStatus( GnuPGProcessBase * proc, const
 
 
     if ( args.size() < 2 ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() not recognising ERROR with < 2 args!" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() not recognising ERROR with < 2 args!" << endl;
       return;
     }
     const int source = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() expected number for first ERROR arg, got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for first ERROR arg, got something else" << endl;
       return;
     }
     ok = false;
     const int code = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() expected number for second ERROR arg, got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for second ERROR arg, got something else" << endl;
       return;
     }
     mError = gpg_err_make( (gpg_err_source_t)source, (gpg_err_code_t)code );
@@ -143,20 +143,20 @@ void Kleo::QGpgMESecretKeyExportJob::slotStatus( GnuPGProcessBase * proc, const
 
 
     if ( args.size() < 4 ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() not recognising PROGRESS with < 4 args!" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() not recognising PROGRESS with < 4 args!" << endl;
       return;
     }
     const TQString what = *++it;
     ++it; // don't use "type"...
     const int cur = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() expected number for \"cur\", got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for \"cur\", got something else" << endl;
       return;
     }
     ok = false;
     const int total = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() expected number for \"total\", got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for \"total\", got something else" << endl;
       return;
     }
     emit progress( QGpgMEProgressTokenMapper::instance()->map( what, 0, cur, total ), cur, total );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
index 50d42c3c..cb65d549 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
@@ -67,7 +67,7 @@ namespace Kleo {
     /*! \reimp from Job */
     void slotCancel();
 
-    void slotStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
+    void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
     void slotStdout( KProcess *, char *, int );
     void slotStderr( KProcess *, char *, int );
     void slotProcessExited( KProcess * );
diff --git a/certmanager/lib/cryptplug.cpp b/certmanager/lib/cryptplug.cpp
index 77a91451..c3c8b462 100644
--- a/certmanager/lib/cryptplug.cpp
+++ b/certmanager/lib/cryptplug.cpp
@@ -226,7 +226,7 @@ OpenPGPCryptPlug::OpenPGPCryptPlug() : CryptPlug() {
 /* Max number of parts in a DN */
 #define MAX_GPGME_IDX 20
 
-/* some macros to replace ctype ones and avoid locale problems */
+/* some macros to tqreplace ctype ones and avoid locale problems */
 #define spacep(p)   (*(p) == ' ' || *(p) == '\t')
 #define digitp(p)   (*(p) >= '0' && *(p) <= '9')
 #define hexdigitp(a) (digitp (a)                     \
diff --git a/certmanager/lib/cryptplug.h b/certmanager/lib/cryptplug.h
index 081702a7..6af3a644 100644
--- a/certmanager/lib/cryptplug.h
+++ b/certmanager/lib/cryptplug.h
@@ -104,7 +104,7 @@ namespace GpgME {
 /*! \defgroup groupConfigDir Directory Service Configuration
     \ingroup groupConfig
 
-    This section contains messages for configuring the
+    This section tqcontains messages for configuring the
     directory service.
 */
 
@@ -501,7 +501,7 @@ bool hasFeature( ::Feature );
 
    <b>How to use StructuringInfo data in your program:</b>
    \li To compose a signed message please act as described below.
-   \li For constructing an encrypted message just replace the
+   \li For constructing an encrypted message just tqreplace the
    \c signMessage() call by the respective \c encryptMessage() call
    and then proceed exactly the same way.
    \li In any case make <b>sure</b> to free your \c ciphertext <b>and</b>
diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp
index ec6d6d57..7694a138 100644
--- a/certmanager/lib/cryptplugwrapper.cpp
+++ b/certmanager/lib/cryptplugwrapper.cpp
@@ -424,7 +424,7 @@ CryptPlugWrapper::CryptPlugWrapper( const TQString& name,
     _libName( libName ),
     _updateURL( update ),
     _active(  active  ),
-    _initStatus( InitStatus_undef ),
+    _iniStatus( IniStatus_undef ),
     _cp( 0 ),
     _config( 0 ),
     _cryptoConfig( 0 )
@@ -468,9 +468,9 @@ TQString CryptPlugWrapper::libName() const
 
 TQString CryptPlugWrapper::protocol() const
 {
-  if ( _libName.contains( "smime" ) )
+  if ( _libName.tqcontains( "smime" ) )
     return "SMIME";
-  if ( _libName.contains( "openpgp" ) )
+  if ( _libName.tqcontains( "openpgp" ) )
     return "OpenPGP";
   return TQString::null;
 }
@@ -485,28 +485,28 @@ TQString CryptPlugWrapper::displayName() const
 {
     if ( !_name.isEmpty() )
       return _name;
-    if ( _libName.contains( "smime" ) )
+    if ( _libName.tqcontains( "smime" ) )
       return "gpgsm";
-    if ( _libName.contains( "openpgp" ) )
+    if ( _libName.tqcontains( "openpgp" ) )
       return "gpg";
     return i18n("(Unknown Protocol)");
 }
 
-bool CryptPlugWrapper::initialize( InitStatus* initStatus, TQString* errorMsg )
+bool CryptPlugWrapper::initialize( IniStatus* iniStatus, TQString* errorMsg )
 {
     if ( _cp )
       return true;
 
-    _initStatus = InitStatus_undef;
+    _iniStatus = IniStatus_undef;
     /* make sure we have a lib name */
     if ( _libName.isEmpty() ) {
-      _initStatus = InitStatus_NoLibName;
+      _iniStatus = IniStatus_NoLibName;
       kdDebug(5150) << "No library name was given.\n" << endl;
     } else {
-      if ( _libName.contains( "smime" ) ) {
+      if ( _libName.tqcontains( "smime" ) ) {
 	_cp = new SMIMECryptPlug();
 	_config = new Config( GPGME_PROTOCOL_CMS );
-      } else if ( _libName.contains( "openpgp" ) ) {
+      } else if ( _libName.tqcontains( "openpgp" ) ) {
 	_cp = new OpenPGPCryptPlug();
 	_config = new Config( GPGME_PROTOCOL_OpenPGP );
       } else {
@@ -515,12 +515,12 @@ bool CryptPlugWrapper::initialize( InitStatus* initStatus, TQString* errorMsg )
       }
 
       if ( !_cp ) {
-	_initStatus = InitStatus_LoadError;
+	_iniStatus = IniStatus_LoadError;
 	kdDebug(5150) << "Couldn't create '" << _libName.latin1() << "'" << endl;
       } else {
 	/* now call the init function */
 	if( !_cp->initialize() ) {
-	  _initStatus = InitStatus_InitError;
+	  _iniStatus = IniStatus_InitError;
 	  kdDebug(5150) << "Error while executing function 'initialize' on plugin " << _libName << endl;
 	  _lastError = i18n("Error while initializing plugin \"%1\"").arg( _libName );
 	  if ( errorMsg )
@@ -528,13 +528,13 @@ bool CryptPlugWrapper::initialize( InitStatus* initStatus, TQString* errorMsg )
 	  delete _cp; _cp = 0;
 	  delete _config; _config = 0;
 	} else {
-	  _initStatus  = InitStatus_Ok;
+	  _iniStatus  = IniStatus_Ok;
 	}
       }
     }
-    if( initStatus )
-        *initStatus = _initStatus;
-    return _initStatus == InitStatus_Ok;
+    if( iniStatus )
+        *iniStatus = _iniStatus;
+    return _iniStatus == IniStatus_Ok;
 }
 
 
@@ -547,11 +547,11 @@ void CryptPlugWrapper::deinitialize()
 }
 
 
-CryptPlugWrapper::InitStatus CryptPlugWrapper::initStatus( TQString* errorMsg ) const
+CryptPlugWrapper::IniStatus CryptPlugWrapper::iniStatus( TQString* errorMsg ) const
 {
     if( errorMsg )
         *errorMsg = _lastError;
-    return _initStatus;
+    return _iniStatus;
 }
 
 
diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h
index fca08b65..a2ddea95 100644
--- a/certmanager/lib/cryptplugwrapper.h
+++ b/certmanager/lib/cryptplugwrapper.h
@@ -170,7 +170,7 @@ namespace Kleo {
 /*! \defgroup groupConfigDir Directory Service Configuration
     \ingroup groupConfig
 
-    This section contains messages for configuring the
+    This section tqcontains messages for configuring the
     directory service.
 */
 
@@ -322,7 +322,7 @@ class CryptPlugWrapper;
 
   <b>How to use StructuringInfoWrapper data in your program:</b>
   \li To compose a signed message please act as described below.
-  \li For constructing an encrypted message just replace the
+  \li For constructing an encrypted message just tqreplace the
   \c signMessage() call by the respective \c encryptMessage() call
   and then proceed exactly the same way.
   \li In any case make <b>sure</b> to free your \c ciphertext when
@@ -462,16 +462,16 @@ public:
         If initialize was not called before return value will be
         \c CryptPlugInit_undef.
 
-        \sa initStatus, initialize
+        \sa iniStatus, initialize
     */
     typedef enum {
-        InitStatus_undef         = 0,
+        IniStatus_undef         = 0,
 
-        InitStatus_Ok            = 1,
-        InitStatus_NoLibName     = 2,
-        InitStatus_LoadError     = 0x1000,
-        InitStatus_InitError     = 0x2000
-    } InitStatus;
+        IniStatus_Ok            = 1,
+        IniStatus_NoLibName     = 2,
+        IniStatus_LoadError     = 0x1000,
+        IniStatus_InitError     = 0x2000
+    } IniStatus;
 
     /*! \ingroup groupSignAct
         \brief Flags used to compose the SigStatusFlags value.
@@ -518,7 +518,7 @@ public:
 
 
     enum {
-        CertStatus_EXPIRES_NEVER = CRYPTPLUG_CERT_DOES_NEVER_EXPIRE
+        CerStatus_EXPIRES_NEVER = CRYPTPLUG_CERT_DOES_NEVER_EXPIRE
     };
 
 
@@ -543,7 +543,7 @@ public:
                        or not.
 
         \sa ~CryptPlugWrapper, setActive, active, initialize, deinitialize
-        \sa initStatus
+        \sa iniStatus
     */
     CryptPlugWrapper( const TQString& name=TQString::null,
                       const TQString& libName=TQString::null,
@@ -582,7 +582,7 @@ public:
               structures - if just prevents the normal functions from
               being called erroneously. When deactivated only the following
               functions are operational: constructor , destructor ,
-              setActive , active, setLibName , libName , initStatus;
+              setActive , active, setLibName , libName , iniStatus;
               calling other functions will be ignored and their return
               values will be undefined.
 
@@ -590,7 +590,7 @@ public:
                        or not.
 
         \sa active, CryptPlugWrapper(), ~CryptPlugWrapper
-        \sa deinitialize, initialize, initStatus
+        \sa deinitialize, initialize, iniStatus
     */
     void setActive( bool active );
 
@@ -613,7 +613,7 @@ public:
         This name may be set in the constructor or by calling setLibName().
 
         \note Setting/changing the library name may only be done when
-              the initStatus() is <b>not</b> \c InitStatus_Ok.
+              the iniStatus() is <b>not</b> \c IniStatus_Ok.
               If you want to change the name of the library after
               successfully having called initialize() please make
               sure to unload it by calling the deinitialize() function.
@@ -626,7 +626,7 @@ public:
                 above 'note'.
 
         \sa libName, CryptPlugWrapper(), ~CryptPlugWrapper
-        \sa deinitialize, initialize, initStatus
+        \sa deinitialize, initialize, iniStatus
     */
     bool setLibName( const TQString& libName );
 
@@ -666,13 +666,13 @@ private:
         undefined in this case, this rule does not apply to the functions
         \c setActive() and \c setLibName().
 
-        \param initStatus will receive the resulting InitStatus if not NULL
+        \param iniStatus will receive the resulting IniStatus if not NULL
         \param errorMsg will receive the system error message if not NULL
 
-        \sa initStatus, deinitialize, CryptPlugWrapper(), ~CryptPlugWrapper
+        \sa iniStatus, deinitialize, CryptPlugWrapper(), ~CryptPlugWrapper
         \sa setActive, active
     */
-    bool initialize( InitStatus* initStatus, TQString* errorMsg );
+    bool initialize( IniStatus* iniStatus, TQString* errorMsg );
 
 public:
     /*! \ingroup groupGeneral
@@ -681,10 +681,10 @@ public:
         After this function has been called, no other plugin functions
         should be called; the behavior is undefined in this case.
 
-        \note Deinitializing sets the internal initStatus value back
-              to \c InitStatus_undef.
+        \note Deinitializing sets the internal iniStatus value back
+              to \c IniStatus_undef.
 
-        \sa initStatus, initialize, CryptPlugWrapper, ~CryptPlugWrapper
+        \sa iniStatus, initialize, CryptPlugWrapper, ~CryptPlugWrapper
         \sa setActive, active
     */
     void deinitialize();
@@ -693,7 +693,7 @@ public:
         \brief Returns this CRYPTPLUG wrapper's initialization state.
 
         \param errorMsg receives the last system error message, this value
-        should be ignored if InitStatus value equals \c InitStatus_Ok.
+        should be ignored if IniStatus value equals \c IniStatus_Ok.
 
         \return  whether the relative library was loaded and initialized
                  correctly
@@ -701,7 +701,7 @@ public:
         \sa initialize, deinitialize, CryptPlugWrapper(), ~CryptPlugWrapper
         \sa setActive, active
     */
-    InitStatus initStatus( TQString* errorMsg ) const;
+    IniStatus iniStatus( TQString* errorMsg ) const;
 
 
     /*! \ingroup groupGeneral
@@ -714,7 +714,7 @@ public:
         however.
 
         \note In case this function cannot be executed the system's error
-        message may be retrieved by calling initStatus( TQString* ).
+        message may be retrieved by calling iniStatus( TQString* ).
 
         \return  whether the relative feature is implemented or not
     */
@@ -824,7 +824,7 @@ private:
     TQString    _libName;
     TQString    _updateURL;
     bool       _active;
-    InitStatus _initStatus;
+    IniStatus _iniStatus;
     TQString    _lastError;
     CryptPlug* _cp;
     // local parameters without representation in cryptplug.h
diff --git a/certmanager/lib/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp
index 88ba036d..9b56e89b 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.cpp
+++ b/certmanager/lib/kleo/cryptobackendfactory.cpp
@@ -66,7 +66,7 @@ static const char * availableProtocols[] = {
 static const unsigned int numAvailableProtocols = sizeof availableProtocols / sizeof *availableProtocols;
 
 Kleo::CryptoBackendFactory::CryptoBackendFactory()
-  : TQObject( qApp, "CryptoBackendFactory::instance()" ),
+  : TQObject( tqApp, "CryptoBackendFactory::instance()" ),
     mConfigObject( 0 ),
     mAvailableProtocols( availableProtocols, availableProtocols + numAvailableProtocols )
 {
diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp
index 61693aff..a9333ebb 100644
--- a/certmanager/lib/kleo/dn.cpp
+++ b/certmanager/lib/kleo/dn.cpp
@@ -272,7 +272,7 @@ static TQString dn_escape( const TQString & s ) {
     TQString result;
     for ( unsigned int i = 0, end = s.length() ; i != end ; ++i ) {
         const TQChar ch = s[i];
-        switch ( ch.unicode() ) {
+        switch ( ch.tqunicode() ) {
         case ',':
         case '+':
         case '"':
diff --git a/certmanager/lib/kleo/downloadjob.h b/certmanager/lib/kleo/downloadjob.h
index bac195d9..45a4bf9c 100644
--- a/certmanager/lib/kleo/downloadjob.h
+++ b/certmanager/lib/kleo/downloadjob.h
@@ -68,7 +68,7 @@ namespace Kleo {
     /**
        Starts the download operation. \a fingerprints is a list of
        fingerprints used to specify the list of keys downloaded. Empty
-       patterns are ignored. If \a fingerprints is empty, contains
+       patterns are ignored. If \a fingerprints is empty, tqcontains
        only empty strings or anything other than fingerprints, the
        result is undefined.
     */
diff --git a/certmanager/lib/kleo/exportjob.h b/certmanager/lib/kleo/exportjob.h
index 363006e6..193ea863 100644
--- a/certmanager/lib/kleo/exportjob.h
+++ b/certmanager/lib/kleo/exportjob.h
@@ -68,7 +68,7 @@ namespace Kleo {
     /**
        Starts the export operation. \a patterns is a list of patterns
        used to restrict the list of keys exported. Empty patterns are
-       ignored. If \a patterns is empty or contains only empty
+       ignored. If \a patterns is empty or tqcontains only empty
        strings, all available keys are exported.
     */
     virtual GpgME::Error start( const TQStringList & patterns ) = 0;
diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
index c9a9ffce..4d33761f 100644
--- a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
+++ b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
@@ -75,7 +75,7 @@ Kleo::HierarchicalKeyListJob::~HierarchicalKeyListJob() {
 GpgME::Error Kleo::HierarchicalKeyListJob::start( const TQStringList & patterns, bool secretOnly ) {
   if ( secretOnly || patterns.empty() )
     return gpg_err_make( GPG_ERR_SOURCE_GPGME, GPG_ERR_UNSUPPORTED_OPERATION );
-  qCopy( patterns.begin(), patterns.end(),
+  tqCopy( patterns.begin(), patterns.end(),
 	 std::inserter( mNextSet, mNextSet.begin() ) );
   const GpgME::Error err = startAJob();
   if ( err )
diff --git a/certmanager/lib/kleo/importjob.h b/certmanager/lib/kleo/importjob.h
index 9c446457..275c9b6c 100644
--- a/certmanager/lib/kleo/importjob.h
+++ b/certmanager/lib/kleo/importjob.h
@@ -67,7 +67,7 @@ namespace Kleo {
     ~ImportJob();
 
     /**
-       Starts the importing operation. \a keyData contains the data to
+       Starts the importing operation. \a keyData tqcontains the data to
        import from.
     */
     virtual GpgME::Error start( const TQByteArray & keyData ) = 0;
diff --git a/certmanager/lib/kleo/job.cpp b/certmanager/lib/kleo/job.cpp
index dedbebfc..ac5dbac2 100644
--- a/certmanager/lib/kleo/job.cpp
+++ b/certmanager/lib/kleo/job.cpp
@@ -62,8 +62,8 @@
 Kleo::Job::Job( TQObject * parent, const char * name )
   : TQObject( parent, name )
 {
-  if ( qApp )
-    connect( qApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(slotCancel()) );
+  if ( tqApp )
+    connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(slotCancel()) );
 }
 
 Kleo::Job::~Job() {
diff --git a/certmanager/lib/kleo/keyfiltermanager.cpp b/certmanager/lib/kleo/keyfiltermanager.cpp
index 53493ab8..51caf5d2 100644
--- a/certmanager/lib/kleo/keyfiltermanager.cpp
+++ b/certmanager/lib/kleo/keyfiltermanager.cpp
@@ -72,8 +72,8 @@ Kleo::KeyFilterManager::KeyFilterManager( TQObject * parent, const char * name )
   mSelf = this;
   d = new Private();
   // ### DF: doesn't a KStaticDeleter work more reliably?
-  if ( qApp )
-    connect( qApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) );
+  if ( tqApp )
+    connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) );
   reload();
 }
 
diff --git a/certmanager/lib/kleo/keylistjob.h b/certmanager/lib/kleo/keylistjob.h
index ed657184..667ddadc 100644
--- a/certmanager/lib/kleo/keylistjob.h
+++ b/certmanager/lib/kleo/keylistjob.h
@@ -73,7 +73,7 @@ namespace Kleo {
      /**
        Starts the keylist operation. \a pattern is a list of patterns
        used to restrict the list of keys returned. Empty patterns are
-       ignored. If \a pattern is empty or contains only empty strings,
+       ignored. If \a pattern is empty or tqcontains only empty strings,
        all keys are returned (however, the backend is free to truncate
        the result and should do so; when this happens, it will be
        reported by the reult object).
diff --git a/certmanager/lib/kleo/refreshkeysjob.h b/certmanager/lib/kleo/refreshkeysjob.h
index 29467a1c..6249116d 100644
--- a/certmanager/lib/kleo/refreshkeysjob.h
+++ b/certmanager/lib/kleo/refreshkeysjob.h
@@ -70,7 +70,7 @@ namespace Kleo {
      /**
        Starts the keylist operation. \a pattern is a list of patterns
        used to restrict the list of keys returned. Empty patterns are
-       ignored. If \a pattern is empty or contains only empty strings,
+       ignored. If \a pattern is empty or tqcontains only empty strings,
        all keys are returned (however, the backend is free to truncate
        the result and should do so; when this happens, it will be
        reported by the reult object).
diff --git a/certmanager/lib/kleo/verifydetachedjob.h b/certmanager/lib/kleo/verifydetachedjob.h
index 58ff6473..c88c3461 100644
--- a/certmanager/lib/kleo/verifydetachedjob.h
+++ b/certmanager/lib/kleo/verifydetachedjob.h
@@ -67,8 +67,8 @@ namespace Kleo {
     ~VerifyDetachedJob();
 
     /**
-       Starts the verification operation. \a signature contains the
-       signature data, while \a signedData contains the data over
+       Starts the verification operation. \a signature tqcontains the
+       signature data, while \a signedData tqcontains the data over
        which the signature was made.
     */
     virtual GpgME::Error start( const TQByteArray & signature,
diff --git a/certmanager/lib/kleo/verifyopaquejob.h b/certmanager/lib/kleo/verifyopaquejob.h
index 58c452b7..ba7f40d8 100644
--- a/certmanager/lib/kleo/verifyopaquejob.h
+++ b/certmanager/lib/kleo/verifyopaquejob.h
@@ -67,8 +67,8 @@ namespace Kleo {
     ~VerifyOpaqueJob();
 
     /**
-       Starts the verification operation. \a signature contains the
-       signature data, while \a signedData contains the data over
+       Starts the verification operation. \a signature tqcontains the
+       signature data, while \a signedData tqcontains the data over
        which the signature was made.
     */
     virtual GpgME::Error start( const TQByteArray & signedData ) = 0;
diff --git a/certmanager/lib/tests/gnupgviewer.h b/certmanager/lib/tests/gnupgviewer.h
index 059d1f76..bd6af17e 100644
--- a/certmanager/lib/tests/gnupgviewer.h
+++ b/certmanager/lib/tests/gnupgviewer.h
@@ -53,12 +53,12 @@ public:
 private slots:
   void slotStdout( KProcess *, char *, int );
   void slotStderr( KProcess *, char *, int );
-  void slotStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
+  void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
   void slotProcessExited( KProcess * );
 
 private:
   Kleo::GnuPGProcessBase * mProcess;
-  TQString mLastStdout, mLastStderr, mLastStatus;
+  TQString mLastStdout, mLastStderr, mLasStatus;
 };
 
 #endif // __KLEO_TESTS_GNUPGVIEWER_H__
diff --git a/certmanager/lib/tests/test_cryptoconfig.cpp b/certmanager/lib/tests/test_cryptoconfig.cpp
index 4aadb7ff..96467483 100644
--- a/certmanager/lib/tests/test_cryptoconfig.cpp
+++ b/certmanager/lib/tests/test_cryptoconfig.cpp
@@ -312,7 +312,7 @@ int main( int argc, char** argv ) {
       // Test with query containing a litteral ':' (KURL supports this)
       // and a ' ' (KURL will escape it, see issue119)
       lst << KURL( "ldap://foo:389/?a:b c" );
-      lst << KURL( "ldap://server:389/?a%3db,c=DE" ); // the query contains a litteral ','
+      lst << KURL( "ldap://server:389/?a%3db,c=DE" ); // the query tqcontains a litteral ','
       //cout << " trying to set: " << lst.toStringList().join(", ").local8Bit() << endl;
       assert( lst[0].query() == "?b" );
       assert( lst[1].query() == "?a:b%20c" ); // see, the space got escaped
diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp
index 29ca483f..daccda6d 100644
--- a/certmanager/lib/tests/test_gnupgprocessbase.cpp
+++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp
@@ -69,7 +69,7 @@ void GnuPGViewer::setProcess( Kleo::GnuPGProcessBase * process ) {
   connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
 	   TQT_SLOT(slotStderr(KProcess*,char*,int)) );
   connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
-	   TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+	   TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
 }
 
 static TQStringList split( char * buffer, int buflen, TQString & old ) {
@@ -88,7 +88,7 @@ static TQStringList split( char * buffer, int buflen, TQString & old ) {
 }
 
 static TQString escape( TQString str ) {
-  return str.replace( '&', "&amp" ).replace( '<', "&lt;" ).replace( '>', "&gt;" );
+  return str.tqreplace( '&', "&amp" ).tqreplace( '<', "&lt;" ).tqreplace( '>', "&gt;" );
 }
 
 void GnuPGViewer::slotStdout( KProcess *, char * buffer, int buflen ) {
@@ -102,14 +102,14 @@ void GnuPGViewer::slotStderr( KProcess *, char * buffer, int buflen ) {
   for ( TQStringList::const_iterator it = l.begin() ; it != l.end() ; ++it )
     append( "<b>stderr: " + escape( *it ) + "</b>" );
 }
-void GnuPGViewer::slotStatus( Kleo::GnuPGProcessBase *, const TQString & type, const TQStringList & args ) {
+void GnuPGViewer::sloStatus( Kleo::GnuPGProcessBase *, const TQString & type, const TQStringList & args ) {
   append( "<b><font color=\"red\">status: " + escape( type + ' ' + args.join( " " ) ) + "</font></b>" );
 }
 void GnuPGViewer::slotProcessExited( KProcess * proc ) {
   if ( !proc )
     return;
   if ( proc->normalExit() )
-    append( TQString( "<b>Process exit: return code %1</b>" ).arg ( proc->exitStatus() ) );
+    append( TQString( "<b>Process exit: return code %1</b>" ).arg ( proc->exiStatus() ) );
   else
     append( "<b>Process exit: killed</b>" );
 }
diff --git a/certmanager/lib/ui/adddirectoryservicedialog.ui b/certmanager/lib/ui/adddirectoryservicedialog.ui
index 98e17188..f15d2d20 100644
--- a/certmanager/lib/ui/adddirectoryservicedialog.ui
+++ b/certmanager/lib/ui/adddirectoryservicedialog.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>AddDirectoryServiceDialog</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -75,7 +75,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>60</height>
@@ -136,7 +136,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>260</width>
                     <height>21</height>
@@ -203,5 +203,5 @@
     <tabstop>PushButton3</tabstop>
     <tabstop>PushButton4</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp
index 2871b920..720525a1 100644
--- a/certmanager/lib/ui/backendconfigwidget.cpp
+++ b/certmanager/lib/ui/backendconfigwidget.cpp
@@ -88,7 +88,7 @@ public:
   /// deselect all except one for a given protocol type (radiobutton-like exclusivity)
   void deselectAll( const char * protocol, TQCheckListItem* except );
 
-  void emitChanged() { static_cast<BackendConfigWidget *>( parentWidget() )->emitChanged( true ); }
+  void emitChanged() { static_cast<BackendConfigWidget *>( tqparentWidget() )->emitChanged( true ); }
 };
 
 // Toplevel listviewitem for a given backend (e.g. "GpgME", "Kgpg/gpg v2")
@@ -144,7 +144,7 @@ private:
     // First one is the generic name (find a nice one for OpenPGP, SMIME)
     const TQString protoName = qstricmp( protocolName, "openpgp" ) != 0
                               ? qstricmp( protocolName, "smime" ) != 0
-                              ? TQString::fromLatin1( protocolName )
+                              ? TQString::tqfromLatin1( protocolName )
                               : i18n( "S/MIME" )
                               : i18n( "OpenPGP" );
     // second one is implementation name (gpg, gpgsm...)
diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp
index 5b14d7c4..3bed433e 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.cpp
+++ b/certmanager/lib/ui/cryptoconfigmodule.cpp
@@ -59,7 +59,7 @@ using namespace Kleo;
 
 static inline TQPixmap loadIcon( TQString s ) {
   return KGlobal::instance()->iconLoader()
-    ->loadIcon( s.replace( TQRegExp( "[^a-zA-Z0-9_]" ), "_" ), KIcon::NoGroup, KIcon::SizeMedium );
+    ->loadIcon( s.tqreplace( TQRegExp( "[^a-zA-Z0-9_]" ), "_" ), KIcon::NoGroup, KIcon::SizeMedium );
 }
 
 static unsigned int num_components_with_options( const Kleo::CryptoConfig * config ) {
@@ -122,10 +122,10 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg
       dialogHeight = 500;
     else // small (800x600, 640x480) desktop
       dialogHeight = 400;
-    TQSize sz = scrollView->sizeHint();
+    TQSize sz = scrollView->tqsizeHint();
     scrollView->setMinimumSize( sz.width()
-                                + scrollView->style().pixelMetric(TQStyle::PM_ScrollBarExtent),
-                                QMIN( compGUI->sizeHint().height(), dialogHeight ) );
+                                + scrollView->style().tqpixelMetric(TQStyle::PM_ScrollBarExtent),
+                                QMIN( compGUI->tqsizeHint().height(), dialogHeight ) );
   }
   if ( mComponentGUIs.empty() ) {
       Q_ASSERT( face() == Plain );
@@ -136,7 +136,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg
                                "information.")
           .arg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" );
       TQLabel * label = new TQLabel( msg, vbox );
-      label->setAlignment( TQt::WordBreak );
+      label->tqsetAlignment( TQt::WordBreak );
       label->setMinimumHeight( fontMetrics().lineSpacing() * 5 );
   }
 }
@@ -633,7 +633,7 @@ void Kleo::CryptoConfigEntryLDAPURL::slotOpenDialog()
 {
   // I'm a bad boy and I do it all on the stack. Enough classes already :)
   // This is just a simple dialog around the directory-services-widget
-  KDialogBase dialog( mPushButton->parentWidget(), 0, true /*modal*/,
+  KDialogBase dialog( mPushButton->tqparentWidget(), 0, true /*modal*/,
                       i18n( "Configure LDAP Servers" ),
                       KDialogBase::Default|KDialogBase::Cancel|KDialogBase::Ok,
                       KDialogBase::Ok, true /*separator*/ );
diff --git a/certmanager/lib/ui/cryptoconfigmodule_p.h b/certmanager/lib/ui/cryptoconfigmodule_p.h
index 8bc52f21..cce1afea 100644
--- a/certmanager/lib/ui/cryptoconfigmodule_p.h
+++ b/certmanager/lib/ui/cryptoconfigmodule_p.h
@@ -80,7 +80,7 @@ namespace Kleo {
 
   public:
     CryptoConfigGroupGUI( CryptoConfigModule* module, Kleo::CryptoConfigGroup* group,
-                          TQGridLayout * layout, TQWidget* parent, const char* name = 0 );
+                          TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 );
 
     bool save();
     void load();
@@ -100,7 +100,7 @@ namespace Kleo {
     static CryptoConfigEntryGUI* createEntryGUI(
       CryptoConfigModule* module,
       Kleo::CryptoConfigEntry* entry, const TQString& entryName,
-      TQGridLayout * layout, TQWidget* widget, const char* name = 0 );
+      TQGridLayout * tqlayout, TQWidget* widget, const char* name = 0 );
   };
 
   /**
@@ -150,7 +150,7 @@ namespace Kleo {
     CryptoConfigEntryLineEdit( CryptoConfigModule* module,
                                Kleo::CryptoConfigEntry* entry,
                                const TQString& entryName,
-                               TQGridLayout * layout,
+                               TQGridLayout * tqlayout,
                                TQWidget* parent, const char* name = 0 );
 
     virtual void doSave();
@@ -169,7 +169,7 @@ namespace Kleo {
     CryptoConfigEntryPath( CryptoConfigModule* module,
                            Kleo::CryptoConfigEntry* entry,
                            const TQString& entryName,
-                           TQGridLayout * layout,
+                           TQGridLayout * tqlayout,
                            TQWidget* parent, const char* name = 0 );
 
     virtual void doSave();
@@ -188,7 +188,7 @@ namespace Kleo {
     CryptoConfigEntryDirPath( CryptoConfigModule* module,
                               Kleo::CryptoConfigEntry* entry,
                               const TQString& entryName,
-                              TQGridLayout * layout,
+                              TQGridLayout * tqlayout,
                               TQWidget* parent, const char* name = 0 );
 
     virtual void doSave();
@@ -207,7 +207,7 @@ namespace Kleo {
     CryptoConfigEntryURL( CryptoConfigModule* module,
                           Kleo::CryptoConfigEntry* entry,
                           const TQString& entryName,
-                          TQGridLayout * layout,
+                          TQGridLayout * tqlayout,
                           TQWidget* parent, const char* name = 0 );
 
     virtual void doSave();
@@ -226,7 +226,7 @@ namespace Kleo {
     CryptoConfigEntrySpinBox( CryptoConfigModule* module,
                               Kleo::CryptoConfigEntry* entry,
                               const TQString& entryName,
-                              TQGridLayout * layout,
+                              TQGridLayout * tqlayout,
                               TQWidget* parent, const char* name = 0 );
     virtual void doSave();
     virtual void doLoad();
@@ -245,7 +245,7 @@ namespace Kleo {
     CryptoConfigEntryCheckBox( CryptoConfigModule* module,
                                Kleo::CryptoConfigEntry* entry,
                                const TQString& entryName,
-                               TQGridLayout * layout,
+                               TQGridLayout * tqlayout,
                                TQWidget* parent, const char* name = 0 );
     virtual void doSave();
     virtual void doLoad();
@@ -263,7 +263,7 @@ namespace Kleo {
     CryptoConfigEntryLDAPURL( CryptoConfigModule* module,
                               Kleo::CryptoConfigEntry* entry,
                               const TQString& entryName,
-                              TQGridLayout * layout,
+                              TQGridLayout * tqlayout,
                               TQWidget* parent, const char* name = 0 );
     virtual void doSave();
     virtual void doLoad();
diff --git a/certmanager/lib/ui/directoryserviceswidget.cpp b/certmanager/lib/ui/directoryserviceswidget.cpp
index 0b9dd91f..3f99ddb9 100644
--- a/certmanager/lib/ui/directoryserviceswidget.cpp
+++ b/certmanager/lib/ui/directoryserviceswidget.cpp
@@ -63,7 +63,7 @@ public:
 
   void setPassword( const TQString& pass ) {
     mPassword = pass;
-    setText( 4, pass.isEmpty() ? TQString::null : TQString::fromLatin1( "******" ) );
+    setText( 4, pass.isEmpty() ? TQString::null : TQString::tqfromLatin1( "******" ) );
   }
 
   const TQString& password() const { return mPassword; }
diff --git a/certmanager/lib/ui/directoryserviceswidgetbase.ui b/certmanager/lib/ui/directoryserviceswidgetbase.ui
index 1dabbca5..c2c22501 100644
--- a/certmanager/lib/ui/directoryserviceswidgetbase.ui
+++ b/certmanager/lib/ui/directoryserviceswidgetbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>DirectoryServicesWidgetBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -44,7 +44,7 @@
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -126,7 +126,7 @@ If you do not use a directory service, you can still use local certificates.
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -158,7 +158,7 @@ If you do not use a directory service, you can still use local certificates.
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>51</height>
@@ -171,7 +171,7 @@ If you do not use a directory service, you can still use local certificates.
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -187,7 +187,7 @@ If you do not use a directory service, you can still use local certificates.
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>47</width>
                             <height>20</height>
@@ -221,7 +221,7 @@ By clicking this button, you can select a new directory service to be used for r
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>47</width>
                             <height>20</height>
@@ -258,7 +258,7 @@ By clicking this button, you can remove the currently selected directory service
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>47</width>
                             <height>20</height>
@@ -277,7 +277,7 @@ By clicking this button, you can remove the currently selected directory service
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -338,5 +338,5 @@ By clicking this button, you can remove the currently selected directory service
     <slot access="protected">slotMoveUp()</slot>
     <slot access="protected">slotMoveDown()</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
index 4c718406..8f2bc6ec 100644
--- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
+++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
@@ -115,7 +115,7 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap
   // the up/down/left/right arrow cross:
 
   TQGridLayout * xlay = new TQGridLayout( 5, 3, 0, "xlay" );
-  xlay->setAlignment( AlignCenter );
+  xlay->tqsetAlignment( AlignCenter );
 
   static const struct {
     const char * icon;
diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp
index 7ccddb5d..bb9432a9 100644
--- a/certmanager/lib/ui/kdhorizontalline.cpp
+++ b/certmanager/lib/ui/kdhorizontalline.cpp
@@ -97,7 +97,7 @@ void KDHorizontalLine::calculateFrame() {
     qDebug( "mLenVisible = %d (of %d)", mLenVisible, mTitle.length() );
     if ( mLenVisible ) { // but do we also have a visible label?
       TQRect r = rect();
-      const int va = style().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
+      const int va = style().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
       if( va & AlignVCenter )
         r.setTop( fm.height() / 2 );		// frame rect should be
       else if( va & AlignTop )
@@ -115,15 +115,15 @@ TQSizePolicy KDHorizontalLine::sizePolicy() const {
   return TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
 }
 
-TQSize KDHorizontalLine::sizeHint() const {
-  return minimumSizeHint();
+TQSize KDHorizontalLine::tqsizeHint() const {
+  return tqminimumSizeHint();
 }
 
-TQSize KDHorizontalLine::minimumSizeHint() const {
+TQSize KDHorizontalLine::tqminimumSizeHint() const {
   const int w = fontMetrics().width( mTitle, mLenVisible ) +
                 fontMetrics().width( TQChar( ' ' ) );
   const int h = fontMetrics().height();
-  return TQSize( QMAX( w, indentHint() ), h ).expandedTo( qApp->globalStrut() );
+  return TQSize( QMAX( w, indentHint() ), h ).expandedTo( tqApp->globalStrut() );
 }
 
 void KDHorizontalLine::paintEvent( TQPaintEvent * e ) {
@@ -134,11 +134,11 @@ void KDHorizontalLine::paintEvent( TQPaintEvent * e ) {
     const int h = fm.height();
     const int tw = fm.width( mTitle, mLenVisible ) + fm.width(TQChar(' '));
     int x;
-    if ( mAlign & AlignHCenter )		// center alignment
+    if ( mAlign & AlignHCenter )		// center tqalignment
       x = frameRect().width()/2 - tw/2;
-    else if ( mAlign & AlignRight )	// right alignment
+    else if ( mAlign & AlignRight )	// right tqalignment
       x = frameRect().width() - tw;
-    else if ( mAlign & AlignLeft )       // left alignment
+    else if ( mAlign & AlignLeft )       // left tqalignment
       x = 0;
     else { // auto align
       if( TQApplication::reverseLayout() )
@@ -147,15 +147,15 @@ void KDHorizontalLine::paintEvent( TQPaintEvent * e ) {
         x = 0;
     }
     TQRect r( x, 0, tw, h );
-    int va = style().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
+    int va = style().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
     if ( va & AlignTop )
       r.moveBy( 0, fm.descent() );
-    const TQColor pen( (QRgb) style().styleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) );
+    const TQColor pen( (QRgb) style().tqstyleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) );
 #if QT_VERSION >= 0x030300
-    if ( !style().styleHint( TQStyle::SH_UnderlineAccelerator, this ) )
+    if ( !style().tqstyleHint( TQStyle::SH_UnderlineAccelerator, this ) )
       va |= NoAccel;
 #endif
-    style().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, colorGroup(),
+    style().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, tqcolorGroup(),
                       isEnabled(), 0, mTitle, -1, ownPalette() ? 0 : &pen );
     paint.setClipRegion( e->region().subtract( r ) ); // clip everything but title
   }
diff --git a/certmanager/lib/ui/kdhorizontalline.h b/certmanager/lib/ui/kdhorizontalline.h
index 5b6d5da9..0b857bac 100644
--- a/certmanager/lib/ui/kdhorizontalline.h
+++ b/certmanager/lib/ui/kdhorizontalline.h
@@ -54,11 +54,11 @@ public:
 
   TQString title() const { return mTitle; }
 
-  /*! \reimp to hard-code the frame shape */
+  /*! \reimp to hard-code the frame tqshape */
   void setFrameStyle( int style );
 
-  TQSize sizeHint() const;
-  TQSize minimumSizeHint() const;
+  TQSize tqsizeHint() const;
+  TQSize tqminimumSizeHint() const;
   TQSizePolicy sizePolicy() const;
 
   static int indentHint();
diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp
index d45b64a8..8c48f896 100644
--- a/certmanager/lib/ui/keyapprovaldialog.cpp
+++ b/certmanager/lib/ui/keyapprovaldialog.cpp
@@ -170,8 +170,8 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients
   // calculate the optimal width for the dialog
   const int dialogWidth = marginHint()
                   + sv->frameWidth()
-                  + view->sizeHint().width()
-                  + sv->verticalScrollBar()->sizeHint().width()
+                  + view->tqsizeHint().width()
+                  + sv->verticalScrollBar()->tqsizeHint().width()
                   + sv->frameWidth()
                   + marginHint()
                   + 2;
@@ -180,11 +180,11 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients
                    + fontMetrics().height()
                    + spacingHint()
                    + sv->frameWidth()
-                   + view->sizeHint().height()
-                   + sv->horizontalScrollBar()->sizeHint().height()
+                   + view->tqsizeHint().height()
+                   + sv->horizontalScrollBar()->tqsizeHint().height()
                    + sv->frameWidth()
                    + spacingHint()
-                   + actionButton( KDialogBase::Cancel )->sizeHint().height()
+                   + actionButton( KDialogBase::Cancel )->tqsizeHint().height()
                    + marginHint()
                    + 2;
 
diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp
index fa8c9eb8..d8afcc59 100644
--- a/certmanager/lib/ui/keylistview.cpp
+++ b/certmanager/lib/ui/keylistview.cpp
@@ -81,8 +81,8 @@ namespace {
     if ( !item )
       return;
 
-    const TQRect itemRect = mKeyListView->itemRect( item );
-    if ( !itemRect.isValid() )
+    const TQRect tqitemRect = mKeyListView->tqitemRect( item );
+    if ( !tqitemRect.isValid() )
       return;
 
     const int col = mKeyListView->header()->sectionAt( p.x() );
@@ -93,8 +93,8 @@ namespace {
     if ( !headerRect.isValid() )
       return;
 
-    const TQRect cellRect( headerRect.left(), itemRect.top(),
-			  headerRect.width(), itemRect.height() );
+    const TQRect cellRect( headerRect.left(), tqitemRect.top(),
+			  headerRect.width(), tqitemRect.height() );
 
     TQString tipStr;
     if ( const Kleo::KeyListViewItem * klvi = Kleo::lvi_cast<Kleo::KeyListViewItem>( item ) )
@@ -117,7 +117,7 @@ struct Kleo::KeyListView::Private {
   std::map<TQCString,KeyListViewItem*> itemMap;
 };
 
-// a list of signals where we want to replace TQListViewItem with
+// a list of signals where we want to tqreplace TQListViewItem with
 // Kleo:KeyListViewItem:
 static const struct {
   const char * source;
@@ -428,7 +428,7 @@ void Kleo::KeyListViewItem::setKey( const GpgME::Key & key ) {
     if ( const TQPixmap * pix = cs->pixmap( key, i ) )
       setPixmap( i, *pix );
   }
-  repaint();
+  tqrepaint();
 }
 
 TQString Kleo::KeyListViewItem::toolTip( int col ) const {
@@ -444,10 +444,10 @@ int Kleo::KeyListViewItem::compare( TQListViewItem * item, int col, bool ascendi
   return listView()->columnStrategy()->compare( this->key(), that->key(), col );
 }
 
-void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
+void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) {
   const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
   if ( !ds ) {
-    TQListViewItem::paintCell( p, cg, column, width, alignment );
+    TQListViewItem::paintCell( p, cg, column, width, tqalignment );
     return;
   }
   const TQColor fg = ds->keyForeground( key(), cg.text() );
@@ -459,7 +459,7 @@ void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, i
   _cg.setColor( TQColorGroup::Text, fg );
   _cg.setColor( TQColorGroup::Base, bg );
 
-  TQListViewItem::paintCell( p, _cg, column, width, alignment );
+  TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
 }
 
 void Kleo::KeyListViewItem::insertItem( TQListViewItem * qlvi ) {
@@ -536,10 +536,10 @@ int Kleo::SubkeyKeyListViewItem::compare( TQListViewItem * item, int col, bool a
   return listView()->columnStrategy()->subkeyCompare( this->subkey(), that->subkey(), col );
 }
 
-void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
+void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) {
   const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
   if ( !ds ) {
-    TQListViewItem::paintCell( p, cg, column, width, alignment );
+    TQListViewItem::paintCell( p, cg, column, width, tqalignment );
     return;
   }
   const TQColor fg = ds->subkeyForeground( subkey(), cg.text() );
@@ -551,7 +551,7 @@ void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup &
   _cg.setColor( TQColorGroup::Text, fg );
   _cg.setColor( TQColorGroup::Base, bg );
 
-  TQListViewItem::paintCell( p, _cg, column, width, alignment );
+  TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
 }
 
 
@@ -615,10 +615,10 @@ int Kleo::UserIDKeyListViewItem::compare( TQListViewItem * item, int col, bool a
 }
 
 
-void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
+void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) {
   const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
   if ( !ds ) {
-    TQListViewItem::paintCell( p, cg, column, width, alignment );
+    TQListViewItem::paintCell( p, cg, column, width, tqalignment );
     return;
   }
   const TQColor fg = ds->useridForeground( userID(), cg.text() );
@@ -630,7 +630,7 @@ void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup &
   _cg.setColor( TQColorGroup::Text, fg );
   _cg.setColor( TQColorGroup::Base, bg );
 
-  TQListViewItem::paintCell( p, _cg, column, width, alignment );
+  TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
 }
 
 
@@ -693,10 +693,10 @@ int Kleo::SignatureKeyListViewItem::compare( TQListViewItem * item, int col, boo
   return listView()->columnStrategy()->signatureCompare( this->signature(), that->signature(), col );
 }
 
-void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
+void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) {
   const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
   if ( !ds ) {
-    TQListViewItem::paintCell( p, cg, column, width, alignment );
+    TQListViewItem::paintCell( p, cg, column, width, tqalignment );
     return;
   }
   const TQColor fg = ds->signatureForeground( signature(), cg.text() );
@@ -708,7 +708,7 @@ void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGrou
   _cg.setColor( TQColorGroup::Text, fg );
   _cg.setColor( TQColorGroup::Base, bg );
 
-  TQListViewItem::paintCell( p, _cg, column, width, alignment );
+  TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
 }
 
 
diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h
index 2ade61a3..986ed267 100644
--- a/certmanager/lib/ui/keylistview.h
+++ b/certmanager/lib/ui/keylistview.h
@@ -45,7 +45,7 @@ class TQColor;
 
 namespace Kleo {
 
-  // work around moc parser bug...
+  // work around tqmoc parser bug...
 #define TEMPLATE_TYPENAME(T) template <typename T>
   TEMPLATE_TYPENAME(T)
   inline T * lvi_cast( TQListViewItem * item ) {
@@ -91,7 +91,7 @@ namespace Kleo {
     /*! \reimp */
     int rtti() const { return RTTI; }
     /*! \reimp */
-    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
+    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment );
     /*! \reimp */
     void insertItem( TQListViewItem * item );
     /*! \reimp */
@@ -127,7 +127,7 @@ namespace Kleo {
     /*! \reimp */
     int rtti() const { return RTTI; }
     /*! \reimp */
-    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
+    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment );
 
   private:
     GpgME::Subkey mSubkey;
@@ -159,7 +159,7 @@ namespace Kleo {
     /*! \reimp */
     int rtti() const { return RTTI; }
     /*! \reimp */
-    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
+    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment );
 
   private:
     GpgME::UserID mUserID;
@@ -191,7 +191,7 @@ namespace Kleo {
     /*! \reimp */
     int rtti() const { return RTTI; }
     /*! \reimp */
-    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
+    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment );
 
   private:
     GpgME::UserID::Signature mSignature;
diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp
index 3a883dea..27d9d873 100644
--- a/certmanager/lib/ui/keyrequester.cpp
+++ b/certmanager/lib/ui/keyrequester.cpp
@@ -117,7 +117,7 @@ void Kleo::KeyRequester::init()
   // the button to unset any key:
   mEraseButton = new KPushButton( this );
   mEraseButton->setAutoDefault( false );
-  mEraseButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
+  mEraseButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
 					    TQSizePolicy::Minimum ) );
   mEraseButton->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? "locationbar_erase" : "clear_left" ) );
   TQToolTip::add( mEraseButton, i18n("Clear") );
@@ -133,7 +133,7 @@ void Kleo::KeyRequester::init()
   connect( mEraseButton,  TQT_SIGNAL(clicked()), TQT_SLOT(slotEraseButtonClicked()) );
   connect( mDialogButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDialogButtonClicked()) );
 
-  setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+  tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
 			      TQSizePolicy::Fixed ) );
 
   setAllowedKeys( mKeyUsage );
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index fc590d49..1ff68570 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -250,7 +250,7 @@ namespace {
 		   "Fingerprint: %4" )
 	.arg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"),
 	      creation, expiry,
-	      fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") );
+	      fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") );
     else
       return i18n( "S/MIME key for %1\n"
 		   "Created: %2\n"
@@ -259,7 +259,7 @@ namespace {
 		   "Issuer: %5" )
 	.arg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"),
 	      creation, expiry,
-	      fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") )
+	      fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") )
 	.arg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") );
   }
 
@@ -374,11 +374,11 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection
       KActiveLabel *textLabel = new KActiveLabel( text, page );
       disconnect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), textLabel, TQT_SLOT(openLink(const TQString&)) );
       connect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), TQT_SLOT(slotStartCertificateManager(const TQString&)) );
-      textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak );
+      textLabel->tqsetAlignment( textLabel->tqalignment() | TQt::WordBreak );
       mTopLayout->addWidget( textLabel );
     } else {
       KActiveLabel *textLabel = new KActiveLabel( text, page );
-      textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak );
+      textLabel->tqsetAlignment( textLabel->tqalignment() | TQt::WordBreak );
       mTopLayout->addWidget( textLabel );
     }
   }
diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp
index e05a21b9..c209ff67 100644
--- a/certmanager/lib/ui/messagebox.cpp
+++ b/certmanager/lib/ui/messagebox.cpp
@@ -99,7 +99,7 @@ public:
         kdDebug() << "setAuditLog: rect = " << rect << endl;
         if ( !rect.isValid() )
             return;
-        TQSize maxSize = qApp->desktop()->screenGeometry( this ).size() * 2 / 3 ;
+        TQSize maxSize = tqApp->desktop()->screenGeometry( this ).size() * 2 / 3 ;
         if ( !maxSize.isValid() )
             maxSize = TQSize( 640, 480 );
         m_textEdit->setMinimumSize( rect.size().boundedTo( maxSize ) );
diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp
index 1418bb65..58f196d1 100644
--- a/certmanager/lib/ui/progressdialog.cpp
+++ b/certmanager/lib/ui/progressdialog.cpp
@@ -48,7 +48,7 @@ Kleo::ProgressDialog::ProgressDialog( Job * job, const TQString & baseText,
   : TQProgressDialog( creator, name, false, f ), mBaseText( baseText )
 {
   assert( job );
-  setBar( new ProgressBar( this, "replacement progressbar in Kleo::ProgressDialog" ) );
+  setBar( new ProgressBar( this, "tqreplacement progressbar in Kleo::ProgressDialog" ) );
 
   setMinimumDuration( 2000 /*ms*/ );
   setAutoReset( false );
diff --git a/certmanager/storedtransferjob.cpp b/certmanager/storedtransferjob.cpp
index 1aa995e8..fd9e601b 100644
--- a/certmanager/storedtransferjob.cpp
+++ b/certmanager/storedtransferjob.cpp
@@ -89,7 +89,7 @@ StoredTransferJob *KIOext::storedGet( const KURL& url, bool reload, bool showPro
 StoredTransferJob *KIOext::put( const TQByteArray& arr, const KURL& url, int permissions,
                                 bool overwrite, bool resume, bool showProgressInfo )
 {
-    KIO_ARGS << url << Q_INT8( overwrite ? 1 : 0 ) << Q_INT8( resume ? 1 : 0 ) << permissions;
+    KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions;
     StoredTransferJob * job = new StoredTransferJob( url, KIO::CMD_PUT, packedArgs, TQByteArray(), showProgressInfo );
     job->setData( arr );
     return job;
diff --git a/doc/api/doxygen.css b/doc/api/doxygen.css
index e059f34a..2e8f17f5 100644
--- a/doc/api/doxygen.css
+++ b/doc/api/doxygen.css
@@ -227,7 +227,7 @@ height: 100px;
 bottom:0px;
 }
 
-/* right footer, contains the wave image */
+/* right footer, tqcontains the wave image */
 #footer_right {
 position: absolute;
 right: 0px;
@@ -235,7 +235,7 @@ text-align: right;
 z-index: 5;
 }
 
-/* left footer, contains the text */
+/* left footer, tqcontains the text */
 #footer_left {
 position: absolute;
 left: 0px;
@@ -362,7 +362,7 @@ display: none;
 @media aural { .doNotDisplay {
 display: inline;
 }}
-/* Stylesheet that handles PIM-specific classes and layout */
+/* Stylesheet that handles PIM-specific classes and tqlayout */
 
 #content h1
 {
diff --git a/indexlib/boost-compat/config/abi/borland_prefix.hpp b/indexlib/boost-compat/config/abi/borland_prefix.hpp
index 49f42494..f8d23b7a 100644
--- a/indexlib/boost-compat/config/abi/borland_prefix.hpp
+++ b/indexlib/boost-compat/config/abi/borland_prefix.hpp
@@ -8,11 +8,11 @@
 //  -b (on or off - effect emum sizes)
 //  -Vx  (on or off - empty members)
 //  -Ve (on or off - empty base classes)
-//  -aX (alignment - 5 options).
+//  -aX (tqalignment - 5 options).
 //  -pX (Calling convention - 4 options)
-//  -VmX (member pointer size and layout - 5 options)
+//  -VmX (member pointer size and tqlayout - 5 options)
 //  -VC (on or off, changes name mangling)
-//  -Vl (on or off, changes struct layout).
+//  -Vl (on or off, changes struct tqlayout).
 
 //  In addition the following warnings are sufficiently annoying (and
 //  unfixable) to have them turned off by default:
diff --git a/indexlib/boost-compat/config/auto_link.hpp b/indexlib/boost-compat/config/auto_link.hpp
index b4e580ff..9723a18f 100644
--- a/indexlib/boost-compat/config/auto_link.hpp
+++ b/indexlib/boost-compat/config/auto_link.hpp
@@ -53,7 +53,7 @@ BOOST_LIB_TOOLSET:    The compiler toolset name (vc6, vc7, bcb5 etc).
 BOOST_LIB_THREAD_OPT: "-mt" for multithread builds, otherwise nothing.
 
 BOOST_LIB_RT_OPT:     A suffix that indicates the runtime library used,
-                      contains one or more of the following letters after
+                      tqcontains one or more of the following letters after
                       a hiphen:
 
                       s      static runtime (dynamic if not present).
diff --git a/indexlib/boost-compat/config/platform/macos.hpp b/indexlib/boost-compat/config/platform/macos.hpp
index 3a5f4130..4893faaa 100644
--- a/indexlib/boost-compat/config/platform/macos.hpp
+++ b/indexlib/boost-compat/config/platform/macos.hpp
@@ -53,7 +53,7 @@
 
 #    define BOOST_HAS_MPTASKS
 
-// The MP task implementation of Boost Threads aims to replace MP-unsafe
+// The MP task implementation of Boost Threads aims to tqreplace MP-unsafe
 // parts of the MSL, so we turn on threads unconditionally.
 #    define BOOST_HAS_THREADS
 
diff --git a/indexlib/boost-compat/config/select_stdlib_config.hpp b/indexlib/boost-compat/config/select_stdlib_config.hpp
index b7bf5914..735a03b0 100644
--- a/indexlib/boost-compat/config/select_stdlib_config.hpp
+++ b/indexlib/boost-compat/config/select_stdlib_config.hpp
@@ -54,7 +54,7 @@
 #  define BOOST_STDLIB_CONFIG "boost/config/stdlib/modena.hpp"
 
 #elif (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER)
-// Dinkumware Library (this has to appear after any possible replacement libraries):
+// Dinkumware Library (this has to appear after any possible tqreplacement libraries):
 #  define BOOST_STDLIB_CONFIG "boost/config/stdlib/dinkumware.hpp"
 
 #elif defined (BOOST_ASSERT_CONFIG)
diff --git a/indexlib/boost-compat/config/suffix.hpp b/indexlib/boost-compat/config/suffix.hpp
index 77d9deca..a144b4fe 100644
--- a/indexlib/boost-compat/config/suffix.hpp
+++ b/indexlib/boost-compat/config/suffix.hpp
@@ -332,7 +332,7 @@ namespace std {
 // The same problem occurs with has_facet.
 // These macros provide a consistent way to access a locale's facets.
 // Usage:
-//    replace
+//    tqreplace
 //       std::use_facet<Type>(loc);
 //    with
 //       BOOST_USE_FACET(Type, loc);
@@ -357,7 +357,7 @@ namespace std {
 
 // BOOST_NESTED_TEMPLATE workaround ------------------------------------------//
 // Member templates are supported by some compilers even though they can't use
-// the A::template member<U> syntax, as a workaround replace:
+// the A::template member<U> syntax, as a workaround tqreplace:
 //
 // typedef typename A::template rebind<U> binder;
 //
@@ -500,7 +500,7 @@ namespace boost{
 
 //
 // Helper macro BOOST_STRINGIZE:
-// Converts the parameter X to a string after macro replacement
+// Converts the parameter X to a string after macro tqreplacement
 // on X has been performed.
 //
 #define BOOST_STRINGIZE(X) BOOST_DO_STRINGIZE(X)
diff --git a/indexlib/boost-compat/config/user.hpp b/indexlib/boost-compat/config/user.hpp
index 5a4a9d47..d595f997 100644
--- a/indexlib/boost-compat/config/user.hpp
+++ b/indexlib/boost-compat/config/user.hpp
@@ -67,16 +67,16 @@
 
 // BOOST_DISABLE_ABI_HEADERS: Stops boost headers from including any 
 // prefix/suffix headers that normally control things like struct 
-// packing and alignment. 
+// packing and tqalignment. 
 // #define BOOST_DISABLE_ABI_HEADERS
 
 // BOOST_ABI_PREFIX: A prefix header to include in place of whatever
-// boost.config would normally select, any replacement should set up 
-// struct packing and alignment options as required. 
+// boost.config would normally select, any tqreplacement should set up 
+// struct packing and tqalignment options as required. 
 // #define BOOST_ABI_PREFIX my-header-name
 
 // BOOST_ABI_SUFFIX: A suffix header to include in place of whatever 
-// boost.config would normally select, any replacement should undo 
+// boost.config would normally select, any tqreplacement should undo 
 // the effects of the prefix header. 
 // #define BOOST_ABI_SUFFIX my-header-name
 
@@ -91,7 +91,7 @@
 // #define BOOST_ALL_DYN_LINK
  
 // BOOST_WHATEVER_DYN_LINK: Forces library "whatever" to be linked as a dll 
-// rather than a static library on Microsoft Windows: replace the WHATEVER 
+// rather than a static library on Microsoft Windows: tqreplace the WHATEVER 
 // part of the macro name with the name of the library that you want to 
 // dynamically link to, for example use BOOST_DATE_TIME_DYN_LINK or 
 // BOOST_REGEX_DYN_LINK etc (this macro is used to turn on __declspec(dllimport) 
@@ -112,7 +112,7 @@
  
 // BOOST_WHATEVER_NO_LIB: Tells the config system not to automatically 
 // select which library to link against for library "whatever", 
-// replace WHATEVER in the macro name with the name of the library; 
+// tqreplace WHATEVER in the macro name with the name of the library; 
 // for example BOOST_DATE_TIME_NO_LIB or BOOST_REGEX_NO_LIB.  
 // Normally if a compiler supports #pragma lib, then the correct library 
 // build variant will be automatically selected and linked against, simply 
diff --git a/indexlib/boost-compat/weak_ptr.hpp b/indexlib/boost-compat/weak_ptr.hpp
index c2385007..8a063784 100644
--- a/indexlib/boost-compat/weak_ptr.hpp
+++ b/indexlib/boost-compat/weak_ptr.hpp
@@ -51,11 +51,11 @@ public:
 //
 //  has a serious problem.
 //
-//  r.px may already have been invalidated. The px(r.px)
+//  r.px may already have been tqinvalidated. The px(r.px)
 //  conversion may require access to *r.px (virtual inheritance).
 //
 //  It is not possible to avoid spurious access violations since
-//  in multithreaded programs r.px may be invalidated at any point.
+//  in multithreaded programs r.px may be tqinvalidated at any point.
 //
 
     template<class Y>
@@ -106,7 +106,7 @@ public:
         catch(bad_weak_ptr const &)
         {
             // Q: how can we get here?
-            // A: another thread may have invalidated r after the use_count test above.
+            // A: another thread may have tqinvalidated r after the use_count test above.
             return shared_ptr<element_type>();
         }
 
diff --git a/indexlib/compat.h b/indexlib/compat.h
index f7c1c270..f0dd0d18 100644
--- a/indexlib/compat.h
+++ b/indexlib/compat.h
@@ -51,7 +51,7 @@ struct iterator {
 }
 #endif
 
-/* compatibility replacements for functions not defined in older libstdc++ */
+/* compatibility tqreplacements for functions not defined in older libstdc++ */
 template<class T> T kMin(const T &a, const T &b) { return a < b ? a : b; }
 template<class T> T kMax(const T &a, const T &b) { return a > b ? a : b; }
 
diff --git a/indexlib/manager.h b/indexlib/manager.h
index c2672e23..da321cb7 100644
--- a/indexlib/manager.h
+++ b/indexlib/manager.h
@@ -51,7 +51,7 @@ class memory_manager  {
 		/** Returns the size of the block */
 		virtual unsigned size() const = 0;
 		/** Resizes the block.
-		  * This invalidates all previously returned pointers
+		  * This tqinvalidates all previously returned pointers
 		  */
 		virtual void resize( unsigned ) = 0;
 };
diff --git a/indexlib/match.cpp b/indexlib/match.cpp
index a73dc5f5..03851a84 100644
--- a/indexlib/match.cpp
+++ b/indexlib/match.cpp
@@ -47,17 +47,17 @@ namespace {
 }
 
 indexlib::Match::Match( std::string str, unsigned flags ):
-	masks_( 256 ),
+	tqmasks_( 256 ),
 	caseinsensitive_( flags & caseinsensitive ),
 	pattern_rest_( str, kMin( str.size(), sizeof( unsigned ) * 8 - 1 ) )
 {
 	hot_bit_ = kMin( str.size(), sizeof( unsigned ) * 8 - 1 );
 	for ( unsigned i = 0; i != hot_bit_; ++i ) {
 		if ( caseinsensitive_ ) {
-			setbit( masks_[ ( unsigned char )std::toupper( str[ i ] ) ], i );
-			setbit( masks_[ ( unsigned char )std::tolower( str[ i ] ) ], i );
+			setbit( tqmasks_[ ( unsigned char )std::toupper( str[ i ] ) ], i );
+			setbit( tqmasks_[ ( unsigned char )std::tolower( str[ i ] ) ], i );
 		} else {
-			setbit( masks_[ ( unsigned char )str[ i ] ], i );
+			setbit( tqmasks_[ ( unsigned char )str[ i ] ], i );
 		}
 	}
 }
@@ -69,7 +69,7 @@ bool indexlib::Match::process( const char* string ) const {
 	unsigned state = 0;
 	while ( *string ) {
 		state |= 1;
-		state &= masks_[ ( unsigned char )*string ];
+		state &= tqmasks_[ ( unsigned char )*string ];
 		state <<= 1;
 		++string;
 		if ( getbit( state, hot_bit_ ) && ( pattern_rest_ == std::string( string, pattern_rest_.size() ) ) ) return true;
diff --git a/indexlib/match.h b/indexlib/match.h
index 568eb3d0..6cbf448b 100644
--- a/indexlib/match.h
+++ b/indexlib/match.h
@@ -64,8 +64,8 @@ class Match {
 		bool process( const char* string ) const;
 		bool process( std::string str ) const { return process( str.c_str() ); }
 	private:
-		typedef std::vector<unsigned> masks_type;
-		masks_type masks_;
+		typedef std::vector<unsigned> tqmasks_type;
+		tqmasks_type tqmasks_;
 		unsigned hot_bit_;
 		bool caseinsensitive_;
 		std::string pattern_rest_;
diff --git a/kabc/frontend/mainWindow.ui b/kabc/frontend/mainWindow.ui
index be9996c5..3497a980 100644
--- a/kabc/frontend/mainWindow.ui
+++ b/kabc/frontend/mainWindow.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>MainWindow</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -277,7 +277,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -540,7 +540,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -867,7 +867,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -1011,7 +1011,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -1405,5 +1405,5 @@
     <slot>addressBookUnlocked()</slot>
     <slot>fileOpenStd()</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kabc/kabc2mutt/kabc2mutt.cpp b/kabc/kabc2mutt/kabc2mutt.cpp
index 96cf7923..b86521dd 100644
--- a/kabc/kabc2mutt/kabc2mutt.cpp
+++ b/kabc/kabc2mutt/kabc2mutt.cpp
@@ -86,9 +86,9 @@ void KABC2Mutt::loadingFinished()
       else
         if ( !(*iaddr).familyName().isEmpty() )
           key = (*iaddr).givenName().left( 1 ).lower() +
-                (*iaddr).familyName().lower().replace( space, underscore );
+                (*iaddr).familyName().lower().tqreplace( space, underscore );
         else
-          key = (*iaddr).givenName().lower().replace( space, underscore );
+          key = (*iaddr).givenName().lower().tqreplace( space, underscore );
 
       while ( from != to ) {
         std::cout << "alias " << key;
@@ -101,7 +101,7 @@ void KABC2Mutt::loadingFinished()
 
       if ( !(*iaddr).nickName().isEmpty() ) {
         std::cout << "alias "
-                  << (*iaddr).nickName().lower().replace( space, underscore )
+                  << (*iaddr).nickName().lower().tqreplace( space, underscore )
                   << '\t' << name << " <"
                   << (*iaddr).preferredEmail() << '>' << std::endl;
       }
@@ -140,7 +140,7 @@ void KABC2Mutt::loadingFinished()
         continue;
 
       if ( mFormat == Aliases ) {
-        std::cout << "alias " << (*iaddr).replace( TQRegExp( " " ), "_" )
+        std::cout << "alias " << (*iaddr).tqreplace( TQRegExp( " " ), "_" )
                   << '\t' << emails.join( "," ) << std::endl;
       } else {
         std::cout << emails.join( "," ) << '\t' << (*iaddr) << '\t' << std::endl;
diff --git a/kaddressbook/Makefile.am b/kaddressbook/Makefile.am
index fe39a108..05cdddb0 100644
--- a/kaddressbook/Makefile.am
+++ b/kaddressbook/Makefile.am
@@ -24,7 +24,7 @@ kde_module_LTLIBRARIES = libkaddressbookpart.la
 
 libkaddressbookpart_la_SOURCES = kaddressbook_part.cpp
 libkaddressbookpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddressbookpart_la_LIBADD = libkaddressbook.la
+libkaddressbookpart_la_LIBADD = libkaddressbook.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) -lDCOP
 
 lib_LTLIBRARIES = libkaddressbook.la
 libkaddressbook_la_SOURCES = addresseeconfig.cpp addresseeeditordialog.cpp \
diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp
index 26924ef8..ac70cbaa 100644
--- a/kaddressbook/addresseditwidget.cpp
+++ b/kaddressbook/addresseditwidget.cpp
@@ -82,25 +82,25 @@ class TabPressEater : public QObject
 AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  TQBoxLayout *layout = new TQVBoxLayout( this, 4, 2 );
-  layout->setSpacing( KDialog::spacingHint() );
+  TQBoxLayout *tqlayout = new TQVBoxLayout( this, 4, 2 );
+  tqlayout->setSpacing( KDialog::spacingHint() );
 
   mTypeCombo = new AddressTypeCombo( mAddressList, this );
   connect( mTypeCombo, TQT_SIGNAL( activated( int ) ),
            TQT_SLOT( updateAddressEdit() ) );
-  layout->addWidget( mTypeCombo );
+  tqlayout->addWidget( mTypeCombo );
 
   mAddressField = new KActiveLabel( this );
   mAddressField->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
   mAddressField->setMinimumHeight( 20 );
-  mAddressField->setAlignment( Qt::AlignTop );
+  mAddressField->tqsetAlignment( Qt::AlignTop );
   mAddressField->setTextFormat( Qt::PlainText );
-  layout->addWidget( mAddressField );
+  tqlayout->addWidget( mAddressField );
 
   mEditButton = new TQPushButton( i18n( "street/postal", "&Edit Addresses..." ), this );
   connect( mEditButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( edit() ) );
 
-  layout->addWidget( mEditButton );
+  tqlayout->addWidget( mEditButton );
 }
 
 AddressEditWidget::~AddressEditWidget()
@@ -274,7 +274,7 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list,
   topLayout->addMultiCellWidget( mTypeCombo, 0, 0, 0, 1 );
 
   TQLabel *label = new TQLabel( i18n( "<streetLabel>:", "%1:" ).arg( KABC::Address::streetLabel() ), page );
-  label->setAlignment( Qt::AlignTop | Qt::AlignLeft );
+  label->tqsetAlignment( Qt::AlignTop | Qt::AlignLeft );
   topLayout->addWidget( label, 1, 0 );
   mStreetTextEdit = new TQTextEdit( page );
   mStreetTextEdit->setTextFormat( Qt::PlainText );
@@ -604,10 +604,10 @@ AddressTypeDialog::AddressTypeDialog( int type, TQWidget *parent )
                  parent, "AddressTypeDialog" )
 {
   TQWidget *page = plainPage();
-  TQVBoxLayout *layout = new TQVBoxLayout( page );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( page );
 
   mGroup = new TQButtonGroup( 2, Horizontal, i18n( "street/postal", "Address Types" ), page );
-  layout->addWidget( mGroup );
+  tqlayout->addWidget( mGroup );
 
   mTypeList = KABC::Address::typeList();
   mTypeList.remove( KABC::Address::Pref );
diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp
index 429d6b90..7e6bab40 100644
--- a/kaddressbook/addresseeeditordialog.cpp
+++ b/kaddressbook/addresseeeditordialog.cpp
@@ -48,7 +48,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core,
 
   TQWidget *page = plainPage();
 
-  TQVBoxLayout *layout = new TQVBoxLayout( page );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( page );
 
   if ( KABPrefs::instance()->editorType() == KABPrefs::SimpleEditor ) {
     mEditorWidget = new SimpleAddresseeEditor( page );
@@ -56,7 +56,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core,
     mEditorWidget = new AddresseeEditorWidget( page );
   }
   connect( mEditorWidget, TQT_SIGNAL( modified() ), TQT_SLOT( widgetModified() ) );
-  layout->addWidget( mEditorWidget );
+  tqlayout->addWidget( mEditorWidget );
 
   enableButton( KDialogBase::Apply, false );
 
diff --git a/kaddressbook/addresseeeditorextension.cpp b/kaddressbook/addresseeeditorextension.cpp
index 5c1ddcec..ab8572ce 100644
--- a/kaddressbook/addresseeeditorextension.cpp
+++ b/kaddressbook/addresseeeditorextension.cpp
@@ -36,14 +36,14 @@
 AddresseeEditorExtension::AddresseeEditorExtension( KAB::Core *core, TQWidget *parent, const char *name )
   : KAB::ExtensionWidget( core, parent, name )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
 
   if ( KABPrefs::instance()->editorType() == KABPrefs::SimpleEditor )
     mAddresseeEditor = new SimpleAddresseeEditor( this );
   else
     mAddresseeEditor = new AddresseeEditorWidget( this );
 
-  layout->addWidget( mAddresseeEditor );
+  tqlayout->addWidget( mAddresseeEditor );
 }
 
 AddresseeEditorExtension::~AddresseeEditorExtension()
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index 631d1a3a..519a817f 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -125,10 +125,10 @@ void AddresseeEditorWidget::textChanged( const TQString& )
 
 void AddresseeEditorWidget::initGUI()
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
 
   mTabWidget = new TQTabWidget( this );
-  layout->addWidget( mTabWidget );
+  tqlayout->addWidget( mTabWidget );
 
   setupTab1();
   setupTab2();
@@ -144,9 +144,9 @@ void AddresseeEditorWidget::setupTab1()
   // This is the General tab
   TQWidget *tab1 = new TQWidget( mTabWidget );
 
-  TQGridLayout *layout = new TQGridLayout( tab1, 11, 7 );
-  layout->setMargin( KDialogBase::marginHint() );
-  layout->setSpacing( KDialogBase::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( tab1, 11, 7 );
+  tqlayout->setMargin( KDialogBase::marginHint() );
+  tqlayout->setSpacing( KDialogBase::spacingHint() );
 
   TQLabel *label;
   KSeparator* bar;
@@ -159,7 +159,7 @@ void AddresseeEditorWidget::setupTab1()
   label = new TQLabel( tab1 );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop,
                                                       KIcon::SizeMedium ) );
-  layout->addMultiCellWidget( label, 0, 1, 0, 0 );
+  tqlayout->addMultiCellWidget( label, 0, 1, 0, 0 );
 
   // First name
   button = new TQPushButton( i18n( "Edit Name..." ), tab1 );
@@ -178,16 +178,16 @@ void AddresseeEditorWidget::setupTab1()
     mNameLabel->show();
   }
 
-  layout->addWidget( button, 0, 1 );
-  layout->addWidget( mNameEdit, 0, 2 );
-  layout->addWidget( mNameLabel, 0, 2 );
+  tqlayout->addWidget( button, 0, 1 );
+  tqlayout->addWidget( mNameEdit, 0, 2 );
+  tqlayout->addWidget( mNameLabel, 0, 2 );
   label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).arg( KABC::Addressee::roleLabel() ), tab1 );
   mRoleEdit = new KLineEdit( tab1 );
   connect( mRoleEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( textChanged( const TQString& ) ) );
   label->setBuddy( mRoleEdit );
-  layout->addWidget( label, 1, 1 );
-  layout->addWidget( mRoleEdit, 1, 2 );
+  tqlayout->addWidget( label, 1, 1 );
+  tqlayout->addWidget( mRoleEdit, 1, 2 );
 
   // Organization
   label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).arg( KABC::Addressee::organizationLabel() ), tab1 );
@@ -195,59 +195,59 @@ void AddresseeEditorWidget::setupTab1()
   label->setBuddy( mOrgEdit );
   connect( mOrgEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( organizationTextChanged( const TQString& ) ) );
-  layout->addWidget( label, 2, 1 );
-  layout->addWidget( mOrgEdit, 2, 2 );
+  tqlayout->addWidget( label, 2, 1 );
+  tqlayout->addWidget( mOrgEdit, 2, 2 );
 
   // File as (formatted name)
   label = new TQLabel( i18n( "Formatted name:" ), tab1 );
   mFormattedNameLabel = new KSqueezedTextLabel( tab1 );
-  layout->addWidget( label, 3, 1 );
-  layout->addWidget( mFormattedNameLabel, 3, 2 );
+  tqlayout->addWidget( label, 3, 1 );
+  tqlayout->addWidget( mFormattedNameLabel, 3, 2 );
 
   // Left hand separator. This separator doesn't go all the way
   // across so the dialog still flows from top to bottom
   bar = new KSeparator( KSeparator::HLine, tab1 );
-  layout->addMultiCellWidget( bar, 4, 4, 0, 2 );
+  tqlayout->addMultiCellWidget( bar, 4, 4, 0, 2 );
 
   //////////////////////////////////////
   // Phone numbers (upper right)
   label = new TQLabel( tab1 );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook",
                     KIcon::Desktop, KIcon::SizeMedium ) );
-  layout->addMultiCellWidget( label, 0, 1, 3, 3 );
+  tqlayout->addMultiCellWidget( label, 0, 1, 3, 3 );
 
   mPhoneEditWidget = new PhoneEditWidget( tab1 );
   connect( mPhoneEditWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) );
-  layout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 );
+  tqlayout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 );
 
   bar = new KSeparator( KSeparator::HLine, tab1 );
-  layout->addMultiCellWidget( bar, 4, 4, 3, 6 );
+  tqlayout->addMultiCellWidget( bar, 4, 4, 3, 6 );
 
   //////////////////////////////////////
   // Addresses (lower left)
   label = new TQLabel( tab1 );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "kfm_home", KIcon::Desktop,
                                                      KIcon::SizeMedium ) );
-  layout->addMultiCellWidget( label, 5, 6, 0, 0 );
+  tqlayout->addMultiCellWidget( label, 5, 6, 0, 0 );
 
   mAddressEditWidget = new AddressEditWidget( tab1 );
   connect( mAddressEditWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) );
-  layout->addMultiCellWidget( mAddressEditWidget, 5, 10, 1, 2 );
+  tqlayout->addMultiCellWidget( mAddressEditWidget, 5, 10, 1, 2 );
 
   //////////////////////////////////////
   // Email / Web (lower right)
   label = new TQLabel( tab1 );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "email", KIcon::Desktop,
                                                      KIcon::SizeMedium ) );
-  layout->addMultiCellWidget( label, 5, 6, 3, 3 );
+  tqlayout->addMultiCellWidget( label, 5, 6, 3, 3 );
 
   mEmailWidget = new EmailEditWidget( tab1 );
   connect( mEmailWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) );
-  layout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 );
+  tqlayout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 );
 
   // add the separator
   bar = new KSeparator( KSeparator::HLine, tab1 );
-  layout->addMultiCellWidget( bar, 7, 7, 3, 6 );
+  tqlayout->addMultiCellWidget( bar, 7, 7, 3, 6 );
 
   TQHBoxLayout *homePageLayout = new TQHBoxLayout( 0, 11, 7 );
 
@@ -263,7 +263,7 @@ void AddresseeEditorWidget::setupTab1()
   label->setBuddy( mURLEdit );
   homePageLayout->addWidget( label );
   homePageLayout->addWidget( mURLEdit );
-  layout->addMultiCellLayout( homePageLayout, 8, 8, 3, 6 );
+  tqlayout->addMultiCellLayout( homePageLayout, 8, 8, 3, 6 );
 
   TQHBoxLayout *blogLayout = new TQHBoxLayout( 0, 11, 7 );
   label = new TQLabel( i18n("Blog feed:"), tab1 );
@@ -273,16 +273,16 @@ void AddresseeEditorWidget::setupTab1()
   connect( mBlogEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
            TQT_SLOT( textChanged( const TQString & ) ) );
   label->setBuddy( mBlogEdit );
-  layout->addMultiCellLayout( blogLayout, 9, 9, 4, 6 );
+  tqlayout->addMultiCellLayout( blogLayout, 9, 9, 4, 6 );
 
   mIMWidget = new IMEditWidget( tab1, mAddressee );
   connect( mIMWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) );
-  layout->addMultiCellWidget( mIMWidget, 10, 10, 4, 6 );
+  tqlayout->addMultiCellWidget( mIMWidget, 10, 10, 4, 6 );
 
-  layout->addColSpacing( 6, 50 );
+  tqlayout->addColSpacing( 6, 50 );
 
   bar = new KSeparator( KSeparator::HLine, tab1 );
-  layout->addMultiCellWidget( bar, 11, 11, 0, 6 );
+  tqlayout->addMultiCellWidget( bar, 11, 11, 0, 6 );
 
   ///////////////////////////////////////
   TQHBox *categoryBox = new TQHBox( tab1 );
@@ -300,10 +300,10 @@ void AddresseeEditorWidget::setupTab1()
   mSecrecyWidget = new SecrecyWidget( categoryBox );
   connect( mSecrecyWidget, TQT_SIGNAL( changed() ), TQT_SLOT( emitModified() ) );
 
-  layout->addMultiCellWidget( categoryBox, 12, 12, 0, 6 );
+  tqlayout->addMultiCellWidget( categoryBox, 12, 12, 0, 6 );
 
-  // Build the layout and add to the tab widget
-  layout->activate(); // required
+  // Build the tqlayout and add to the tab widget
+  tqlayout->activate(); // required
 
   mTabWidget->addTab( tab1, i18n( "&General" ) );
 }
@@ -313,9 +313,9 @@ void AddresseeEditorWidget::setupTab2()
   // This is the Details tab
   TQWidget *tab2 = new TQWidget( mTabWidget );
 
-  TQGridLayout *layout = new TQGridLayout( tab2, 6, 6 );
-  layout->setMargin( KDialogBase::marginHint() );
-  layout->setSpacing( KDialogBase::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( tab2, 6, 6 );
+  tqlayout->setMargin( KDialogBase::marginHint() );
+  tqlayout->setSpacing( KDialogBase::spacingHint() );
 
   TQLabel *label;
   KSeparator* bar;
@@ -327,58 +327,58 @@ void AddresseeEditorWidget::setupTab2()
   label = new TQLabel( tab2 );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop,
                                                      KIcon::SizeMedium ) );
-  layout->addMultiCellWidget( label, 0, 1, 0, 0 );
+  tqlayout->addMultiCellWidget( label, 0, 1, 0, 0 );
 
   label = new TQLabel( i18n( "Department:" ), tab2 );
-  layout->addWidget( label, 0, 1 );
+  tqlayout->addWidget( label, 0, 1 );
   mDepartmentEdit = new KLineEdit( tab2 );
   connect( mDepartmentEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( textChanged( const TQString& ) ) );
   label->setBuddy( mDepartmentEdit );
-  layout->addWidget( mDepartmentEdit, 0, 2 );
+  tqlayout->addWidget( mDepartmentEdit, 0, 2 );
 
   label = new TQLabel( i18n( "Office:" ), tab2 );
-  layout->addWidget( label, 1, 1 );
+  tqlayout->addWidget( label, 1, 1 );
   mOfficeEdit = new KLineEdit( tab2 );
   connect( mOfficeEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( textChanged( const TQString& ) ) );
   label->setBuddy( mOfficeEdit );
-  layout->addWidget( mOfficeEdit, 1, 2 );
+  tqlayout->addWidget( mOfficeEdit, 1, 2 );
 
   label = new TQLabel( i18n( "Profession:" ), tab2 );
-  layout->addWidget( label, 2, 1 );
+  tqlayout->addWidget( label, 2, 1 );
   mProfessionEdit = new KLineEdit( tab2 );
   connect( mProfessionEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( textChanged( const TQString& ) ) );
   label->setBuddy( mProfessionEdit );
-  layout->addWidget( mProfessionEdit, 2, 2 );
+  tqlayout->addWidget( mProfessionEdit, 2, 2 );
 
   label = new TQLabel( i18n( "Manager\'s name:" ), tab2 );
-  layout->addWidget( label, 0, 3 );
+  tqlayout->addWidget( label, 0, 3 );
   mManagerEdit = new KPIM::AddresseeLineEdit( tab2 );
   connect( mManagerEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( textChanged( const TQString& ) ) );
   label->setBuddy( mManagerEdit );
-  layout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 );
+  tqlayout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 );
 
   label = new TQLabel( i18n( "Assistant's name:" ), tab2 );
-  layout->addWidget( label, 1, 3 );
+  tqlayout->addWidget( label, 1, 3 );
   mAssistantEdit = new KPIM::AddresseeLineEdit( tab2 );
   connect( mAssistantEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( textChanged( const TQString& ) ) );
   label->setBuddy( mAssistantEdit );
-  layout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 );
+  tqlayout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 );
 
   label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).arg( KABC::Addressee::titleLabel() ), tab2 );
-  layout->addWidget( label, 2, 3 );
+  tqlayout->addWidget( label, 2, 3 );
   mTitleEdit = new KLineEdit( tab2 );
   connect( mTitleEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( textChanged( const TQString& ) ) );
   label->setBuddy( mTitleEdit );
-  layout->addMultiCellWidget( mTitleEdit, 2, 2, 4, 5 );
+  tqlayout->addMultiCellWidget( mTitleEdit, 2, 2, 4, 5 );
 
   bar = new KSeparator( KSeparator::HLine, tab2 );
-  layout->addMultiCellWidget( bar, 3, 3, 0, 5 );
+  tqlayout->addMultiCellWidget( bar, 3, 3, 0, 5 );
 
   /////////////////////////////////////////////////
   // Personal info
@@ -386,61 +386,61 @@ void AddresseeEditorWidget::setupTab2()
   label = new TQLabel( tab2 );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop,
                                                      KIcon::SizeMedium ) );
-  layout->addMultiCellWidget( label, 4, 5, 0, 0 );
+  tqlayout->addMultiCellWidget( label, 4, 5, 0, 0 );
 
   label = new TQLabel( i18n( "Nickname:" ), tab2 );
-  layout->addWidget( label, 4, 1 );
+  tqlayout->addWidget( label, 4, 1 );
   mNicknameEdit = new KLineEdit( tab2 );
   connect( mNicknameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( textChanged( const TQString& ) ) );
   label->setBuddy( mNicknameEdit );
-  layout->addWidget( mNicknameEdit, 4, 2 );
+  tqlayout->addWidget( mNicknameEdit, 4, 2 );
 
   label = new TQLabel( i18n( "Partner's name:" ), tab2 );
-  layout->addWidget( label, 5, 1 );
+  tqlayout->addWidget( label, 5, 1 );
   mSpouseEdit = new KPIM::AddresseeLineEdit( tab2 );
   connect( mSpouseEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( textChanged( const TQString& ) ) );
   label->setBuddy( mSpouseEdit );
-  layout->addWidget( mSpouseEdit, 5, 2 );
+  tqlayout->addWidget( mSpouseEdit, 5, 2 );
 
   label = new TQLabel( i18n( "Birthdate:" ), tab2 );
-  layout->addWidget( label, 4, 3 );
+  tqlayout->addWidget( label, 4, 3 );
   mBirthdayPicker = new KDateEdit( tab2 );
   connect( mBirthdayPicker, TQT_SIGNAL( dateChanged( const TQDate& ) ),
            TQT_SLOT( dateChanged( const TQDate& ) ) );
   connect( mBirthdayPicker, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( emitModified() ) );
   label->setBuddy( mBirthdayPicker );
-  layout->addWidget( mBirthdayPicker, 4, 4 );
+  tqlayout->addWidget( mBirthdayPicker, 4, 4 );
 
   label = new TQLabel( i18n( "Anniversary:" ), tab2 );
-  layout->addWidget( label, 5, 3 );
+  tqlayout->addWidget( label, 5, 3 );
   mAnniversaryPicker = new KDateEdit( tab2 );
   connect( mAnniversaryPicker, TQT_SIGNAL( dateChanged( const TQDate& ) ),
            TQT_SLOT( dateChanged( const TQDate& ) ) );
   connect( mAnniversaryPicker, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( emitModified() ) );
   label->setBuddy( mAnniversaryPicker );
-  layout->addWidget( mAnniversaryPicker, 5, 4 );
+  tqlayout->addWidget( mAnniversaryPicker, 5, 4 );
 
   bar = new KSeparator( KSeparator::HLine, tab2 );
-  layout->addMultiCellWidget( bar, 6, 6, 0, 5 );
+  tqlayout->addMultiCellWidget( bar, 6, 6, 0, 5 );
 
    //////////////////////////////////////
   // Notes
   label = new TQLabel( i18n( "Note:" ), tab2 );
-  label->setAlignment( Qt::AlignTop | Qt::AlignLeft );
-  layout->addWidget( label, 7, 0 );
+  label->tqsetAlignment( Qt::AlignTop | Qt::AlignLeft );
+  tqlayout->addWidget( label, 7, 0 );
   mNoteEdit = new TQTextEdit( tab2 );
   mNoteEdit->setWordWrap( TQTextEdit::WidgetWidth );
-  mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() );
+  mNoteEdit->setMinimumSize( mNoteEdit->tqsizeHint() );
   connect( mNoteEdit, TQT_SIGNAL( textChanged() ), TQT_SLOT( emitModified() ) );
   label->setBuddy( mNoteEdit );
-  layout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 );
+  tqlayout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 );
 
-   // Build the layout and add to the tab widget
-  layout->activate(); // required
+   // Build the tqlayout and add to the tab widget
+  tqlayout->activate(); // required
 
   mTabWidget->addTab( tab2, i18n( "&Details" ) );
 }
@@ -474,7 +474,7 @@ void AddresseeEditorWidget::setupAdditionalTabs()
       page->addWidget( widget );
   }
 
-  // query the layout update
+  // query the tqlayout update
   TQDictIterator<ContactEditorTabPage> it( mTabPages );
   for ( ; it.current(); ++it )
     it.current()->updateLayout();
diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp
index b42729e3..c936e5fa 100644
--- a/kaddressbook/addviewdialog.cpp
+++ b/kaddressbook/addviewdialog.cpp
@@ -44,23 +44,23 @@ AddViewDialog::AddViewDialog( TQDict<ViewFactory> *viewFactoryDict,
 
   TQWidget *page = plainPage();
 
-  TQGridLayout *layout = new TQGridLayout( page, 2, 2 );
-  layout->setSpacing( spacingHint() );
-  layout->setRowStretch( 1, 1 );
-  layout->setColStretch( 1, 1 );
+  TQGridLayout *tqlayout = new TQGridLayout( page, 2, 2 );
+  tqlayout->setSpacing( spacingHint() );
+  tqlayout->setRowStretch( 1, 1 );
+  tqlayout->setColStretch( 1, 1 );
 
   TQLabel *label = new TQLabel( i18n( "View name:" ), page );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mViewNameEdit = new TQLineEdit( page );
   connect( mViewNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
            TQT_SLOT( textChanged( const TQString& ) ) );
-  layout->addWidget( mViewNameEdit, 0, 1 );
+  tqlayout->addWidget( mViewNameEdit, 0, 1 );
 
   mTypeGroup = new TQButtonGroup( 0, Qt::Horizontal, i18n( "View Type" ), page );
   connect( mTypeGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( clicked( int ) ) );
-  layout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 );
-  TQGridLayout *groupLayout = new TQGridLayout( mTypeGroup->layout(), 3, 2 );
+  tqlayout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 );
+  TQGridLayout *groupLayout = new TQGridLayout( mTypeGroup->tqlayout(), 3, 2 );
   groupLayout->setSpacing( spacingHint() );
 
   int row = 0;
@@ -69,7 +69,7 @@ AddViewDialog::AddViewDialog( TQDict<ViewFactory> *viewFactoryDict,
     TQRadioButton *button = new TQRadioButton( i18n((*iter)->type().utf8()),
                                              mTypeGroup, (*iter)->type().latin1() );
     label = new TQLabel( (*iter)->description(), mTypeGroup );
-    label->setAlignment( Qt::WordBreak );
+    label->tqsetAlignment( Qt::WordBreak );
 
     groupLayout->addWidget( button, row, 0, Qt::AlignTop );
     groupLayout->addWidget( label, row, 1, Qt::AlignTop );
diff --git a/kaddressbook/advancedcustomfields.cpp b/kaddressbook/advancedcustomfields.cpp
index b1788c50..c2f5dc40 100644
--- a/kaddressbook/advancedcustomfields.cpp
+++ b/kaddressbook/advancedcustomfields.cpp
@@ -126,11 +126,11 @@ void AdvancedCustomFields::setReadOnly( bool readOnly )
 
 void AdvancedCustomFields::initGUI( const TQString &uiFile )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(),
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   mFields = new KPIM::DesignerFields( uiFile, this );
-  layout->addWidget( mFields );
+  tqlayout->addWidget( mFields );
 
   connect( mFields, TQT_SIGNAL( modified() ), TQT_SLOT( setModified() ) );
 }
diff --git a/kaddressbook/common/kabprefs.h b/kaddressbook/common/kabprefs.h
index 688cab99..5c7c8c0c 100644
--- a/kaddressbook/common/kabprefs.h
+++ b/kaddressbook/common/kabprefs.h
@@ -42,7 +42,7 @@ class KDE_EXPORT KABPrefs : public KABPrefsBase
 
     void setLocationMapURL( const TQString &locationMapURL )
     {
-      if ( !isImmutable( TQString::fromLatin1( "LocationMapURL" ) ) )
+      if ( !isImmutable( TQString::tqfromLatin1( "LocationMapURL" ) ) )
         mLocationMapURL = locationMapURL;
     }
 
@@ -53,7 +53,7 @@ class KDE_EXPORT KABPrefs : public KABPrefsBase
 
     void setLocationMapURLs( const TQStringList &locationMapURLs )
     {
-      if ( !isImmutable( TQString::fromLatin1( "LocationMapURLs" ) ) )
+      if ( !isImmutable( TQString::tqfromLatin1( "LocationMapURLs" ) ) )
         mLocationMapURLs = locationMapURLs;
     }
 
diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp
index efae019c..5788e6fc 100644
--- a/kaddressbook/common/locationmap.cpp
+++ b/kaddressbook/common/locationmap.cpp
@@ -79,17 +79,17 @@ TQString LocationMap::createUrl( const KABC::Address &addr )
   }
 
 #if KDE_VERSION >= 319
-  return urlTemplate.replace( "%s", addr.street() ).
-                     replace( "%r", addr.region() ).
-                     replace( "%l", addr.locality() ).
-                     replace( "%z", addr.postalCode() ).
-                     replace( "%c", addr.countryToISO( addr.country() ) );
+  return urlTemplate.tqreplace( "%s", addr.street() ).
+                     tqreplace( "%r", addr.region() ).
+                     tqreplace( "%l", addr.locality() ).
+                     tqreplace( "%z", addr.postalCode() ).
+                     tqreplace( "%c", addr.countryToISO( addr.country() ) );
 #else
-  return urlTemplate.replace( "%s", addr.street() ).
-                     replace( "%r", addr.region() ).
-                     replace( "%l", addr.locality() ).
-                     replace( "%z", addr.postalCode() ).
-                     replace( "%c", "" );
+  return urlTemplate.tqreplace( "%s", addr.street() ).
+                     tqreplace( "%r", addr.region() ).
+                     tqreplace( "%l", addr.locality() ).
+                     tqreplace( "%z", addr.postalCode() ).
+                     tqreplace( "%c", "" );
 #endif
 }
 
diff --git a/kaddressbook/contacteditorwidgetmanager.cpp b/kaddressbook/contacteditorwidgetmanager.cpp
index 6a6a68d9..d48be3d9 100644
--- a/kaddressbook/contacteditorwidgetmanager.cpp
+++ b/kaddressbook/contacteditorwidgetmanager.cpp
@@ -41,7 +41,7 @@
 ContactEditorWidgetManager *ContactEditorWidgetManager::mSelf = 0;
 
 ContactEditorWidgetManager::ContactEditorWidgetManager()
-  : TQObject( qApp )
+  : TQObject( tqApp )
 {
   reload();
 }
diff --git a/kaddressbook/contacteditorwidgetmanager.h b/kaddressbook/contacteditorwidgetmanager.h
index d0b03ddf..4b78b17f 100644
--- a/kaddressbook/contacteditorwidgetmanager.h
+++ b/kaddressbook/contacteditorwidgetmanager.h
@@ -94,7 +94,7 @@ class ContactEditorTabPage : public QWidget
     void setReadOnly( bool readOnly );
 
     /**
-      Calculates the layout of the widgets and moves them to the
+      Calculates the tqlayout of the widgets and moves them to the
       correct position.
      */
     void updateLayout();
diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp
index c9f4d861..3d992be1 100644
--- a/kaddressbook/customfieldswidget.cpp
+++ b/kaddressbook/customfieldswidget.cpp
@@ -48,26 +48,26 @@ AddFieldDialog::AddFieldDialog( TQWidget *parent, const char *name )
 {
   TQWidget *page = plainPage();
 
-  TQGridLayout *layout = new TQGridLayout( page, 3, 2, marginHint(), spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( page, 3, 2, marginHint(), spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Title:" ), page );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mTitle = new KLineEdit( page );
   mTitle->setValidator( new TQRegExpValidator( TQRegExp( "([a-zA-Z]|\\d|-)+" ), mTitle ) );
   label->setBuddy( mTitle );
-  layout->addWidget( mTitle, 0, 1 );
+  tqlayout->addWidget( mTitle, 0, 1 );
 
   label = new TQLabel( i18n( "Type:" ), page );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
 
   mType = new KComboBox( page );
   label->setBuddy( mType );
-  layout->addWidget( mType, 1, 1 );
+  tqlayout->addWidget( mType, 1, 1 );
 
   mGlobal = new TQCheckBox( i18n( "Is available for all contacts" ), page );
   mGlobal->setChecked( true );
-  layout->addMultiCellWidget( mGlobal, 2, 2, 0, 1 );
+  tqlayout->addMultiCellWidget( mGlobal, 2, 2, 0, 1 );
 
   connect( mTitle, TQT_SIGNAL( textChanged( const TQString& ) ),
            this, TQT_SLOT( nameChanged( const TQString& ) ) );
@@ -103,7 +103,7 @@ TQString AddFieldDialog::title() const
 TQString AddFieldDialog::identifier() const
 {
   TQString id = mTitle->text().lower();
-  return id.replace( ",", "_" ).replace( " ", "_" );
+  return id.tqreplace( ",", "_" ).tqreplace( " ", "_" );
 }
 
 TQString AddFieldDialog::type() const
@@ -124,19 +124,19 @@ void AddFieldDialog::nameChanged( const TQString &name )
 FieldWidget::FieldWidget( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(),
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
-  mGlobalLayout = new TQVBoxLayout( layout, KDialog::spacingHint() );
-  mGlobalLayout->setAlignment( Qt::AlignTop );
+  mGlobalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() );
+  mGlobalLayout->tqsetAlignment( Qt::AlignTop );
 
   mSeparator = new TQFrame( this );
   mSeparator->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
   mSeparator->hide();
-  layout->addWidget( mSeparator );
+  tqlayout->addWidget( mSeparator );
 
-  mLocalLayout = new TQVBoxLayout( layout, KDialog::spacingHint() );
-  mLocalLayout->setAlignment( Qt::AlignTop );
+  mLocalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() );
+  mLocalLayout->tqsetAlignment( Qt::AlignTop );
 }
 
 void FieldWidget::addField( const TQString &identifier, const TQString &title,
@@ -238,13 +238,13 @@ void FieldWidget::clearFields()
       wdg->setChecked( true );
     } else if ( (*fieldIt).mWidget->isA( "QDateEdit" ) ) {
       QDateEdit *wdg = static_cast<QDateEdit*>( (*fieldIt).mWidget );
-      wdg->setDate( TQDate::currentDate() );
+      wdg->setDate( TQDate::tqcurrentDate() );
     } else if ( (*fieldIt).mWidget->isA( "QTimeEdit" ) ) {
       QTimeEdit *wdg = static_cast<QTimeEdit*>( (*fieldIt).mWidget );
       wdg->setTime( TQTime::currentTime() );
     } else if ( (*fieldIt).mWidget->isA( "QDateTimeEdit" ) ) {
       QDateTimeEdit *wdg = static_cast<QDateTimeEdit*>( (*fieldIt).mWidget );
-      wdg->setDateTime( TQDateTime::currentDateTime() );
+      wdg->setDateTime( TQDateTime::tqcurrentDateTime() );
     }
   }
 }
@@ -370,7 +370,7 @@ void FieldWidget::recalculateLayout()
 
   FieldRecordList::ConstIterator it;
   for ( it = mFieldList.begin(); it != mFieldList.end(); ++it )
-    maxWidth = QMAX( maxWidth, (*it).mLabel->minimumSizeHint().width() );
+    maxWidth = QMAX( maxWidth, (*it).mLabel->tqminimumSizeHint().width() );
 
   for ( it = mFieldList.begin(); it != mFieldList.end(); ++it )
     (*it).mLabel->setMinimumWidth( maxWidth );
@@ -485,18 +485,18 @@ void CustomFieldsWidget::removeField()
 
 void CustomFieldsWidget::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   mFieldWidget = new FieldWidget( this );
-  layout->addMultiCellWidget( mFieldWidget, 0, 0, 0, 2 );
+  tqlayout->addMultiCellWidget( mFieldWidget, 0, 0, 0, 2 );
 
   mAddButton = new TQPushButton( i18n( "Add Field..." ), this );
-  layout->addWidget( mAddButton, 1, 1, Qt::AlignRight );
+  tqlayout->addWidget( mAddButton, 1, 1, Qt::AlignRight );
 
   mRemoveButton = new TQPushButton( i18n( "Remove Field..." ), this );
   mRemoveButton->setEnabled( false );
-  layout->addWidget( mRemoveButton, 1, 2, Qt::AlignRight );
+  tqlayout->addWidget( mRemoveButton, 1, 2, Qt::AlignRight );
 
   // load global fields
   TQStringList globalFields = KABPrefs::instance()->globalCustomFields();
diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp
index c088978f..ac0115fe 100644
--- a/kaddressbook/distributionlisteditor.cpp
+++ b/kaddressbook/distributionlisteditor.cpp
@@ -67,16 +67,16 @@ public:
 KPIM::DistributionListEditor::Line::Line( KABC::AddressBook* book, TQWidget* parent ) : TQWidget( parent ), m_addressBook( book )
 {
     Q_ASSERT( m_addressBook );
-    TQBoxLayout* layout = new TQHBoxLayout( this );
-    layout->setSpacing( KDialog::spacingHint() );
+    TQBoxLayout* tqlayout = new TQHBoxLayout( this );
+    tqlayout->setSpacing( KDialog::spacingHint() );
     m_lineEdit = new KPIM::DistributionListEditor::LineEdit( this );
     connect( m_lineEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
              this, TQT_SLOT( textChanged( const TQString& ) ) );
-    layout->addWidget( m_lineEdit );
+    tqlayout->addWidget( m_lineEdit );
     m_clearButton = new TQToolButton( this );
     m_clearButton->setIconSet( KApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) );
     m_clearButton->setEnabled( false );
-    layout->addWidget( m_clearButton );
+    tqlayout->addWidget( m_clearButton );
     connect( m_clearButton, TQT_SIGNAL( clicked() ), m_lineEdit, TQT_SLOT( clear() ) );
 }
 
@@ -106,7 +106,7 @@ KABC::Addressee KPIM::DistributionListEditor::Line::findAddressee( const TQStrin
         return KABC::Addressee();
 
     typedef KABC::Addressee::List List;
-    const List byEmail = m_addressBook->findByEmail( email );
+    const List byEmail = m_addressBook->tqfindByEmail( email );
     if ( !byEmail.isEmpty() )
     {
         const List::ConstIterator end = byEmail.end();
@@ -136,7 +136,7 @@ KPIM::DistributionList::Entry KPIM::DistributionListEditor::Line::entry() const
     KPIM::DistributionList::Entry res;
     if ( !m_uid.isNull() )
     {
-        const KABC::Addressee addr = m_addressBook->findByUid( m_uid );
+        const KABC::Addressee addr = m_addressBook->tqfindByUid( m_uid );
         if ( m_initialText == text || addr.formattedName() == name )
             res.addressee = addr;
     }
@@ -188,7 +188,7 @@ KPIM::DistributionListEditor::EditorWidget::EditorWidget( KABC::AddressBook* boo
     d->scrollView->setFrameShape( TQFrame::NoFrame );
     mainLayout->addWidget( d->scrollView );
     d->memberListWidget = new TQWidget( d->scrollView->viewport() );
-    d->memberListWidget->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding );
+    d->memberListWidget->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding );
     TQVBoxLayout* memberLayout = new TQVBoxLayout( d->memberListWidget );
     d->addresseeLayout = new TQVBoxLayout;
     d->addresseeLayout->setSpacing( KDialog::spacingHint() );
@@ -200,7 +200,7 @@ KPIM::DistributionListEditor::EditorWidget::EditorWidget( KABC::AddressBook* boo
     setMainWidget( main );
 
     KPIM::DistributionListEditor::Line* const last = d->addLineForEntry( KPIM::DistributionList::Entry() );
-    const TQSize hint = sizeHint();
+    const TQSize hint = tqsizeHint();
     resize( hint.width() * 3L/2, hint.height() );
 }
 
diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp
index c28cbec2..42e90a3b 100644
--- a/kaddressbook/distributionlistentryview.cpp
+++ b/kaddressbook/distributionlistentryview.cpp
@@ -44,7 +44,7 @@ KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWi
 
     TQLabel* distLabel = new TQLabel( this );
     distLabel->setText( i18n( "<b>Distribution list:</b>" ) );
-    distLabel->setAlignment( Qt::SingleLine );
+    distLabel->tqsetAlignment( Qt::SingleLine );
     distLayout->addWidget( distLabel );
 
     m_distListLabel = new KURLLabel( this );
@@ -57,7 +57,7 @@ KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWi
 
     TQLabel* emailLabel = new TQLabel( this );
     emailLabel->setText( i18n( "<b>Email address to use in this list:</b>" ) );
-    emailLabel->setAlignment( Qt::SingleLine );
+    emailLabel->tqsetAlignment( Qt::SingleLine );
     m_mainLayout->addWidget( emailLabel );
 
     TQBoxLayout* emailLayout = new TQHBoxLayout;
@@ -110,7 +110,7 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis
     m_distListLabel->setURL( m_list.name() );
     m_distListLabel->setText( m_list.name() );
     m_resourceLabel->setText( i18n( "<b>Address book:</b> %1" ).arg( m_entry.addressee.resource() ? m_entry.addressee.resource()->resourceName() : TQString() ) );
-    m_resourceLabel->setAlignment( Qt::SingleLine );
+    m_resourceLabel->tqsetAlignment( Qt::SingleLine );
  
     m_emailGroup = new TQVButtonGroup( this );
     m_emailGroup->setFlat( true );
@@ -133,7 +133,7 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis
              this, TQT_SLOT( emailButtonClicked( int ) ) ); 
     m_radioLayout->addWidget( m_emailGroup, 0, 0 );
     m_emailGroup->setShown( true );
-    m_mainLayout->invalidate();
+    m_mainLayout->tqinvalidate();
 }
 
 
diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp
index a43c76d0..7858e295 100644
--- a/kaddressbook/distributionlistpicker.cpp
+++ b/kaddressbook/distributionlistpicker.cpp
@@ -48,12 +48,12 @@ KPIM::DistributionListPickerDialog::DistributionListPickerDialog( KABC::AddressB
     enableButton( Ok, false );
     setButtonText( User1, i18n( "Add New Distribution List" ) );
     TQWidget* main = new TQWidget( this );
-    TQGridLayout* layout = new TQGridLayout( main );
-    layout->setSpacing( KDialog::spacingHint() );
+    TQGridLayout* tqlayout = new TQGridLayout( main );
+    tqlayout->setSpacing( KDialog::spacingHint() );
     m_label = new TQLabel( main );
-    layout->addWidget( m_label, 0, 0 );
+    tqlayout->addWidget( m_label, 0, 0 );
     m_listBox = new KListBox( main );
-    layout->addWidget( m_listBox, 1, 0 );
+    tqlayout->addWidget( m_listBox, 1, 0 );
     connect( m_listBox, TQT_SIGNAL( highlighted( const TQString& ) ),
              this, TQT_SLOT( entrySelected( const TQString& ) ) ); 
     connect( m_listBox, TQT_SIGNAL( selected( const TQString& ) ),
@@ -97,7 +97,7 @@ void KPIM::DistributionListPickerDialog::slotUser1()
         if ( name.isEmpty() )
             return;
 
-        validName = !listNames.contains( name );
+        validName = !listNames.tqcontains( name );
 
         if ( validName )
         {
diff --git a/kaddressbook/editors/Makefile.am b/kaddressbook/editors/Makefile.am
index e611bb5e..bb39762b 100644
--- a/kaddressbook/editors/Makefile.am
+++ b/kaddressbook/editors/Makefile.am
@@ -13,7 +13,7 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
 
 libkaddrbk_cryptosettings_la_SOURCES = cryptowidget.cpp
 libkaddrbk_cryptosettings_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) # -no-undefined
-libkaddrbk_cryptosettings_la_LIBADD = $(XXLIBS)
+libkaddrbk_cryptosettings_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC)
 
 noinst_HEADERS = cryptowidget.h imeditorwidget.h imaddresswidget.h
 
diff --git a/kaddressbook/editors/imaddressbase.ui b/kaddressbook/editors/imaddressbase.ui
index f62ac00d..2f608a08 100644
--- a/kaddressbook/editors/imaddressbase.ui
+++ b/kaddressbook/editors/imaddressbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>IMAddressBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -85,5 +85,5 @@
     <slot>slotProtocolChanged( const QString &amp; )</slot>
     <slot>slotProtocolChanged()</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kaddressbook/editors/imeditorbase.ui b/kaddressbook/editors/imeditorbase.ui
index 24a5696a..3c8e3601 100644
--- a/kaddressbook/editors/imeditorbase.ui
+++ b/kaddressbook/editors/imeditorbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>IMEditorBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -37,7 +37,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -116,7 +116,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>200</width>
                     <height>28</height>
@@ -152,8 +152,8 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<layoutdefaults spacing="6" margin="0"/>
-<layoutfunctions spacing="KDialog::spacingHint"/>
+<tqlayoutdefaults spacing="6" margin="0"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp
index ad84505c..30c3ca98 100644
--- a/kaddressbook/editors/imeditorwidget.cpp
+++ b/kaddressbook/editors/imeditorwidget.cpp
@@ -64,7 +64,7 @@ bool IMAddressLVI::preferred() const
 }
 
 void IMAddressLVI::paintCell( TQPainter *p, const TQColorGroup &cg,
-                              int column, int width, int alignment )
+                              int column, int width, int tqalignment )
 {
   if ( mPreferred ) {
     TQFont font = p->font();
@@ -72,7 +72,7 @@ void IMAddressLVI::paintCell( TQPainter *p, const TQColorGroup &cg,
     p->setFont( font );
   }
 
-  KListViewItem::paintCell( p, cg, column, width, alignment );
+  KListViewItem::paintCell( p, cg, column, width, tqalignment );
 }
 
 void IMAddressLVI::setAddress( const TQString &address )
@@ -166,8 +166,8 @@ IMEditorWidget::IMEditorWidget( TQWidget *parent, const TQString &preferredIM, c
   //mWidget->btnUp->setEnabled( false );
   //mWidget->btnDown->setEnabled( false );
   mPreferred = preferredIM;
-  mPreferred = mPreferred.replace( " on ", TQString( TQChar( 0xE120 ) ), true );
-  mProtocols = KPluginInfo::fromServices( KTrader::self()->query( TQString::fromLatin1( "KABC/IMProtocol" ) ) );
+  mPreferred = mPreferred.tqreplace( " on ", TQString( TQChar( 0xE120 ) ), true );
+  mProtocols = KPluginInfo::fromServices( KTrader::self()->query( TQString::tqfromLatin1( "KABC/IMProtocol" ) ) );
 
   // order the protocols by putting them in a qmap, then sorting the set of keys and recreating the list
   TQMap<TQString, KPluginInfo *> protocolMap;
@@ -204,8 +204,8 @@ void IMEditorWidget::loadContact( KABC::Addressee *addr )
     TQString app, name, value;
     splitField( *it, app, name, value );
 
-    if ( app.startsWith( TQString::fromLatin1( "messaging/" ) ) ) {
-      if ( name == TQString::fromLatin1( "All" ) ) {
+    if ( app.startsWith( TQString::tqfromLatin1( "messaging/" ) ) ) {
+      if ( name == TQString::tqfromLatin1( "All" ) ) {
         KPluginInfo *protocol = protocolFromString( app );
         if ( protocol ) {
           TQStringList addresses = TQStringList::split( TQChar( 0xE000 ), value );
@@ -244,9 +244,9 @@ void IMEditorWidget::storeContact( KABC::Addressee *addr )
 
     TQString addrBookField = (*protocolIt)->property( "X-KDE-InstantMessagingKABCField" ).toString();
     if ( !lst.isEmpty() )
-      addr->insertCustom( addrBookField, TQString::fromLatin1( "All" ), lst.join( TQChar( 0xE000 ) ) );
+      addr->insertCustom( addrBookField, TQString::tqfromLatin1( "All" ), lst.join( TQChar( 0xE000 ) ) );
     else
-      addr->removeCustom( addrBookField, TQString::fromLatin1( "All" ) );
+      addr->removeCustom( addrBookField, TQString::tqfromLatin1( "All" ) );
   }
 }
 
@@ -271,7 +271,7 @@ void IMEditorWidget::slotSetStandard()
           return; //Selected is already preferred
         else {
           item->setPreferred( false );
-          mWidget->lvAddresses->repaintItem( item );
+          mWidget->lvAddresses->tqrepaintItem( item );
           break;
         }
       }
@@ -282,7 +282,7 @@ void IMEditorWidget::slotSetStandard()
     mPreferred = current->address();
     current->setPreferred( true );
     setModified( true );
-    mWidget->lvAddresses->repaintItem( current );
+    mWidget->lvAddresses->tqrepaintItem( current );
   }
 }
 
@@ -457,7 +457,7 @@ void IMEditorWidget::slotDelete()
 TQString IMEditorWidget::preferred() const
 {
   TQString retval( mPreferred );
-  return retval.replace( TQChar( 0xE120 ), " on " );
+  return retval.tqreplace( TQChar( 0xE120 ), " on " );
 }
 
 
diff --git a/kaddressbook/editors/imeditorwidget.h b/kaddressbook/editors/imeditorwidget.h
index 0184ccca..25fd9804 100644
--- a/kaddressbook/editors/imeditorwidget.h
+++ b/kaddressbook/editors/imeditorwidget.h
@@ -115,7 +115,7 @@ class IMAddressLVI : public KListViewItem
     bool preferred() const;
 
   protected:
-    virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment );
+    virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment );
 
   private:
     KPluginInfo * mProtocol;
diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp
index 6d52c90b..3cc2de14 100644
--- a/kaddressbook/emaileditwidget.cpp
+++ b/kaddressbook/emaileditwidget.cpp
@@ -184,7 +184,7 @@ EmailEditDialog::EmailEditDialog( const TQStringList &list, TQWidget *parent,
   mEmailListBox = new TQListBox( page );
 
   // Make sure there is room for the scrollbar
-  mEmailListBox->setMinimumHeight( mEmailListBox->sizeHint().height() + 30 );
+  mEmailListBox->setMinimumHeight( mEmailListBox->tqsizeHint().height() + 30 );
   connect( mEmailListBox, TQT_SIGNAL( highlighted( int ) ),
            TQT_SLOT( selectionChanged( int ) ) );
   connect( mEmailListBox, TQT_SIGNAL( selected( int ) ),
diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp
index 93da52d0..aa4a5c00 100644
--- a/kaddressbook/extensionmanager.cpp
+++ b/kaddressbook/extensionmanager.cpp
@@ -50,10 +50,10 @@ ExtensionManager::ExtensionManager( TQWidget* extensionBar, TQWidgetStack* detai
       mMapper( 0 ), mDetailsStack( detailsStack ), mActiveDetailsWidget( 0 )
 {
   Q_ASSERT( mExtensionBar );
-  TQVBoxLayout* layout = new TQVBoxLayout( mExtensionBar );
+  TQVBoxLayout* tqlayout = new TQVBoxLayout( mExtensionBar );
   mSplitter = new TQSplitter( mExtensionBar );
   mSplitter->setOrientation( TQSplitter::Vertical );
-  layout->addWidget( mSplitter );
+  tqlayout->addWidget( mSplitter );
 
   createExtensionWidgets();
 
@@ -74,7 +74,7 @@ void ExtensionManager::restoreSettings()
 
   typedef TQMap<TQString, ExtensionData>::ConstIterator ConstIterator;
   for ( ConstIterator it = mExtensionMap.begin(), end = mExtensionMap.end(); it != end; ++it ) {
-    if ( activeExtensions.contains( it.data().identifier ) ) {
+    if ( activeExtensions.tqcontains( it.data().identifier ) ) {
       KToggleAction *action = static_cast<KToggleAction*>( it.data().action );
       if ( action )
         action->setChecked( true );
@@ -102,20 +102,20 @@ void ExtensionManager::reconfigure()
 
 bool ExtensionManager::isQuickEditVisible() const
 {
-  return mActiveExtensions.contains( "contact_editor" );
+  return mActiveExtensions.tqcontains( "contact_editor" );
 }
 
 void ExtensionManager::setSelectionChanged()
 {
   for ( TQStringList::ConstIterator it = mActiveExtensions.begin(), end = mActiveExtensions.end(); it != end; ++it ) {
-    if ( mExtensionMap.contains( *it ) && mExtensionMap[*it].widget )
+    if ( mExtensionMap.tqcontains( *it ) && mExtensionMap[*it].widget )
       mExtensionMap[*it].widget->contactsSelectionChanged();
   }
 }
 
 void ExtensionManager::activationToggled( const TQString &extid )
 {
-  if ( !mExtensionMap.contains( extid ) )
+  if ( !mExtensionMap.tqcontains( extid ) )
     return;
   const ExtensionData data = mExtensionMap[ extid ];
   const bool activated = data.action->isChecked();
@@ -124,9 +124,9 @@ void ExtensionManager::activationToggled( const TQString &extid )
 
 void ExtensionManager::setExtensionActive( const TQString& extid, bool active )
 {
-  if ( !mExtensionMap.contains( extid ) )
+  if ( !mExtensionMap.tqcontains( extid ) )
     return;
-  if ( mActiveExtensions.contains( extid ) == active )
+  if ( mActiveExtensions.tqcontains( extid ) == active )
     return;
   const ExtensionData data = mExtensionMap[ extid ];
   if ( active ) {
@@ -174,7 +174,7 @@ void ExtensionManager::createActions()
     mMapper->setMapping( data.action, data.identifier );
     mActionList.append( data.action );
 
-    if ( mActiveExtensions.contains( data.identifier ) )
+    if ( mActiveExtensions.tqcontains( data.identifier ) )
       data.action->setChecked( true );
   }
 
diff --git a/kaddressbook/features/Makefile.am b/kaddressbook/features/Makefile.am
index d3311c77..a2b5db39 100644
--- a/kaddressbook/features/Makefile.am
+++ b/kaddressbook/features/Makefile.am
@@ -17,16 +17,16 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
 if compile_newdistrlists
 libkaddrbk_distributionlistng_la_SOURCES = distributionlistngwidget.cpp
 libkaddrbk_distributionlistng_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_distributionlistng_la_LIBADD = $(XXLIBS)
+libkaddrbk_distributionlistng_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC)
 else
 libkaddrbk_distributionlist_la_SOURCES = distributionlistwidget.cpp
 libkaddrbk_distributionlist_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_distributionlist_la_LIBADD = $(XXLIBS)
+libkaddrbk_distributionlist_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC)
 endif
 
 libkaddrbk_resourceselection_la_SOURCES = resourceselection.cpp
 libkaddrbk_resourceselection_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS)
+libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) -lkresources
 
 noinst_HEADERS = distributionlistwidget.h distributionlistngwidget.h resourceselection.h
 
diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp
index 4ca4e365..d6b1d7d9 100644
--- a/kaddressbook/features/distributionlistngwidget.cpp
+++ b/kaddressbook/features/distributionlistngwidget.cpp
@@ -56,7 +56,7 @@ void KAB::DistributionListNg::ListBox::dragMoveEvent( TQDragMoveEvent *event )
         event->ignore();
     }
     else {
-        event->accept( itemRect( item ) );
+        event->accept( tqitemRect( item ) );
     }
 }
 
@@ -117,11 +117,11 @@ TQString KAB::DistributionListNg::MainWidget::identifier() const
 
 KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *parent, const char *name ) : KAB::ExtensionWidget( core, parent, name )
 {
-    TQVBoxLayout *layout = new TQVBoxLayout( this );
-    layout->setSpacing( KDialog::spacingHint() );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+    tqlayout->setSpacing( KDialog::spacingHint() );
 
     TQHBoxLayout *buttonLayout = new TQHBoxLayout();
-    layout->addLayout( buttonLayout );
+    tqlayout->addLayout( buttonLayout );
 
     TQLabel *label = new TQLabel( this );
     label->setText( i18n( "Distribution Lists" ) );
@@ -154,7 +154,7 @@ KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *pare
     connect( mListBox, TQT_SIGNAL( highlighted( int ) ),
              this, TQT_SLOT( itemSelected( int ) ) );
     connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(editSelectedDistributionList()) );
-    layout->addWidget( mListBox );
+    tqlayout->addWidget( mListBox );
 
     connect( core, TQT_SIGNAL( contactsUpdated() ),
              this, TQT_SLOT( updateEntries() ) );
diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp
index 93a00bdf..878ede7a 100644
--- a/kaddressbook/features/distributionlistwidget.cpp
+++ b/kaddressbook/features/distributionlistwidget.cpp
@@ -255,9 +255,9 @@ void DistributionListWidget::selectionContactViewChanged()
 bool DistributionListWidget::alreadyExists( const TQString& distrListName ) const
 {
 #ifdef KDEPIM_NEW_DISTRLISTS
-  return core()->distributionListNames().contains( distrListName );
+  return core()->distributionListNames().tqcontains( distrListName );
 #else
-  return mManager->listNames().contains( distrListName );
+  return mManager->listNames().tqcontains( distrListName );
 #endif
 }
 
diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp
index 2b660737..a6ccd462 100644
--- a/kaddressbook/filtereditdialog.cpp
+++ b/kaddressbook/filtereditdialog.cpp
@@ -71,7 +71,7 @@ void FilterEditDialog::setFilter( const Filter &filter )
   TQStringList categories = filter.categories();
   TQListViewItem *item = mCategoriesView->firstChild();
   while ( item != 0 ) {
-    if ( categories.contains( item->text( 0 ) ) ) {
+    if ( categories.tqcontains( item->text( 0 ) ) ) {
       TQCheckListItem *checkItem = static_cast<TQCheckListItem*>( item );
       checkItem->setOn( true );
     }
@@ -272,7 +272,7 @@ void FilterDialog::initGUI()
   mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), this, TQT_SLOT( remove() ) );
   mRemoveButton->setEnabled( false );
 
-  buttonBox->layout();
+  buttonBox->tqlayout();
   topLayout->addWidget( buttonBox, 0, 1 );
 }
 
diff --git a/kaddressbook/freebusywidget.cpp b/kaddressbook/freebusywidget.cpp
index 096c1d58..5b588fcf 100644
--- a/kaddressbook/freebusywidget.cpp
+++ b/kaddressbook/freebusywidget.cpp
@@ -35,15 +35,15 @@
 FreeBusyWidget::FreeBusyWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
   : KAB::ContactEditorWidget( ab, parent, name )
 {
-  TQHBoxLayout *layout = new TQHBoxLayout( this, KDialog::marginHint(),
+  TQHBoxLayout *tqlayout = new TQHBoxLayout( this, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Location of Free/Busy information:" ), this );
-  layout->addWidget( label );
+  tqlayout->addWidget( label );
 
   mURL = new KURLRequester( this );
   label->setBuddy( mURL );
-  layout->addWidget( mURL );
+  tqlayout->addWidget( mURL );
 
   connect( mURL, TQT_SIGNAL( textChanged( const TQString& ) ),
            this, TQT_SLOT( setModified() ) );
diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp
index 40631147..ec8c92f9 100644
--- a/kaddressbook/geowidget.cpp
+++ b/kaddressbook/geowidget.cpp
@@ -56,7 +56,7 @@ GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name
   label = new TQLabel( this );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "package_network",
                     KIcon::Desktop, KIcon::SizeMedium ) );
-  label->setAlignment( Qt::AlignTop );
+  label->tqsetAlignment( Qt::AlignTop );
   topLayout->addMultiCellWidget( label, 0, 3, 0, 0 );
 
   mGeoIsValid = new TQCheckBox( i18n( "Use geo data" ), this );
@@ -175,7 +175,7 @@ GeoDialog::GeoDialog( TQWidget *parent, const char *name )
   topLayout->addWidget( mCityCombo, 0, 1 );
 
   TQGroupBox *sexagesimalGroup = new TQGroupBox( 0, Vertical, i18n( "Sexagesimal" ), page );
-  TQGridLayout *sexagesimalLayout = new TQGridLayout( sexagesimalGroup->layout(),
+  TQGridLayout *sexagesimalLayout = new TQGridLayout( sexagesimalGroup->tqlayout(),
                                                     2, 5, spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Latitude:" ), sexagesimalGroup );
@@ -404,7 +404,7 @@ void GeoDialog::loadCityList()
       pos = name.search(line, pos);
       if ( pos > 0 ) {
         n = line.mid( pos, name.matchedLength() ).stripWhiteSpace();
-        n.replace( '_', " " );
+        n.tqreplace( '_', " " );
       }
 
       if ( !c.isEmpty() && !n.isEmpty() ) {
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index 7d8ac8f5..4a8ab340 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -255,12 +255,12 @@ ImageBaseWidget::ImageBaseWidget( const TQString &title,
   TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(),
                                             KDialog::spacingHint() );
   TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical, title, this );
-  TQVBoxLayout *layout = new TQVBoxLayout( box->layout(), KDialog::spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( box->tqlayout(), KDialog::spacingHint() );
 
   mImageButton = new ImageButton( i18n( "Picture" ), box );
   mImageButton->setFixedSize( 100, 140 );
   mImageButton->setImageLoader( mImageLoader );
-  layout->addWidget( mImageButton );
+  tqlayout->addWidget( mImageButton );
 
   topLayout->addWidget( box );
 
@@ -293,14 +293,14 @@ KABC::Picture ImageBaseWidget::image() const
 ImageWidget::ImageWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
   : KAB::ContactEditorWidget( ab, parent, name )
 {
-  TQHBoxLayout *layout = new TQHBoxLayout( this, KDialog::marginHint(),
+  TQHBoxLayout *tqlayout = new TQHBoxLayout( this, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   mPhotoWidget = new ImageBaseWidget( KABC::Addressee::photoLabel(), this );
-  layout->addWidget( mPhotoWidget );
+  tqlayout->addWidget( mPhotoWidget );
 
   mLogoWidget = new ImageBaseWidget( KABC::Addressee::logoLabel(), this );
-  layout->addWidget( mLogoWidget );
+  tqlayout->addWidget( mLogoWidget );
 
   connect( mPhotoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) );
   connect( mLogoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) );
diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp
index 479f79c7..74349bd7 100644
--- a/kaddressbook/incsearchwidget.cpp
+++ b/kaddressbook/incsearchwidget.cpp
@@ -40,32 +40,32 @@
 IncSearchWidget::IncSearchWidget( TQWidget *parent, const char *name )
     : TQWidget( parent, name )
 {
-  TQHBoxLayout *layout = new TQHBoxLayout( this, 2, KDialog::spacingHint() );
+  TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 2, KDialog::spacingHint() );
 
   TQToolButton *button = new TQToolButton( this );
-  button->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum );
+  button->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum );
   button->setPixmap( SmallIcon( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase" ) );
   button->setAccel( TQKeySequence( CTRL+ALT+Key_S ) );
   button->setAutoRaise( true );
   TQToolTip::add( button, i18n( "Reset" ) );
-  layout->addWidget( button );
+  tqlayout->addWidget( button );
 
   TQLabel *label = new TQLabel( i18n( "Search:" ), this, "kde toolbar widget" );
-  label->setAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight );
-  layout->addWidget( label );
+  label->tqsetAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight );
+  tqlayout->addWidget( label );
 
   mSearchText = new KLineEdit( this );
-  mSearchText->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred );
+  mSearchText->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred );
   TQWhatsThis::add( mSearchText, i18n( "The incremental search<p>Enter some text here will start the search for the contact, which matches the search pattern best. The part of the contact, which will be used for matching, depends on the field selection." ) );
   label->setBuddy( mSearchText );
-  layout->addWidget( mSearchText );
+  tqlayout->addWidget( mSearchText );
 
   label = new TQLabel( i18n( "as in 'Search in:'", "&in:" ), this, "kde toolbar widget" );
-  label->setAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight );
-  layout->addWidget( label );
+  label->tqsetAlignment( TQLabel::AlignVCenter | TQLabel::AlignRight );
+  tqlayout->addWidget( label );
 
   mFieldCombo = new TQComboBox( false, this );
-  layout->addWidget( mFieldCombo );
+  tqlayout->addWidget( mFieldCombo );
   label->setBuddy(mFieldCombo);
 
   TQToolTip::add( mFieldCombo, i18n( "Select incremental search field" ) );
diff --git a/kaddressbook/interfaces/extensionwidget.cpp b/kaddressbook/interfaces/extensionwidget.cpp
index 8c98e5e0..75622935 100644
--- a/kaddressbook/interfaces/extensionwidget.cpp
+++ b/kaddressbook/interfaces/extensionwidget.cpp
@@ -55,7 +55,7 @@ KABC::Addressee::List ExtensionWidget::selectedContacts()
   TQStringList::ConstIterator it;
   const TQStringList::ConstIterator endIt = uids.end();
   for ( it = uids.begin(); it != endIt; ++it )
-    list.append( mCore->addressBook()->findByUid( *it ) );
+    list.append( mCore->addressBook()->tqfindByUid( *it ) );
 
   return list;
 }
diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp
index 53be5519..798ebf55 100644
--- a/kaddressbook/interfaces/xxport.cpp
+++ b/kaddressbook/interfaces/xxport.cpp
@@ -99,7 +99,7 @@ KABC::AddressBook *XXPort::addressBook() const
   return mAddressBook;
 }
 
-TQWidget *XXPort::parentWidget() const
+TQWidget *XXPort::tqparentWidget() const
 {
   return mParentWidget;
 }
diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h
index 29b54acc..d8b83c40 100644
--- a/kaddressbook/interfaces/xxport.h
+++ b/kaddressbook/interfaces/xxport.h
@@ -113,14 +113,14 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
   signals:
     /**
       Emitted whenever the export action is activated.
-      The parameter contains the @ref identifier() for
+      The parameter tqcontains the @ref identifier() for
       unique identification.
      */
     void exportActivated( const TQString&, const TQString& );
 
     /**
       Emitted whenever the import action is activated.
-      The parameter contains the @ref identifier() for
+      The parameter tqcontains the @ref identifier() for
       unique identification.
      */
     void importActivated( const TQString&, const TQString& );
@@ -145,7 +145,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
       Returns a pointer to the parent widget. It can be used as parent for
       message boxes.
      */
-    TQWidget *parentWidget() const;
+    TQWidget *tqparentWidget() const;
 
   private slots:
     void slotImportActivated( const TQString& );
diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp
index baa84ce2..aa7cb891 100644
--- a/kaddressbook/jumpbuttonbar.cpp
+++ b/kaddressbook/jumpbuttonbar.cpp
@@ -67,15 +67,15 @@ JumpButtonBar::JumpButtonBar( KAB::Core *core, TQWidget *parent, const char *nam
 {
   setMinimumSize( 1, 1 );
 
-  TQVBoxLayout *layout = new TQVBoxLayout( this, 0, 0 );
-  layout->setAlignment( Qt::AlignTop );
-  layout->setAutoAdd( true );
-  layout->setResizeMode( TQLayout::FreeResize );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, 0 );
+  tqlayout->tqsetAlignment( Qt::AlignTop );
+  tqlayout->setAutoAdd( true );
+  tqlayout->setResizeMode( TQLayout::FreeResize );
 
   mGroupBox = new TQButtonGroup( 1, Qt::Horizontal, this );
   mGroupBox->setExclusive( true );
-  mGroupBox->layout()->setSpacing( 0 );
-  mGroupBox->layout()->setMargin( 0 );
+  mGroupBox->tqlayout()->setSpacing( 0 );
+  mGroupBox->tqlayout()->setMargin( 0 );
   mGroupBox->setFrameStyle( TQFrame::NoFrame );
 }
 
@@ -121,7 +121,7 @@ void JumpButtonBar::updateButtons()
       return;
     }
 
-    if ( !character.isEmpty() && !characters.contains( character ) )
+    if ( !character.isEmpty() && !characters.tqcontains( character ) )
       characters.append( character );
   }
 
@@ -179,7 +179,7 @@ void JumpButtonBar::updateButtons()
   int maxWidth = 0;
   TQPushButton *button;
   for ( button = mButtons.first(); button; button = mButtons.next() )
-    maxWidth = QMAX( maxWidth, button->sizeHint().width() );
+    maxWidth = QMAX( maxWidth, button->tqsizeHint().width() );
 
   setFixedWidth( maxWidth );
 }
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 7951cded..66b0bb81 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -334,7 +334,7 @@ KAboutData *KABCore::createAboutData()
   return about;
 }
 
-void KABCore::setStatusBar( KStatusBar *statusBar )
+void KABCore::seStatusBar( KStatusBar *statusBar )
 {
   mStatusBar = statusBar;
 }
@@ -351,7 +351,7 @@ void KABCore::setContactSelected( const TQString &uid )
       return;
   }
 
-  KABC::Addressee addr = mAddressBook->findByUid( uid );
+  KABC::Addressee addr = mAddressBook->tqfindByUid( uid );
   if ( !mDetailsViewer->isHidden() )
     mDetailsViewer->setAddressee( addr );
 #ifdef KDEPIM_NEW_DISTRLISTS
@@ -433,7 +433,7 @@ void KABCore::setContactSelected( const TQString &uid )
     QClipboard *cb = TQApplication::clipboard();
 #if defined(KABC_VCARD_ENCODING_FIX)
     const TQMimeSource *data = cb->data( QClipboard::Clipboard );
-    list = AddresseeUtil::clipboardToAddressees( data->encodedData( "text/x-vcard" ) );
+    list = AddresseeUtil::clipboardToAddressees( data->tqencodedData( "text/x-vcard" ) );
 #else
     list = AddresseeUtil::clipboardToAddressees( cb->text() );
 #endif
@@ -517,7 +517,7 @@ void KABCore::deleteContacts( const TQStringList &uids )
     TQStringList::ConstIterator it = uids.begin();
     const TQStringList::ConstIterator endIt( uids.end() );
     while ( it != endIt ) {
-      KABC::Addressee addr = mAddressBook->findByUid( *it );
+      KABC::Addressee addr = mAddressBook->tqfindByUid( *it );
       names.append( addr.realName().isEmpty() ? addr.preferredEmail() : addr.realName() );
       ++it;
     }
@@ -578,7 +578,7 @@ void KABCore::pasteContacts()
   QClipboard *cb = TQApplication::clipboard();
 #if defined(KABC_VCARD_ENCODING_FIX)
   const TQMimeSource *data = cb->data( QClipboard::Clipboard );
-  KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( data->encodedData( "text/x-vcard" ) );
+  KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( data->tqencodedData( "text/x-vcard" ) );
 #else
   KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( cb->text() );
 #endif
@@ -692,7 +692,7 @@ void KABCore::contactModified( const KABC::Addressee &addr )
   Command *command = 0;
 
   // check if it exists already
-  KABC::Addressee origAddr = mAddressBook->findByUid( addr.uid() );
+  KABC::Addressee origAddr = mAddressBook->tqfindByUid( addr.uid() );
   if ( origAddr.isEmpty() ) {
     KABC::Addressee::List addressees;
     addressees.append( addr );
@@ -778,7 +778,7 @@ void KABCore::addEmail( const TQString &aStr )
   const KABC::AddressBook::Iterator endIt( mAddressBook->end() );
   for ( it = mAddressBook->begin(); !found && (it != endIt); ++it ) {
     emailList = (*it).emails();
-    if ( emailList.contains( email ) > 0 ) {
+    if ( emailList.tqcontains( email ) > 0 ) {
       found = true;
       (*it).setNameFromString( fullName );
       editContact( (*it).uid() );
@@ -829,7 +829,7 @@ void KABCore::editContact( const TQString &uid )
   }
 #endif
 
-  KABC::Addressee addr = mAddressBook->findByUid( localUID );
+  KABC::Addressee addr = mAddressBook->tqfindByUid( localUID );
   if ( !addr.isEmpty() ) {
     AddresseeEditorDialog *dialog = mEditorDict.find( addr.uid() );
     if ( !dialog ) {
@@ -950,7 +950,7 @@ void KABCore::extensionModified( const KABC::Addressee::List &list )
       Command *command = 0;
 
       // check if it exists already
-      KABC::Addressee origAddr = mAddressBook->findByUid( (*it).uid() );
+      KABC::Addressee origAddr = mAddressBook->tqfindByUid( (*it).uid() );
       if ( origAddr.isEmpty() ) {
         KABC::Addressee::List addressees;
         addressees.append( *it );
@@ -1005,7 +1005,7 @@ TQString KABCore::getNameByPhone( const TQString &phone )
     const KABC::PhoneNumber::List::Iterator phoneEndIter( phoneList.end() );
     for ( ; !found && ( phoneIter != phoneEndIter ); ++phoneIter) {
       // Get rid of separator chars so just the numbers are compared.
-      if ( (*phoneIter).number().replace( r, "" ) == localPhone.replace( r, "" ) ) {
+      if ( (*phoneIter).number().tqreplace( r, "" ) == localPhone.tqreplace( r, "" ) ) {
         ownerName = (*iter).realName();
         found = true;
       }
@@ -1084,7 +1084,7 @@ void KABCore::showContactsAddress( const TQString &addrUid )
   if ( uidList.isEmpty() )
     return;
 
-  KABC::Addressee addr = mAddressBook->findByUid( uidList.first() );
+  KABC::Addressee addr = mAddressBook->tqfindByUid( uidList.first() );
   if ( addr.isEmpty() )
     return;
 
@@ -1224,7 +1224,7 @@ void KABCore::initGUI()
   viewLayout->setSpacing( KDialog::spacingHint() );
 
   mViewHeaderLabel = new TQLabel( viewWidget );
-//  mViewHeaderLabel->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
+//  mViewHeaderLabel->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
   mViewHeaderLabel->setText( i18n( "Contacts" ) );
   viewLayout->addWidget( mViewHeaderLabel );
   mViewManager = new ViewManager( this, viewWidget );
@@ -1477,7 +1477,7 @@ TQStringList KABCore::allCategories() const
     categories = (*it).categories();
     const TQStringList::ConstIterator catEndIt( categories.end() );
     for ( catIt = categories.begin(); catIt != catEndIt; ++catIt ) {
-      if ( !allCategories.contains( *catIt ) )
+      if ( !allCategories.tqcontains( *catIt ) )
         allCategories.append( *catIt );
 	}
   }
@@ -1510,7 +1510,7 @@ void KABCore::categoriesSelected( const TQStringList &categories )
   TQStringList::ConstIterator it;
   const TQStringList::ConstIterator endIt( uids.end() );
   for ( it = uids.begin(); it != endIt; ++it ) {
-    KABC::Addressee addr = mAddressBook->findByUid( *it );
+    KABC::Addressee addr = mAddressBook->tqfindByUid( *it );
     if ( !addr.isEmpty() ) {
       if ( !merge )
         addr.setCategories( categories );
@@ -1519,7 +1519,7 @@ void KABCore::categoriesSelected( const TQStringList &categories )
         TQStringList::ConstIterator catIt;
         const TQStringList::ConstIterator catEndIt( categories.end() );
         for ( catIt = categories.begin(); catIt != catEndIt; ++catIt ) {
-          if ( !addrCategories.contains( *catIt ) )
+          if ( !addrCategories.tqcontains( *catIt ) )
             addrCategories.append( *catIt );
         }
         addr.setCategories( addrCategories );
@@ -1617,7 +1617,7 @@ void KABCore::removeSelectedContactsFromDistList()
   TQStringList::ConstIterator it = uids.begin();
   const TQStringList::ConstIterator endIt( uids.end() );
   while ( it != endIt ) {
-    KABC::Addressee addr = mAddressBook->findByUid( *it );
+    KABC::Addressee addr = mAddressBook->tqfindByUid( *it );
     names.append( addr.realName().isEmpty() ? addr.preferredEmail() : addr.realName() );
     ++it;
   }
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 2e6fded3..d1c27575 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -139,7 +139,7 @@ class KDE_EXPORT KABCore : public KAB::Core
 
     static KAboutData *createAboutData();
 
-    void setStatusBar( KStatusBar *statusBar );
+    void seStatusBar( KStatusBar *statusBar );
 
     KStatusBar *statusBar() const;
 
diff --git a/kaddressbook/kabtools.cpp b/kaddressbook/kabtools.cpp
index 7e6b5c9c..83571a7a 100644
--- a/kaddressbook/kabtools.cpp
+++ b/kaddressbook/kabtools.cpp
@@ -39,12 +39,12 @@ static TQString uniqueFileName( const KABC::Addressee &addressee, TQStringList &
   uint number = 0;
   do {
     name = addressee.givenName() + "_" + addressee.familyName() + uniquePart + ".vcf";
-    name.replace( ' ', '_' );
-    name.replace( '/', '_' );
+    name.tqreplace( ' ', '_' );
+    name.tqreplace( '/', '_' );
 
     ++number;
     uniquePart = TQString( "_%1" ).arg( number );
-  } while ( existingFiles.contains( name ) );
+  } while ( existingFiles.tqcontains( name ) );
 
   existingFiles.append( name );
 
@@ -65,7 +65,7 @@ void KABTools::mailVCards( const TQStringList &uids, KABC::AddressBook *ab )
   TQStringList::ConstIterator it( uids.begin() );
   const TQStringList::ConstIterator endIt( uids.end() );
   for ( ; it != endIt; ++it ) {
-    KABC::Addressee addressee = ab->findByUid( *it );
+    KABC::Addressee addressee = ab->tqfindByUid( *it );
 
     if ( addressee.isEmpty() )
       continue;
@@ -141,7 +141,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list )
     KABC::Address::List::ConstIterator addrIt( addresses.begin() );
     const KABC::Address::List::ConstIterator addrEndIt( addresses.end() );
     for ( ; addrIt != addrEndIt; ++addrIt ) {
-      if ( !masterAddresses.contains( *addrIt ) )
+      if ( !masterAddresses.tqcontains( *addrIt ) )
         masterAddressee.insertAddress( *addrIt );
     }
 
@@ -156,7 +156,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list )
     TQStringList::ConstIterator it( categories.begin() );
     TQStringList::ConstIterator endIt( categories.end() );
     for ( it = categories.begin(); it != endIt; ++it )
-      if ( !masterCategories.contains( *it ) )
+      if ( !masterCategories.tqcontains( *it ) )
         newCategories.append( *it );
     masterAddressee.setCategories( newCategories );
 
@@ -169,7 +169,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list )
     const TQStringList masterEmails = masterAddressee.emails();
     endIt = emails.end();
     for ( it = emails.begin(); it != endIt; ++it )
-      if ( !masterEmails.contains( *it ) )
+      if ( !masterEmails.tqcontains( *it ) )
         masterAddressee.insertEmail( *it, false );
 
     // FN
@@ -239,7 +239,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list )
     KABC::PhoneNumber::List::ConstIterator phoneIt( phones.begin() );
     const KABC::PhoneNumber::List::ConstIterator phoneEndIt( phones.end() );
     for ( ; phoneIt != phoneEndIt; ++phoneIt )
-      if ( !masterPhones.contains( *phoneIt ) )
+      if ( !masterPhones.tqcontains( *phoneIt ) )
         masterAddressee.insertPhoneNumber( *phoneIt );
 
     // TITLE
@@ -262,7 +262,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list )
     TQStringList newCustoms( masterCustoms );
     endIt = customs.end();
     for ( it = customs.begin(); it != endIt; ++it )
-      if ( !masterCustoms.contains( *it ) )
+      if ( !masterCustoms.tqcontains( *it ) )
         newCustoms.append( *it );
     masterAddressee.setCustoms( newCustoms );
   }
diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp
index 34e65184..39216b8f 100644
--- a/kaddressbook/kaddressbook_part.cpp
+++ b/kaddressbook/kaddressbook_part.cpp
@@ -42,7 +42,7 @@
 typedef KParts::GenericFactory< KAddressbookPart > KAddressbookFactory;
 K_EXPORT_COMPONENT_FACTORY( libkaddressbookpart, KAddressbookFactory )
 
-KAddressbookPart::KAddressbookPart( TQWidget *parentWidget, const char *widgetName,
+KAddressbookPart::KAddressbookPart( TQWidget *tqparentWidget, const char *widgetName,
                                     TQObject *parent, const char *name,
                                     const TQStringList & )
   : DCOPObject( "KAddressBookIface" ), KParts::ReadOnlyPart( parent, name )
@@ -50,7 +50,7 @@ KAddressbookPart::KAddressbookPart( TQWidget *parentWidget, const char *widgetNa
   setInstance( KAddressbookFactory::instance() );
 
   // create a canvas to insert our widget
-  TQWidget *canvas = new TQWidget( parentWidget, widgetName );
+  TQWidget *canvas = new TQWidget( tqparentWidget, widgetName );
   canvas->setFocusPolicy( TQWidget::ClickFocus );
   setWidget( canvas );
 
@@ -63,7 +63,7 @@ KAddressbookPart::KAddressbookPart( TQWidget *parentWidget, const char *widgetNa
   topLayout->addWidget( mCore->widget() );
 
   KParts::StatusBarExtension *statusBar = new KParts::StatusBarExtension( this );
-  mCore->setStatusBar( statusBar->statusBar() );
+  mCore->seStatusBar( statusBar->statusBar() );
 
   setXMLFile( "kaddressbook_part.rc" );
 }
diff --git a/kaddressbook/kaddressbook_part.h b/kaddressbook/kaddressbook_part.h
index b0a2c391..c2e6b10f 100644
--- a/kaddressbook/kaddressbook_part.h
+++ b/kaddressbook/kaddressbook_part.h
@@ -39,7 +39,7 @@ class KAddressbookPart: public KParts::ReadOnlyPart, virtual public KAddressBook
   Q_OBJECT
 
   public:
-    KAddressbookPart( TQWidget *parentWidget, const char *widgetName,
+    KAddressbookPart( TQWidget *tqparentWidget, const char *widgetName,
                       TQObject *parent, const char *name, const TQStringList& );
     virtual ~KAddressbookPart();
 
diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp
index f54c1882..cf67d2ee 100644
--- a/kaddressbook/kaddressbookmain.cpp
+++ b/kaddressbook/kaddressbookmain.cpp
@@ -64,7 +64,7 @@ KAddressBookMain::KAddressBookMain( const TQString &file )
 
   statusBar()->addWidget( progressWidget, 0, true );
 
-  mCore->setStatusBar( statusBar() );
+  mCore->seStatusBar( statusBar() );
 
   setStandardToolBarMenuEnabled( true );
 
diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp
index 28fd81af..2059fbb3 100644
--- a/kaddressbook/kaddressbookview.cpp
+++ b/kaddressbook/kaddressbookview.cpp
@@ -79,7 +79,7 @@ TQString KAddressBookView::selectedEmails()
 
   TQStringList::ConstIterator it;
   for ( it = uidList.begin(); it != uidList.end(); ++it ) {
-    addr = mCore->addressBook()->findByUid( *it );
+    addr = mCore->addressBook()->tqfindByUid( *it );
 
     if ( !addr.isEmpty() ) {
       TQString m = TQString::null;
@@ -121,12 +121,12 @@ KABC::Addressee::List KAddressBookView::addressees()
 
 void KAddressBookView::initGUI()
 {
-  // Create the layout
-  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  // Create the tqlayout
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
 
   // Add the view widget
   mViewWidget = new TQWidget( this );
-  layout->addWidget( mViewWidget );
+  tqlayout->addWidget( mViewWidget );
 }
 
 KABC::Field::List KAddressBookView::fields() const
diff --git a/kaddressbook/kcmconfigs/addhostdialog.cpp b/kaddressbook/kcmconfigs/addhostdialog.cpp
index 14abca14..c09e5b94 100644
--- a/kaddressbook/kcmconfigs/addhostdialog.cpp
+++ b/kaddressbook/kcmconfigs/addhostdialog.cpp
@@ -39,7 +39,7 @@ AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent,  const
   mServer = server;
 
   TQWidget *page = plainPage();
-  TQHBoxLayout *layout = new TQHBoxLayout( page, marginHint(), spacingHint() );
+  TQHBoxLayout *tqlayout = new TQHBoxLayout( page, marginHint(), spacingHint() );
 
   mCfg = new KABC::LdapConfigWidget(
        KABC::LdapConfigWidget::W_USER |
@@ -56,7 +56,7 @@ AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent,  const
        KABC::LdapConfigWidget::W_AUTHBOX,
         page );
 
-  layout->addWidget( mCfg );
+  tqlayout->addWidget( mCfg );
   mCfg->setHost( mServer->host() );
   mCfg->setPort( mServer->port() );
   mCfg->setDn( mServer->baseDN() );
diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index 1c074d39..a7d9ebe6 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -44,10 +44,10 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label,
                                 TQWidget *parent, const char *name )
   : TQWidget( parent, name ), mTitle( title ), mLabel( label )
 {
-  TQHBoxLayout *layout = new TQHBoxLayout( this );
+  TQHBoxLayout *tqlayout = new TQHBoxLayout( this );
 
   TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, title, this );
-  TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 2, 2,
+  TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 2, 2,
                                               KDialog::spacingHint() );
 
   mBox = new TQListBox( group );
@@ -61,10 +61,10 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label,
   mEditButton->setEnabled( false );
   mRemoveButton = bbox->addButton( i18n( "Remove" ), this,  TQT_SLOT( remove() ) );
   mRemoveButton->setEnabled( false );
-  bbox->layout();
+  bbox->tqlayout();
   groupLayout->addWidget( bbox, 0, 1 );
 
-  layout->addWidget( group );
+  tqlayout->addWidget( group );
 }
 
 NamePartWidget::~NamePartWidget()
@@ -134,20 +134,20 @@ void NamePartWidget::selectionChanged( TQListBoxItem *item )
 AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   mPrefix = new NamePartWidget( i18n( "Prefixes"), i18n( "Enter prefix:" ), this );
-  layout->addWidget( mPrefix, 0, 0 );
+  tqlayout->addWidget( mPrefix, 0, 0 );
 
   mInclusion = new NamePartWidget( i18n( "Inclusions"), i18n( "Enter inclusion:" ), this );
-  layout->addWidget( mInclusion, 0, 1 );
+  tqlayout->addWidget( mInclusion, 0, 1 );
 
   mSuffix = new NamePartWidget( i18n( "Suffixes" ), i18n( "Enter suffix:" ), this );
-  layout->addWidget( mSuffix, 0, 2 );
+  tqlayout->addWidget( mSuffix, 0, 2 );
 
   TQLabel *label = new TQLabel( i18n( "Default formatted name:" ), this );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
 
   mFormattedNameCombo = new KComboBox( this );
   mFormattedNameCombo->insertItem( i18n( "Empty" ) );
@@ -155,7 +155,7 @@ AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name )
   mFormattedNameCombo->insertItem( i18n( "Full Name" ) );
   mFormattedNameCombo->insertItem( i18n( "Reverse Name with Comma" ) );
   mFormattedNameCombo->insertItem( i18n( "Reverse Name" ) );
-  layout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 );
+  tqlayout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 );
 
   connect( mPrefix, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) );
   connect( mInclusion, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) );
diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
index 80f73f46..0758f320 100644
--- a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
+++ b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
@@ -35,10 +35,10 @@ ExtensionConfigDialog::ExtensionConfigDialog( KAB::ExtensionFactory *factory, KC
                  name, true, true ), mWidget( 0 ), mConfig( config )
 {
   TQFrame *page = plainPage();
-  TQGridLayout *layout = new TQGridLayout( page, 1, 1, marginHint(), spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( page, 1, 1, marginHint(), spacingHint() );
 
   mWidget = factory->configureWidget( page, "ExtensionConfigWidget" );
-  layout->addWidget( mWidget, 0, 0 );
+  tqlayout->addWidget( mWidget, 0, 0 );
 
   mWidget->restoreSettings( mConfig );
 }
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index e4fea740..d1888624 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -56,12 +56,12 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
 
   // General page
   TQWidget *generalPage = new TQWidget( this );
-  TQVBoxLayout *layout = new TQVBoxLayout( generalPage, KDialog::marginHint(),
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( generalPage, KDialog::marginHint(),
                                             KDialog::spacingHint() );
 
   TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage );
-  TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->layout() );
-  boxLayout->setAlignment( Qt::AlignTop );
+  TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->tqlayout() );
+  boxLayout->tqsetAlignment( Qt::AlignTop );
 
   mViewsSingleClickBox = new TQCheckBox( i18n( "Honor KDE single click" ), groupBox, "msingle" );
   boxLayout->addWidget( mViewsSingleClickBox );
@@ -94,10 +94,10 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
   editorLayout->addStretch( 1 );
 
 
-  layout->addWidget( groupBox );
+  tqlayout->addWidget( groupBox );
 
   groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Script-Hooks" ), generalPage );
-  TQGridLayout *grid = new TQGridLayout( groupBox->layout(), 3, 2,
+  TQGridLayout *grid = new TQGridLayout( groupBox->tqlayout(), 3, 2,
                                        KDialog::spacingHint() );
   label = new TQLabel( i18n( "Phone:" ), groupBox );
   grid->addWidget( label, 0, 0 );
@@ -124,14 +124,14 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
 
   grid->setColStretch( 1, 1 );
 
-  layout->addWidget( groupBox );
+  tqlayout->addWidget( groupBox );
 
   groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Location Map" ), generalPage );
-  boxLayout = new TQVBoxLayout( groupBox->layout(), KDialog::spacingHint() );
-  boxLayout->setAlignment( Qt::AlignTop );
+  boxLayout = new TQVBoxLayout( groupBox->tqlayout(), KDialog::spacingHint() );
+  boxLayout->tqsetAlignment( Qt::AlignTop );
 
   mLocationMapURL = new TQComboBox( true, groupBox );
-  mLocationMapURL->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+  mLocationMapURL->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
   TQToolTip::add( mLocationMapURL, i18n( "<ul> <li>%s: Street</li>"
                                  "<li>%r: Region</li>"
                                  "<li>%l: Location</li>"
@@ -139,7 +139,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name )
                                  "<li>%c: Country ISO Code</li> </ul>" ) );
   mLocationMapURL->insertStringList( KABPrefs::instance()->locationMapURLs() );
   boxLayout->addWidget( mLocationMapURL );
-  layout->addWidget( groupBox );
+  tqlayout->addWidget( groupBox );
 
   connect( mNameParsing, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) );
   connect( mViewsSingleClickBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) );
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
index 6b516249..f112c4c8 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
@@ -43,9 +43,9 @@ extern "C"
 KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name )
   : KCModule( parent, name )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
   mConfigWidget = new KABConfigWidget( this, "mConfigWidget" );
-  layout->addWidget( mConfigWidget );
+  tqlayout->addWidget( mConfigWidget );
 
   connect( mConfigWidget, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) );
 
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
index e899198b..4cadf263 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
@@ -44,9 +44,9 @@ extern "C"
 KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name )
   : KCModule( parent, name )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
   mConfigWidget = new LDAPOptionsWidget( this );
-  layout->addWidget( mConfigWidget );
+  tqlayout->addWidget( mConfigWidget );
 
   connect( mConfigWidget, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) );
 
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
index 3825ac1d..639cec02 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
@@ -258,7 +258,7 @@ void LDAPOptionsWidget::defaults()
 
 void LDAPOptionsWidget::initGUI()
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 
   TQVGroupBox *groupBox = new TQVGroupBox( i18n( "LDAP Servers" ), this );
   groupBox->setInsideSpacing( KDialog::spacingHint() );
@@ -285,7 +285,7 @@ void LDAPOptionsWidget::initGUI()
   TQWidget* spacer = new TQWidget( upDownBox );
   upDownBox->setStretchFactor( spacer, 100 );
 
-  layout->addWidget( groupBox );
+  tqlayout->addWidget( groupBox );
 
   KButtonBox *buttons = new KButtonBox( this );
   buttons->addButton( i18n( "&Add Host..." ), this, TQT_SLOT( slotAddHost() ) );
@@ -293,11 +293,11 @@ void LDAPOptionsWidget::initGUI()
   mEditButton->setEnabled( false );
   mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), this, TQT_SLOT( slotRemoveHost() ) );
   mRemoveButton->setEnabled( false );
-  buttons->layout();
+  buttons->tqlayout();
 
-  layout->addWidget( buttons );
+  tqlayout->addWidget( buttons );
 
-  resize( TQSize( 460, 300 ).expandedTo( sizeHint() ) );
+  resize( TQSize( 460, 300 ).expandedTo( tqsizeHint() ) );
 }
 
 #include "ldapoptionswidget.moc"
diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp
index 57558cb4..0e309452 100644
--- a/kaddressbook/keywidget.cpp
+++ b/kaddressbook/keywidget.cpp
@@ -41,25 +41,25 @@
 KeyWidget::KeyWidget( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 4, 2, KDialog::marginHint(),
+  TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Keys:" ), this );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mKeyCombo = new KComboBox( this );
-  layout->addWidget( mKeyCombo, 0, 1 );
+  tqlayout->addWidget( mKeyCombo, 0, 1 );
 
   mAddButton = new TQPushButton( i18n( "Add..." ), this );
-  layout->addMultiCellWidget( mAddButton, 1, 1, 0, 1 );
+  tqlayout->addMultiCellWidget( mAddButton, 1, 1, 0, 1 );
 
   mRemoveButton = new TQPushButton( i18n( "Remove" ), this );
   mRemoveButton->setEnabled( false );
-  layout->addMultiCellWidget( mRemoveButton, 2, 2, 0, 1 );
+  tqlayout->addMultiCellWidget( mRemoveButton, 2, 2, 0, 1 );
 
   mExportButton = new TQPushButton( i18n( "Export..." ), this );
   mExportButton->setEnabled( false );
-  layout->addMultiCellWidget( mExportButton, 3, 3, 0, 1 );
+  tqlayout->addMultiCellWidget( mExportButton, 3, 3, 0, 1 );
 
   connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addKey() ) );
   connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeKey() ) );
@@ -98,7 +98,7 @@ void KeyWidget::addKey()
   KABC::Key::TypeList::ConstIterator it;
   for ( it = typeList.begin(); it != typeList.end(); ++it ) {
     if ( (*it) != KABC::Key::Custom &&
-         !existingKeyTypes.contains( KABC::Key::typeLabel( *it ) ) ) {
+         !existingKeyTypes.tqcontains( KABC::Key::typeLabel( *it ) ) ) {
       keyMap.insert( KABC::Key::typeLabel( *it ), *it );
       keyTypeNames.append( KABC::Key::typeLabel( *it ) );
     }
@@ -110,7 +110,7 @@ void KeyWidget::addKey()
     return;
 
   int type = keyMap[ name ];
-  if ( !keyTypeNames.contains( name ) )
+  if ( !keyTypeNames.tqcontains( name ) )
     type = KABC::Key::Custom;
 
   KURL url = KFileDialog::getOpenURL();
diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp
index c42ff669..7074a596 100644
--- a/kaddressbook/ldapsearchdialog.cpp
+++ b/kaddressbook/ldapsearchdialog.cpp
@@ -153,7 +153,7 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,
   groupBox->setFrameShape( TQGroupBox::Box );
   groupBox->setFrameShadow( TQGroupBox::Sunken );
   groupBox->setColumnLayout( 0, Qt::Vertical );
-  TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 2,
+  TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 2,
                                             5, spacingHint() );
   boxLayout->setColStretch( 1, 1 );
 
@@ -176,10 +176,10 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,
 
   TQSize buttonSize;
   mSearchButton = new TQPushButton( i18n( "Stop" ), groupBox );
-  buttonSize = mSearchButton->sizeHint();
+  buttonSize = mSearchButton->tqsizeHint();
   mSearchButton->setText( i18n( "&Search" ) );
-  if ( buttonSize.width() < mSearchButton->sizeHint().width() )
-    buttonSize = mSearchButton->sizeHint();
+  if ( buttonSize.width() < mSearchButton->tqsizeHint().width() )
+    buttonSize = mSearchButton->tqsizeHint();
   mSearchButton->setFixedWidth( buttonSize.width() );
 
   mSearchButton->setDefault( true );
@@ -208,7 +208,7 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,
 
   topLayout->addWidget( buttons );
 
-  resize( TQSize( 600, 400).expandedTo( minimumSizeHint() ) );
+  resize( TQSize( 600, 400).expandedTo( tqminimumSizeHint() ) );
 
   setButtonText( User1, i18n( "Add Selected" ) );
 
@@ -560,7 +560,7 @@ KPIM::DistributionList LDAPSearchDialog::selectDistributionList()
 KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQValueList<ContactListItem*>& selectedItems,
                                                                        KABC::Resource * const resource )
 {
-    const TQDateTime now = TQDateTime::currentDateTime();
+    const TQDateTime now = TQDateTime::tqcurrentDateTime();
     TQStringList importedAddrs;
     KABC::Addressee::List localAddrs;
 
@@ -569,7 +569,7 @@ KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQV
     for ( TQValueList<ContactListItem*>::ConstIterator it = selectedItems.begin(); it != selectedItems.end(); ++it ) {
       const ContactListItem * const cli = *it;
       KABC::Addressee addr = convertLdapAttributesToAddressee( cli->mAttrs );
-      const KABC::Addressee::List existing = mCore->addressBook()->findByEmail( addr.preferredEmail() );
+      const KABC::Addressee::List existing = mCore->addressBook()->tqfindByEmail( addr.preferredEmail() );
 
       if ( existing.isEmpty() ) {
         addr.setUid( KApplication::randomString( 10 ) );
diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp
index 3e2191ff..f713ef4e 100644
--- a/kaddressbook/nameeditdialog.cpp
+++ b/kaddressbook/nameeditdialog.cpp
@@ -51,71 +51,71 @@ NameEditDialog::NameEditDialog( const KABC::Addressee &addr, int type,
                  Ok, parent, name, true ), mAddressee( addr )
 {
   TQWidget *page = plainPage();
-  TQGridLayout *layout = new TQGridLayout( page );
-  layout->setSpacing( spacingHint() );
-  layout->addColSpacing( 2, 100 );
+  TQGridLayout *tqlayout = new TQGridLayout( page );
+  tqlayout->setSpacing( spacingHint() );
+  tqlayout->addColSpacing( 2, 100 );
   TQLabel *label;
 
   label = new TQLabel( i18n( "Honorific prefixes:" ), page );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
   mPrefixCombo = new KComboBox( page );
   mPrefixCombo->setDuplicatesEnabled( false );
   mPrefixCombo->setEditable( true );
   mPrefixCombo->setEnabled( !readOnly );
   label->setBuddy( mPrefixCombo );
-  layout->addMultiCellWidget( mPrefixCombo, 0, 0, 1, 2 );
+  tqlayout->addMultiCellWidget( mPrefixCombo, 0, 0, 1, 2 );
 
   TQWhatsThis::add( mPrefixCombo, i18n( "The predefined honorific prefixes can be extended in the settings dialog." ) );
 
   label = new TQLabel( i18n( "Given name:" ), page );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
   mGivenNameEdit = new KLineEdit( page );
   mGivenNameEdit->setReadOnly( readOnly );
   label->setBuddy( mGivenNameEdit );
-  layout->addMultiCellWidget( mGivenNameEdit, 1, 1, 1, 2 );
+  tqlayout->addMultiCellWidget( mGivenNameEdit, 1, 1, 1, 2 );
 
   label = new TQLabel( i18n( "Additional names:" ), page );
-  layout->addWidget( label, 2, 0 );
+  tqlayout->addWidget( label, 2, 0 );
   mAdditionalNameEdit = new KLineEdit( page );
   mAdditionalNameEdit->setReadOnly( readOnly );
   label->setBuddy( mAdditionalNameEdit );
-  layout->addMultiCellWidget( mAdditionalNameEdit, 2, 2, 1, 2 );
+  tqlayout->addMultiCellWidget( mAdditionalNameEdit, 2, 2, 1, 2 );
 
   label = new TQLabel( i18n( "Family names:" ), page );
-  layout->addWidget( label, 3, 0 );
+  tqlayout->addWidget( label, 3, 0 );
   mFamilyNameEdit = new KLineEdit( page );
   mFamilyNameEdit->setReadOnly( readOnly );
   label->setBuddy( mFamilyNameEdit );
-  layout->addMultiCellWidget( mFamilyNameEdit, 3, 3, 1, 2 );
+  tqlayout->addMultiCellWidget( mFamilyNameEdit, 3, 3, 1, 2 );
 
   label = new TQLabel( i18n( "Honorific suffixes:" ), page );
-  layout->addWidget( label, 4, 0 );
+  tqlayout->addWidget( label, 4, 0 );
   mSuffixCombo = new KComboBox( page );
   mSuffixCombo->setDuplicatesEnabled( false );
   mSuffixCombo->setEditable( true );
   mSuffixCombo->setEnabled( !readOnly );
   label->setBuddy( mSuffixCombo );
-  layout->addMultiCellWidget( mSuffixCombo, 4, 4, 1, 2 );
+  tqlayout->addMultiCellWidget( mSuffixCombo, 4, 4, 1, 2 );
 
   TQWhatsThis::add( mSuffixCombo, i18n( "The predefined honorific suffixes can be extended in the settings dialog." ) );
 
   label = new TQLabel( i18n( "Formatted name:" ), page );
-  layout->addWidget( label, 5, 0 );
+  tqlayout->addWidget( label, 5, 0 );
 
   mFormattedNameCombo = new KComboBox( page );
   mFormattedNameCombo->setEnabled( !readOnly );
-  layout->addWidget( mFormattedNameCombo, 5, 1 );
+  tqlayout->addWidget( mFormattedNameCombo, 5, 1 );
   connect( mFormattedNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( typeChanged( int ) ) );
 
   mFormattedNameEdit = new KLineEdit( page );
   mFormattedNameEdit->setEnabled( type == CustomName && !readOnly );
-  layout->addWidget( mFormattedNameEdit, 5, 2 );
+  tqlayout->addWidget( mFormattedNameEdit, 5, 2 );
 
   mParseBox = new TQCheckBox( i18n( "Parse name automatically" ), page );
   mParseBox->setEnabled( !readOnly );
   connect( mParseBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( parseBoxChanged(bool) ) );
   connect( mParseBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( modified() ) );
-  layout->addMultiCellWidget( mParseBox, 6, 6, 0, 1 );
+  tqlayout->addMultiCellWidget( mParseBox, 6, 6, 0, 1 );
 
   // Fill in the values
   mFamilyNameEdit->setText( addr.familyName() );
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index 71a9f504..46efcba9 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -68,7 +68,7 @@ PhoneTypeCombo::~PhoneTypeCombo()
 
 void PhoneTypeCombo::setType( int type )
 {
-  if ( !mTypeList.contains( type ) )
+  if ( !mTypeList.tqcontains( type ) )
     mTypeList.insert( mTypeList.at( mTypeList.count() - 1 ), type );
 
   mType = type;
@@ -117,7 +117,7 @@ void PhoneTypeCombo::otherSelected()
   PhoneTypeDialog dlg( mType, this );
   if ( dlg.exec() ) {
     mType = dlg.type();
-    if ( !mTypeList.contains( mType ) )
+    if ( !mTypeList.tqcontains( mType ) )
       mTypeList.insert( mTypeList.at( mTypeList.count() - 1 ), mType );
   } else {
     setType( mTypeList[ mLastSelected ] );
@@ -129,13 +129,13 @@ void PhoneTypeCombo::otherSelected()
 PhoneNumberWidget::PhoneNumberWidget( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQHBoxLayout *layout = new TQHBoxLayout( this, 6, 11 );
+  TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 6, 11 );
 
   mTypeCombo = new PhoneTypeCombo( this );
   mNumberEdit = new KLineEdit( this );
 
-  layout->addWidget( mTypeCombo );
-  layout->addWidget( mNumberEdit );
+  tqlayout->addWidget( mTypeCombo );
+  tqlayout->addWidget( mNumberEdit );
 
   connect( mTypeCombo, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) );
   connect( mNumberEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SIGNAL( modified() ) );
@@ -169,19 +169,19 @@ void PhoneNumberWidget::setReadOnly( bool readOnly )
 PhoneEditWidget::PhoneEditWidget( TQWidget *parent, const char *name )
   : TQWidget( parent, name ), mReadOnly( false )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 2, 2 );
-  layout->setSpacing( KDialog::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2 );
+  tqlayout->setSpacing( KDialog::spacingHint() );
 
-  mWidgetLayout = new TQVBoxLayout( layout );
-  layout->addMultiCellLayout( mWidgetLayout, 0, 0, 0, 1 );
+  mWidgetLayout = new TQVBoxLayout( tqlayout );
+  tqlayout->addMultiCellLayout( mWidgetLayout, 0, 0, 0, 1 );
 
   mAddButton = new TQPushButton( i18n( "Add" ), this );
-  mAddButton->setMaximumSize( mAddButton->sizeHint() );
-  layout->addWidget( mAddButton, 1, 0, Qt::AlignRight );
+  mAddButton->setMaximumSize( mAddButton->tqsizeHint() );
+  tqlayout->addWidget( mAddButton, 1, 0, Qt::AlignRight );
 
   mRemoveButton = new TQPushButton( i18n( "Remove" ), this );
-  mRemoveButton->setMaximumSize( mRemoveButton->sizeHint() );
-  layout->addWidget( mRemoveButton, 1, 1 );
+  mRemoveButton->setMaximumSize( mRemoveButton->tqsizeHint() );
+  tqlayout->addWidget( mRemoveButton, 1, 1 );
 
   mMapper = new TQSignalMapper( this );
   connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( changed( int ) ) );
@@ -298,13 +298,13 @@ PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *parent )
 {
   TQWidget *page = plainPage();
 
-  TQVBoxLayout *layout = new TQVBoxLayout( page, spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( page, spacingHint() );
 
   mPreferredBox = new TQCheckBox( i18n( "This is the preferred phone number" ), page );
-  layout->addWidget( mPreferredBox );
+  tqlayout->addWidget( mPreferredBox );
 
   mGroup = new TQButtonGroup( 2, Horizontal, i18n( "Types" ), page );
-  layout->addWidget( mGroup );
+  tqlayout->addWidget( mGroup );
 
   // fill widgets
   mTypeList = KABC::PhoneNumber::typeList();
diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp
index 39046481..4cd59780 100644
--- a/kaddressbook/printing/detailledstyle.cpp
+++ b/kaddressbook/printing/detailledstyle.cpp
@@ -112,8 +112,8 @@ DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *na
   mPageAppearance->kcbHeaderTextColor->setColor(
       config->readColorEntry( ContactHeaderForeColor, &Qt::white ) );
 
-  mPageAppearance->layout()->setMargin( KDialog::marginHint() );
-  mPageAppearance->layout()->setSpacing( KDialog::spacingHint() );
+  mPageAppearance->tqlayout()->setMargin( KDialog::marginHint() );
+  mPageAppearance->tqlayout()->setSpacing( KDialog::spacingHint() );
 }
 
 DetailledPrintStyle::~DetailledPrintStyle()
diff --git a/kaddressbook/printing/ds_appearance.ui b/kaddressbook/printing/ds_appearance.ui
index 2fe5ce20..03ca4b58 100644
--- a/kaddressbook/printing/ds_appearance.ui
+++ b/kaddressbook/printing/ds_appearance.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>AppearancePage</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -68,7 +68,7 @@
             <property name="scaledContents">
                 <bool>false</bool>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignLeft</set>
             </property>
         </widget>
@@ -138,7 +138,7 @@
                             <property name="text">
                                 <string>Details font:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -149,7 +149,7 @@
                             <property name="text">
                                 <string>Size:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -160,7 +160,7 @@
                             <property name="text">
                                 <string>Body font:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -171,7 +171,7 @@
                             <property name="text">
                                 <string>Size:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -182,7 +182,7 @@
                             <property name="text">
                                 <string>Fixed font:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -203,7 +203,7 @@
                             <property name="text">
                                 <string>Size:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -245,7 +245,7 @@
                             <property name="text">
                                 <string>Contact header font:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -274,7 +274,7 @@
                             <property name="text">
                                 <string>Size:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -285,7 +285,7 @@
                             <property name="text">
                                 <string>Size:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -301,7 +301,7 @@
                             <property name="text">
                                 <string>Headlines:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -400,7 +400,7 @@
                             <property name="text">
                                 <string>Headline background color:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -411,7 +411,7 @@
                             <property name="text">
                                 <string>Headline text color:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -475,5 +475,5 @@
         <slot>setDisabled(bool)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kaddressbook/printing/kabentrypainter.cpp b/kaddressbook/printing/kabentrypainter.cpp
index c7432d5d..c74e4e41 100644
--- a/kaddressbook/printing/kabentrypainter.cpp
+++ b/kaddressbook/printing/kabentrypainter.cpp
@@ -139,7 +139,7 @@ int KABEntryPainter::hits( const QRectList& list, const TQPoint &p )
   int count = 0;
 
   for ( pos = list.begin(); pos != list.end(); ++pos ) {
-    if ( (*pos).contains( p ) )
+    if ( (*pos).tqcontains( p ) )
       return count;
 
     ++count;
@@ -172,7 +172,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
   KABC::Address address;
 
   // this is used to prepare some fields for printing and decide about
-  // the layout later:
+  // the tqlayout later:
   TQValueList<TQStringList> parts;
   TQValueList<QRectList*> contents;
 
@@ -189,7 +189,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
   painter->setPen( mBackgroundColor );
   text = addr.realName();
 
-  // replacement for: api->addressbook()->literalName(entry, text);
+  // tqreplacement for: api->addressbook()->literalName(entry, text);
   rect = painter->boundingRect( Ruler1, y, Width, Height,
                                 Qt::AlignVCenter | Qt::AlignLeft, text );
   rect.setHeight( (int)( 1.25 * rect.height() ) );
@@ -241,7 +241,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
   if ( !( addr.prefix().isEmpty() ) )
     y += fmBody.lineSpacing() / 2;
 
-  // fill the parts stringlist, it contains "parts" (printable areas)
+  // fill the parts stringlist, it tqcontains "parts" (printable areas)
   // that will be combined to fill the page as effectively as possible:
   // Email addresses:
   if ( !addr.emails().isEmpty() && mShowEmails ) {
@@ -399,27 +399,27 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
           line1 = i18n( "Preferred Address" );
       }
 
-      line1 += TQString::fromLatin1( ":" );
+      line1 += TQString::tqfromLatin1( ":" );
       text = TQString::null;
 
       if ( !address.extended().isEmpty() )
         text = address.extended().stripWhiteSpace();
 
       if ( !text.isEmpty() ) {
-        line1 = line1 + TQString::fromLatin1( " (" ) + text +
-        TQString::fromLatin1( ")" );
+        line1 = line1 + TQString::tqfromLatin1( " (" ) + text +
+        TQString::tqfromLatin1( ")" );
       }
 
       line1 = line1.stripWhiteSpace();
       line2 = address.street();
       if ( !address.postOfficeBox().isEmpty() )
-        line2 += TQString::fromLatin1( " - " ) + address.postOfficeBox();
+        line2 += TQString::tqfromLatin1( " - " ) + address.postOfficeBox();
 
       // print address in american style, this will need localisation:
       line3 = address.locality() + ( address.region().isEmpty() ?
-              TQString::fromLatin1( "" ) : TQString::fromLatin1( ", " ) +
+              TQString::tqfromLatin1( "" ) : TQString::tqfromLatin1( ", " ) +
               address.region() ) + ( address.postalCode().isEmpty()
-              ? TQString::fromLatin1( "" ) : TQString::fromLatin1( " " )
+              ? TQString::tqfromLatin1( "" ) : TQString::tqfromLatin1( " " )
               + address.postalCode() );
       line4 = address.country();
 
diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp
index 9ecc57f5..26312ee1 100644
--- a/kaddressbook/printing/mikesstyle.cpp
+++ b/kaddressbook/printing/mikesstyle.cpp
@@ -205,7 +205,7 @@ void MikesStyle::paintTagLine( TQPainter &p, const TQFont &font )
   TQFontMetrics fm( font );
 
   TQString text = i18n( "Printed on %1 by KAddressBook (http://www.kde.org)" )
-                 .arg( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) );
+                 .arg( KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) );
 
   p.setPen( Qt::black );
   p.drawText( 0, fm.height(), text );
@@ -226,14 +226,14 @@ int MikesStyle::calcHeight( const KABC::Addressee &addr,
 
   // Determine which half of the fields is higher
   for ( int i = 0; i < numFields / 2; i++ )
-    halfHeight += fm.height() * (fieldList[ i ]->value( addr ).contains( '\n' ) + 1);
+    halfHeight += fm.height() * (fieldList[ i ]->value( addr ).tqcontains( '\n' ) + 1);
 
   height = halfHeight;
 
   // now the second half
   halfHeight = 0;
   for ( int i = numFields / 2; i < numFields; i++ )
-    halfHeight += fm.height() * (fieldList[ i ]->value( addr ).contains( '\n' ) + 1);
+    halfHeight += fm.height() * (fieldList[ i ]->value( addr ).tqcontains( '\n' ) + 1);
 
   height = QMAX( height, halfHeight );
 
diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp
index 2bf6deaf..8f2e98f2 100644
--- a/kaddressbook/printing/printingwizard.cpp
+++ b/kaddressbook/printing/printingwizard.cpp
@@ -162,7 +162,7 @@ void PrintingWizard::print()
     if ( mSelectionPage->useSelection() ) {
       TQStringList::ConstIterator it;
       for ( it = mSelection.begin(); it != mSelection.end(); ++it ) {
-        KABC::Addressee addr = addressBook()->findByUid( *it );
+        KABC::Addressee addr = addressBook()->tqfindByUid( *it );
         if ( !addr.isEmpty() )
           list.append( addr );
       }
@@ -186,7 +186,7 @@ void PrintingWizard::print()
         const TQStringList tmp( (*it).categories() );
         TQStringList::ConstIterator tmpIt;
         for ( tmpIt = tmp.begin(); tmpIt != tmp.end(); ++tmpIt )
-          if ( categories.contains( *tmpIt ) ) {
+          if ( categories.tqcontains( *tmpIt ) ) {
             list.append( *it );
             break;
           }
diff --git a/kaddressbook/printing/printprogress.cpp b/kaddressbook/printing/printprogress.cpp
index 43aec8cf..a66ca960 100644
--- a/kaddressbook/printing/printprogress.cpp
+++ b/kaddressbook/printing/printprogress.cpp
@@ -49,7 +49,7 @@ PrintProgress::PrintProgress( TQWidget *parent, const char *name )
   mProgressBar->setProgress( 0 );
   topLayout->addWidget( mProgressBar, 1, 0 );
 
-  resize( TQSize( 370, 220 ).expandedTo( minimumSizeHint() ) );
+  resize( TQSize( 370, 220 ).expandedTo( tqminimumSizeHint() ) );
 }
 
 PrintProgress::~PrintProgress()
diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp
index 3e8bde5f..e926d0db 100644
--- a/kaddressbook/printing/selectionpage.cpp
+++ b/kaddressbook/printing/selectionpage.cpp
@@ -52,11 +52,11 @@ SelectionPage::SelectionPage( TQWidget* parent, const char* name )
   mButtonGroup = new TQButtonGroup( this );
   mButtonGroup->setFrameShape( TQButtonGroup::NoFrame );
   mButtonGroup->setColumnLayout( 0, Qt::Vertical );
-  mButtonGroup->layout()->setSpacing( KDialog::spacingHint() );
-  mButtonGroup->layout()->setMargin( KDialog::marginHint() );
+  mButtonGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
+  mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() );
 
-  TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->layout() );
-  groupLayout->setAlignment( Qt::AlignTop );
+  TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->tqlayout() );
+  groupLayout->tqsetAlignment( Qt::AlignTop );
 
   mUseWholeBook = new TQRadioButton( i18n( "&All contacts" ), mButtonGroup );
   mUseWholeBook->setChecked( true );
diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp
index 88e2e71c..172e7df7 100644
--- a/kaddressbook/printing/stylepage.cpp
+++ b/kaddressbook/printing/stylepage.cpp
@@ -122,9 +122,9 @@ void StylePage::initGUI()
 
   TQButtonGroup *group = new TQButtonGroup( i18n( "Sorting" ), this );
   group->setColumnLayout( 0, Qt::Vertical );
-  TQGridLayout *sortLayout = new TQGridLayout( group->layout(), 2, 2,
+  TQGridLayout *sortLayout = new TQGridLayout( group->tqlayout(), 2, 2,
                                              KDialog::spacingHint() );
-  sortLayout->setAlignment( Qt::AlignTop );
+  sortLayout->tqsetAlignment( Qt::AlignTop );
 
   label = new TQLabel( i18n( "Criterion:" ), group );
   sortLayout->addWidget( label, 0, 0 );
@@ -142,7 +142,7 @@ void StylePage::initGUI()
 
   group = new TQButtonGroup( i18n( "Print Style" ), this );
   group->setColumnLayout( 0, Qt::Vertical );
-  TQVBoxLayout *styleLayout = new TQVBoxLayout( group->layout(),
+  TQVBoxLayout *styleLayout = new TQVBoxLayout( group->tqlayout(),
                                               KDialog::spacingHint() );
 
   mStyleCombo = new KComboBox( false, group );
@@ -153,7 +153,7 @@ void StylePage::initGUI()
   font.setPointSize( 20 );
   mPreview->setFont( font );
   mPreview->setScaledContents( true );
-  mPreview->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) );
+  mPreview->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) );
   styleLayout->addWidget( mPreview );
 
   topLayout->addWidget( group, 1, 1 );
diff --git a/kaddressbook/secrecywidget.cpp b/kaddressbook/secrecywidget.cpp
index 5a39ddfa..4db7197a 100644
--- a/kaddressbook/secrecywidget.cpp
+++ b/kaddressbook/secrecywidget.cpp
@@ -32,10 +32,10 @@
 SecrecyWidget::SecrecyWidget( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(),
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(),
                                          KDialog::spacingHint() );
   mSecrecyCombo = new KComboBox( this );
-  layout->addWidget( mSecrecyCombo );
+  tqlayout->addWidget( mSecrecyCombo );
 
   const KABC::Secrecy::TypeList list = KABC::Secrecy::typeList();
   KABC::Secrecy::TypeList::ConstIterator it;
diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp
index ca0a9bfd..f94a72d2 100644
--- a/kaddressbook/soundwidget.cpp
+++ b/kaddressbook/soundwidget.cpp
@@ -48,7 +48,7 @@ SoundWidget::SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *n
   TQLabel *label = new TQLabel( this );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "multimedia",
                     KIcon::Desktop, KIcon::SizeMedium ) );
-  label->setAlignment( Qt::AlignTop );
+  label->tqsetAlignment( Qt::AlignTop );
   topLayout->addMultiCellWidget( label, 0, 1, 0, 0 );
 
   mPlayButton = new TQPushButton( i18n( "Play" ), this );
@@ -77,7 +77,7 @@ SoundWidget::SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *n
   connect( mPlayButton, TQT_SIGNAL( clicked() ),
            TQT_SLOT( playSound() ) );
 
-  TQWhatsThis::add( this, i18n( "This field stores a sound file which contains the name of the contact to clarify the pronunciation." ) );
+  TQWhatsThis::add( this, i18n( "This field stores a sound file which tqcontains the name of the contact to clarify the pronunciation." ) );
   TQWhatsThis::add( mUseSoundUrl, i18n( "Save only the URL to the sound file, not the whole object." ) );
 }
 
diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
index 3de0220f..6a8e495d 100644
--- a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
+++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
@@ -130,7 +130,7 @@ bool VCard_LDIFCreator::readContents( const TQString &path )
   TQStringList phoneNumbers;
   for (unsigned int no=0; no<pnList.count(); ++no) {
     TQString pn = pnList[no].number().simplifyWhiteSpace();
-    if (!pn.isEmpty() && !phoneNumbers.contains(pn))
+    if (!pn.isEmpty() && !phoneNumbers.tqcontains(pn))
       phoneNumbers.append(pn);
   }
   if ( !phoneNumbers.isEmpty() )
diff --git a/kaddressbook/typecombo.h b/kaddressbook/typecombo.h
index 90a00011..a8bbb4ca 100644
--- a/kaddressbook/typecombo.h
+++ b/kaddressbook/typecombo.h
@@ -86,7 +86,7 @@ void TypeCombo<T>::updateTypes()
     int type = ( mTypeList[ i ].type() & ~( T::Pref ) );
     TQString label = mTypeList[ i ].typeLabel( type );
     int count = 1;
-    if ( labelCount.contains( type ) ) {
+    if ( labelCount.tqcontains( type ) ) {
       count = labelCount[ type ] + 1;
     }
     labelCount[ type ] = count;
diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp
index 0f6e555d..bd26270f 100644
--- a/kaddressbook/undocmds.cpp
+++ b/kaddressbook/undocmds.cpp
@@ -84,7 +84,7 @@ void DeleteCommand::execute()
   TQStringList::ConstIterator it;
   const TQStringList::ConstIterator endIt( mUIDList.end() );
   for ( it = mUIDList.begin(); it != endIt; ++it ) {
-    addr = addressBook()->findByUid( *it );
+    addr = addressBook()->tqfindByUid( *it );
     lock()->lock( addr.resource() );
     mAddresseeList.append( addr );
     AddresseeConfig cfg( addr );
@@ -273,7 +273,7 @@ void CutCommand::execute()
   TQStringList::ConstIterator it;
   const TQStringList::ConstIterator endIt( mUIDList.end() );
   for ( it = mUIDList.begin(); it != endIt; ++it ) {
-    addr = addressBook()->findByUid( *it );
+    addr = addressBook()->tqfindByUid( *it );
     mAddresseeList.append( addr );
     lock()->lock( addr.resource() );
   }
@@ -332,7 +332,7 @@ void CopyToCommand::execute()
   TQStringList::Iterator it( mUIDList.begin() );
   const TQStringList::Iterator endIt( mUIDList.end() );
   while ( it != endIt ) {
-    KABC::Addressee addr = addressBook()->findByUid( *it++ );
+    KABC::Addressee addr = addressBook()->tqfindByUid( *it++ );
     if ( !addr.isEmpty() ) {
       KABC::Addressee newAddr( addr );
       // We need to set a new uid, otherwise the insert below is
@@ -379,7 +379,7 @@ void MoveToCommand::moveContactTo( KABC::Resource *resource )
     TQStringList::Iterator it( mUIDList.begin() );
     const TQStringList::Iterator endIt( mUIDList.end() );
     while ( it != endIt ) {
-        KABC::Addressee addr = addressBook()->findByUid( *it++ );
+        KABC::Addressee addr = addressBook()->tqfindByUid( *it++ );
         if ( !addr.isEmpty() ) {
             KABC::Addressee newAddr( addr );
       // We need to set a new uid, otherwise the insert below is
diff --git a/kaddressbook/viewconfigurefieldspage.cpp b/kaddressbook/viewconfigurefieldspage.cpp
index f83a8c92..453f4758 100644
--- a/kaddressbook/viewconfigurefieldspage.cpp
+++ b/kaddressbook/viewconfigurefieldspage.cpp
@@ -262,16 +262,16 @@ void ViewConfigureFieldsPage::initGUI()
   vb2->addStretch();
   gl->addLayout( vb2, 1, 3 );
 
-  TQSize sizeHint = mUnSelectedBox->sizeHint();
+  TQSize tqsizeHint = mUnSelectedBox->tqsizeHint();
 
   // make sure we fill the list with all items, so that we can
   // get the maxItemWidth we need to not truncate the view
   slotShowFields( 0 );
 
-  sizeHint = sizeHint.expandedTo( mSelectedBox->sizeHint() );
-  sizeHint.setWidth( mUnSelectedBox->maxItemWidth() );
-  mUnSelectedBox->setMinimumSize( sizeHint );
-  mSelectedBox->setMinimumSize( sizeHint );
+  tqsizeHint = tqsizeHint.expandedTo( mSelectedBox->tqsizeHint() );
+  tqsizeHint.setWidth( mUnSelectedBox->maxItemWidth() );
+  mUnSelectedBox->setMinimumSize( tqsizeHint );
+  mSelectedBox->setMinimumSize( tqsizeHint );
 
   gl->activate();
 
diff --git a/kaddressbook/viewconfigurefilterpage.cpp b/kaddressbook/viewconfigurefilterpage.cpp
index 7a07b050..923743f8 100644
--- a/kaddressbook/viewconfigurefilterpage.cpp
+++ b/kaddressbook/viewconfigurefilterpage.cpp
@@ -47,7 +47,7 @@ ViewConfigureFilterPage::ViewConfigureFilterPage( TQWidget *parent,
   " this view is displayed. This feature allows you to configure views that only"
   " interact with certain types of information based on the filter. Once the view"
   " is activated, the filter can be changed at anytime." ), this );
-  label->setAlignment( Qt::AlignLeft | Qt::AlignTop | Qt::WordBreak );
+  label->tqsetAlignment( Qt::AlignLeft | Qt::AlignTop | Qt::WordBreak );
   topLayout->addWidget( label );
 
   TQWidget *spacer = new TQWidget( this );
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 5dab74e2..46eb653b 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -133,7 +133,7 @@ KABC::Addressee::List ViewManager::selectedAddressees() const
   const TQStringList uids = selectedUids();
   TQStringList::ConstIterator it;
   for ( it = uids.begin(); it != uids.end(); ++it ) {
-    KABC::Addressee addr = mCore->addressBook()->findByUid( *it );
+    KABC::Addressee addr = mCore->addressBook()->tqfindByUid( *it );
     if ( !addr.isEmpty() )
       list.append( addr );
   }
@@ -342,7 +342,7 @@ void ViewManager::addView()
     // Check for name conflicts
     bool firstConflict = true;
     int numTries = 1;
-    while ( mViewNameList.contains( newName ) > 0 ) {
+    while ( mViewNameList.tqcontains( newName ) > 0 ) {
       if ( !firstConflict ) {
         newName = newName.left( newName.length() - 4 );
         firstConflict = false;
@@ -436,7 +436,7 @@ void ViewManager::dropped( TQDropEvent *e )
   } else if ( KVCardDrag::decode( e, list ) ) {
     KABC::Addressee::List::ConstIterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
-      KABC::Addressee a = mCore->addressBook()->findByUid( (*it).uid() );
+      KABC::Addressee a = mCore->addressBook()->tqfindByUid( (*it).uid() );
       if ( a.isEmpty() ) { // not yet in address book
         mCore->addressBook()->insertAddressee( *it );
         emit modified();
@@ -459,7 +459,7 @@ void ViewManager::startDrag()
 
   TQStringList::ConstIterator it;
   for ( it = uidList.begin(); it != uidList.end(); ++it )
-    addrList.append( mCore->addressBook()->findByUid( *it ) );
+    addrList.append( mCore->addressBook()->tqfindByUid( *it ) );
 
   KMultipleDrag *drag = new KMultipleDrag( this );
 
@@ -601,9 +601,9 @@ void ViewManager::initActions()
 
 void ViewManager::initGUI()
 {
-  TQHBoxLayout *layout = new TQHBoxLayout( this );
+  TQHBoxLayout *tqlayout = new TQHBoxLayout( this );
   mViewWidgetStack = new TQWidgetStack( this );
-  layout->addWidget( mViewWidgetStack );
+  tqlayout->addWidget( mViewWidgetStack );
 }
 
 #include "viewmanager.moc"
diff --git a/kaddressbook/views/Makefile.am b/kaddressbook/views/Makefile.am
index 39db0f58..98cf458a 100644
--- a/kaddressbook/views/Makefile.am
+++ b/kaddressbook/views/Makefile.am
@@ -12,17 +12,17 @@ libkaddrbk_cardview_la_SOURCES = cardview.cpp colorlistbox.cpp \
                                  configurecardviewdialog.cpp \
                                  kaddressbookcardview.cpp
 libkaddrbk_cardview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_cardview_la_LIBADD = $(XXLIBS)
+libkaddrbk_cardview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KABC)
 
 libkaddrbk_iconview_la_SOURCES = kaddressbookiconview.cpp
 libkaddrbk_iconview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_iconview_la_LIBADD = $(XXLIBS)
+libkaddrbk_iconview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KABC)
 
 libkaddrbk_tableview_la_SOURCES = configuretableviewdialog.cpp \
                                   contactlistview.cpp \
                                   kaddressbooktableview.cpp
 libkaddrbk_tableview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_tableview_la_LIBADD = $(XXLIBS)
+libkaddrbk_tableview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KABC) $(LIB_KIO) $(LIB_KIMPROXY)
 
 noinst_HEADERS = cardview.h colorlistbox.h configurecardviewdialog.h \
                  configuretableviewdialog.h contactlistview.h \
diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index 6e7d71d6..5c8ccf82 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -107,9 +107,9 @@ class CardViewSeparator
                    cg.brush(TQColorGroup::Button) );
     }
 
-    void repaintSeparator()
+    void tqrepaintSeparator()
     {
-      mView->repaintContents( mRect );
+      mView->tqrepaintContents( mRect );
     }
 
   private:
@@ -355,7 +355,7 @@ int CardViewItem::height( bool allowCache ) const
   for ( iter.toFirst(); iter.current(); ++iter ) {
     if ( !sef && (*iter)->second.isEmpty() )
       continue;
-    lines = QMIN( (*iter)->second.contains( '\n' ) + 1, maxLines );
+    lines = QMIN( (*iter)->second.tqcontains( '\n' ) + 1, maxLines );
     fieldHeight += ( lines * fh ) + 2;
   }
 
@@ -448,16 +448,16 @@ CardViewItem *CardViewItem::nextItem() const
   return item;
 }
 
-void CardViewItem::repaintCard()
+void CardViewItem::tqrepaintCard()
 {
   if ( mView )
-    mView->repaintItem( this );
+    mView->tqrepaintItem( this );
 }
 
 void CardViewItem::setCaption( const TQString &caption )
 {
   d->mCaption = caption;
-  repaintCard();
+  tqrepaintCard();
 }
 
 TQString CardViewItem::fieldValue( const TQString &label ) const
@@ -507,7 +507,7 @@ void CardViewItem::showFullString( const TQPoint &itempos, CardViewTip *tip )
     Field *_f;
     for ( _f = d->mFieldList.first(); _f != f; _f = d->mFieldList.next() )
       if ( se || ! _f->second.isEmpty() )
-        y += ( QMIN( _f->second.contains( '\n' ) + 1, maxLines ) * fh ) + 2;
+        y += ( QMIN( _f->second.tqcontains( '\n' ) + 1, maxLines ) * fh ) + 2;
 
     if ( isLabel && itempos.y() > y + fh )
       return;
@@ -521,7 +521,7 @@ void CardViewItem::showFullString( const TQPoint &itempos, CardViewTip *tip )
       trimmed = mView->d->mFm->width( s ) > mw - colonWidth;
     } else {
       TQRect r( mView->d->mFm->boundingRect( 0, 0, INT_MAX, INT_MAX, Qt::AlignTop|Qt::AlignLeft, s ) );
-      trimmed = r.width() > mw || r.height() / fh >  QMIN( s.contains( '\n' ) + 1, maxLines );
+      trimmed = r.width() > mw || r.height() / fh >  QMIN( s.tqcontains( '\n' ) + 1, maxLines );
     }
   }
 
@@ -560,7 +560,7 @@ CardViewItem::Field *CardViewItem::fieldAt( const TQPoint & itempos ) const
   Field *f;
   for ( f = d->mFieldList.first(); f; f = d->mFieldList.next() ) {
     if ( showEmpty || !f->second.isEmpty() )
-      ypos += (QMIN( f->second.contains( '\n' )+1, maxLines ) * fh) + 2;
+      ypos += (QMIN( f->second.tqcontains( '\n' )+1, maxLines ) * fh) + 2;
     if ( iy <= ypos )
       break;
   }
@@ -653,9 +653,9 @@ void CardView::setCurrentItem( CardViewItem *item )
     CardViewItem *it = d->mCurrentItem;
     d->mCurrentItem = item;
     if ( it )
-      it->repaintCard();
+      it->tqrepaintCard();
 
-    item->repaintCard();
+    item->tqrepaintCard();
   }
 
   if ( ! d->mOnSeparator )
@@ -671,7 +671,7 @@ CardViewItem *CardView::itemAt( const TQPoint &viewPos ) const
   bool found = false;
   for ( iter.toFirst(); iter.current() && !found; ++iter ) {
     item = *iter;
-    if ( TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() ).contains( viewPos ) )
+    if ( TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() ).tqcontains( viewPos ) )
       found = true;
   }
 
@@ -681,7 +681,7 @@ CardViewItem *CardView::itemAt( const TQPoint &viewPos ) const
   return 0;
 }
 
-TQRect CardView::itemRect( const CardViewItem *item ) const
+TQRect CardView::tqitemRect( const CardViewItem *item ) const
 {
   return TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() );
 }
@@ -692,9 +692,9 @@ void CardView::ensureItemVisible( const CardViewItem *item )
   ensureVisible( item->d->x + d->mItemWidth, item->d->y, d->mItemSpacing, 0 );
 }
 
-void CardView::repaintItem( const CardViewItem *item )
+void CardView::tqrepaintItem( const CardViewItem *item )
 {
-  repaintContents( TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() ) );
+  tqrepaintContents( TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() ) );
 }
 
 void CardView::setSelectionMode( CardView::SelectionMode mode )
@@ -716,7 +716,7 @@ void CardView::selectAll( bool state )
     for ( iter.toFirst(); iter.current(); ++iter ) {
       if ( (*iter)->isSelected() ) {
         (*iter)->setSelected( false );
-        (*iter)->repaintCard();
+        (*iter)->tqrepaintCard();
       }
     }
 
@@ -743,7 +743,7 @@ void CardView::setSelected( CardViewItem *item, bool selected )
     CardViewItem *it = d->mCurrentItem;
     d->mCurrentItem = item;
     if ( it )
-      it->repaintCard();
+      it->tqrepaintCard();
   }
 
   if ( d->mSelectionMode == CardView::Single ) {
@@ -754,7 +754,7 @@ void CardView::setSelected( CardViewItem *item, bool selected )
 
     if ( selected ) {
       item->setSelected( selected );
-      item->repaintCard();
+      item->tqrepaintCard();
       emit selectionChanged();
       emit selectionChanged( item );
     } else {
@@ -763,7 +763,7 @@ void CardView::setSelected( CardViewItem *item, bool selected )
     }
   } else if ( d->mSelectionMode == CardView::Multi ) {
     item->setSelected( selected );
-    item->repaintCard();
+    item->tqrepaintCard();
     emit selectionChanged();
   } else if ( d->mSelectionMode == CardView::Extended ) {
     bool b = signalsBlocked();
@@ -772,7 +772,7 @@ void CardView::setSelected( CardViewItem *item, bool selected )
     blockSignals( b );
 
     item->setSelected( selected );
-    item->repaintCard();
+    item->tqrepaintCard();
     emit selectionChanged();
   }
 }
@@ -860,7 +860,7 @@ void CardView::drawContents( TQPainter *p, int clipx, int clipy,
     item = *iter;
     cardRect.setRect( item->d->x, item->d->y, d->mItemWidth, item->height() );
 
-    if ( clipRect.intersects( cardRect ) || clipRect.contains( cardRect ) ) {
+    if ( clipRect.intersects( cardRect ) || clipRect.tqcontains( cardRect ) ) {
       // Tell the card to paint
       p->save();
       p->translate( cardRect.x(), cardRect.y() );
@@ -875,7 +875,7 @@ void CardView::drawContents( TQPainter *p, int clipx, int clipy,
     sep = *sepIter;
     sepRect = sep->mRect;
 
-    if ( clipRect.intersects( sepRect ) || clipRect.contains( sepRect ) ) {
+    if ( clipRect.intersects( sepRect ) || clipRect.tqcontains( sepRect ) ) {
       p->save();
       p->translate( sepRect.x(), sepRect.y() );
       sep->paintSeparator( p, cg );
@@ -893,7 +893,7 @@ void CardView::resizeEvent( TQResizeEvent *event )
 
 void CardView::calcLayout()
 {
-  // Start in the upper left corner and layout all the
+  // Start in the upper left corner and tqlayout all the
   // cars using their height and width
   int maxWidth = 0;
   int maxHeight = 0;
@@ -1048,12 +1048,12 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
     blockSignals( b );
 
     item->setSelected( true );
-    item->repaintCard();
+    item->tqrepaintCard();
     emit selectionChanged( item );
   } else if ( d->mSelectionMode == CardView::Multi ) {
     // toggle the selection
     item->setSelected( !item->isSelected() );
-    item->repaintCard();
+    item->tqrepaintCard();
     emit selectionChanged();
   } else if ( d->mSelectionMode == CardView::Extended ) {
     if ( (e->button() & Qt::LeftButton) && (e->state() & Qt::ShiftButton) ) {
@@ -1079,13 +1079,13 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
       for ( ; from <= to; from++ ) {
         aItem = d->mItemList.at( from );
         aItem->setSelected( s );
-        repaintItem( aItem );
+        tqrepaintItem( aItem );
       }
 
       emit selectionChanged();
     } else if ( (e->button() & Qt::LeftButton) && (e->state() & Qt::ControlButton) ) {
       item->setSelected( !item->isSelected() );
-      item->repaintCard();
+      item->tqrepaintCard();
       emit selectionChanged();
     } else if ( e->button() & Qt::LeftButton ) {
       bool b = signalsBlocked();
@@ -1094,7 +1094,7 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
       blockSignals( b );
 
       item->setSelected( true );
-      item->repaintCard();
+      item->tqrepaintCard();
       emit selectionChanged();
     }
   }
@@ -1202,13 +1202,13 @@ void CardView::focusInEvent( TQFocusEvent* )
   if ( !d->mCurrentItem && d->mItemList.count() )
     setCurrentItem( d->mItemList.first() );
   else if ( d->mCurrentItem )
-    d->mCurrentItem->repaintCard();
+    d->mCurrentItem->tqrepaintCard();
 }
 
 void CardView::focusOutEvent( TQFocusEvent* )
 {
   if ( d->mCurrentItem )
-    d->mCurrentItem->repaintCard();
+    d->mCurrentItem->tqrepaintCard();
 }
 
 void CardView::keyPressEvent( TQKeyEvent *e )
@@ -1324,7 +1324,7 @@ void CardView::keyPressEvent( TQKeyEvent *e )
       break;
     case Key_Menu:
       emit contextMenuRequested( d->mCurrentItem, viewport()->mapToGlobal(
-                                 itemRect(d->mCurrentItem).center() ) );
+                                 tqitemRect(d->mCurrentItem).center() ) );
       break;
     default:
       if ( (e->state() & ControlButton) && e->key() == Key_A ) {
@@ -1363,7 +1363,7 @@ void CardView::keyPressEvent( TQKeyEvent *e )
         for ( ; from <= to; from++ ) {
           item = d->mItemList.at( from );
           item->setSelected( s );
-          repaintItem( item );
+          tqrepaintItem( item );
         }
 
         emit selectionChanged();
@@ -1392,7 +1392,7 @@ void CardView::setLayoutDirty( bool dirty )
 {
   if ( d->mLayoutDirty != dirty ) {
     d->mLayoutDirty = dirty;
-    repaint();
+    tqrepaint();
   }
 }
 
@@ -1400,7 +1400,7 @@ void CardView::setDrawCardBorder( bool enabled )
 {
   if ( enabled != d->mDrawCardBorder ) {
     d->mDrawCardBorder = enabled;
-    repaint();
+    tqrepaint();
   }
 }
 
@@ -1426,7 +1426,7 @@ void CardView::setDrawFieldLabels( bool enabled )
 {
   if ( enabled != d->mDrawFieldLabels ) {
     d->mDrawFieldLabels = enabled;
-    repaint();
+    tqrepaint();
   }
 }
 
@@ -1462,7 +1462,7 @@ void CardView::tryShowFullText()
   CardViewItem *item = itemAt( cpos );
   if ( item ) {
     // query it for a value to display
-    TQPoint ipos = cpos - itemRect( item ).topLeft();
+    TQPoint ipos = cpos - tqitemRect( item ).topLeft();
     item->showFullString( ipos, d->mTip );
   }
 }
diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h
index 5ab75e6c..a5410419 100644
--- a/kaddressbook/views/cardview.h
+++ b/kaddressbook/views/cardview.h
@@ -87,10 +87,10 @@ class CardViewItem
     virtual void paintCard( TQPainter *p, TQColorGroup &cg );
 
     /**
-      Repaints the card. This is done by sending a repaint event to the
+      Repaints the card. This is done by sending a tqrepaint event to the
       view with the clip rect defined as this card.
      */
-    virtual void repaintCard();
+    virtual void tqrepaintCard();
 
     /**
       Adds a field to the card.
@@ -244,7 +244,7 @@ class CardView : public QScrollView
     /**
       @return The bounding rect of the given item.
      */
-    TQRect itemRect( const CardViewItem *item ) const;
+    TQRect tqitemRect( const CardViewItem *item ) const;
 
     /**
       Ensures that the given item is in the viewable area of the widget
@@ -254,7 +254,7 @@ class CardView : public QScrollView
     /**
       Repaints the given item.
      */
-    void repaintItem( const CardViewItem *item );
+    void tqrepaintItem( const CardViewItem *item );
 
     enum SelectionMode { Single, Multi, Extended, NoSelection };
 
@@ -515,7 +515,7 @@ class CardView : public QScrollView
     void drawContents( TQPainter *p, int clipx, int clipy, int clipw, int cliph );
 
     /**
-      Sets the layout to dirty and repaints.
+      Sets the tqlayout to dirty and tqrepaints.
      */
     void resizeEvent( TQResizeEvent* );
 
@@ -525,13 +525,13 @@ class CardView : public QScrollView
     void contentsWheelEvent( TQWheelEvent* );
 
     /**
-      Sets the layout to dirty and calls for a repaint.
+      Sets the tqlayout to dirty and calls for a tqrepaint.
      */
     void setLayoutDirty( bool dirty );
 
     /**
       Does the math based on the bounding rect of the cards to properly
-      lay the cards out on the screen. This is only done if the layout is
+      lay the cards out on the screen. This is only done if the tqlayout is
       marked as dirty.
      */
     void calcLayout();
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index ed7cfda1..919e4987 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -94,19 +94,19 @@ void CardViewLookNFeelPage::restoreSettings( KConfig *config )
   c = KGlobalSettings::baseColor();
   lbColors->insertItem( new ColorListItem( i18n("Background Color"),
         config->readColorEntry( "BackgroundColor", &c ) ) );
-  c = colorGroup().foreground();
+  c = tqcolorGroup().foreground();
   lbColors->insertItem( new ColorListItem( i18n("Text Color"),
         config->readColorEntry( "TextColor", &c ) ) );
-  c = colorGroup().button();
+  c = tqcolorGroup().button();
   lbColors->insertItem( new ColorListItem( i18n("Header, Border & Separator Color"),
         config->readColorEntry( "HeaderColor", &c ) ) );
-  c = colorGroup().buttonText();
+  c = tqcolorGroup().buttonText();
   lbColors->insertItem( new ColorListItem( i18n("Header Text Color"),
         config->readColorEntry( "HeaderTextColor", &c ) ) );
-  c = colorGroup().highlight();
+  c = tqcolorGroup().highlight();
   lbColors->insertItem( new ColorListItem( i18n("Highlight Color"),
         config->readColorEntry( "HighlightColor", &c ) ) );
-  c = colorGroup().highlightedText();
+  c = tqcolorGroup().highlightedText();
   lbColors->insertItem( new ColorListItem( i18n("Highlighted Text Color"),
         config->readColorEntry( "HighlightedTextColor", &c ) ) );
 
@@ -120,7 +120,7 @@ void CardViewLookNFeelPage::restoreSettings( KConfig *config )
   cbEnableCustomFonts->setChecked( config->readBoolEntry( "EnableCustomFonts", false ) );
   enableFonts();
 
-  // layout
+  // tqlayout
   sbMargin->setValue( config->readNumEntry( "ItemMargin", 0 ) );
   sbSpacing->setValue( config->readNumEntry( "ItemSpacing", 10 ) );
   sbSepWidth->setValue( config->readNumEntry( "SeparatorWidth", 2 ) );
@@ -152,7 +152,7 @@ void CardViewLookNFeelPage::saveSettings( KConfig *config )
     config->writeEntry( "TextFont", lTextFont->font() );
     config->writeEntry( "HeaderFont", lHeaderFont->font() );
   }
-  // layout
+  // tqlayout
   config->writeEntry( "ItemMargin", sbMargin->value() );
   config->writeEntry( "ItemSpacing", sbSpacing->value() );
   config->writeEntry( "SeparatorWidth", sbSepWidth->value() );
@@ -196,7 +196,7 @@ void CardViewLookNFeelPage::initGUI()
   TQTabWidget *tabs = new TQTabWidget( this );
 
   // Layout
-  TQVBox *loTab = new TQVBox( this, "layouttab" );
+  TQVBox *loTab = new TQVBox( this, "tqlayouttab" );
 
   loTab->setSpacing( spacing );
   loTab->setMargin( margin );
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp
index c79ef524..d65f42d3 100644
--- a/kaddressbook/views/configuretableviewdialog.cpp
+++ b/kaddressbook/views/configuretableviewdialog.cpp
@@ -111,11 +111,11 @@ void LookAndFeelPage::saveSettings( KConfig *config )
 
 void LookAndFeelPage::initGUI()
 {
-  TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint());
+  TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint());
 
   TQButtonGroup *group = new TQButtonGroup(1, Qt::Horizontal,
                                          i18n("Row Separator"), this);
-  layout->addWidget(group);
+  tqlayout->addWidget(group);
 
   mAlternateButton = new TQRadioButton(i18n("Alternating backgrounds"),
                                       group, "mAlternateButton");
@@ -124,7 +124,7 @@ void LookAndFeelPage::initGUI()
 
   // Background Checkbox/Selector
   TQHBoxLayout *backgroundLayout = new TQHBoxLayout();
-  layout->addLayout(backgroundLayout);
+  tqlayout->addLayout(backgroundLayout);
 
   mBackgroundBox = new TQCheckBox(i18n("Enable background image:"), this,
                                  "mBackgroundBox");
@@ -141,10 +141,10 @@ void LookAndFeelPage::initGUI()
   // ToolTip Checkbox
   mToolTipBox = new TQCheckBox(i18n("Enable contact tooltips"), this,
                               "mToolTipBox");
-  layout->addWidget(mToolTipBox);
+  tqlayout->addWidget(mToolTipBox);
 #if KDE_IS_VERSION(3,2,90)
   mIMPresenceBox = new TQCheckBox( i18n( "Show instant messaging presence" ), this, "mIMPresenceBox" );
-  layout->addWidget( mIMPresenceBox );
+  tqlayout->addWidget( mIMPresenceBox );
 #endif
 }
 
diff --git a/kaddressbook/views/configuretableviewdialog.h b/kaddressbook/views/configuretableviewdialog.h
index 58bac86d..2e3378b4 100644
--- a/kaddressbook/views/configuretableviewdialog.h
+++ b/kaddressbook/views/configuretableviewdialog.h
@@ -58,7 +58,7 @@ class ConfigureTableViewWidget : public ViewConfigureWidget
 };
 
 /**
-  Internal class. It is only defined here for moc
+  Internal class. It is only defined here for tqmoc
 */
 class LookAndFeelPage : public QWidget
 {
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index 0bc7c041..5b9ecbf1 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -54,10 +54,10 @@ DynamicTip::DynamicTip( ContactListView *parent)
 
 void DynamicTip::maybeTip( const TQPoint &pos )
 {
-  if (!parentWidget()->inherits( "ContactListView" ))
+  if (!tqparentWidget()->inherits( "ContactListView" ))
     return;
 
-  ContactListView *plv = (ContactListView*)parentWidget();
+  ContactListView *plv = (ContactListView*)tqparentWidget();
   if (!plv->tooltips())
     return;
 
@@ -72,7 +72,7 @@ void DynamicTip::maybeTip( const TQPoint &pos )
     return;
 
   TQString s;
-  TQRect r = plv->itemRect( lvi );
+  TQRect r = plv->tqitemRect( lvi );
   r.moveBy( posVp.x(), posVp.y() );
 
     //kdDebug(5720) << "Tip rec: " << r.x() << "," << r.y() << "," << r.width()
@@ -109,7 +109,7 @@ void DynamicTip::maybeTip( const TQPoint &pos )
         linew += fm.width( notes[i] );
 
       if ( lastSpace >= a && notes[i] != '\n' )
-        if  (linew >= parentWidget()->width()) {
+        if  (linew >= tqparentWidget()->width()) {
           doBreak = true;
           if ( lastSpace > a ) {
             i = lastSpace;
@@ -222,7 +222,7 @@ void ContactListViewItem::refresh()
   }
 
   // Update our addressee, since it may have changed elsewhere
-  mAddressee = mDocument->findByUid(mAddressee.uid());
+  mAddressee = mDocument->tqfindByUid(mAddressee.uid());
   if (mAddressee.isEmpty())
     return;
 
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index 7ba89a0e..2f0c859c 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -87,7 +87,7 @@ class AddresseeCardViewItem : public CardViewItem
 
     void refresh()
     {
-      mAddressee = mDocument->findByUid( mAddressee.uid() );
+      mAddressee = mDocument->tqfindByUid( mAddressee.uid() );
 
       if ( !mAddressee.isEmpty() ) {
         clearFields();
@@ -96,7 +96,7 @@ class AddresseeCardViewItem : public CardViewItem
         const KABC::Field::List::ConstIterator endIt( mFields.end() );
         for ( ; it != endIt; ++it ) {
           // insert empty fields or not? not doing so saves a bit of memory and CPU
-          // (during geometry calculations), but prevents having equally
+          // (during tqgeometry calculations), but prevents having equally
           // wide label columns in all cards, unless CardViewItem/CardView search
           // globally for the widest label. (anders)
 
@@ -149,11 +149,11 @@ KAddressBookCardView::KAddressBookCardView( KAB::Core *core,
 {
   mShowEmptyFields = false;
 
-  TQVBoxLayout *layout = new TQVBoxLayout( viewWidget() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( viewWidget() );
 
   mCardView = new AddresseeCardView( viewWidget(), "mCardView" );
   mCardView->setSelectionMode( CardView::Extended );
-  layout->addWidget( mCardView );
+  tqlayout->addWidget( mCardView );
 
   // Connect up the signals
   connect( mCardView, TQT_SIGNAL( executed( CardViewItem* ) ),
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index 6d02acf7..58b4a340 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -106,7 +106,7 @@ class AddresseeIconViewItem : public KIconViewItem
 
     void refresh()
     {
-      mAddressee = mDocument->findByUid( mAddressee.uid() );
+      mAddressee = mDocument->tqfindByUid( mAddressee.uid() );
 
       if ( !mAddressee.isEmpty() )
         setText( mAddressee.givenName() + " " + mAddressee.familyName() );
@@ -139,10 +139,10 @@ KAddressBookIconView::KAddressBookIconView( KAB::Core *core,
                                             TQWidget *parent, const char *name)
   : KAddressBookView( core, parent, name )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( viewWidget() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( viewWidget() );
 
   mIconView = new AddresseeIconView( viewWidget(), "mIconView" );
-  layout->addWidget( mIconView );
+  tqlayout->addWidget( mIconView );
 
   // Connect up the signals
   connect( mIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ),
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 7f822ae4..89caa045 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -210,7 +210,7 @@ void KAddressBookTableView::readConfig( KConfig *config )
   if ( config->readBoolEntry( "Background", false ) )
     mListView->setBackgroundPixmap( config->readPathEntry( "BackgroundName" ) );
 
-  // Restore the layout of the listview
+  // Restore the tqlayout of the listview
   mListView->restoreLayout( config, config->group() );
 }
 
@@ -244,7 +244,7 @@ void KAddressBookTableView::refresh( const TQString &uid )
 
     // Sometimes the background pixmap gets messed up when we add lots
     // of items.
-    mListView->repaint();
+    mListView->tqrepaint();
 
     if ( currentItem ) {
       mListView->setCurrentItem( currentItem );
diff --git a/kaddressbook/xxport/Makefile.am b/kaddressbook/xxport/Makefile.am
index 5aebc23f..f88d91d1 100644
--- a/kaddressbook/xxport/Makefile.am
+++ b/kaddressbook/xxport/Makefile.am
@@ -21,33 +21,33 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
          $(top_builddir)/libkdepim/libkdepim.la
 
 libkaddrbk_csv_xxport_la_SOURCES = csv_xxport.cpp csvimportdialog.cpp dateparser.cpp
-libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS)
+libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
 
 libkaddrbk_vcard_xxport_la_SOURCES = vcard_xxport.cpp
-libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) \
+libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO) \
                                     $(top_builddir)/kaddressbook/libkaddressbook.la \
                                     $(top_builddir)/libkdenetwork/qgpgme/libqgpgme.la
 
 libkaddrbk_kde2_xxport_la_SOURCES = kde2_xxport.cpp
-libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS)
+libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
 
 libkaddrbk_bookmark_xxport_la_SOURCES = bookmark_xxport.cpp
-libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS)
+libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
 
 libkaddrbk_eudora_xxport_la_SOURCES = eudora_xxport.cpp
-libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS)
+libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
 
 libkaddrbk_ldif_xxport_la_SOURCES = ldif_xxport.cpp
-libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS)
+libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
 
 libkaddrbk_gnokii_xxport_la_SOURCES = gnokii_xxport.cpp
-libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS)
+libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
 
 libkaddrbk_opera_xxport_la_SOURCES = opera_xxport.cpp
-libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS)
+libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
 
 libkaddrbk_pab_xxport_la_SOURCES = pab_xxport.cpp pab_mapihd.cpp pab_pablib.cpp
-libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS)
+libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
 
 noinst_HEADERS = csvimportdialog.h
 
diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp
index b1ee9404..52286d3b 100644
--- a/kaddressbook/xxport/csv_xxport.cpp
+++ b/kaddressbook/xxport/csv_xxport.cpp
@@ -50,7 +50,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
       return true;
 
   if( TQFileInfo(url.path()).exists() ) {                                                                                                   
-      if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No)        
+      if(KMessageBox::questionYesNo( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No)        
         return false;                                                                                                                      
   }
 
@@ -58,7 +58,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
     KTempFile tmpFile;
     if ( tmpFile.status() != 0 ) {
       TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" );
-      KMessageBox::error( parentWidget(), txt.arg( url.url() )
+      KMessageBox::error( tqparentWidget(), txt.arg( url.url() )
                           .arg( strerror( tmpFile.status() ) ) );
       return false;
     }
@@ -66,19 +66,19 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
     doExport( tmpFile.file(), list );
     tmpFile.close();
 
-    return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
+    return KIO::NetAccess::upload( tmpFile.name(), url, tqparentWidget() );
   } else {
     TQFile file( url.path() );
     if ( !file.open( IO_WriteOnly ) ) {
       TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" );
-      KMessageBox::error( parentWidget(), txt.arg( url.path() ) );
+      KMessageBox::error( tqparentWidget(), txt.arg( url.path() ) );
       return false;
     }
 
     doExport( &file, list );
     file.close();
 
-    KMessageBox::information( parentWidget(), i18n( "The contacts have been exported successfully." ) );
+    KMessageBox::information( tqparentWidget(), i18n( "The contacts have been exported successfully." ) );
 
     return true;
   }
@@ -86,7 +86,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
 
 KABC::AddresseeList CSVXXPort::importContacts( const TQString& ) const
 {
-  CSVImportDialog dlg( addressBook(), parentWidget() );
+  CSVImportDialog dlg( addressBook(), tqparentWidget() );
   if ( dlg.exec() )
     return dlg.contacts();
   else
@@ -123,7 +123,7 @@ void CSVXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list )
       if ( !first )
         t << ",";
 
-      t << "\"" << (*fieldIter)->value( addr ).replace( "\n", "\\n" ) << "\"";
+      t << "\"" << (*fieldIter)->value( addr ).tqreplace( "\n", "\\n" ) << "\"";
       first = false;
     }
 
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index bbcd74d2..36f76054 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -367,7 +367,7 @@ void CSVImportDialog::initGUI()
 {
   mPage = plainPage();
 
-  TQGridLayout *layout = new TQGridLayout( mPage, 1, 1, marginHint(),
+  TQGridLayout *tqlayout = new TQGridLayout( mPage, 1, 1, marginHint(),
                                          spacingHint() );
   TQHBoxLayout *hbox = new TQHBoxLayout();
   hbox->setSpacing( spacingHint() );
@@ -379,16 +379,16 @@ void CSVImportDialog::initGUI()
   mUrlRequester->setFilter( "*.csv" );
   hbox->addWidget( mUrlRequester );
 
-  layout->addMultiCellLayout( hbox, 0, 0, 0, 4 );
+  tqlayout->addMultiCellLayout( hbox, 0, 0, 0, 4 );
 
   // Delimiter: comma, semicolon, tab, space, other
   mDelimiterBox = new TQButtonGroup( i18n( "Delimiter" ), mPage );
   mDelimiterBox->setColumnLayout( 0, Qt::Vertical );
-  mDelimiterBox->layout()->setSpacing( spacingHint() );
-  mDelimiterBox->layout()->setMargin( marginHint() );
-  TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->layout() );
-  delimiterLayout->setAlignment( Qt::AlignTop );
-  layout->addMultiCellWidget( mDelimiterBox, 1, 4, 0, 0 );
+  mDelimiterBox->tqlayout()->setSpacing( spacingHint() );
+  mDelimiterBox->tqlayout()->setMargin( marginHint() );
+  TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->tqlayout() );
+  delimiterLayout->tqsetAlignment( Qt::AlignTop );
+  tqlayout->addMultiCellWidget( mDelimiterBox, 1, 4, 0, 0 );
 
   mRadioComma = new TQRadioButton( i18n( "Comma" ), mDelimiterBox );
   mRadioComma->setChecked( true );
@@ -411,13 +411,13 @@ void CSVImportDialog::initGUI()
 
   mComboLine = new TQComboBox( false, mPage );
   mComboLine->insertItem( i18n( "1" ) );
-  layout->addWidget( mComboLine, 2, 3 );
+  tqlayout->addWidget( mComboLine, 2, 3 );
 
   mComboQuote = new TQComboBox( false, mPage );
   mComboQuote->insertItem( i18n( "\"" ), 0 );
   mComboQuote->insertItem( i18n( "'" ), 1 );
   mComboQuote->insertItem( i18n( "None" ), 2 );
-  layout->addWidget( mComboQuote, 2, 2 );
+  tqlayout->addWidget( mComboQuote, 2, 2 );
 
   mDatePatternEdit = new TQLineEdit( mPage );
   mDatePatternEdit->setText( "Y-M-D" ); // ISO 8601 format as default
@@ -427,28 +427,28 @@ void CSVImportDialog::initGUI()
                                          "<li>M: month with 2 digits</li>"
                                          "<li>d: day with 1 or 2 digits</li>"
                                          "<li>D: day with 2 digits</li></ul>" ) );
-  layout->addWidget( mDatePatternEdit, 2, 4 );
+  tqlayout->addWidget( mDatePatternEdit, 2, 4 );
 
   label = new TQLabel( i18n( "Start at line:" ), mPage );
-  layout->addWidget( label, 1, 3 );
+  tqlayout->addWidget( label, 1, 3 );
 
   label = new TQLabel( i18n( "Textquote:" ), mPage );
-  layout->addWidget( label, 1, 2 );
+  tqlayout->addWidget( label, 1, 2 );
 
   label = new TQLabel( i18n( "Date format:" ), mPage );
-  layout->addWidget( label, 1, 4 );
+  tqlayout->addWidget( label, 1, 4 );
 
   mIgnoreDuplicates = new TQCheckBox( mPage );
   mIgnoreDuplicates->setText( i18n( "Ignore duplicate delimiters" ) );
-  layout->addMultiCellWidget( mIgnoreDuplicates, 3, 3, 2, 4 );
+  tqlayout->addMultiCellWidget( mIgnoreDuplicates, 3, 3, 2, 4 );
 
   mCodecCombo = new TQComboBox( mPage );
-  layout->addMultiCellWidget( mCodecCombo, 4, 4, 2, 4 );
+  tqlayout->addMultiCellWidget( mCodecCombo, 4, 4, 2, 4 );
 
   mTable = new TQTable( 0, 0, mPage );
   mTable->setSelectionMode( TQTable::NoSelection );
   mTable->horizontalHeader()->hide();
-  layout->addMultiCellWidget( mTable, 5, 5, 0, 4 );
+  tqlayout->addMultiCellWidget( mTable, 5, 5, 0, 4 );
 
   setButtonText( User1, i18n( "Apply Template..." ) );
   setButtonText( User2, i18n( "Save Template..." ) );
@@ -854,7 +854,7 @@ void CSVImportDialog::saveTemplate()
   if ( fileName.isEmpty() )
     return;
 
-  if ( !fileName.contains( ".desktop" ) )
+  if ( !fileName.tqcontains( ".desktop" ) )
     fileName += ".desktop";
 
   if( TQFileInfo(fileName).exists() ) {                                                                                                   
diff --git a/kaddressbook/xxport/dateparser.h b/kaddressbook/xxport/dateparser.h
index 3087d339..56996951 100644
--- a/kaddressbook/xxport/dateparser.h
+++ b/kaddressbook/xxport/dateparser.h
@@ -29,7 +29,7 @@
 /**
   This class parses the date out of a given string with the
   help of a pattern.
-  The pattern can contains the following key characters:
+  The pattern can tqcontains the following key characters:
     y = year (e.g. 82)
     Y = year (e.g. 1982)
     m = month (e.g. 7, 07 or 12)
diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp
index c6bd0917..faf52707 100644
--- a/kaddressbook/xxport/gnokii_xxport.cpp
+++ b/kaddressbook/xxport/gnokii_xxport.cpp
@@ -173,9 +173,9 @@ static gn_error read_phone_memstat( const gn_memory_type memtype, gn_memory_stat
 
 static TQString buildPhoneInfoString( const gn_memory_status &memstat )
 {
-	TQString format = TQString::fromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>");
+	TQString format = TQString::tqfromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>");
 
-	return TQString::fromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>")
+	return TQString::tqfromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>")
 		.arg(i18n("Mobile Phone information:"))
 		.arg(format.arg(i18n("Manufacturer")).arg(GN_FROM(manufacturer)))
 		.arg(format.arg(i18n("Phone model")).arg(GN_FROM(model)))
@@ -272,7 +272,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 		TQDateTime datetime;
 		gn_timestamp ts = gn_lib_get_pb_date(state);
 		if (ts.year<1998)
-			datetime = TQDateTime::currentDateTime();
+			datetime = TQDateTime::tqcurrentDateTime();
 		else
 			datetime = TQDateTime( TQDate(ts.year, ts.month, ts.day),
 							  TQTime(ts.hour, ts.minute, ts.second) );
@@ -481,14 +481,14 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
 		if (Addr->isEmpty()) continue;
 		TQStringList a;
 		TQChar sem(';');
-		TQString sem_repl(TQString::fromLatin1(","));
-      		a.append( Addr->postOfficeBox().replace( sem, sem_repl ) );
-		a.append( Addr->extended()     .replace( sem, sem_repl ) );
-		a.append( Addr->street()       .replace( sem, sem_repl ) );
-		a.append( Addr->locality()     .replace( sem, sem_repl ) );
-		a.append( Addr->region()       .replace( sem, sem_repl ) );
-		a.append( Addr->postalCode()   .replace( sem, sem_repl ) );
-		a.append( Addr->country()      .replace( sem, sem_repl ) );
+		TQString sem_repl(TQString::tqfromLatin1(","));
+      		a.append( Addr->postOfficeBox().tqreplace( sem, sem_repl ) );
+		a.append( Addr->extended()     .tqreplace( sem, sem_repl ) );
+		a.append( Addr->street()       .tqreplace( sem, sem_repl ) );
+		a.append( Addr->locality()     .tqreplace( sem, sem_repl ) );
+		a.append( Addr->region()       .tqreplace( sem, sem_repl ) );
+		a.append( Addr->postalCode()   .tqreplace( sem, sem_repl ) );
+		a.append( Addr->country()      .tqreplace( sem, sem_repl ) );
 		s = a.join(sem);
 		gn_lib_set_pb_subentry(state, -1 /* index to append entry */,
 			GN_PHONEBOOK_ENTRY_Postal, GN_PHONEBOOK_NUMBER_General, GN_TO(s));
@@ -528,7 +528,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
 {
 	KABC::AddresseeList addrList;
 
-	if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(),
+	if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparentWidget(),
 		i18n("<qt>Please connect your Mobile Phone to your computer and press "
 		     "<b>Continue</b> to start importing the personal contacts.<br><br>"
 		     "Please note that if your Mobile Phone is not properly connected "
@@ -536,7 +536,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
                      "KAddressbook will behave unresponsively.</qt>") ))
 	  return addrList;
 
-	m_progressDlg = new KProgressDialog( parentWidget(), "importwidget",
+	m_progressDlg = new KProgressDialog( tqparentWidget(), "importwidget",
 		i18n("Mobile Phone Import"),
 		i18n("<qt><center>Establishing connection to the Mobile Phone.<br><br>"
 		     "Please wait...</center></qt>") );
@@ -555,7 +555,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
 	m_progressDlg->unsetCursor();
 
 	if (!errStr.isEmpty()) {
-		KMessageBox::error(parentWidget(), errStr);
+		KMessageBox::error(tqparentWidget(), errStr);
 		delete m_progressDlg;
 		return addrList;
 	}
@@ -577,7 +577,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
 
 bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & )
 {
-	if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(),
+	if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparentWidget(),
 		i18n("<qt>Please connect your Mobile Phone to your computer and press "
 		     "<b>Continue</b> to start exporting the selected personal contacts.<br><br>"
 		     "Please note that if your Mobile Phone is not properly connected "
@@ -585,7 +585,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
 		     "KAddressbook will behave unresponsively.</qt>") ))
 	  return false;
 
-	m_progressDlg = new KProgressDialog( parentWidget(), "importwidget",
+	m_progressDlg = new KProgressDialog( tqparentWidget(), "importwidget",
 		i18n("Mobile Phone Export"),
 		i18n("<qt><center>Establishing connection to the Mobile Phone.<br><br>"
 		     "Please wait...</center></qt>") );
@@ -612,7 +612,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
 	m_progressDlg->unsetCursor();
 
 	if (!errStr.isEmpty()) {
-		KMessageBox::error(parentWidget(), errStr);
+		KMessageBox::error(tqparentWidget(), errStr);
 		delete m_progressDlg;
 		return false;
 	}
@@ -641,11 +641,11 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
 	phone_count = memstat.used;
 
 	if (memstat.free >= (int) list.count()) {
-		if (KMessageBox::No == KMessageBox::questionYesNo(parentWidget(),
+		if (KMessageBox::No == KMessageBox::questionYesNo(tqparentWidget(),
 			i18n("<qt>Do you want the selected contacts to be <b>appended</b> to "
-			     "the current mobile phonebook or should they <b>replace</b> all "
+			     "the current mobile phonebook or should they <b>tqreplace</b> all "
 			     "currently existing phonebook entries ?<br><br>"
-			     "Please note, that in case you choose to replace the phonebook "
+			     "Please note, that in case you choose to tqreplace the phonebook "
 			     "entries, every contact in your phone will be deleted and only "
 			     "the newly exported contacts will be available from inside your phone.</qt>"),
 			i18n("Export to Mobile Phone"),
@@ -760,7 +760,7 @@ finish:
 
 	if (!failedList.isEmpty()) {
 		GNOKII_DEBUG(TQString("Failed to export: %1\n").arg(failedList.join(", ")));
-		KMessageBox::informationList(parentWidget(),
+		KMessageBox::informationList(tqparentWidget(),
                         i18n("<qt>The following contacts could not be exported to the Mobile Phone. "
 			     "Possible Reasons for this problem could be:<br><ul>"
 			     "<li>The contacts contain more information per entry than the phone can store.</li>"
@@ -827,7 +827,7 @@ static TQString businit(void)
 		return i18n("Gnokii is not yet configured.");
 
 	// uncomment to debug all gnokii communication on stderr.
-	// gn_log_debug_mask = GN_LOG_T_STDERR;
+	// gn_log_debug_tqmask = GN_LOG_T_STDERR;
 
 	gn_data_clear(&data);
 
@@ -947,9 +947,9 @@ static bool phone_entry_empty( const int index, const gn_memory_type memtype )
 
 static TQString buildPhoneInfoString( const gn_memory_status &memstat )
 {
-	TQString format = TQString::fromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>");
+	TQString format = TQString::tqfromLatin1("<tr><td><b>%1</b></td><td>%2</td></tr>");
 
-	return TQString::fromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>")
+	return TQString::tqfromLatin1("<b>%1</b><br><table>%2%3%4%5%6</table><br>")
 		.arg(i18n("Mobile Phone information:"))
 		.arg(format.arg(i18n("Manufacturer")).arg(GN_FROM(manufacturer)))
 		.arg(format.arg(i18n("Phone model")).arg(GN_FROM(model)))
@@ -1048,7 +1048,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 		// evaluate timestamp (ignore timezone)
 		TQDateTime datetime;
 		if (entry.date.year<1998)
-			datetime = TQDateTime::currentDateTime();
+			datetime = TQDateTime::tqcurrentDateTime();
 		else
 			datetime = TQDateTime( TQDate(entry.date.year, entry.date.month, entry.date.day),
 							  TQTime(entry.date.hour, entry.date.minute, entry.date.second) );
@@ -1267,14 +1267,14 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
 		subentry->entry_type  = GN_PHONEBOOK_ENTRY_Postal;
 		TQStringList a;
 		TQChar sem(';');
-		TQString sem_repl(TQString::fromLatin1(","));
-      		a.append( Addr->postOfficeBox().replace( sem, sem_repl ) );
-		a.append( Addr->extended()     .replace( sem, sem_repl ) );
-		a.append( Addr->street()       .replace( sem, sem_repl ) );
-		a.append( Addr->locality()     .replace( sem, sem_repl ) );
-		a.append( Addr->region()       .replace( sem, sem_repl ) );
-		a.append( Addr->postalCode()   .replace( sem, sem_repl ) );
-		a.append( Addr->country()      .replace( sem, sem_repl ) );
+		TQString sem_repl(TQString::tqfromLatin1(","));
+      		a.append( Addr->postOfficeBox().tqreplace( sem, sem_repl ) );
+		a.append( Addr->extended()     .tqreplace( sem, sem_repl ) );
+		a.append( Addr->street()       .tqreplace( sem, sem_repl ) );
+		a.append( Addr->locality()     .tqreplace( sem, sem_repl ) );
+		a.append( Addr->region()       .tqreplace( sem, sem_repl ) );
+		a.append( Addr->postalCode()   .tqreplace( sem, sem_repl ) );
+		a.append( Addr->country()      .tqreplace( sem, sem_repl ) );
 		s = a.join(sem);
 		strncpy(subentry->data.number, GN_TO(s), sizeof(subentry->data.number)-1);
 		entry.subentries_count++;
@@ -1323,7 +1323,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
 {
 	KABC::AddresseeList addrList;
 
-	if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(),
+	if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparentWidget(),
 		i18n("<qt>Please connect your Mobile Phone to your computer and press "
 		     "<b>Continue</b> to start importing the personal contacts.<br><br>"
 		     "Please note that if your Mobile Phone is not properly connected "
@@ -1331,7 +1331,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
                      "KAddressbook will behave unresponsively.</qt>") ))
 	  return addrList;
 
-	m_progressDlg = new KProgressDialog( parentWidget(), "importwidget",
+	m_progressDlg = new KProgressDialog( tqparentWidget(), "importwidget",
 		i18n("Mobile Phone Import"),
 		i18n("<qt><center>Establishing connection to the Mobile Phone.<br><br>"
 		     "Please wait...</center></qt>") );
@@ -1350,7 +1350,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
 	m_progressDlg->unsetCursor();
 
 	if (!errStr.isEmpty()) {
-		KMessageBox::error(parentWidget(), errStr);
+		KMessageBox::error(tqparentWidget(), errStr);
 		delete m_progressDlg;
 		return addrList;
 	}
@@ -1372,7 +1372,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
 
 bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & )
 {
-	if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(),
+	if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparentWidget(),
 		i18n("<qt>Please connect your Mobile Phone to your computer and press "
 		     "<b>Continue</b> to start exporting the selected personal contacts.<br><br>"
 		     "Please note that if your Mobile Phone is not properly connected "
@@ -1380,7 +1380,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
 		     "KAddressbook will behave unresponsively.</qt>") ))
 	  return false;
 
-	m_progressDlg = new KProgressDialog( parentWidget(), "importwidget",
+	m_progressDlg = new KProgressDialog( tqparentWidget(), "importwidget",
 		i18n("Mobile Phone Export"),
 		i18n("<qt><center>Establishing connection to the Mobile Phone.<br><br>"
 		     "Please wait...</center></qt>") );
@@ -1407,7 +1407,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
 	m_progressDlg->unsetCursor();
 
 	if (!errStr.isEmpty()) {
-		KMessageBox::error(parentWidget(), errStr);
+		KMessageBox::error(tqparentWidget(), errStr);
 		delete m_progressDlg;
 		return false;
 	}
@@ -1436,11 +1436,11 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
 	phone_count = memstat.used;
 
 	if (memstat.free >= (int) list.count()) {
-		if (KMessageBox::No == KMessageBox::questionYesNo(parentWidget(),
+		if (KMessageBox::No == KMessageBox::questionYesNo(tqparentWidget(),
 			i18n("<qt>Do you want the selected contacts to be <b>appended</b> to "
-			     "the current mobile phonebook or should they <b>replace</b> all "
+			     "the current mobile phonebook or should they <b>tqreplace</b> all "
 			     "currently existing phonebook entries ?<br><br>"
-			     "Please note, that in case you choose to replace the phonebook "
+			     "Please note, that in case you choose to tqreplace the phonebook "
 			     "entries, every contact in your phone will be deleted and only "
 			     "the newly exported contacts will be available from inside your phone.</qt>"),
 			i18n("Export to Mobile Phone"),
@@ -1555,7 +1555,7 @@ finish:
 
 	if (!failedList.isEmpty()) {
 		GNOKII_DEBUG(TQString("Failed to export: %1\n").arg(failedList.join(", ")));
-		KMessageBox::informationList(parentWidget(),
+		KMessageBox::informationList(tqparentWidget(),
                         i18n("<qt>The following contacts could not be exported to the Mobile Phone. "
 			     "Possible Reasons for this problem could be:<br><ul>"
 			     "<li>The contacts contain more information per entry than the phone can store.</li>"
@@ -1583,7 +1583,7 @@ finish:
 KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
 {
 	KABC::AddresseeList addrList;
-	KMessageBox::error(parentWidget(), i18n("Gnokii interface is not available.\n"
+	KMessageBox::error(tqparentWidget(), i18n("Gnokii interface is not available.\n"
 		"Please ask your distributor to add gnokii at compile time."));
 	return addrList;
 }
@@ -1591,7 +1591,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
 bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & )
 {
 	Q_UNUSED(list);
-	KMessageBox::error(parentWidget(), i18n("Gnokii interface is not available.\n"
+	KMessageBox::error(tqparentWidget(), i18n("Gnokii interface is not available.\n"
 		"Please ask your distributor to add gnokii at compile time."));
 	return true;
 }
diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp
index 92a31102..fb03e2c3 100644
--- a/kaddressbook/xxport/kde2_xxport.cpp
+++ b/kaddressbook/xxport/kde2_xxport.cpp
@@ -49,11 +49,11 @@ KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const
 {
   TQString fileName = locateLocal( "data", "kabc/std.vcf" );
   if ( !TQFile::exists( fileName ) ) {
-    KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>" ).arg( fileName ) );
+    KMessageBox::sorry( tqparentWidget(), i18n( "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>" ).arg( fileName ) );
     return KABC::AddresseeList();
   }
 
-  int result = KMessageBox::questionYesNoCancel( parentWidget(),
+  int result = KMessageBox::questionYesNoCancel( tqparentWidget(),
       i18n( "Override previously imported entries?" ),
       i18n( "Import KDE 2 Addressbook" ), i18n("Import"), i18n("Do Not Import") );
 
diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp
index 92143c7e..799e4ca3 100644
--- a/kaddressbook/xxport/ldif_xxport.cpp
+++ b/kaddressbook/xxport/ldif_xxport.cpp
@@ -71,7 +71,7 @@ KABC::AddresseeList LDIFXXPort::importContacts( const TQString& ) const
   TQFile file( fileName );
   if ( !file.open( IO_ReadOnly ) ) {
     TQString msg = i18n( "<qt>Unable to open <b>%1</b> for reading.</qt>" );
-    KMessageBox::error( parentWidget(), msg.arg( fileName ) );
+    KMessageBox::error( tqparentWidget(), msg.arg( fileName ) );
     return addrList;
   }
 
@@ -97,7 +97,7 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString
       return true;
 
   if( TQFileInfo(url.path()).exists() ) {
-      if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No)   
+      if(KMessageBox::questionYesNo( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No)   
         return false;
   }
 
@@ -106,7 +106,7 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString
     KTempFile tmpFile;
     if ( tmpFile.status() != 0 ) {
       TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" );
-      KMessageBox::error( parentWidget(), txt.arg( url.url() )
+      KMessageBox::error( tqparentWidget(), txt.arg( url.url() )
                           .arg( strerror( tmpFile.status() ) ) );
       return false;
     }
@@ -114,14 +114,14 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString
     doExport( tmpFile.file(), list );
     tmpFile.close();
 
-    return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
+    return KIO::NetAccess::upload( tmpFile.name(), url, tqparentWidget() );
   } else {
     TQString filename = url.path();
     TQFile file( filename );
 
     if ( !file.open( IO_WriteOnly ) ) {
       TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" );
-      KMessageBox::error( parentWidget(), txt.arg( filename ) );
+      KMessageBox::error( tqparentWidget(), txt.arg( filename ) );
       return false;
     }
 
diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp
index 474a6672..c10a2852 100644
--- a/kaddressbook/xxport/opera_xxport.cpp
+++ b/kaddressbook/xxport/opera_xxport.cpp
@@ -48,14 +48,14 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
 {
   KABC::AddresseeList addrList;
 
-  TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath() + TQString::fromLatin1( "/.opera/contacts.adr" ) );
+  TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath() + TQString::tqfromLatin1( "/.opera/contacts.adr" ) );
   if ( fileName.isEmpty() )
     return addrList;
 
   TQFile file( fileName );
   if ( !file.open( IO_ReadOnly ) ) {
     TQString msg = i18n( "<qt>Unable to open <b>%1</b> for reading.</qt>" );
-    KMessageBox::error( parentWidget(), msg.arg( fileName ) );
+    KMessageBox::error( tqparentWidget(), msg.arg( fileName ) );
     return addrList;
   }
 
@@ -70,7 +70,7 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
   while ( !stream.atEnd() ) {
     line = stream.readLine();
     line = line.stripWhiteSpace();
-    if ( line == TQString::fromLatin1( "#CONTACT" ) ) {
+    if ( line == TQString::tqfromLatin1( "#CONTACT" ) ) {
       parseContact = true;
       addr = KABC::Addressee();
       continue;
@@ -87,9 +87,9 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
       int sep = line.find( '=' );
       key = line.left( sep ).lower();
       value = line.mid( sep + 1 );
-      if ( key == TQString::fromLatin1( "name" ) )
+      if ( key == TQString::tqfromLatin1( "name" ) )
         addr.setNameFromString( value );
-      else if ( key == TQString::fromLatin1( "mail" ) ) {
+      else if ( key == TQString::tqfromLatin1( "mail" ) ) {
         TQStringList emails = TQStringList::split( separator, value );
 
         TQStringList::Iterator it = emails.begin();
@@ -98,20 +98,20 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
           addr.insertEmail( *it, preferred );
           preferred = false;
         }
-      } else if ( key == TQString::fromLatin1( "phone" ) )
+      } else if ( key == TQString::tqfromLatin1( "phone" ) )
         addr.insertPhoneNumber( KABC::PhoneNumber( value ) );
-      else if ( key == TQString::fromLatin1( "fax" ) )
+      else if ( key == TQString::tqfromLatin1( "fax" ) )
         addr.insertPhoneNumber( KABC::PhoneNumber( value,
                               KABC::PhoneNumber::Fax | KABC::PhoneNumber::Home ) );
-      else if ( key == TQString::fromLatin1( "postaladdress" ) ) {
+      else if ( key == TQString::tqfromLatin1( "postaladdress" ) ) {
         KABC::Address address( KABC::Address::Home );
-        address.setLabel( value.replace( separator, "\n" ) );
+        address.setLabel( value.tqreplace( separator, "\n" ) );
         addr.insertAddress( address );
-      } else if ( key == TQString::fromLatin1( "description" ) )
-        addr.setNote( value.replace( separator, "\n" ) );
-      else if ( key == TQString::fromLatin1( "url" ) )
+      } else if ( key == TQString::tqfromLatin1( "description" ) )
+        addr.setNote( value.tqreplace( separator, "\n" ) );
+      else if ( key == TQString::tqfromLatin1( "url" ) )
         addr.setUrl( KURL( value ) );
-      else if ( key == TQString::fromLatin1( "pictureurl" ) ) {
+      else if ( key == TQString::tqfromLatin1( "pictureurl" ) ) {
         KABC::Picture pic( value );
         addr.setPhoto( pic );
       }
diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp
index 21ac67c0..6aa81850 100644
--- a/kaddressbook/xxport/pab_xxport.cpp
+++ b/kaddressbook/xxport/pab_xxport.cpp
@@ -55,7 +55,7 @@ KABC::AddresseeList PABXXPort::importContacts( const TQString& ) const
   if ( fileName.isEmpty() )
     return addrList;
   if ( !TQFile::exists( fileName ) ) {
-    KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a MS Exchange Personal Address Book <b>%1</b>.</qt>" ).arg( fileName ) );
+    KMessageBox::sorry( tqparentWidget(), i18n( "<qt>Could not find a MS Exchange Personal Address Book <b>%1</b>.</qt>" ).arg( fileName ) );
     return addrList;
   }
 
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index 1dfc9bcc..69f854f3 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -131,7 +131,7 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS
     TQString msg = i18n( "You have selected a list of contacts, shall they be "
                         "exported to several files?" );
 
-    switch ( KMessageBox::questionYesNo( parentWidget(), msg, TQString::null, i18n("Export to Several Files"), i18n("Export to One File") ) ) {
+    switch ( KMessageBox::questionYesNo( tqparentWidget(), msg, TQString::null, i18n("Export to Several Files"), i18n("Export to One File") ) ) {
       case KMessageBox::Yes: {
         KURL baseUrl = KFileDialog::getExistingURL();
         if ( baseUrl.isEmpty() )
@@ -146,7 +146,7 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS
           else
             testUrl = baseUrl.url() + "/" + (*it).givenName() + "_" + (*it).familyName();
 
-          if ( KIO::NetAccess::exists( testUrl + (counter == 0 ? "" : TQString::number( counter )) + ".vcf", false, parentWidget() ) ) {
+          if ( KIO::NetAccess::exists( testUrl + (counter == 0 ? "" : TQString::number( counter )) + ".vcf", false, tqparentWidget() ) ) {
             counter++;
             url = testUrl + TQString::number( counter ) + ".vcf";
           } else
@@ -208,7 +208,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
 #endif
   } else {
     if ( XXPortManager::importURL.isEmpty() )
-      urls = KFileDialog::getOpenURLs( TQString::null, "*.vcf|vCards", parentWidget(),
+      urls = KFileDialog::getOpenURLs( TQString::null, "*.vcf|vCards", tqparentWidget(),
                                        i18n( "Select vCard to Import" ) );
     else
       urls.append( XXPortManager::importURL );
@@ -220,7 +220,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
     bool anyFailures = false;
     KURL::List::Iterator it;
     for ( it = urls.begin(); it != urls.end(); ++it ) {
-      if ( KIO::NetAccess::download( *it, fileName, parentWidget() ) ) {
+      if ( KIO::NetAccess::download( *it, fileName, tqparentWidget() ) ) {
 
         TQFile file( fileName );
 
@@ -237,12 +237,12 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
 
             TQString vCardText;
 
-            // With version 3.0, vCards are encoded with UTF-8 by default. Otherwise, use fromLatin1()
+            // With version 3.0, vCards are encoded with UTF-8 by default. Otherwise, use tqfromLatin1()
             // and hope that are fields are encoded correctly.
-            if ( TQString::fromLatin1( rawData ).lower().contains( "version:3.0" ) ) {
+            if ( TQString::tqfromLatin1( rawData ).lower().tqcontains( "version:3.0" ) ) {
               vCardText = TQString::fromUtf8( rawData );
             } else {
-              vCardText = TQString::fromLatin1( rawData );
+              vCardText = TQString::tqfromLatin1( rawData );
             }
             addrList += parseVCard( vCardText );
           }
@@ -253,13 +253,13 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
           text = text.arg( (*it).url() );
           text = text.arg( kapp->translate( "TQFile",
                                             file.errorString().latin1() ) );
-          KMessageBox::error( parentWidget(), text, caption );
+          KMessageBox::error( tqparentWidget(), text, caption );
           anyFailures = true;
         }
       } else {
         TQString text = i18n( "<qt>Unable to access vCard: %1</qt>" );
         text = text.arg( KIO::NetAccess::lastErrorString() );
-        KMessageBox::error( parentWidget(), text, caption );
+        KMessageBox::error( tqparentWidget(), text, caption );
         anyFailures = true;
       }
     }
@@ -267,12 +267,12 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
     if ( !XXPortManager::importURL.isEmpty() ) { // a vcard was passed via cmd
       if ( addrList.isEmpty() ) {
         if ( anyFailures && urls.count() > 1 )
-          KMessageBox::information( parentWidget(),
+          KMessageBox::information( tqparentWidget(),
                                     i18n( "No contacts were imported, due to errors with the vCards." ) );
         else if ( !anyFailures )
-          KMessageBox::information( parentWidget(), i18n( "The vCard does not contain any contacts." ) );
+          KMessageBox::information( tqparentWidget(), i18n( "The vCard does not contain any contacts." ) );
       } else {
-        VCardViewerDialog dlg( addrList, parentWidget() );
+        VCardViewerDialog dlg( addrList, tqparentWidget() );
         dlg.exec();
         addrList = dlg.contacts();
       }
@@ -293,7 +293,7 @@ KABC::AddresseeList VCardXXPort::parseVCard( const TQByteArray &data ) const
 bool VCardXXPort::doExport( const KURL &url, const TQByteArray &data )
 {
   if( TQFileInfo(url.path()).exists() ) {
-    if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No)
+    if(KMessageBox::questionYesNo( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No)
       return false;
   }
   KTempFile tmpFile;
@@ -302,7 +302,7 @@ bool VCardXXPort::doExport( const KURL &url, const TQByteArray &data )
   tmpFile.file()->writeBlock( data.data(), data.size() );
   tmpFile.close();
 
-  return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
+  return KIO::NetAccess::upload( tmpFile.name(), url, tqparentWidget() );
 }
 #else
 KABC::AddresseeList VCardXXPort::parseVCard( const TQString &data ) const
@@ -315,7 +315,7 @@ KABC::AddresseeList VCardXXPort::parseVCard( const TQString &data ) const
 bool VCardXXPort::doExport( const KURL &url, const TQString &data )
 {
   if( TQFileInfo(url.path()).exists() ) {
-    if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No)
+    if(KMessageBox::questionYesNo( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").arg( url.path()) ) == KMessageBox::No)
       return false;
   }
   KTempFile tmpFile;
@@ -327,7 +327,7 @@ bool VCardXXPort::doExport( const KURL &url, const TQString &data )
   stream << data;
   tmpFile.close();
 
-  return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
+  return KIO::NetAccess::upload( tmpFile.name(), url, tqparentWidget() );
 }
 #endif
 
@@ -338,7 +338,7 @@ KABC::AddresseeList VCardXXPort::filterContacts( const KABC::AddresseeList &addr
   if ( addrList.isEmpty() )
     return addrList;
 
-  VCardExportSelectionDialog dlg( parentWidget() );
+  VCardExportSelectionDialog dlg( tqparentWidget() );
   if ( !dlg.exec() )
     return list;
 
@@ -471,18 +471,18 @@ VCardViewerDialog::VCardViewerDialog( const KABC::Addressee::List &list,
     mContacts( list )
 {
   TQFrame *page = plainPage();
-  TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Do you want to import this contact in your address book?" ), page );
   TQFont font = label->font();
   font.setBold( true );
   label->setFont( font );
-  layout->addWidget( label );
+  tqlayout->addWidget( label );
 
   mView = new KPIM::AddresseeView( page );
   mView->enableLinks( 0 );
   mView->setVScrollBarMode( TQScrollView::Auto );
-  layout->addWidget( mView );
+  tqlayout->addWidget( mView );
 
   setButtonText( Apply, i18n( "Import All..." ) );
 
@@ -544,22 +544,22 @@ VCardExportSelectionDialog::VCardExportSelectionDialog( TQWidget *parent,
 {
   TQFrame *page = plainPage();
 
-  TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Select the fields which shall be exported in the vCard." ), page );
-  layout->addWidget( label );
+  tqlayout->addWidget( label );
 
   mPrivateBox = new TQCheckBox( i18n( "Private fields" ), page );
-  layout->addWidget( mPrivateBox );
+  tqlayout->addWidget( mPrivateBox );
 
   mBusinessBox = new TQCheckBox( i18n( "Business fields" ), page );
-  layout->addWidget( mBusinessBox );
+  tqlayout->addWidget( mBusinessBox );
 
   mOtherBox = new TQCheckBox( i18n( "Other fields" ), page );
-  layout->addWidget( mOtherBox );
+  tqlayout->addWidget( mOtherBox );
 
   mEncryptionKeys = new TQCheckBox( i18n( "Encryption keys" ), page );
-  layout->addWidget( mEncryptionKeys );
+  tqlayout->addWidget( mEncryptionKeys );
 
   KConfig config( "kaddressbookrc" );
   config.setGroup( "XXPortVCard" );
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index 1cbf75a5..9b84961d 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -94,7 +94,7 @@ KABC::AddresseeList XXPortSelectDialog::contacts()
   if ( mUseSelection->isChecked() ) {
     TQStringList::ConstIterator it;
     for ( it = selection.begin(); it != selection.end(); ++it ) {
-      KABC::Addressee addr = mCore->addressBook()->findByUid( *it );
+      KABC::Addressee addr = mCore->addressBook()->tqfindByUid( *it );
       if ( !addr.isEmpty() )
         list.append( addr );
     }
@@ -119,7 +119,7 @@ KABC::AddresseeList XXPortSelectDialog::contacts()
       const TQStringList tmp( (*it).categories() );
       TQStringList::ConstIterator tmpIt;
       for ( tmpIt = tmp.begin(); tmpIt != tmp.end(); ++tmpIt )
-        if ( categorieList.contains( *tmpIt ) ) {
+        if ( categorieList.tqcontains( *tmpIt ) ) {
           list.append( *it );
           break;
         }
@@ -187,11 +187,11 @@ void XXPortSelectDialog::initGUI()
 
   mButtonGroup = new TQButtonGroup( i18n( "Selection" ), page );
   mButtonGroup->setColumnLayout( 0, Qt::Vertical );
-  mButtonGroup->layout()->setSpacing( KDialog::spacingHint() );
-  mButtonGroup->layout()->setMargin( KDialog::marginHint() );
+  mButtonGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
+  mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() );
 
-  TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->layout() );
-  groupLayout->setAlignment( Qt::AlignTop );
+  TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->tqlayout() );
+  groupLayout->tqsetAlignment( Qt::AlignTop );
 
   mUseWholeBook = new TQRadioButton( i18n( "&All contacts" ), mButtonGroup );
   mUseWholeBook->setChecked( true );
@@ -226,9 +226,9 @@ void XXPortSelectDialog::initGUI()
 
   TQButtonGroup *sortingGroup = new TQButtonGroup( i18n( "Sorting" ), page );
   sortingGroup->setColumnLayout( 0, Qt::Vertical );
-  TQGridLayout *sortLayout = new TQGridLayout( sortingGroup->layout(), 2, 2,
+  TQGridLayout *sortLayout = new TQGridLayout( sortingGroup->tqlayout(), 2, 2,
                                              KDialog::spacingHint() );
-  sortLayout->setAlignment( Qt::AlignTop );
+  sortLayout->tqsetAlignment( Qt::AlignTop );
 
   label = new TQLabel( i18n( "Criterion:" ), sortingGroup );
   sortLayout->addWidget( label, 0, 0 );
diff --git a/kalarm/Makefile.am b/kalarm/Makefile.am
index af4896a2..909198b7 100644
--- a/kalarm/Makefile.am
+++ b/kalarm/Makefile.am
@@ -21,7 +21,7 @@ kalarm_SOURCES = birthdaydlg.cpp main.cpp alarmevent.cpp editdlg.cpp \
 	templatelistview.cpp templatepickdlg.cpp templatedlg.cpp \
 	templatemenuaction.cpp latecancel.cpp repetition.cpp alarmtext.cpp \
 	emailidcombo.cpp find.cpp pickfileradio.cpp calendarcompat.cpp
-kalarm_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kalarm_LDFLAGS = $(all_libraries) $(KDE_RPATH) -L$(top_builddir)/libkdenetwork/qgpgme
 if include_ARTS
 ARTSLIB = -lartskde
 endif
diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp
index 4b03f305..274bf0c8 100644
--- a/kalarm/alarmcalendar.cpp
+++ b/kalarm/alarmcalendar.cpp
@@ -61,17 +61,17 @@ using namespace KCal;
 
 TQString AlarmCalendar::icalProductId()
 {
-	return TQString::fromLatin1("-//K Desktop Environment//NONSGML " KALARM_NAME " %1//EN").arg(KAlarm::currentCalendarVersionString());
+	return TQString::tqfromLatin1("-//K Desktop Environment//NONSGML " KALARM_NAME " %1//EN").arg(KAlarm::currentCalendarVersionString());
 }
 
 static const KAEvent::Status eventTypes[AlarmCalendar::NCALS] = {
 	KAEvent::ACTIVE, KAEvent::EXPIRED, KAEvent::DISPLAYING, KAEvent::TEMPLATE
 };
 static const TQString calendarNames[AlarmCalendar::NCALS] = {
-	TQString::fromLatin1("calendar.ics"),
-	TQString::fromLatin1("expired.ics"),
-	TQString::fromLatin1("displaying.ics"),
-	TQString::fromLatin1("template.ics")
+	TQString::tqfromLatin1("calendar.ics"),
+	TQString::tqfromLatin1("expired.ics"),
+	TQString::tqfromLatin1("displaying.ics"),
+	TQString::tqfromLatin1("template.ics")
 };
 static KStaticDeleter<AlarmCalendar> calendarDeleter[AlarmCalendar::NCALS];    // ensure that the calendar destructors are called
 
@@ -83,7 +83,7 @@ AlarmCalendar* AlarmCalendar::mCalendars[NCALS] = { 0, 0, 0, 0 };
 * There are 4 calendars:
 *  1) A user-independent one containing the active alarms;
 *  2) A historical one containing expired alarms;
-*  3) A user-specific one which contains details of alarms which are currently
+*  3) A user-specific one which tqcontains details of alarms which are currently
 *     being displayed to that user and which have not yet been acknowledged;
 *  4) One containing alarm templates.
 * Reply = true if success, false if calendar name error.
@@ -91,10 +91,10 @@ AlarmCalendar* AlarmCalendar::mCalendars[NCALS] = { 0, 0, 0, 0 };
 bool AlarmCalendar::initialiseCalendars()
 {
 	KConfig* config = kapp->config();
-	config->setGroup(TQString::fromLatin1("General"));
-	TQString activeKey   = TQString::fromLatin1("Calendar");
-	TQString expiredKey  = TQString::fromLatin1("ExpiredCalendar");
-	TQString templateKey = TQString::fromLatin1("TemplateCalendar");
+	config->setGroup(TQString::tqfromLatin1("General"));
+	TQString activeKey   = TQString::tqfromLatin1("Calendar");
+	TQString expiredKey  = TQString::tqfromLatin1("ExpiredCalendar");
+	TQString templateKey = TQString::tqfromLatin1("TemplateCalendar");
 	TQString displayCal, activeCal, expiredCal, templateCal;
 	calendarDeleter[ACTIVE].setObject(mCalendars[ACTIVE], createCalendar(ACTIVE, config, activeCal, activeKey));
 	calendarDeleter[EXPIRED].setObject(mCalendars[EXPIRED], createCalendar(EXPIRED, config, expiredCal, expiredKey));
@@ -152,8 +152,8 @@ bool AlarmCalendar::initialiseCalendars()
 */
 AlarmCalendar* AlarmCalendar::createCalendar(CalID type, KConfig* config, TQString& writePath, const TQString& configKey)
 {
-	static TQRegExp vcsRegExp(TQString::fromLatin1("\\.vcs$"));
-	static TQString ical = TQString::fromLatin1(".ics");
+	static TQRegExp vcsRegExp(TQString::tqfromLatin1("\\.vcs$"));
+	static TQString ical = TQString::tqfromLatin1(".ics");
 
 	if (configKey.isNull())
 	{
@@ -164,7 +164,7 @@ AlarmCalendar* AlarmCalendar::createCalendar(CalID type, KConfig* config, TQStri
 	{
 		TQString readPath = config->readPathEntry(configKey, locateLocal("appdata", calendarNames[type]));
 		writePath = readPath;
-		writePath.replace(vcsRegExp, ical);
+		writePath.tqreplace(vcsRegExp, ical);
 		return new AlarmCalendar(readPath, type, writePath, configKey);
 	}
 }
@@ -261,7 +261,7 @@ bool AlarmCalendar::open()
 
 	kdDebug(5950) << "AlarmCalendar::open(" << mUrl.prettyURL() << ")\n";
 	if (!mCalendar)
-		mCalendar = new CalendarLocal(TQString::fromLatin1("UTC"));
+		mCalendar = new CalendarLocal(TQString::tqfromLatin1("UTC"));
 	mCalendar->setLocalTime();    // write out using local time (i.e. no time zone)
 
 	// Check for file's existence, assuming that it does exist when uncertain,
@@ -404,7 +404,7 @@ bool AlarmCalendar::saveCal(const TQString& newFile)
 		if (!mConfigKey.isNull())
 		{
 			KConfig* config = kapp->config();
-			config->setGroup(TQString::fromLatin1("General"));
+			config->setGroup(TQString::tqfromLatin1("General"));
 			config->writePathEntry(mConfigKey, mICalUrl.path());
 			config->sync();
 		}
@@ -445,8 +445,8 @@ void AlarmCalendar::close()
 */
 bool AlarmCalendar::importAlarms(TQWidget* parent)
 {
-	KURL url = KFileDialog::getOpenURL(TQString::fromLatin1(":importalarms"),
-	                                   TQString::fromLatin1("*.vcs *.ics|%1").arg(i18n("Calendar Files")), parent);
+	KURL url = KFileDialog::getOpenURL(TQString::tqfromLatin1(":importalarms"),
+	                                   TQString::tqfromLatin1("*.vcs *.ics|%1").arg(i18n("Calendar Files")), parent);
 	if (url.isEmpty())
 	{
 		kdError(5950) << "AlarmCalendar::importAlarms(): Empty URL" << endl;
@@ -484,7 +484,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent)
 	}
 
 	// Read the calendar and add its alarms to the current calendars
-	CalendarLocal cal(TQString::fromLatin1("UTC"));
+	CalendarLocal cal(TQString::tqfromLatin1("UTC"));
 	cal.setLocalTime();    // write out using local time (i.e. no time zone)
 	success = cal.load(filename);
 	if (!success)
@@ -616,7 +616,7 @@ void AlarmCalendar::convertToICal()
 		if (!mConfigKey.isNull())
 		{
 			KConfig* config = kapp->config();
-			config->setGroup(TQString::fromLatin1("General"));
+			config->setGroup(TQString::tqfromLatin1("General"));
 			config->writePathEntry(mConfigKey, mICalUrl.path());
 			config->sync();
 		}
@@ -688,7 +688,7 @@ void AlarmCalendar::purgeIfQueued()
 		{
 			kdDebug(5950) << "AlarmCalendar::purgeIfQueued(" << mPurgeDaysQueued << ")\n";
 			bool changed = false;
-			TQDate cutoff = TQDate::currentDate().addDays(-mPurgeDaysQueued);
+			TQDate cutoff = TQDate::tqcurrentDate().addDays(-mPurgeDaysQueued);
 			Event::List events = mCalendar->rawEvents();
 			for (Event::List::ConstIterator it = events.begin();  it != events.end();  ++it)
 			{
diff --git a/kalarm/alarmevent.cpp b/kalarm/alarmevent.cpp
index 34ce46a2..52206342 100644
--- a/kalarm/alarmevent.cpp
+++ b/kalarm/alarmevent.cpp
@@ -44,7 +44,7 @@ const TQCString APPNAME("KALARM");
 // KAlarm version which first used the current calendar/event format.
 // If this changes, KAEvent::convertKCalEvents() must be changed correspondingly.
 // The string version is the KAlarm version string used in the calendar file.
-TQString KAEvent::calVersionString()  { return TQString::fromLatin1("1.5.0"); }
+TQString KAEvent::calVersionString()  { return TQString::tqfromLatin1("1.5.0"); }
 int     KAEvent::calVersion()        { return KAlarm::Version(1,5,0); }
 
 // Custom calendar properties.
@@ -54,16 +54,16 @@ static const TQCString NEXT_RECUR_PROPERTY("NEXTRECUR");     // X-KDE-KALARM-NEX
 static const TQCString REPEAT_PROPERTY("REPEAT");            // X-KDE-KALARM-REPEAT property
 // - General alarm properties
 static const TQCString TYPE_PROPERTY("TYPE");    // X-KDE-KALARM-TYPE property
-static const TQString FILE_TYPE                  = TQString::fromLatin1("FILE");
-static const TQString AT_LOGIN_TYPE              = TQString::fromLatin1("LOGIN");
-static const TQString REMINDER_TYPE              = TQString::fromLatin1("REMINDER");
-static const TQString REMINDER_ONCE_TYPE         = TQString::fromLatin1("REMINDER_ONCE");
-static const TQString ARCHIVE_REMINDER_ONCE_TYPE = TQString::fromLatin1("ONCE");
-static const TQString TIME_DEFERRAL_TYPE         = TQString::fromLatin1("DEFERRAL");
-static const TQString DATE_DEFERRAL_TYPE         = TQString::fromLatin1("DATE_DEFERRAL");
-static const TQString DISPLAYING_TYPE            = TQString::fromLatin1("DISPLAYING");   // used only in displaying calendar
-static const TQString PRE_ACTION_TYPE            = TQString::fromLatin1("PRE");
-static const TQString POST_ACTION_TYPE           = TQString::fromLatin1("POST");
+static const TQString FILE_TYPE                  = TQString::tqfromLatin1("FILE");
+static const TQString AT_LOGIN_TYPE              = TQString::tqfromLatin1("LOGIN");
+static const TQString REMINDER_TYPE              = TQString::tqfromLatin1("REMINDER");
+static const TQString REMINDER_ONCE_TYPE         = TQString::tqfromLatin1("REMINDER_ONCE");
+static const TQString ARCHIVE_REMINDER_ONCE_TYPE = TQString::tqfromLatin1("ONCE");
+static const TQString TIME_DEFERRAL_TYPE         = TQString::tqfromLatin1("DEFERRAL");
+static const TQString DATE_DEFERRAL_TYPE         = TQString::tqfromLatin1("DATE_DEFERRAL");
+static const TQString DISPLAYING_TYPE            = TQString::tqfromLatin1("DISPLAYING");   // used only in displaying calendar
+static const TQString PRE_ACTION_TYPE            = TQString::tqfromLatin1("PRE");
+static const TQString POST_ACTION_TYPE           = TQString::tqfromLatin1("POST");
 static const TQCString NEXT_REPEAT_PROPERTY("NEXTREPEAT");   // X-KDE-KALARM-NEXTREPEAT property
 // - Display alarm properties
 static const TQCString FONT_COLOUR_PROPERTY("FONTCOLOR");    // X-KDE-KALARM-FONTCOLOR property
@@ -74,27 +74,27 @@ static const TQCString VOLUME_PROPERTY("VOLUME");            // X-KDE-KALARM-VOL
 static const TQCString SPEAK_PROPERTY("SPEAK");              // X-KDE-KALARM-SPEAK property
 
 // Event categories
-static const TQString DATE_ONLY_CATEGORY        = TQString::fromLatin1("DATE");
-static const TQString EMAIL_BCC_CATEGORY        = TQString::fromLatin1("BCC");
-static const TQString CONFIRM_ACK_CATEGORY      = TQString::fromLatin1("ACKCONF");
-static const TQString LATE_CANCEL_CATEGORY      = TQString::fromLatin1("LATECANCEL;");
-static const TQString AUTO_CLOSE_CATEGORY       = TQString::fromLatin1("LATECLOSE;");
-static const TQString TEMPL_AFTER_TIME_CATEGORY = TQString::fromLatin1("TMPLAFTTIME;");
-static const TQString KMAIL_SERNUM_CATEGORY     = TQString::fromLatin1("KMAIL:");
-static const TQString KORGANIZER_CATEGORY       = TQString::fromLatin1("KORG");
-static const TQString DEFER_CATEGORY            = TQString::fromLatin1("DEFER;");
-static const TQString ARCHIVE_CATEGORY          = TQString::fromLatin1("SAVE");
-static const TQString ARCHIVE_CATEGORIES        = TQString::fromLatin1("SAVE:");
-static const TQString LOG_CATEGORY              = TQString::fromLatin1("LOG:");
-static const TQString xtermURL = TQString::fromLatin1("xterm:");
+static const TQString DATE_ONLY_CATEGORY        = TQString::tqfromLatin1("DATE");
+static const TQString EMAIL_BCC_CATEGORY        = TQString::tqfromLatin1("BCC");
+static const TQString CONFIRM_ACK_CATEGORY      = TQString::tqfromLatin1("ACKCONF");
+static const TQString LATE_CANCEL_CATEGORY      = TQString::tqfromLatin1("LATECANCEL;");
+static const TQString AUTO_CLOSE_CATEGORY       = TQString::tqfromLatin1("LATECLOSE;");
+static const TQString TEMPL_AFTER_TIME_CATEGORY = TQString::tqfromLatin1("TMPLAFTTIME;");
+static const TQString KMAIL_SERNUM_CATEGORY     = TQString::tqfromLatin1("KMAIL:");
+static const TQString KORGANIZER_CATEGORY       = TQString::tqfromLatin1("KORG");
+static const TQString DEFER_CATEGORY            = TQString::tqfromLatin1("DEFER;");
+static const TQString ARCHIVE_CATEGORY          = TQString::tqfromLatin1("SAVE");
+static const TQString ARCHIVE_CATEGORIES        = TQString::tqfromLatin1("SAVE:");
+static const TQString LOG_CATEGORY              = TQString::tqfromLatin1("LOG:");
+static const TQString xtermURL = TQString::tqfromLatin1("xterm:");
 
 // Event status strings
-static const TQString DISABLED_STATUS           = TQString::fromLatin1("DISABLED");
+static const TQString DISABLED_STATUS           = TQString::tqfromLatin1("DISABLED");
 
-static const TQString EXPIRED_UID    = TQString::fromLatin1("-exp-");
-static const TQString DISPLAYING_UID = TQString::fromLatin1("-disp-");
-static const TQString TEMPLATE_UID   = TQString::fromLatin1("-tmpl-");
-static const TQString KORGANIZER_UID = TQString::fromLatin1("-korg-");
+static const TQString EXPIRED_UID    = TQString::tqfromLatin1("-exp-");
+static const TQString DISPLAYING_UID = TQString::tqfromLatin1("-disp-");
+static const TQString TEMPLATE_UID   = TQString::tqfromLatin1("-tmpl-");
+static const TQString KORGANIZER_UID = TQString::tqfromLatin1("-korg-");
 
 struct AlarmData
 {
@@ -927,7 +927,7 @@ TQString KAEvent::uid(const TQString& id, Status status)
 			case TEMPLATE:    part = TEMPLATE_UID;  break;
 			case KORGANIZER:  part = KORGANIZER_UID;  break;
 		}
-		result.replace(i, len, part);
+		result.tqreplace(i, len, part);
 	}
 	return result;
 }
@@ -1039,7 +1039,7 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc
 		if (params.count() > 0)
 		{
 			TQString cat = ARCHIVE_CATEGORIES;
-			cat += params.join(TQString::fromLatin1(";"));
+			cat += params.join(TQString::tqfromLatin1(";"));
 			cats.append(cat);
 		}
 		else
@@ -1097,9 +1097,9 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc
 		else if (mAtLoginDateTime.isValid())
 			dtl = mAtLoginDateTime;
 		else if (mStartDateTime.isDateOnly())
-			dtl = TQDate::currentDate().addDays(-1);
+			dtl = TQDate::tqcurrentDate().addDays(-1);
 		else
-			dtl = TQDateTime::currentDateTime();
+			dtl = TQDateTime::tqcurrentDateTime();
 		initKCalAlarm(ev, dtl, AT_LOGIN_TYPE);
 		if (!ancillaryType  &&  dtl.isValid())
 		{
@@ -1243,7 +1243,7 @@ Alarm* KAEvent::initKCalAlarm(Event& event, int startOffsetSecs, const TQStringL
 		case KAAlarm::AUDIO_ALARM:
 			alarm->setAudioAlarm(mAudioFile);  // empty for a beep or for speaking
 			if (mSpeak)
-				alarm->setCustomProperty(APPNAME, SPEAK_PROPERTY, TQString::fromLatin1("Y"));
+				alarm->setCustomProperty(APPNAME, SPEAK_PROPERTY, TQString::tqfromLatin1("Y"));
 			if (mRepeatSound)
 			{
 				alarm->setRepeatCount(-1);
@@ -1251,7 +1251,7 @@ Alarm* KAEvent::initKCalAlarm(Event& event, int startOffsetSecs, const TQStringL
 			}
 			if (!mAudioFile.isEmpty()  &&  mSoundVolume >= 0)
 				alarm->setCustomProperty(APPNAME, VOLUME_PROPERTY,
-				              TQString::fromLatin1("%1;%2;%3").arg(TQString::number(mSoundVolume, 'f', 2))
+				              TQString::tqfromLatin1("%1;%2;%3").arg(TQString::number(mSoundVolume, 'f', 2))
 				                                             .arg(TQString::number(mFadeVolume, 'f', 2))
 				                                             .arg(mFadeSeconds));
 			break;
@@ -1277,7 +1277,7 @@ Alarm* KAEvent::initKCalAlarm(Event& event, int startOffsetSecs, const TQStringL
 				case T_MESSAGE:
 					alarm->setDisplayAlarm(AlarmText::toCalendarText(mText));
 					alarm->setCustomProperty(APPNAME, FONT_COLOUR_PROPERTY,
-						      TQString::fromLatin1("%1;%2;%3").arg(mBgColour.name())
+						      TQString::tqfromLatin1("%1;%2;%3").arg(mBgColour.name())
 										     .arg(mFgColour.name())
 										     .arg(mDefaultFont ? TQString::null : mFont.toString()));
 					break;
@@ -1601,7 +1601,7 @@ bool KAEvent::defer(const DateTime& dateTime, bool reminder, bool adjustRecurren
 			set_deferral(NORMAL_DEFERRAL);
 		if (adjustRecurrence)
 		{
-			TQDateTime now = TQDateTime::currentDateTime();
+			TQDateTime now = TQDateTime::tqcurrentDateTime();
 			if (mainEndRepeatTime() < now)
 			{
 				// The last repetition (if any) of the current recurrence has already passed.
@@ -1641,7 +1641,7 @@ void KAEvent::cancelDefer()
 		// Set the deferral time to be the same as the next recurrence/repetition.
 		// This prevents an immediate retriggering of the alarm.
 		if (mMainExpired
-		||  nextOccurrence(TQDateTime::currentDateTime(), mDeferralTime, RETURN_REPETITION) == NO_OCCURRENCE)
+		||  nextOccurrence(TQDateTime::tqcurrentDateTime(), mDeferralTime, RETURN_REPETITION) == NO_OCCURRENCE)
 		{
 			// The main alarm has expired, so simply delete the deferral
 			mDeferralTime = DateTime();
@@ -1678,7 +1678,7 @@ DateTime KAEvent::deferralLimit(KAEvent::DeferLimitType* limitType) const
 		// It's a repeated alarm. Don't allow it to be deferred past its
 		// next occurrence or repetition.
 		DateTime reminderTime;
-		TQDateTime now = TQDateTime::currentDateTime();
+		TQDateTime now = TQDateTime::tqcurrentDateTime();
 		OccurType type = nextOccurrence(now, endTime, RETURN_REPETITION);
 		if (type & OCCURRENCE_REPEAT)
 			ltype = LIMIT_REPETITION;
@@ -1695,7 +1695,7 @@ DateTime KAEvent::deferralLimit(KAEvent::DeferLimitType* limitType) const
 			ltype = LIMIT_RECURRENCE;
 	}
 	else if ((mReminderMinutes  ||  mDeferral == REMINDER_DEFERRAL  ||  mArchiveReminderMinutes)
-		 &&  TQDateTime::currentDateTime() < mNextMainDateTime.dateTime())
+		 &&  TQDateTime::tqcurrentDateTime() < mNextMainDateTime.dateTime())
 	{
 		// It's an reminder alarm. Don't allow it to be deferred past its main alarm time.
 		endTime = mNextMainDateTime;
@@ -2633,21 +2633,21 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
 	static const TQChar   LATE_CANCEL_CODE = 'C';
 	static const TQChar   AT_LOGIN_CODE    = 'L';   // subsidiary alarm at every login
 	static const TQChar   DEFERRAL_CODE    = 'D';   // extra deferred alarm
-	static const TQString TEXT_PREFIX      = TQString::fromLatin1("TEXT:");
-	static const TQString FILE_PREFIX      = TQString::fromLatin1("FILE:");
-	static const TQString COMMAND_PREFIX   = TQString::fromLatin1("CMD:");
+	static const TQString TEXT_PREFIX      = TQString::tqfromLatin1("TEXT:");
+	static const TQString FILE_PREFIX      = TQString::tqfromLatin1("FILE:");
+	static const TQString COMMAND_PREFIX   = TQString::tqfromLatin1("CMD:");
 
 	// KAlarm pre-0.9.2 codes held in the event's CATEGORY property
-	static const TQString BEEP_CATEGORY    = TQString::fromLatin1("BEEP");
+	static const TQString BEEP_CATEGORY    = TQString::tqfromLatin1("BEEP");
 
 	// KAlarm pre-1.1.1 LATECANCEL category with no parameter
-	static const TQString LATE_CANCEL_CAT = TQString::fromLatin1("LATECANCEL");
+	static const TQString LATE_CANCEL_CAT = TQString::tqfromLatin1("LATECANCEL");
 
 	// KAlarm pre-1.3.0 TMPLDEFTIME category with no parameter
-	static const TQString TEMPL_DEF_TIME_CAT = TQString::fromLatin1("TMPLDEFTIME");
+	static const TQString TEMPL_DEF_TIME_CAT = TQString::tqfromLatin1("TMPLDEFTIME");
 
 	// KAlarm pre-1.3.1 XTERM category
-	static const TQString EXEC_IN_XTERM_CAT  = TQString::fromLatin1("XTERM");
+	static const TQString EXEC_IN_XTERM_CAT  = TQString::tqfromLatin1("XTERM");
 
 	// KAlarm pre-1.4.22 properties
 	static const TQCString KMAIL_ID_PROPERTY("KMAILID");    // X-KDE-KALARM-KMAILID property
@@ -2844,7 +2844,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
 					Alarm* alarm = *alit;
 					if (alarm->type() == Alarm::Display)
 						alarm->setCustomProperty(APPNAME, FONT_COLOUR_PROPERTY,
-						                         TQString::fromLatin1("%1;;").arg(cats[0]));
+						                         TQString::tqfromLatin1("%1;;").arg(cats[0]));
 				}
 				cats.remove(cats.begin());
 			}
diff --git a/kalarm/alarmevent.h b/kalarm/alarmevent.h
index 91bf2428..0436d3fb 100644
--- a/kalarm/alarmevent.h
+++ b/kalarm/alarmevent.h
@@ -153,7 +153,7 @@ class KAAlarm : public KAAlarmEventBase
 		{
 			INVALID_ALARM       = 0,     // not an alarm
 			MAIN_ALARM          = 1,     // THE real alarm. Must be the first in the enumeration.
-			// The following values may be used in combination as a bitmask 0x0E
+			// The following values may be used in combination as a bitqmask 0x0E
 			REMINDER_ALARM      = 0x02,  // reminder in advance of main alarm
 			DEFERRED_ALARM      = 0x04,  // deferred alarm
 			DEFERRED_REMINDER_ALARM = REMINDER_ALARM | DEFERRED_ALARM,  // deferred early warning
@@ -170,7 +170,7 @@ class KAAlarm : public KAAlarmEventBase
 		{
 			INVALID__ALARM                = INVALID_ALARM,
 			MAIN__ALARM                   = MAIN_ALARM,
-			// The following values may be used in combination as a bitmask 0x0E
+			// The following values may be used in combination as a bitqmask 0x0E
 			REMINDER__ALARM               = REMINDER_ALARM,
 			TIMED_DEFERRAL_FLAG           = 0x08,  // deferral has a time; if clear, it is date-only
 			DEFERRED_DATE__ALARM          = DEFERRED_ALARM,  // deferred alarm - date-only
@@ -263,7 +263,7 @@ class KAEvent : public KAAlarmEventBase
 			DATE_DEFERRAL   = DEFERRAL,
 			TIME_DEFERRAL   = DEFERRAL | TIMED_FLAG,
 			DISPLAYING_     = 0x80000,
-			READ_ONLY_FLAGS = 0xF0000   // mask for all read-only internal values
+			READ_ONLY_FLAGS = 0xF0000   // tqmask for all read-only internal values
 		};
 		/** The category of an event, indicated by the middle part of its UID. */
 		enum Status
@@ -288,7 +288,7 @@ class KAEvent : public KAAlarmEventBase
 			RECURRENCE_DATE             = 0x02,   // a recurrence with only a date, not a time
 			RECURRENCE_DATE_TIME        = 0x03,   // a recurrence with a date and time
 			LAST_RECURRENCE             = 0x04,   // the last recurrence
-			OCCURRENCE_REPEAT = 0x10,    // (bitmask for a repetition of an occurrence)
+			OCCURRENCE_REPEAT = 0x10,    // (bitqmask for a repetition of an occurrence)
 			FIRST_OR_ONLY_OCCURRENCE_REPEAT = OCCURRENCE_REPEAT | FIRST_OR_ONLY_OCCURRENCE,     // a repetition of the first occurrence
 			RECURRENCE_DATE_REPEAT      = OCCURRENCE_REPEAT | RECURRENCE_DATE,      // a repetition of a date-only recurrence
 			RECURRENCE_DATE_TIME_REPEAT = OCCURRENCE_REPEAT | RECURRENCE_DATE_TIME, // a repetition of a date/time recurrence
diff --git a/kalarm/alarmlistview.cpp b/kalarm/alarmlistview.cpp
index 8fb72fe3..2d4e39d6 100644
--- a/kalarm/alarmlistview.cpp
+++ b/kalarm/alarmlistview.cpp
@@ -167,7 +167,7 @@ void AlarmListView::populate()
 	KAEvent event;
 	KCal::Event::List events;
 	KCal::Event::List::ConstIterator it;
-	TQDateTime now = TQDateTime::currentDateTime();
+	TQDateTime now = TQDateTime::tqcurrentDateTime();
 	if (mShowExpired)
 	{
 		AlarmCalendar* cal = AlarmCalendar::expiredCalendarOpen();
@@ -257,7 +257,7 @@ void AlarmListView::updateTimeToAlarms(bool forceDisplay)
 {
 	if (forceDisplay  ||  columnWidth(mColumn[TIME_TO_COLUMN]))
 	{
-		TQDateTime now = TQDateTime::currentDateTime();
+		TQDateTime now = TQDateTime::tqcurrentDateTime();
 		for (AlarmListViewItem* item = firstChild();  item;  item = item->nextSibling())
 			item->updateTimeToAlarm(now, forceDisplay);
 	}
@@ -269,7 +269,7 @@ void AlarmListView::updateTimeToAlarms(bool forceDisplay)
 */
 void AlarmListView::addEvent(const KAEvent& event, EventListViewBase* view)
 {
-	TQDateTime now = TQDateTime::currentDateTime();
+	TQDateTime now = TQDateTime::tqcurrentDateTime();
 	for (InstanceListConstIterator it = mInstanceList.begin();  it != mInstanceList.end();  ++it)
 		static_cast<AlarmListView*>(*it)->addEntry(event, now, true, (*it == view));
 }
@@ -290,7 +290,7 @@ AlarmListViewItem* AlarmListView::addEntry(const KAEvent& event, const TQDateTim
 */
 EventListViewItemBase* AlarmListView::createItem(const KAEvent& event)
 {
-	return new AlarmListViewItem(this, event, TQDateTime::currentDateTime());
+	return new AlarmListViewItem(this, event, TQDateTime::tqcurrentDateTime());
 }
 
 /******************************************************************************
@@ -373,7 +373,7 @@ void AlarmListView::contentsMouseMoveEvent(TQMouseEvent* e)
 		// Create a calendar object containing all the currently selected alarms
 		kdDebug(5950) << "AlarmListView::contentsMouseMoveEvent(): drag started" << endl;
 		mMousePressed = false;
-		KCal::CalendarLocal cal(TQString::fromLatin1("UTC"));
+		KCal::CalendarLocal cal(TQString::tqfromLatin1("UTC"));
 		cal.setLocalTime();    // write out using local time (i.e. no time zone)
 		TQValueList<EventListViewItemBase*> items = selectedItems();
 		if (!items.count())
@@ -503,7 +503,7 @@ TQString AlarmListViewItem::alarmTimeText(const DateTime& dateTime) const
 		{
 			// Initialise the position of the hour within the time string, if leading
 			// zeroes are omitted, so that displayed times can be aligned with each other.
-			mTimeHourPos = -1;     // default = alignment isn't possible/sensible
+			mTimeHourPos = -1;     // default = tqalignment isn't possible/sensible
 			if (!TQApplication::reverseLayout())    // don't try to align right-to-left languages
 			{
 				TQString fmt = locale->timeFormat();
@@ -514,7 +514,7 @@ TQString AlarmListViewItem::alarmTimeText(const DateTime& dateTime) const
 		}
 		if (mTimeHourPos >= 0  &&  (int)time.length() > mTimeHourPos + 1
 		&&  time[mTimeHourPos].isDigit()  &&  !time[mTimeHourPos + 1].isDigit())
-			dateTimeText += '~';     // improve alignment of times with no leading zeroes
+			dateTimeText += '~';     // improve tqalignment of times with no leading zeroes
 		dateTimeText += time;
 	}
 	return dateTimeText + ' ';
@@ -652,7 +652,7 @@ void AlarmListViewItem::paintCell(TQPainter* painter, const TQColorGroup& cg, in
 */
 int AlarmListViewItem::typeIconWidth(AlarmListView* v)
 {
-	return iconWidth() +  2 * v->style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
+	return iconWidth() +  2 * v->style().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
 }
 
 /******************************************************************************
@@ -684,7 +684,7 @@ TQString AlarmListViewItem::key(int column, bool) const
 */
 void AlarmListTooltip::maybeTip(const TQPoint& pt)
 {
-	AlarmListView* listView = (AlarmListView*)parentWidget()->parentWidget();
+	AlarmListView* listView = (AlarmListView*)tqparentWidget()->tqparentWidget();
 	int column = listView->column(AlarmListView::MESSAGE_COLUMN);
 	int xOffset = listView->contentsX();
 	if (listView->header()->sectionAt(pt.x() + xOffset) == column)
@@ -700,7 +700,7 @@ void AlarmListTooltip::maybeTip(const TQPoint& pt)
 				if (columnX + widthNeeded <= listView->viewport()->width())
 					return;
 			}
-			TQRect rect = listView->itemRect(item);
+			TQRect rect = listView->tqitemRect(item);
 			rect.setLeft(columnX);
 			rect.setWidth(columnWidth);
 			kdDebug(5950) << "AlarmListTooltip::maybeTip(): display\n";
diff --git a/kalarm/alarmlistview.h b/kalarm/alarmlistview.h
index f2ad5b2c..a722ac23 100644
--- a/kalarm/alarmlistview.h
+++ b/kalarm/alarmlistview.h
@@ -107,7 +107,7 @@ class AlarmListView : public EventListViewBase
 		virtual TQString        whatsThisText(int column) const;
 		virtual bool           shouldShowEvent(const KAEvent& e) const  { return mShowExpired || !e.expired(); }
 		AlarmListViewItem*     addEntry(const KAEvent& e, bool setSize = false)
-		                               { return addEntry(e, TQDateTime::currentDateTime(), setSize); }
+		                               { return addEntry(e, TQDateTime::tqcurrentDateTime(), setSize); }
 		AlarmListViewItem*     updateEntry(AlarmListViewItem* item, const KAEvent& newEvent, bool setSize = false)
 		                               { return (AlarmListViewItem*)EventListViewBase::updateEntry(item, newEvent, setSize); }
 		virtual void           contentsMousePressEvent(TQMouseEvent*);
diff --git a/kalarm/alarmtext.cpp b/kalarm/alarmtext.cpp
index 46051711..5be991f0 100644
--- a/kalarm/alarmtext.cpp
+++ b/kalarm/alarmtext.cpp
@@ -32,17 +32,17 @@ TQString AlarmText::mToPrefix;
 TQString AlarmText::mCcPrefix;
 TQString AlarmText::mDatePrefix;
 TQString AlarmText::mSubjectPrefix;
-TQString AlarmText::mFromPrefixEn    = TQString::fromLatin1("From:");
-TQString AlarmText::mToPrefixEn      = TQString::fromLatin1("To:");
-TQString AlarmText::mCcPrefixEn      = TQString::fromLatin1("Cc:");
-TQString AlarmText::mDatePrefixEn    = TQString::fromLatin1("Date:");
-TQString AlarmText::mSubjectPrefixEn = TQString::fromLatin1("Subject:");
+TQString AlarmText::mFromPrefixEn    = TQString::tqfromLatin1("From:");
+TQString AlarmText::mToPrefixEn      = TQString::tqfromLatin1("To:");
+TQString AlarmText::mCcPrefixEn      = TQString::tqfromLatin1("Cc:");
+TQString AlarmText::mDatePrefixEn    = TQString::tqfromLatin1("Date:");
+TQString AlarmText::mSubjectPrefixEn = TQString::tqfromLatin1("Subject:");
 
 
 void AlarmText::setText(const TQString& text)
 {
 	mBody     = text;
-	mIsScript = text.startsWith(TQString::fromLatin1("#!"));
+	mIsScript = text.startsWith(TQString::tqfromLatin1("#!"));
 	mIsEmail  = false;
 	mTo = mFrom = mCc = mTime = mSubject = TQString::null;
 	mKMailSerialNum = 0;
@@ -271,7 +271,7 @@ TQString AlarmText::summary(const KAEvent& event, int maxLines, bool* truncated)
 	}
 	if (truncated)
 		*truncated = false;
-	if (text.contains('\n') < maxLines)
+	if (text.tqcontains('\n') < maxLines)
 		return text;
 	int newline = -1;
 	for (int i = 0;  i < maxLines;  ++i)
@@ -284,5 +284,5 @@ TQString AlarmText::summary(const KAEvent& event, int maxLines, bool* truncated)
 		return text.left(newline);    // text ends in newline
 	if (truncated)
 		*truncated = true;
-	return text.left(newline + (maxLines <= 1 ? 0 : 1)) + TQString::fromLatin1("...");
+	return text.left(newline + (maxLines <= 1 ? 0 : 1)) + TQString::tqfromLatin1("...");
 }
diff --git a/kalarm/alarmtimewidget.cpp b/kalarm/alarmtimewidget.cpp
index 5c3316bc..2e426330 100644
--- a/kalarm/alarmtimewidget.cpp
+++ b/kalarm/alarmtimewidget.cpp
@@ -93,14 +93,14 @@ void AlarmTimeWidget::init(int mode)
 
 	// At time radio button/label
 	mAtTimeRadio = new RadioButton(((mode & DEFER_TIME) ? i18n("&Defer to date/time:") : i18n("At &date/time:")), this, "atTimeRadio");
-	mAtTimeRadio->setFixedSize(mAtTimeRadio->sizeHint());
+	mAtTimeRadio->setFixedSize(mAtTimeRadio->tqsizeHint());
 	TQWhatsThis::add(mAtTimeRadio,
 	                ((mode & DEFER_TIME) ? i18n("Reschedule the alarm to the specified date and time.")
 	                                     : i18n("Schedule the alarm at the specified date and time.")));
 
 	// Date edit box
 	mDateEdit = new DateEdit(this);
-	mDateEdit->setFixedSize(mDateEdit->sizeHint());
+	mDateEdit->setFixedSize(mDateEdit->tqsizeHint());
 	connect(mDateEdit, TQT_SIGNAL(dateEntered(const TQDate&)), TQT_SLOT(dateTimeChanged()));
 	static const TQString enterDateText = i18n("Enter the date to schedule the alarm.");
 	TQWhatsThis::add(mDateEdit, ((mode & DEFER_TIME) ? enterDateText
@@ -111,7 +111,7 @@ void AlarmTimeWidget::init(int mode)
 	TQHBox* timeBox = new TQHBox(this);
 	timeBox->setSpacing(2*KDialog::spacingHint());
 	mTimeEdit = new TimeEdit(timeBox);
-	mTimeEdit->setFixedSize(mTimeEdit->sizeHint());
+	mTimeEdit->setFixedSize(mTimeEdit->tqsizeHint());
 	connect(mTimeEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(dateTimeChanged()));
 	static const TQString enterTimeText = i18n("Enter the time to schedule the alarm.");
 	TQWhatsThis::add(mTimeEdit,
@@ -128,7 +128,7 @@ void AlarmTimeWidget::init(int mode)
 	{
 		mAnyTimeAllowed = true;
 		mAnyTimeCheckBox = new CheckBox(i18n("An&y time"), timeBox);
-		mAnyTimeCheckBox->setFixedSize(mAnyTimeCheckBox->sizeHint());
+		mAnyTimeCheckBox->setFixedSize(mAnyTimeCheckBox->tqsizeHint());
 		connect(mAnyTimeCheckBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAnyTimeToggled(bool)));
 		TQWhatsThis::add(mAnyTimeCheckBox, i18n("Schedule the alarm for any time during the day"));
 	}
@@ -136,7 +136,7 @@ void AlarmTimeWidget::init(int mode)
 	// 'Time from now' radio button/label
 	mAfterTimeRadio = new RadioButton(((mode & DEFER_TIME) ? i18n("Defer for time &interval:") : i18n_w_TimeFromNow()),
 	                                  this, "afterTimeRadio");
-	mAfterTimeRadio->setFixedSize(mAfterTimeRadio->sizeHint());
+	mAfterTimeRadio->setFixedSize(mAfterTimeRadio->tqsizeHint());
 	TQWhatsThis::add(mAfterTimeRadio,
 	                ((mode & DEFER_TIME) ? i18n("Reschedule the alarm for the specified time interval after now.")
 	                                     : i18n("Schedule the alarm after the specified time interval from now.")));
@@ -144,14 +144,14 @@ void AlarmTimeWidget::init(int mode)
 	// Delay time spin box
 	mDelayTimeEdit = new TimeSpinBox(1, maxDelayTime, this);
 	mDelayTimeEdit->setValue(maxDelayTime);
-	mDelayTimeEdit->setFixedSize(mDelayTimeEdit->sizeHint());
+	mDelayTimeEdit->setFixedSize(mDelayTimeEdit->tqsizeHint());
 	connect(mDelayTimeEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(delayTimeChanged(int)));
 	TQWhatsThis::add(mDelayTimeEdit,
 	                ((mode & DEFER_TIME) ? TQString("%1\n\n%2").arg(i18n_TimeAfterPeriod()).arg(TimeSpinBox::shiftWhatsThis())
 	                                     : TQString("%1\n%2\n\n%3").arg(i18n_TimeAfterPeriod()).arg(recurText).arg(TimeSpinBox::shiftWhatsThis())));
 	mAfterTimeRadio->setFocusWidget(mDelayTimeEdit);
 
-	// Set up the layout, either narrow or wide
+	// Set up the tqlayout, either narrow or wide
 	if (mode & NARROW)
 	{
 		TQGridLayout* grid = new TQGridLayout(topLayout, 2, 2, KDialog::spacingHint());
@@ -160,10 +160,10 @@ void AlarmTimeWidget::init(int mode)
 		grid->addWidget(timeBox, 1, 1, Qt::AlignAuto);
 		grid->setColStretch(2, 1);
 		topLayout->addStretch();
-		TQBoxLayout* layout = new TQHBoxLayout(topLayout, KDialog::spacingHint());
-		layout->addWidget(mAfterTimeRadio);
-		layout->addWidget(mDelayTimeEdit);
-		layout->addStretch();
+		TQBoxLayout* tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint());
+		tqlayout->addWidget(mAfterTimeRadio);
+		tqlayout->addWidget(mDelayTimeEdit);
+		tqlayout->addStretch();
 	}
 	else
 	{
@@ -226,7 +226,7 @@ DateTime AlarmTimeWidget::getDateTime(int* minsFromNow, bool checkExpired, bool
 	if (errorWidget)
 		*errorWidget = 0;
 	TQTime nowt = TQTime::currentTime();
-	TQDateTime now(TQDate::currentDate(), TQTime(nowt.hour(), nowt.minute()));
+	TQDateTime now(TQDate::tqcurrentDate(), TQTime(nowt.hour(), nowt.minute()));
 	if (mAtTimeRadio->isOn())
 	{
 		bool anyTime = mAnyTimeAllowed && mAnyTimeCheckBox && mAnyTimeCheckBox->isChecked();
@@ -328,7 +328,7 @@ void AlarmTimeWidget::setMinDateTimeIsCurrent()
 {
 	mMinDateTimeIsNow = true;
 	mMinDateTime = TQDateTime();
-	TQDateTime now = TQDateTime::currentDateTime();
+	TQDateTime now = TQDateTime::tqcurrentDateTime();
 	mDateEdit->setMinDate(now.date());
 	setMaxMinTimeIf(now);
 }
@@ -342,7 +342,7 @@ void AlarmTimeWidget::setMinDateTime(const TQDateTime& dt)
 	mMinDateTimeIsNow = false;
 	mMinDateTime = dt;
 	mDateEdit->setMinDate(dt.date());
-	setMaxMinTimeIf(TQDateTime::currentDateTime());
+	setMaxMinTimeIf(TQDateTime::tqcurrentDateTime());
 }
 
 /******************************************************************************
@@ -357,7 +357,7 @@ void AlarmTimeWidget::setMaxDateTime(const DateTime& dt)
 	else
 		mMaxDateTime = dt.dateTime();
 	mDateEdit->setMaxDate(mMaxDateTime.date());
-	TQDateTime now = TQDateTime::currentDateTime();
+	TQDateTime now = TQDateTime::tqcurrentDateTime();
 	setMaxMinTimeIf(now);
 	setMaxDelayTime(now);
 }
@@ -452,13 +452,13 @@ void AlarmTimeWidget::slotTimer()
 	if (mMinDateTimeIsNow)
 	{
 		// Make sure that the minimum date is updated when the day changes
-		now = TQDateTime::currentDateTime();
+		now = TQDateTime::tqcurrentDateTime();
 		mDateEdit->setMinDate(now.date());
 	}
 	if (mMaxDateTime.isValid())
 	{
 		if (!now.isValid())
-			now = TQDateTime::currentDateTime();
+			now = TQDateTime::tqcurrentDateTime();
 		if (!mPastMax)
 		{
 			// Check whether the maximum date/time has now been reached
@@ -502,7 +502,7 @@ void AlarmTimeWidget::slotButtonSet(int)
 		mAnyTimeCheckBox->setEnabled(at && mAnyTimeAllowed);
 	// Ensure that the value of the delay edit box is > 0.
 	TQDateTime dt(mDateEdit->date(), mTimeEdit->time());
-	int minutes = (TQDateTime::currentDateTime().secsTo(dt) + 59) / 60;
+	int minutes = (TQDateTime::tqcurrentDateTime().secsTo(dt) + 59) / 60;
 	if (minutes <= 0)
 		mDelayTimeEdit->setValid(true);
 	mDelayTimeEdit->setEnabled(!at);
@@ -525,7 +525,7 @@ void AlarmTimeWidget::slotAnyTimeToggled(bool on)
 void AlarmTimeWidget::dateTimeChanged()
 {
 	TQDateTime dt(mDateEdit->date(), mTimeEdit->time());
-	int minutes = (TQDateTime::currentDateTime().secsTo(dt) + 59) / 60;
+	int minutes = (TQDateTime::tqcurrentDateTime().secsTo(dt) + 59) / 60;
 	bool blocked = mDelayTimeEdit->signalsBlocked();
 	mDelayTimeEdit->blockSignals(true);     // prevent infinite recursion between here and delayTimeChanged()
 	if (minutes <= 0  ||  minutes > mDelayTimeEdit->maxValue())
@@ -543,7 +543,7 @@ void AlarmTimeWidget::delayTimeChanged(int minutes)
 {
 	if (mDelayTimeEdit->isValid())
 	{
-		TQDateTime dt = TQDateTime::currentDateTime().addSecs(minutes * 60);
+		TQDateTime dt = TQDateTime::tqcurrentDateTime().addSecs(minutes * 60);
 		bool blockedT = mTimeEdit->signalsBlocked();
 		bool blockedD = mDateEdit->signalsBlocked();
 		mTimeEdit->blockSignals(true);     // prevent infinite recursion between here and dateTimeChanged()
diff --git a/kalarm/alarmtimewidget.h b/kalarm/alarmtimewidget.h
index 9e1e2535..e3580d73 100644
--- a/kalarm/alarmtimewidget.h
+++ b/kalarm/alarmtimewidget.h
@@ -52,7 +52,7 @@ class AlarmTimeWidget : public ButtonGroup
 		bool             anyTime() const               { return mAnyTime; }
 		void             enableAnyTime(bool enable);
 		void             selectTimeFromNow(int minutes = 0);
-		TQSize            sizeHint() const              { return minimumSizeHint(); }
+		TQSize            tqsizeHint() const              { return tqminimumSizeHint(); }
 
 		static TQString   i18n_w_TimeFromNow();     // text of 'Time from now:' radio button, with 'w' shortcut
 		static TQString   i18n_TimeAfterPeriod();
diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp
index 98a4b629..2e299785 100644
--- a/kalarm/birthdaydlg.cpp
+++ b/kalarm/birthdaydlg.cpp
@@ -81,15 +81,15 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent)
 	// Prefix and suffix to the name in the alarm text
 	// Get default prefix and suffix texts from config file
 	KConfig* config = kapp->config();
-	config->setGroup(TQString::fromLatin1("General"));
-	mPrefixText = config->readEntry(TQString::fromLatin1("BirthdayPrefix"), i18n("Birthday: "));
-	mSuffixText = config->readEntry(TQString::fromLatin1("BirthdaySuffix"));
+	config->setGroup(TQString::tqfromLatin1("General"));
+	mPrefixText = config->readEntry(TQString::tqfromLatin1("BirthdayPrefix"), i18n("Birthday: "));
+	mSuffixText = config->readEntry(TQString::tqfromLatin1("BirthdaySuffix"));
 
 	TQGroupBox* textGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Alarm Text"), topWidget);
 	topLayout->addWidget(textGroup);
 	TQLabel* label = new TQLabel(i18n("Pre&fix:"), textGroup);
 	mPrefix = new BLineEdit(mPrefixText, textGroup);
-	mPrefix->setMinimumSize(mPrefix->sizeHint());
+	mPrefix->setMinimumSize(mPrefix->tqsizeHint());
 	label->setBuddy(mPrefix);
 	connect(mPrefix, TQT_SIGNAL(focusLost()), TQT_SLOT(slotTextLostFocus()));
 	TQWhatsThis::add(mPrefix,
@@ -98,7 +98,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent)
 
 	label = new TQLabel(i18n("S&uffix:"), textGroup);
 	mSuffix = new BLineEdit(mSuffixText, textGroup);
-	mSuffix->setMinimumSize(mSuffix->sizeHint());
+	mSuffix->setMinimumSize(mSuffix->tqsizeHint());
 	label->setBuddy(mSuffix);
 	connect(mSuffix, TQT_SIGNAL(focusLost()), TQT_SLOT(slotTextLostFocus()));
 	TQWhatsThis::add(mSuffix,
@@ -128,12 +128,12 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent)
 
 	// Font and colour choice button and sample text
 	mFontColourButton = new FontColourButton(group);
-	mFontColourButton->setMaximumHeight(mFontColourButton->sizeHint().height() * 3/2);
+	mFontColourButton->setMaximumHeight(mFontColourButton->tqsizeHint().height() * 3/2);
 	groupLayout->addWidget(mFontColourButton);
 
 	// Sound checkbox and file selector
 	mSoundPicker = new SoundPicker(group);
-	mSoundPicker->setFixedSize(mSoundPicker->sizeHint());
+	mSoundPicker->setFixedSize(mSoundPicker->tqsizeHint());
 	groupLayout->addWidget(mSoundPicker, 0, Qt::AlignAuto);
 
 	// How much to advance warning to give
@@ -142,36 +142,36 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent)
 	                         i18n("Enter the number of days before each birthday to display a reminder. "
 	                              "This is in addition to the alarm which is displayed on the birthday."),
 	                         false, false, group);
-	mReminder->setFixedSize(mReminder->sizeHint());
+	mReminder->setFixedSize(mReminder->tqsizeHint());
 	mReminder->setMaximum(0, 364);
 	mReminder->setMinutes(0, true);
 	groupLayout->addWidget(mReminder, 0, Qt::AlignAuto);
 
 	// Acknowledgement confirmation required - default = no confirmation
-	TQHBoxLayout* layout = new TQHBoxLayout(groupLayout, 2*spacingHint());
+	TQHBoxLayout* tqlayout = new TQHBoxLayout(groupLayout, 2*spacingHint());
 	mConfirmAck = EditAlarmDlg::createConfirmAckCheckbox(group);
-	layout->addWidget(mConfirmAck);
-	layout->addSpacing(2*spacingHint());
-	layout->addStretch();
+	tqlayout->addWidget(mConfirmAck);
+	tqlayout->addSpacing(2*spacingHint());
+	tqlayout->addStretch();
 
 	if (ShellProcess::authorised())    // don't display if shell commands not allowed (e.g. kiosk mode)
 	{
 		// Special actions button
 		mSpecialActionsButton = new SpecialActionsButton(i18n("Special Actions..."), group);
-		layout->addWidget(mSpecialActionsButton);
+		tqlayout->addWidget(mSpecialActionsButton);
 	}
 
 	// Late display checkbox - default = allow late display
-	layout = new TQHBoxLayout(groupLayout, 2*spacingHint());
+	tqlayout = new TQHBoxLayout(groupLayout, 2*spacingHint());
 	mLateCancel = new LateCancelSelector(false, group);
-	layout->addWidget(mLateCancel);
-	layout->addStretch();
+	tqlayout->addWidget(mLateCancel);
+	tqlayout->addStretch();
 
 	// Sub-repetition button
 	mSubRepetition = new RepetitionButton(i18n("Sub-Repetition"), false, group);
 	mSubRepetition->set(0, 0, true, 364*24*60);
 	TQWhatsThis::add(mSubRepetition, i18n("Set up an additional alarm repetition"));
-	layout->addWidget(mSubRepetition);
+	tqlayout->addWidget(mSubRepetition);
 
 	// Set the values to their defaults
 	mFontColourButton->setDefaultFont();
@@ -295,7 +295,7 @@ void BirthdayDlg::updateSelectionList()
 TQValueList<KAEvent> BirthdayDlg::events() const
 {
 	TQValueList<KAEvent> list;
-	TQDate today = TQDate::currentDate();
+	TQDate today = TQDate::tqcurrentDate();
 	TQDateTime todayNoon(today, TQTime(12, 0, 0));
 	int thisYear = today.year();
 	int reminder = mReminder->minutes();
@@ -344,9 +344,9 @@ void BirthdayDlg::slotOk()
 {
 	// Save prefix and suffix texts to use as future defaults
 	KConfig* config = kapp->config();
-	config->setGroup(TQString::fromLatin1("General"));
-	config->writeEntry(TQString::fromLatin1("BirthdayPrefix"), mPrefix->text());
-	config->writeEntry(TQString::fromLatin1("BirthdaySuffix"), mSuffix->text());
+	config->setGroup(TQString::tqfromLatin1("General"));
+	config->writeEntry(TQString::tqfromLatin1("BirthdayPrefix"), mPrefix->text());
+	config->writeEntry(TQString::tqfromLatin1("BirthdaySuffix"), mSuffix->text());
 	config->sync();
 
 	mFlags = (mSoundPicker->sound() == SoundPicker::BEEP ? KAEvent::BEEP : 0)
diff --git a/kalarm/calendarcompat.cpp b/kalarm/calendarcompat.cpp
index 50d76c50..f0a34919 100644
--- a/kalarm/calendarcompat.cpp
+++ b/kalarm/calendarcompat.cpp
@@ -80,7 +80,7 @@ int CalendarCompat::readKAlarmVersion(KCal::Calendar& calendar, TQString& subVer
 	const TQString& prodid = calendar.productId();
 
 	// Find the KAlarm identifier
-	TQString progname = TQString::fromLatin1(" KAlarm ");
+	TQString progname = TQString::tqfromLatin1(" KAlarm ");
 	int i = prodid.find(progname, 0, false);
 	if (i < 0)
 	{
@@ -100,7 +100,7 @@ int CalendarCompat::readKAlarmVersion(KCal::Calendar& calendar, TQString& subVer
 		i = j;
 	if (i <= 0)
 		return 0;    // missing version string
-	ver = ver.left(i);     // ver now contains the KAlarm version string
+	ver = ver.left(i);     // ver now tqcontains the KAlarm version string
 	if (ver == KAlarm::currentCalendarVersionString())
 		return 0;      // the calendar is in the current KAlarm format
 	return KAlarm::getVersionNumber(ver, &subVersion);
@@ -124,9 +124,9 @@ bool CalendarCompat::isUTC(const TQString& localFile)
 	file.close();
 
 	// Extract the CREATED property for the first VEVENT from the calendar
-	TQString VCALENDAR = TQString::fromLatin1("BEGIN:VCALENDAR");
-	TQString VEVENT    = TQString::fromLatin1("BEGIN:VEVENT");
-	TQString CREATED   = TQString::fromLatin1("CREATED:");
+	TQString VCALENDAR = TQString::tqfromLatin1("BEGIN:VCALENDAR");
+	TQString VEVENT    = TQString::tqfromLatin1("BEGIN:VEVENT");
+	TQString CREATED   = TQString::tqfromLatin1("CREATED:");
 	TQStringList lines = TQStringList::split(TQChar('\n'), text);
 	for (TQStringList::ConstIterator it = lines.begin();  it != lines.end(); ++it)
 	{
diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp
index d2d2b234..a129de8a 100644
--- a/kalarm/daemon.cpp
+++ b/kalarm/daemon.cpp
@@ -134,7 +134,7 @@ bool Daemon::start()
 				return true;     // we're currently waiting for the daemon to start
 			// Start the alarm daemon. It is a KUniqueApplication, which means that
 			// there is automatically only one instance of the alarm daemon running.
-			TQString execStr = locate("exe", TQString::fromLatin1(DAEMON_APP_NAME));
+			TQString execStr = locate("exe", TQString::tqfromLatin1(DAEMON_APP_NAME));
 			if (execStr.isEmpty())
 			{
 				KMessageBox::error(0, i18n("Alarm daemon not found."));
@@ -221,7 +221,7 @@ void Daemon::registrationResult(bool reregister, int result, int version)
 		failed = true;
 		kdError(5950) << "Daemon::registrationResult(" << reregister << "): kalarmd reports incompatible version " << version << endl;
 		errmsg = i18n("Cannot enable alarms.\nInstallation or configuration error: Alarm Daemon (%1) version is incompatible.")
-		              .arg(TQString::fromLatin1(DAEMON_APP_NAME));
+		              .arg(TQString::tqfromLatin1(DAEMON_APP_NAME));
 	}
 	else
 	{
@@ -236,7 +236,7 @@ void Daemon::registrationResult(bool reregister, int result, int version)
 				kdError(5950) << "Daemon::registrationResult(" << reregister << "): registerApp dcop call: " << kapp->aboutData()->appName() << " not found\n";
 				KMessageBox::error(0, i18n("Alarms will be disabled if you stop KAlarm.\n"
 							   "(Installation or configuration error: %1 cannot locate %2 executable.)")
-							   .arg(TQString::fromLatin1(DAEMON_APP_NAME))
+							   .arg(TQString::tqfromLatin1(DAEMON_APP_NAME))
 							   .arg(kapp->aboutData()->appName()));
 				break;
 			case KAlarmd::FAILURE:
@@ -248,7 +248,7 @@ void Daemon::registrationResult(bool reregister, int result, int version)
 				if (!reregister)
 				{
 					errmsg = i18n("Cannot enable alarms:\nFailed to register with Alarm Daemon (%1)")
-					              .arg(TQString::fromLatin1(DAEMON_APP_NAME));
+					              .arg(TQString::tqfromLatin1(DAEMON_APP_NAME));
 				}
 				break;
 		}
@@ -304,7 +304,7 @@ void Daemon::checkIfStarted()
 	if (err)
 	{
 		kdError(5950) << "Daemon::checkIfStarted(): failed to start daemon" << endl;
-		KMessageBox::error(0, i18n("Cannot enable alarms:\nFailed to start Alarm Daemon (%1)").arg(TQString::fromLatin1(DAEMON_APP_NAME)));
+		KMessageBox::error(0, i18n("Cannot enable alarms:\nFailed to start Alarm Daemon (%1)").arg(TQString::tqfromLatin1(DAEMON_APP_NAME)));
 	}
 }
 
@@ -414,8 +414,8 @@ void Daemon::enableAutoStart(bool enable)
 	// The return status doesn't report failure even if the daemon isn't running,
 	// so in case of failure, rewrite the config file in any case.
 	KConfig adconfig(locate("config", DAEMON_APP_NAME"rc"));
-	adconfig.setGroup(TQString::fromLatin1(DAEMON_AUTOSTART_SECTION));
-	adconfig.writeEntry(TQString::fromLatin1(DAEMON_AUTOSTART_KEY), enable);
+	adconfig.setGroup(TQString::tqfromLatin1(DAEMON_AUTOSTART_SECTION));
+	adconfig.writeEntry(TQString::tqfromLatin1(DAEMON_AUTOSTART_KEY), enable);
 	adconfig.sync();
 }
 
@@ -437,8 +437,8 @@ void Daemon::notifyTimeChanged()
 bool Daemon::autoStart()
 {
 	KConfig adconfig(locate("config", DAEMON_APP_NAME"rc"));
-	adconfig.setGroup(TQString::fromLatin1(DAEMON_AUTOSTART_SECTION));
-	return adconfig.readBoolEntry(TQString::fromLatin1(DAEMON_AUTOSTART_KEY), true);
+	adconfig.setGroup(TQString::tqfromLatin1(DAEMON_AUTOSTART_SECTION));
+	return adconfig.readBoolEntry(TQString::tqfromLatin1(DAEMON_AUTOSTART_KEY), true);
 }
 
 /******************************************************************************
@@ -700,7 +700,7 @@ void NotificationHandler::alarmDaemonUpdate(int calendarStatus, const TQString&
 void NotificationHandler::handleEvent(const TQString& url, const TQString& eventId)
 {
 	TQString id = eventId;
-	if (id.startsWith(TQString::fromLatin1("ad:")))
+	if (id.startsWith(TQString::tqfromLatin1("ad:")))
 	{
 		// It's a notification from the alarm deamon
 		id = id.mid(3);
diff --git a/kalarm/dcophandler.cpp b/kalarm/dcophandler.cpp
index 8c37ffd8..42af4ce9 100644
--- a/kalarm/dcophandler.cpp
+++ b/kalarm/dcophandler.cpp
@@ -344,7 +344,7 @@ DateTime DcopHandler::convertStartDateTime(const TQString& startDateTime)
 		else
 		{
 			// It's a time, so use today as the date
-			start.set(TQDate::currentDate(), TQTime::fromString(t, Qt::ISODate));
+			start.set(TQDate::tqcurrentDate(), TQTime::fromString(t, Qt::ISODate));
 		}
 	}
 	if (!start.isValid())
@@ -486,17 +486,17 @@ bool DcopHandlerOld::process(const TQCString& func, const TQByteArray& data, TQC
 	kdDebug(5950) << "DcopHandlerOld::process(): " << func << endl;
 	enum
 	{
-		OPERATION      = 0x0007,    // mask for main operation
+		OPERATION      = 0x0007,    // tqmask for main operation
 		  HANDLE       = 0x0001,
 		  CANCEL       = 0x0002,
 		  TRIGGER      = 0x0003,
 		  SCHEDULE     = 0x0004,
-		ALARM_TYPE     = 0x00F0,    // mask for SCHEDULE alarm type
+		ALARM_TYPE     = 0x00F0,    // tqmask for SCHEDULE alarm type
 		  MESSAGE      = 0x0010,
 		  FILE         = 0x0020,
 		  COMMAND      = 0x0030,
 		  EMAIL        = 0x0040,
-		SCH_FLAGS      = 0x0F00,    // mask for SCHEDULE flags
+		SCH_FLAGS      = 0x0F00,    // tqmask for SCHEDULE flags
 		  REP_COUNT    = 0x0100,
 		  REP_END      = 0x0200,
 		  FONT         = 0x0400,
@@ -516,111 +516,111 @@ bool DcopHandlerOld::process(const TQCString& func, const TQByteArray& data, TQC
 		function = TRIGGER;
 
 	//                scheduleMessage(message, dateTime, colour, colourfg, flags, audioURL, reminder, recurrence)
-	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,const TQString&)"
-	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQColor,Q_UINT32,TQString,Q_UINT32,TQString)")
+	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,const TQColor&,TQ_UINT32,const TQString&,TQ_INT32,const TQString&)"
+	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQColor,TQ_UINT32,TQString,TQ_UINT32,TQString)")
 		function = SCHEDULE | MESSAGE;
 	//                scheduleMessage(message, dateTime, colour, colourfg, font, flags, audioURL, reminder, recurrence)
-	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,const TQColor&,const TQFont&,Q_UINT32,const TQString&,Q_INT32,const TQString&)"
-	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQColor,TQFont,Q_UINT32,TQString,Q_UINT32,TQString)")
+	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,const TQColor&,const TQFont&,TQ_UINT32,const TQString&,TQ_INT32,const TQString&)"
+	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQColor,TQFont,TQ_UINT32,TQString,TQ_UINT32,TQString)")
 		function = SCHEDULE | MESSAGE | FONT;
 	//                scheduleFile(URL, dateTime, colour, flags, audioURL, reminder, recurrence)
-	else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,const TQString&)"
-	||       func == "scheduleFile(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_UINT32,TQString)")
+	else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,const TQString&,TQ_INT32,TQ_INT32,const TQString&)"
+	||       func == "scheduleFile(TQString,TQDateTime,TQColor,TQ_UINT32,TQString,TQ_UINT32,TQString)")
 		function = SCHEDULE | FILE;
 	//                scheduleCommand(commandLine, dateTime, flags, recurrence)
-	else if (func == "scheduleCommand(const TQString&,const TQDateTime&,Q_UINT32,const TQString&)"
-	||       func == "scheduleCommand(TQString,TQDateTime,Q_UINT32,TQString)")
+	else if (func == "scheduleCommand(const TQString&,const TQDateTime&,TQ_UINT32,const TQString&)"
+	||       func == "scheduleCommand(TQString,TQDateTime,TQ_UINT32,TQString)")
 		function = SCHEDULE | COMMAND;
 	//                scheduleEmail(addresses, subject, message, attachments, dateTime, flags, recurrence)
-	else if (func == "scheduleEmail(const TQString&,const TQString&,const TQString&,const TQString&,const TQDateTime&,Q_UINT32,const TQString&)"
-	||       func == "scheduleEmail(TQString,TQString,TQString,TQString,TQDateTime,Q_UINT32,TQString)")
+	else if (func == "scheduleEmail(const TQString&,const TQString&,const TQString&,const TQString&,const TQDateTime&,TQ_UINT32,const TQString&)"
+	||       func == "scheduleEmail(TQString,TQString,TQString,TQString,TQDateTime,TQ_UINT32,TQString)")
 		function = SCHEDULE | EMAIL;
 
 	//                scheduleMessage(message, dateTime, colour, colourfg, flags, audioURL, reminder, recurType, interval, recurCount)
-	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,Q_INT32,Q_INT32)"
-	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,Q_INT32,Q_INT32)")
+	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,const TQColor&,TQ_UINT32,const TQString&,TQ_INT32,TQ_INT32,TQ_INT32,TQ_INT32)"
+	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQColor,TQ_UINT32,TQString,TQ_INT32,TQ_INT32,TQ_INT32,TQ_INT32)")
 		function = SCHEDULE | MESSAGE | REP_COUNT;
 	//                scheduleFile(URL, dateTime, colour, flags, audioURL, reminder, recurType, interval, recurCount)
-	else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,Q_INT32,Q_INT32)"
-	||       func == "scheduleFile(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,Q_INT32,Q_INT32)")
+	else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,const TQString&,TQ_INT32,TQ_INT32,TQ_INT32,TQ_INT32)"
+	||       func == "scheduleFile(TQString,TQDateTime,TQColor,TQ_UINT32,TQString,TQ_INT32,TQ_INT32,TQ_INT32,TQ_INT32)")
 		function = SCHEDULE | FILE | REP_COUNT;
 	//                scheduleCommand(commandLine, dateTime, flags, recurType, interval, recurCount)
-	else if (func == "scheduleCommand(const TQString&,const TQDateTime&,Q_UINT32,Q_INT32,Q_INT32,Q_INT32)"
-	||       func == "scheduleCommand(TQString,TQDateTime,Q_UINT32,Q_INT32,Q_INT32,Q_INT32)")
+	else if (func == "scheduleCommand(const TQString&,const TQDateTime&,TQ_UINT32,TQ_INT32,TQ_INT32,TQ_INT32)"
+	||       func == "scheduleCommand(TQString,TQDateTime,TQ_UINT32,TQ_INT32,TQ_INT32,TQ_INT32)")
 		function = SCHEDULE | COMMAND | REP_COUNT;
 	//                scheduleEmail(addresses, subject, message, attachments, dateTime, flags, recurType, interval, recurCount)
-	else if (func == "scheduleEmail(const TQString&,const TQString&,const TQString&,const TQString&,const TQDateTime&,Q_UINT32,Q_INT32,Q_INT32,Q_INT32)"
-	||       func == "scheduleEmail(TQString,TQString,TQString,TQString,TQDateTime,Q_UINT32,Q_INT32,Q_INT32,Q_INT32)")
+	else if (func == "scheduleEmail(const TQString&,const TQString&,const TQString&,const TQString&,const TQDateTime&,TQ_UINT32,TQ_INT32,TQ_INT32,TQ_INT32)"
+	||       func == "scheduleEmail(TQString,TQString,TQString,TQString,TQDateTime,TQ_UINT32,TQ_INT32,TQ_INT32,TQ_INT32)")
 		function = SCHEDULE | EMAIL | REP_COUNT;
 
 	//                scheduleMessage(message, dateTime, colour, colourfg, flags, audioURL, reminder, recurType, interval, endTime)
-	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,Q_INT32,const TQDateTime&)"
-	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,Q_INT32,TQDateTime)")
+	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,const TQColor&,TQ_UINT32,const TQString&,TQ_INT32,TQ_INT32,TQ_INT32,const TQDateTime&)"
+	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQColor,TQ_UINT32,TQString,TQ_INT32,TQ_INT32,TQ_INT32,TQDateTime)")
 		function = SCHEDULE | MESSAGE | REP_END;
 	//                scheduleFile(URL, dateTime, colour, flags, audioURL, reminder, recurType, interval, endTime)
-	else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,Q_INT32,const TQDateTime&)"
-	||       func == "scheduleFile(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,Q_INT32,TQDateTime)")
+	else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,const TQString&,TQ_INT32,TQ_INT32,TQ_INT32,const TQDateTime&)"
+	||       func == "scheduleFile(TQString,TQDateTime,TQColor,TQ_UINT32,TQString,TQ_INT32,TQ_INT32,TQ_INT32,TQDateTime)")
 		function = SCHEDULE | FILE | REP_END;
 	//                scheduleCommand(commandLine, dateTime, flags, recurType, interval, endTime)
-	else if (func == "scheduleCommand(const TQString&,const TQDateTime&,Q_UINT32,Q_INT32,Q_INT32,const TQDateTime&)"
-	||       func == "scheduleCommand(TQString,TQDateTime,Q_UINT32,Q_INT32,Q_INT32,TQDateTime)")
+	else if (func == "scheduleCommand(const TQString&,const TQDateTime&,TQ_UINT32,TQ_INT32,TQ_INT32,const TQDateTime&)"
+	||       func == "scheduleCommand(TQString,TQDateTime,TQ_UINT32,TQ_INT32,TQ_INT32,TQDateTime)")
 		function = SCHEDULE | COMMAND | REP_END;
 	//                scheduleEmail(addresses, subject, message, attachments, dateTime, flags, recurType, interval, endTime)
-	else if (func == "scheduleEmail(const TQString&,const TQString&,const TQString&,const TQString&,const TQDateTime&,Q_UINT32,Q_INT32,Q_INT32,const TQDateTime&)"
-	||       func == "scheduleEmail(TQString,TQString,TQString,TQString,TQDateTime,Q_UINT32,Q_INT32,Q_INT32,TQDateTime)")
+	else if (func == "scheduleEmail(const TQString&,const TQString&,const TQString&,const TQString&,const TQDateTime&,TQ_UINT32,TQ_INT32,TQ_INT32,const TQDateTime&)"
+	||       func == "scheduleEmail(TQString,TQString,TQString,TQString,TQDateTime,TQ_UINT32,TQ_INT32,TQ_INT32,TQDateTime)")
 		function = SCHEDULE | EMAIL | REP_END;
 
 	// Deprecated methods: backwards compatibility with KAlarm pre-0.9.6
 	//                scheduleMessage(message, dateTime, colour, flags, audioURL, reminder, recurrence)
-	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,const TQString&)"
-	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_UINT32,TQString)")
+	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,const TQString&,TQ_INT32,const TQString&)"
+	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQ_UINT32,TQString,TQ_UINT32,TQString)")
 		function = SCHEDULE | MESSAGE | PRE_096;
 	//                scheduleMessage(message, dateTime, colour, font, flags, audioURL, reminder, recurrence)
-	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,const TQFont&,Q_UINT32,const TQString&,Q_INT32,const TQString&)"
-	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQFont,Q_UINT32,TQString,Q_UINT32,TQString)")
+	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,const TQFont&,TQ_UINT32,const TQString&,TQ_INT32,const TQString&)"
+	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQFont,TQ_UINT32,TQString,TQ_UINT32,TQString)")
 		function = SCHEDULE | MESSAGE | FONT | PRE_096;
 	//                scheduleMessage(message, dateTime, colour, flags, audioURL, reminder, recurType, interval, recurCount)
-	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,Q_INT32,Q_INT32)"
-	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,Q_INT32,Q_INT32)")
+	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,const TQString&,TQ_INT32,TQ_INT32,TQ_INT32,TQ_INT32)"
+	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQ_UINT32,TQString,TQ_INT32,TQ_INT32,TQ_INT32,TQ_INT32)")
 		function = SCHEDULE | MESSAGE | REP_COUNT | PRE_096;
 	//                scheduleMessage(message, dateTime, colour, flags, audioURL, reminder, recurType, interval, endTime)
-	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,Q_INT32,const TQDateTime&)"
-	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,Q_INT32,TQDateTime)")
+	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,const TQString&,TQ_INT32,TQ_INT32,TQ_INT32,const TQDateTime&)"
+	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQ_UINT32,TQString,TQ_INT32,TQ_INT32,TQ_INT32,TQDateTime)")
 		function = SCHEDULE | MESSAGE | REP_END | PRE_096;
 
 	// Deprecated methods: backwards compatibility with KAlarm pre-0.9.1
 	//                scheduleMessage(message, dateTime, colour, flags, audioURL)
-	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&)"
-	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,Q_UINT32,TQString)")
+	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,const TQString&)"
+	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQ_UINT32,TQString)")
 		function = SCHEDULE | MESSAGE | PRE_091;
 	//                scheduleFile(URL, dateTime, colour, flags, audioURL)
-	else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&)"
-	||       func == "scheduleFile(TQString,TQDateTime,TQColor,Q_UINT32,TQString)")
+	else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,const TQString&)"
+	||       func == "scheduleFile(TQString,TQDateTime,TQColor,TQ_UINT32,TQString)")
 		function = SCHEDULE | FILE | PRE_091;
 	//                scheduleMessage(message, dateTime, colour, flags, audioURL, recurType, interval, recurCount)
-	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,Q_INT32)"
-	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,Q_INT32)")
+	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,const TQString&,TQ_INT32,TQ_INT32,TQ_INT32)"
+	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQ_UINT32,TQString,TQ_INT32,TQ_INT32,TQ_INT32)")
 		function = SCHEDULE | MESSAGE | REP_COUNT | PRE_091;
 	//                scheduleFile(URL, dateTime, colour, flags, audioURL, recurType, interval, recurCount)
-	else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,Q_INT32)"
-	||       func == "scheduleFile(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,Q_INT32)")
+	else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,const TQString&,TQ_INT32,TQ_INT32,TQ_INT32)"
+	||       func == "scheduleFile(TQString,TQDateTime,TQColor,TQ_UINT32,TQString,TQ_INT32,TQ_INT32,TQ_INT32)")
 		function = SCHEDULE | FILE | REP_COUNT | PRE_091;
 	//                scheduleMessage(message, dateTime, colour, flags, audioURL, recurType, interval, endTime)
-	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,const TQDateTime&)"
-	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,TQDateTime)")
+	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,const TQString&,TQ_INT32,TQ_INT32,const TQDateTime&)"
+	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQ_UINT32,TQString,TQ_INT32,TQ_INT32,TQDateTime)")
 		function = SCHEDULE | MESSAGE | REP_END | PRE_091;
 	//                scheduleFile(URL, dateTime, colour, flags, audioURL, recurType, interval, endTime)
-	else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,const TQDateTime&)"
-	||       func == "scheduleFile(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,TQDateTime)")
+	else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,const TQString&,TQ_INT32,TQ_INT32,const TQDateTime&)"
+	||       func == "scheduleFile(TQString,TQDateTime,TQColor,TQ_UINT32,TQString,TQ_INT32,TQ_INT32,TQDateTime)")
 		function = SCHEDULE | FILE | REP_END | PRE_091;
 
 	// Obsolete methods: backwards compatibility with KAlarm pre-0.7
-	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,Q_INT32,Q_INT32)"
-	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,Q_UINT32,Q_INT32,Q_INT32)"
-	||       func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,Q_INT32,Q_INT32)"
-	||       func == "scheduleFile(TQString,TQDateTime,TQColor,Q_UINT32,Q_INT32,Q_INT32)"
-	||       func == "scheduleCommand(const TQString&,const TQDateTime&,Q_UINT32,Q_INT32,Q_INT32)"
-	||       func == "scheduleCommand(TQString,TQDateTime,Q_UINT32,Q_INT32,Q_INT32)"
+	else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,TQ_INT32,TQ_INT32)"
+	||       func == "scheduleMessage(TQString,TQDateTime,TQColor,TQ_UINT32,TQ_INT32,TQ_INT32)"
+	||       func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,TQ_UINT32,TQ_INT32,TQ_INT32)"
+	||       func == "scheduleFile(TQString,TQDateTime,TQColor,TQ_UINT32,TQ_INT32,TQ_INT32)"
+	||       func == "scheduleCommand(const TQString&,const TQDateTime&,TQ_UINT32,TQ_INT32,TQ_INT32)"
+	||       func == "scheduleCommand(TQString,TQDateTime,TQ_UINT32,TQ_INT32,TQ_INT32)"
 	// Obsolete methods: backwards compatibility with KAlarm pre-0.6
 	||       func == "cancelMessage(const TQString&,const TQString&)"
 	||       func == "cancelMessage(TQString,TQString)"
@@ -677,10 +677,10 @@ bool DcopHandlerOld::process(const TQCString& func, const TQByteArray& data, TQC
 			TQColor       bgColour;
 			TQColor       fgColour(Qt::black);
 			TQFont        font;
-			Q_UINT32     flags;
+			TQ_UINT32     flags;
 			int          lateCancel = 0;
 			KARecurrence recurrence;
-			Q_INT32      reminderMinutes = 0;
+			TQ_INT32      reminderMinutes = 0;
 			if (action == KAEvent::EMAIL)
 			{
 				TQString addresses, attachments;
@@ -731,9 +731,9 @@ bool DcopHandlerOld::process(const TQCString& func, const TQByteArray& data, TQC
 			if (function & (REP_COUNT | REP_END))
 			{			
 				KARecurrence::Type recurType;
-				Q_INT32 recurCount = 0;
-				Q_INT32 recurInterval;
-				Q_INT32 type;
+				TQ_INT32 recurCount = 0;
+				TQ_INT32 recurInterval;
+				TQ_INT32 type;
 				arg >> type >> recurInterval;
 				switch (type)
 				{
diff --git a/kalarm/deferdlg.cpp b/kalarm/deferdlg.cpp
index 60fce82c..9df852a9 100644
--- a/kalarm/deferdlg.cpp
+++ b/kalarm/deferdlg.cpp
@@ -48,14 +48,14 @@ DeferAlarmDlg::DeferAlarmDlg(const TQString& caption, const DateTime& initialDT,
 
 	TQWidget* page = new TQWidget(this);
 	setMainWidget(page);
-	TQVBoxLayout* layout = new TQVBoxLayout(page, 0, spacingHint());
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(page, 0, spacingHint());
 
 	mTimeWidget = new AlarmTimeWidget(AlarmTimeWidget::DEFER_TIME, page, "timeGroup");
 	mTimeWidget->setDateTime(initialDT);
 	mTimeWidget->setMinDateTimeIsCurrent();
 	connect(mTimeWidget, TQT_SIGNAL(pastMax()), TQT_SLOT(slotPastLimit()));
-	layout->addWidget(mTimeWidget);
-	layout->addSpacing(spacingHint());
+	tqlayout->addWidget(mTimeWidget);
+	tqlayout->addSpacing(spacingHint());
 
 	setButtonWhatsThis(Ok, i18n("Defer the alarm until the specified time."));
 	setButtonWhatsThis(User1, i18n("Cancel the deferred alarm. This does not affect future recurrences."));
diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp
index bd22fdd9..e5cd07dc 100644
--- a/kalarm/editdlg.cpp
+++ b/kalarm/editdlg.cpp
@@ -102,7 +102,7 @@ class PickAlarmFileRadio : public PickFileRadio
 	virtual TQString pickFile()    // called when browse button is pressed to select a file to display
 	{
 		return KAlarm::browseFile(i18n("Choose Text or Image File to Display"), mDefaultDir, fileEdit()->text(),
-		                          TQString::null, KFile::ExistingOnly, parentWidget(), "pickAlarmFile");
+		                          TQString::null, KFile::ExistingOnly, tqparentWidget(), "pickAlarmFile");
 	}
     private:
 	TQString mDefaultDir;   // default directory for file browse button
@@ -119,7 +119,7 @@ class PickLogFileRadio : public PickFileRadio
 	virtual TQString pickFile()    // called when browse button is pressed to select a log file
 	{
 		return KAlarm::browseFile(i18n("Choose Log File"), mDefaultDir, fileEdit()->text(), TQString::null,
-		                          KFile::LocalOnly, parentWidget(), "pickLogFile");
+		                          KFile::LocalOnly, tqparentWidget(), "pickLogFile");
 	}
     private:
 	TQString mDefaultDir;   // default directory for log file browse button
@@ -129,7 +129,7 @@ inline TQString recurText(const KAEvent& event)
 {
 	TQString r;
 	if (event.repeatCount())
-		r = TQString::fromLatin1("%1 / %2").arg(event.recurrenceText()).arg(event.repetitionText());
+		r = TQString::tqfromLatin1("%1 / %2").arg(event.recurrenceText()).arg(event.repetitionText());
 	else
 		r = event.recurrenceText();
 	return i18n("&Recurrence - [%1]").arg(r);
@@ -196,12 +196,12 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
 		TQHBox* box = new TQHBox(mainWidget);
 		box->setSpacing(spacingHint());
 		TQLabel* label = new TQLabel(i18n("Template name:"), box);
-		label->setFixedSize(label->sizeHint());
+		label->setFixedSize(label->tqsizeHint());
 		mTemplateName = new TQLineEdit(box);
 		mTemplateName->setReadOnly(mReadOnly);
 		label->setBuddy(mTemplateName);
 		TQWhatsThis::add(box, i18n("Enter the name of the alarm template"));
-		box->setFixedHeight(box->sizeHint().height());
+		box->setFixedHeight(box->tqsizeHint().height());
 	}
 	mTabs = new TQTabWidget(mainWidget);
 	mTabs->setMargin(marginHint());
@@ -230,13 +230,13 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
 	mActionGroup = new ButtonGroup(i18n("Action"), mainPage, "actionGroup");
 	connect(mActionGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotAlarmTypeChanged(int)));
 	topLayout->addWidget(mActionGroup, 1);
-	TQBoxLayout* layout = new TQVBoxLayout(mActionGroup, marginHint(), spacingHint());
-	layout->addSpacing(fontMetrics().lineSpacing()/2);
-	TQGridLayout* grid = new TQGridLayout(layout, 1, 5);
+	TQBoxLayout* tqlayout = new TQVBoxLayout(mActionGroup, marginHint(), spacingHint());
+	tqlayout->addSpacing(fontMetrics().lineSpacing()/2);
+	TQGridLayout* grid = new TQGridLayout(tqlayout, 1, 5);
 
 	// Message radio button
 	mMessageRadio = new RadioButton(i18n("Te&xt"), mActionGroup, "messageButton");
-	mMessageRadio->setFixedSize(mMessageRadio->sizeHint());
+	mMessageRadio->setFixedSize(mMessageRadio->tqsizeHint());
 	TQWhatsThis::add(mMessageRadio,
 	      i18n("If checked, the alarm will display a text message."));
 	grid->addWidget(mMessageRadio, 1, 0);
@@ -244,7 +244,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
 
 	// File radio button
 	mFileRadio = new PickAlarmFileRadio(i18n("&File"), mActionGroup, "fileButton");
-	mFileRadio->setFixedSize(mFileRadio->sizeHint());
+	mFileRadio->setFixedSize(mFileRadio->tqsizeHint());
 	TQWhatsThis::add(mFileRadio,
 	      i18n("If checked, the alarm will display the contents of a text or image file."));
 	grid->addWidget(mFileRadio, 1, 2);
@@ -252,7 +252,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
 
 	// Command radio button
 	mCommandRadio = new RadioButton(i18n("Co&mmand"), mActionGroup, "cmdButton");
-	mCommandRadio->setFixedSize(mCommandRadio->sizeHint());
+	mCommandRadio->setFixedSize(mCommandRadio->tqsizeHint());
 	TQWhatsThis::add(mCommandRadio,
 	      i18n("If checked, the alarm will execute a shell command."));
 	grid->addWidget(mCommandRadio, 1, 4);
@@ -260,81 +260,81 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
 
 	// Email radio button
 	mEmailRadio = new RadioButton(i18n("&Email"), mActionGroup, "emailButton");
-	mEmailRadio->setFixedSize(mEmailRadio->sizeHint());
+	mEmailRadio->setFixedSize(mEmailRadio->tqsizeHint());
 	TQWhatsThis::add(mEmailRadio,
 	      i18n("If checked, the alarm will send an email."));
 	grid->addWidget(mEmailRadio, 1, 6);
 
 	initDisplayAlarms(mActionGroup);
-	layout->addWidget(mDisplayAlarmsFrame);
+	tqlayout->addWidget(mDisplayAlarmsFrame);
 	initCommand(mActionGroup);
-	layout->addWidget(mCommandFrame);
+	tqlayout->addWidget(mCommandFrame);
 	initEmail(mActionGroup);
-	layout->addWidget(mEmailFrame);
+	tqlayout->addWidget(mEmailFrame);
 
 	// Deferred date/time: visible only for a deferred recurring event.
 	mDeferGroup = new TQGroupBox(1, Qt::Vertical, i18n("Deferred Alarm"), mainPage, "deferGroup");
 	topLayout->addWidget(mDeferGroup);
 	TQLabel* label = new TQLabel(i18n("Deferred to:"), mDeferGroup);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	mDeferTimeLabel = new TQLabel(mDeferGroup);
 
 	mDeferChangeButton = new TQPushButton(i18n("C&hange..."), mDeferGroup);
-	mDeferChangeButton->setFixedSize(mDeferChangeButton->sizeHint());
+	mDeferChangeButton->setFixedSize(mDeferChangeButton->tqsizeHint());
 	connect(mDeferChangeButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditDeferral()));
 	TQWhatsThis::add(mDeferChangeButton, i18n("Change the alarm's deferred time, or cancel the deferral"));
 	mDeferGroup->addSpace(0);
 
-	layout = new TQHBoxLayout(topLayout);
+	tqlayout = new TQHBoxLayout(topLayout);
 
 	// Date and time entry
 	if (mTemplate)
 	{
 		mTemplateTimeGroup = new ButtonGroup(i18n("Time"), mainPage, "templateGroup");
 		connect(mTemplateTimeGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotTemplateTimeType(int)));
-		layout->addWidget(mTemplateTimeGroup);
+		tqlayout->addWidget(mTemplateTimeGroup);
 		grid = new TQGridLayout(mTemplateTimeGroup, 2, 2, marginHint(), spacingHint());
 		grid->addRowSpacing(0, fontMetrics().lineSpacing()/2);
-		// Get alignment to use in TQGridLayout (AlignAuto doesn't work correctly there)
-		int alignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft;
+		// Get tqalignment to use in TQGridLayout (AlignAuto doesn't work correctly there)
+		int tqalignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft;
 
 		mTemplateDefaultTime = new RadioButton(i18n("&Default time"), mTemplateTimeGroup, "templateDefTimeButton");
-		mTemplateDefaultTime->setFixedSize(mTemplateDefaultTime->sizeHint());
+		mTemplateDefaultTime->setFixedSize(mTemplateDefaultTime->tqsizeHint());
 		mTemplateDefaultTime->setReadOnly(mReadOnly);
 		TQWhatsThis::add(mTemplateDefaultTime,
 		      i18n("Do not specify a start time for alarms based on this template. "
 		           "The normal default start time will be used."));
-		grid->addWidget(mTemplateDefaultTime, 0, 0, alignment);
+		grid->addWidget(mTemplateDefaultTime, 0, 0, tqalignment);
 
 		TQHBox* box = new TQHBox(mTemplateTimeGroup);
 		box->setSpacing(spacingHint());
 		mTemplateUseTime = new RadioButton(i18n("Time:"), box, "templateTimeButton");
-		mTemplateUseTime->setFixedSize(mTemplateUseTime->sizeHint());
+		mTemplateUseTime->setFixedSize(mTemplateUseTime->tqsizeHint());
 		mTemplateUseTime->setReadOnly(mReadOnly);
 		TQWhatsThis::add(mTemplateUseTime,
 		      i18n("Specify a start time for alarms based on this template."));
 		mTemplateTimeGroup->insert(mTemplateUseTime);
 		mTemplateTime = new TimeEdit(box, "templateTimeEdit");
-		mTemplateTime->setFixedSize(mTemplateTime->sizeHint());
+		mTemplateTime->setFixedSize(mTemplateTime->tqsizeHint());
 		mTemplateTime->setReadOnly(mReadOnly);
 		TQWhatsThis::add(mTemplateTime,
 		      TQString("%1\n\n%2").arg(i18n("Enter the start time for alarms based on this template."))
 		                         .arg(TimeSpinBox::shiftWhatsThis()));
 		box->setStretchFactor(new TQWidget(box), 1);    // left adjust the controls
-		box->setFixedHeight(box->sizeHint().height());
-		grid->addWidget(box, 0, 1, alignment);
+		box->setFixedHeight(box->tqsizeHint().height());
+		grid->addWidget(box, 0, 1, tqalignment);
 
 		mTemplateAnyTime = new RadioButton(i18n("An&y time"), mTemplateTimeGroup, "templateAnyTimeButton");
-		mTemplateAnyTime->setFixedSize(mTemplateAnyTime->sizeHint());
+		mTemplateAnyTime->setFixedSize(mTemplateAnyTime->tqsizeHint());
 		mTemplateAnyTime->setReadOnly(mReadOnly);
 		TQWhatsThis::add(mTemplateAnyTime,
 		      i18n("Set the '%1' option for alarms based on this template.").arg(i18n("Any time")));
-		grid->addWidget(mTemplateAnyTime, 1, 0, alignment);
+		grid->addWidget(mTemplateAnyTime, 1, 0, tqalignment);
 
 		box = new TQHBox(mTemplateTimeGroup);
 		box->setSpacing(spacingHint());
 		mTemplateUseTimeAfter = new RadioButton(AlarmTimeWidget::i18n_w_TimeFromNow(), box, "templateFromNowButton");
-		mTemplateUseTimeAfter->setFixedSize(mTemplateUseTimeAfter->sizeHint());
+		mTemplateUseTimeAfter->setFixedSize(mTemplateUseTimeAfter->tqsizeHint());
 		mTemplateUseTimeAfter->setReadOnly(mReadOnly);
 		TQWhatsThis::add(mTemplateUseTimeAfter,
 		      i18n("Set alarms based on this template to start after the specified time "
@@ -342,15 +342,15 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
 		mTemplateTimeGroup->insert(mTemplateUseTimeAfter);
 		mTemplateTimeAfter = new TimeSpinBox(1, maxDelayTime, box);
 		mTemplateTimeAfter->setValue(1439);
-		mTemplateTimeAfter->setFixedSize(mTemplateTimeAfter->sizeHint());
+		mTemplateTimeAfter->setFixedSize(mTemplateTimeAfter->tqsizeHint());
 		mTemplateTimeAfter->setReadOnly(mReadOnly);
 		TQWhatsThis::add(mTemplateTimeAfter,
 		      TQString("%1\n\n%2").arg(AlarmTimeWidget::i18n_TimeAfterPeriod())
 		                         .arg(TimeSpinBox::shiftWhatsThis()));
-		box->setFixedHeight(box->sizeHint().height());
-		grid->addWidget(box, 1, 1, alignment);
+		box->setFixedHeight(box->tqsizeHint().height());
+		grid->addWidget(box, 1, 1, tqalignment);
 
-		layout->addStretch();
+		tqlayout->addStretch();
 	}
 	else
 	{
@@ -365,7 +365,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
 	                         i18n("Check to additionally display a reminder in advance of the main alarm time(s)."),
 	                         TQString("%1\n\n%2").arg(reminderText).arg(TimeSpinBox::shiftWhatsThis()),
 	                         true, true, mainPage);
-	mReminder->setFixedSize(mReminder->sizeHint());
+	mReminder->setFixedSize(mReminder->tqsizeHint());
 	topLayout->addWidget(mReminder, 0, Qt::AlignAuto);
 
 	// Late cancel selector - default = allow late display
@@ -373,20 +373,20 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
 	topLayout->addWidget(mLateCancel, 0, Qt::AlignAuto);
 
 	// Acknowledgement confirmation required - default = no confirmation
-	layout = new TQHBoxLayout(topLayout, 0);
+	tqlayout = new TQHBoxLayout(topLayout, 0);
 	mConfirmAck = createConfirmAckCheckbox(mainPage);
-	mConfirmAck->setFixedSize(mConfirmAck->sizeHint());
-	layout->addWidget(mConfirmAck);
-	layout->addSpacing(2*spacingHint());
-	layout->addStretch();
+	mConfirmAck->setFixedSize(mConfirmAck->tqsizeHint());
+	tqlayout->addWidget(mConfirmAck);
+	tqlayout->addSpacing(2*spacingHint());
+	tqlayout->addStretch();
 
 	if (theApp()->korganizerEnabled())
 	{
 		// Show in KOrganizer checkbox
 		mShowInKorganizer = new CheckBox(i18n_ShowInKOrganizer(), mainPage);
-		mShowInKorganizer->setFixedSize(mShowInKorganizer->sizeHint());
+		mShowInKorganizer->setFixedSize(mShowInKorganizer->tqsizeHint());
 		TQWhatsThis::add(mShowInKorganizer, i18n("Check to copy the alarm into KOrganizer's calendar"));
-		layout->addWidget(mShowInKorganizer);
+		tqlayout->addWidget(mShowInKorganizer);
 	}
 
 	setButtonWhatsThis(Ok, i18n("Schedule the alarm at the specified time."));
@@ -436,40 +436,40 @@ void EditAlarmDlg::initDisplayAlarms(TQWidget* parent)
 	// File browse button
 	mFileBrowseButton = new TQPushButton(mFileBox);
 	mFileBrowseButton->setPixmap(SmallIcon("fileopen"));
-	mFileBrowseButton->setFixedSize(mFileBrowseButton->sizeHint());
+	mFileBrowseButton->setFixedSize(mFileBrowseButton->tqsizeHint());
 	TQToolTip::add(mFileBrowseButton, i18n("Choose a file"));
 	TQWhatsThis::add(mFileBrowseButton, i18n("Select a text or image file to display."));
 	mFileRadio->init(mFileBrowseButton, mFileMessageEdit);
 
 	// Font and colour choice button and sample text
 	mFontColourButton = new FontColourButton(mDisplayAlarmsFrame);
-	mFontColourButton->setMaximumHeight(mFontColourButton->sizeHint().height());
+	mFontColourButton->setMaximumHeight(mFontColourButton->tqsizeHint().height());
 	frameLayout->addWidget(mFontColourButton);
 
-	TQHBoxLayout* layout = new TQHBoxLayout(frameLayout, 0, 0);
+	TQHBoxLayout* tqlayout = new TQHBoxLayout(frameLayout, 0, 0);
 	mBgColourBox = new TQHBox(mDisplayAlarmsFrame);
 	mBgColourBox->setSpacing(spacingHint());
-	layout->addWidget(mBgColourBox);
-	layout->addStretch();
+	tqlayout->addWidget(mBgColourBox);
+	tqlayout->addStretch();
 	TQLabel* label = new TQLabel(i18n("&Background color:"), mBgColourBox);
 	mBgColourButton = new ColourCombo(mBgColourBox);
 	label->setBuddy(mBgColourButton);
 	TQWhatsThis::add(mBgColourBox, i18n("Select the alarm message background color"));
 
 	// Sound checkbox and file selector
-	layout = new TQHBoxLayout(frameLayout);
+	tqlayout = new TQHBoxLayout(frameLayout);
 	mSoundPicker = new SoundPicker(mDisplayAlarmsFrame);
-	mSoundPicker->setFixedSize(mSoundPicker->sizeHint());
-	layout->addWidget(mSoundPicker);
-	layout->addSpacing(2*spacingHint());
-	layout->addStretch();
+	mSoundPicker->setFixedSize(mSoundPicker->tqsizeHint());
+	tqlayout->addWidget(mSoundPicker);
+	tqlayout->addSpacing(2*spacingHint());
+	tqlayout->addStretch();
 
 	if (ShellProcess::authorised())    // don't display if shell commands not allowed (e.g. kiosk mode)
 	{
 		// Special actions button
 		mSpecialActionsButton = new SpecialActionsButton(i18n_SpecialActions(), mDisplayAlarmsFrame);
-		mSpecialActionsButton->setFixedSize(mSpecialActionsButton->sizeHint());
-		layout->addWidget(mSpecialActionsButton);
+		mSpecialActionsButton->setFixedSize(mSpecialActionsButton->tqsizeHint());
+		tqlayout->addWidget(mSpecialActionsButton);
 	}
 
 	// Top-adjust the controls
@@ -488,7 +488,7 @@ void EditAlarmDlg::initCommand(TQWidget* parent)
 	TQBoxLayout* frameLayout = new TQVBoxLayout(mCommandFrame, 0, spacingHint());
 
 	mCmdTypeScript = new CheckBox(i18n_p_EnterScript(), mCommandFrame);
-	mCmdTypeScript->setFixedSize(mCmdTypeScript->sizeHint());
+	mCmdTypeScript->setFixedSize(mCmdTypeScript->tqsizeHint());
 	connect(mCmdTypeScript, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCmdScriptToggled(bool)));
 	TQWhatsThis::add(mCmdTypeScript, i18n("Check to enter the contents of a script instead of a shell command line"));
 	frameLayout->addWidget(mCmdTypeScript, 0, Qt::AlignAuto);
@@ -505,20 +505,20 @@ void EditAlarmDlg::initCommand(TQWidget* parent)
 
 	mCmdOutputGroup = new ButtonGroup(i18n("Command Output"), mCommandFrame);
 	frameLayout->addWidget(mCmdOutputGroup);
-	TQBoxLayout* layout = new TQVBoxLayout(mCmdOutputGroup, marginHint(), spacingHint());
-	layout->addSpacing(fontMetrics().lineSpacing()/2);
+	TQBoxLayout* tqlayout = new TQVBoxLayout(mCmdOutputGroup, marginHint(), spacingHint());
+	tqlayout->addSpacing(fontMetrics().lineSpacing()/2);
 
 	// Execute in terminal window
 	RadioButton* button = new RadioButton(i18n_u_ExecInTermWindow(), mCmdOutputGroup, "execInTerm");
-	button->setFixedSize(button->sizeHint());
+	button->setFixedSize(button->tqsizeHint());
 	TQWhatsThis::add(button, i18n("Check to execute the command in a terminal window"));
 	mCmdOutputGroup->insert(button, EXEC_IN_TERMINAL);
-	layout->addWidget(button, 0, Qt::AlignAuto);
+	tqlayout->addWidget(button, 0, Qt::AlignAuto);
 
 	// Log file name edit box
 	TQHBox* box = new TQHBox(mCmdOutputGroup);
 	(new TQWidget(box))->setFixedWidth(button->style().subRect(TQStyle::SR_RadioButtonIndicator, button).width());   // indent the edit box
-//	(new TQWidget(box))->setFixedWidth(button->style().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth));   // indent the edit box
+//	(new TQWidget(box))->setFixedWidth(button->style().tqpixelMetric(TQStyle::PM_ExclusiveIndicatorWidth));   // indent the edit box
 	mCmdLogFileEdit = new LineEdit(LineEdit::Url, box);
 	mCmdLogFileEdit->setAcceptDrops(true);
 	TQWhatsThis::add(mCmdLogFileEdit, i18n("Enter the name or path of the log file."));
@@ -527,25 +527,25 @@ void EditAlarmDlg::initCommand(TQWidget* parent)
 	// The file browser dialogue is activated by the PickLogFileRadio class.
 	TQPushButton* browseButton = new TQPushButton(box);
 	browseButton->setPixmap(SmallIcon("fileopen"));
-	browseButton->setFixedSize(browseButton->sizeHint());
+	browseButton->setFixedSize(browseButton->tqsizeHint());
 	TQToolTip::add(browseButton, i18n("Choose a file"));
 	TQWhatsThis::add(browseButton, i18n("Select a log file."));
 
 	// Log output to file
 	button = new PickLogFileRadio(browseButton, mCmdLogFileEdit, i18n_g_LogToFile(), mCmdOutputGroup, "cmdLog");
-	button->setFixedSize(button->sizeHint());
+	button->setFixedSize(button->tqsizeHint());
 	TQWhatsThis::add(button,
 	      i18n("Check to log the command output to a local file. The output will be appended to any existing contents of the file."));
 	mCmdOutputGroup->insert(button, LOG_TO_FILE);
-	layout->addWidget(button, 0, Qt::AlignAuto);
-	layout->addWidget(box);
+	tqlayout->addWidget(button, 0, Qt::AlignAuto);
+	tqlayout->addWidget(box);
 
 	// Discard output
 	button = new RadioButton(i18n("Discard"), mCmdOutputGroup, "cmdDiscard");
-	button->setFixedSize(button->sizeHint());
+	button->setFixedSize(button->tqsizeHint());
 	TQWhatsThis::add(button, i18n("Check to discard command output."));
 	mCmdOutputGroup->insert(button, DISCARD_OUTPUT);
-	layout->addWidget(button, 0, Qt::AlignAuto);
+	tqlayout->addWidget(button, 0, Qt::AlignAuto);
 
 	// Top-adjust the controls
 	mCmdPadding = new TQHBox(mCommandFrame);
@@ -560,8 +560,8 @@ void EditAlarmDlg::initEmail(TQWidget* parent)
 {
 	mEmailFrame = new TQFrame(parent);
 	mEmailFrame->setFrameStyle(TQFrame::NoFrame);
-	TQBoxLayout* layout = new TQVBoxLayout(mEmailFrame, 0, spacingHint());
-	TQGridLayout* grid = new TQGridLayout(layout, 3, 3, spacingHint());
+	TQBoxLayout* tqlayout = new TQVBoxLayout(mEmailFrame, 0, spacingHint());
+	TQGridLayout* grid = new TQGridLayout(tqlayout, 3, 3, spacingHint());
 	grid->setColStretch(1, 1);
 
 	mEmailFromList = 0;
@@ -569,11 +569,11 @@ void EditAlarmDlg::initEmail(TQWidget* parent)
 	{
 		// Email sender identity
 		TQLabel* label = new TQLabel(i18n_EmailFrom(), mEmailFrame);
-		label->setFixedSize(label->sizeHint());
+		label->setFixedSize(label->tqsizeHint());
 		grid->addWidget(label, 0, 0);
 
 		mEmailFromList = new EmailIdCombo(KAMail::identityManager(), mEmailFrame);
-		mEmailFromList->setMinimumSize(mEmailFromList->sizeHint());
+		mEmailFromList->setMinimumSize(mEmailFromList->tqsizeHint());
 		label->setBuddy(mEmailFromList);
 		TQWhatsThis::add(mEmailFromList,
 		      i18n("Your email identity, used to identify you as the sender when sending email alarms."));
@@ -582,11 +582,11 @@ void EditAlarmDlg::initEmail(TQWidget* parent)
 
 	// Email recipients
 	TQLabel* label = new TQLabel(i18n_EmailTo(), mEmailFrame);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	grid->addWidget(label, 1, 0);
 
 	mEmailToEdit = new LineEdit(LineEdit::Emails, mEmailFrame);
-	mEmailToEdit->setMinimumSize(mEmailToEdit->sizeHint());
+	mEmailToEdit->setMinimumSize(mEmailToEdit->tqsizeHint());
 	TQWhatsThis::add(mEmailToEdit,
 	      i18n("Enter the addresses of the email recipients. Separate multiple addresses by "
 	           "commas or semicolons."));
@@ -594,7 +594,7 @@ void EditAlarmDlg::initEmail(TQWidget* parent)
 
 	mEmailAddressButton = new TQPushButton(mEmailFrame);
 	mEmailAddressButton->setPixmap(SmallIcon("contents"));
-	mEmailAddressButton->setFixedSize(mEmailAddressButton->sizeHint());
+	mEmailAddressButton->setFixedSize(mEmailAddressButton->tqsizeHint());
 	connect(mEmailAddressButton, TQT_SIGNAL(clicked()), TQT_SLOT(openAddressBook()));
 	TQToolTip::add(mEmailAddressButton, i18n("Open address book"));
 	TQWhatsThis::add(mEmailAddressButton, i18n("Select email addresses from your address book."));
@@ -602,11 +602,11 @@ void EditAlarmDlg::initEmail(TQWidget* parent)
 
 	// Email subject
 	label = new TQLabel(i18n_j_EmailSubject(), mEmailFrame);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	grid->addWidget(label, 2, 0);
 
 	mEmailSubjectEdit = new LineEdit(mEmailFrame);
-	mEmailSubjectEdit->setMinimumSize(mEmailSubjectEdit->sizeHint());
+	mEmailSubjectEdit->setMinimumSize(mEmailSubjectEdit->tqsizeHint());
 	label->setBuddy(mEmailSubjectEdit);
 	TQWhatsThis::add(mEmailSubjectEdit, i18n("Enter the email subject."));
 	grid->addMultiCellWidget(mEmailSubjectEdit, 2, 2, 1, 2);
@@ -614,19 +614,19 @@ void EditAlarmDlg::initEmail(TQWidget* parent)
 	// Email body
 	mEmailMessageEdit = new TextEdit(mEmailFrame);
 	TQWhatsThis::add(mEmailMessageEdit, i18n("Enter the email message."));
-	layout->addWidget(mEmailMessageEdit);
+	tqlayout->addWidget(mEmailMessageEdit);
 
 	// Email attachments
-	grid = new TQGridLayout(layout, 2, 3, spacingHint());
+	grid = new TQGridLayout(tqlayout, 2, 3, spacingHint());
 	label = new TQLabel(i18n("Attachment&s:"), mEmailFrame);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	grid->addWidget(label, 0, 0);
 
 	mEmailAttachList = new TQComboBox(true, mEmailFrame);
-	mEmailAttachList->setMinimumSize(mEmailAttachList->sizeHint());
+	mEmailAttachList->setMinimumSize(mEmailAttachList->tqsizeHint());
 	mEmailAttachList->lineEdit()->setReadOnly(true);
 TQListBox* list = mEmailAttachList->listBox();
-TQRect rect = list->geometry();
+TQRect rect = list->tqgeometry();
 list->setGeometry(rect.left() - 50, rect.top(), rect.width(), rect.height());
 	label->setBuddy(mEmailAttachList);
 	TQWhatsThis::add(mEmailAttachList,
@@ -646,7 +646,7 @@ list->setGeometry(rect.left() - 50, rect.top(), rect.width(), rect.height());
 
 	// BCC email to sender
 	mEmailBcc = new CheckBox(i18n_s_CopyEmailToSelf(), mEmailFrame);
-	mEmailBcc->setFixedSize(mEmailBcc->sizeHint());
+	mEmailBcc->setFixedSize(mEmailBcc->tqsizeHint());
 	TQWhatsThis::add(mEmailBcc,
 	      i18n("If checked, the email will be blind copied to you."));
 	grid->addMultiCellWidget(mEmailBcc, 1, 1, 0, 1, Qt::AlignAuto);
@@ -708,7 +708,7 @@ void EditAlarmDlg::initialise(const KAEvent* event)
 			if (event->isTemplate())
 			{
 				// Initialising from an alarm template: use current date
-				TQDateTime now = TQDateTime::currentDateTime();
+				TQDateTime now = TQDateTime::tqcurrentDateTime();
 				int afterTime = event->templateAfterTime();
 				if (afterTime >= 0)
 				{
@@ -750,7 +750,7 @@ void EditAlarmDlg::initialise(const KAEvent* event)
 		                        TimePeriod::HOURS_MINUTES);
 		mLateCancel->showAutoClose(action == KAEvent::MESSAGE || action == KAEvent::FILE);
 		mLateCancel->setAutoClose(event->autoClose());
-		mLateCancel->setFixedSize(mLateCancel->sizeHint());
+		mLateCancel->setFixedSize(mLateCancel->tqsizeHint());
 		if (mShowInKorganizer)
 			mShowInKorganizer->setChecked(event->copyToKOrganizer());
 		mConfirmAck->setChecked(event->confirmAck());
@@ -804,7 +804,7 @@ void EditAlarmDlg::initialise(const KAEvent* event)
 		mFontColourButton->setBgColour(Preferences::defaultBgColour());
 		mFontColourButton->setFgColour(Preferences::defaultFgColour());
 		mBgColourButton->setColour(Preferences::defaultBgColour());
-		TQDateTime defaultTime = TQDateTime::currentDateTime().addSecs(60);
+		TQDateTime defaultTime = TQDateTime::tqcurrentDateTime().addSecs(60);
 		if (mTemplate)
 		{
 			mTemplateTimeGroup->setButton(mTemplateTimeGroup->id(mTemplateDefaultTime));
@@ -817,7 +817,7 @@ void EditAlarmDlg::initialise(const KAEvent* event)
 		mLateCancel->setMinutes((Preferences::defaultLateCancel() ? 1 : 0), false, TimePeriod::HOURS_MINUTES);
 		mLateCancel->showAutoClose(true);
 		mLateCancel->setAutoClose(Preferences::defaultAutoClose());
-		mLateCancel->setFixedSize(mLateCancel->sizeHint());
+		mLateCancel->setFixedSize(mLateCancel->tqsizeHint());
 		if (mShowInKorganizer)
 			mShowInKorganizer->setChecked(Preferences::defaultCopyToKOrganizer());
 		mConfirmAck->setChecked(Preferences::defaultConfirmAck());
@@ -1212,7 +1212,7 @@ void EditAlarmDlg::setEvent(KAEvent& event, const TQString& text, bool trial)
 		if (mRecurrenceEdit->repeatType() != RecurrenceEdit::NO_RECUR)
 		{
 			mRecurrenceEdit->updateEvent(event, !mTemplate);
-			TQDateTime now = TQDateTime::currentDateTime();
+			TQDateTime now = TQDateTime::tqcurrentDateTime();
 			bool dateOnly = mAlarmDateTime.isDateOnly();
 			if (dateOnly  &&  mAlarmDateTime.date() < now.date()
 			||  !dateOnly  &&  mAlarmDateTime.rawDateTime() < now)
@@ -1232,7 +1232,7 @@ void EditAlarmDlg::setEvent(KAEvent& event, const TQString& text, bool trial)
 					DateTime remindTime = mAlarmDateTime.addMins(-reminder);
 					if (mDeferDateTime >= remindTime)
 					{
-						if (remindTime > TQDateTime::currentDateTime())
+						if (remindTime > TQDateTime::tqcurrentDateTime())
 							deferral = false;    // ignore deferral if it's after next reminder
 						else if (mDeferDateTime > remindTime)
 							deferReminder = true;    // it's the reminder which is being deferred
@@ -1298,7 +1298,7 @@ void EditAlarmDlg::showEvent(TQShowEvent* se)
 		if (KAlarm::readConfigWindowSize(EDIT_DIALOG_NAME, s))
 			s.setHeight(s.height() + (mDeferGroup->isHidden() ? 0 : mDeferGroupHeight));
 		else
-			s = minimumSize();
+			s = tqminimumSize();
 		resize(s);
 	}
 	KWin::setOnDesktop(winId(), mDesktop);    // ensure it displays on the desktop expected by the user
@@ -1381,7 +1381,7 @@ void EditAlarmDlg::slotOk()
 	{
 		if (timedRecurrence)
 		{
-			TQDateTime now = TQDateTime::currentDateTime();
+			TQDateTime now = TQDateTime::tqcurrentDateTime();
 			if (mAlarmDateTime.date() < now.date()
 			||  mAlarmDateTime.date() == now.date()
 			    && !mAlarmDateTime.isDateOnly() && mAlarmDateTime.time() < now.time())
@@ -1530,7 +1530,7 @@ void EditAlarmDlg::slotEditDeferral()
 			return;
 		limit = false;
 	}
-	TQDateTime now = TQDateTime::currentDateTime();
+	TQDateTime now = TQDateTime::tqcurrentDateTime();
 	if (limit)
 	{
 		if (repeatCount  &&  start < now)
@@ -1557,7 +1557,7 @@ void EditAlarmDlg::slotEditDeferral()
 		if (reminder)
 		{
 			DateTime remindTime = start.addMins(-reminder);
-			if (TQDateTime::currentDateTime() < remindTime)
+			if (TQDateTime::tqcurrentDateTime() < remindTime)
 				start = remindTime;
 		}
 		deferDlg.setLimit(start.addSecs(-60));
@@ -1604,7 +1604,7 @@ void EditAlarmDlg::slotShowRecurrenceEdit()
 	mRecurPageIndex = mTabs->currentPageIndex();
 	if (!mReadOnly  &&  !mTemplate)
 	{
-		TQDateTime now = TQDateTime::currentDateTime();
+		TQDateTime now = TQDateTime::tqcurrentDateTime();
 		mAlarmDateTime = mTimeWidget->getDateTime(0, false, false);
 		bool expired = (mAlarmDateTime.dateTime() < now);
 		if (mRecurSetDefaultEndDate)
@@ -1826,7 +1826,7 @@ void EditAlarmDlg::slotAlarmTypeChanged(int)
 		focus = mEmailToEdit;
 	}
 	mLateCancel->showAutoClose(displayAlarm);
-	mLateCancel->setFixedSize(mLateCancel->sizeHint());
+	mLateCancel->setFixedSize(mLateCancel->tqsizeHint());
 	if (focus)
 		focus->setFocus();
 }
@@ -1948,7 +1948,7 @@ bool EditAlarmDlg::checkText(TQString& result, bool showErrorMessage) const
 		enum Err { NONE = 0, BLANK, NONEXISTENT, DIRECTORY, UNREADABLE, NOT_TEXT_IMAGE };
 		Err err = NONE;
 		KURL url;
-		int i = alarmtext.find(TQString::fromLatin1("/"));
+		int i = alarmtext.find(TQString::tqfromLatin1("/"));
 		if (i > 0  &&  alarmtext[i - 1] == ':')
 		{
 			url = alarmtext;
@@ -1973,7 +1973,7 @@ bool EditAlarmDlg::checkText(TQString& result, bool showErrorMessage) const
 			TQDir::setCurrent(TQDir::homeDirPath());
 			alarmtext = info.absFilePath();
 			url.setPath(alarmtext);
-			alarmtext = TQString::fromLatin1("file:") + alarmtext;
+			alarmtext = TQString::tqfromLatin1("file:") + alarmtext;
 			if (!err)
 			{
 				if      (info.isDir())        err = DIRECTORY;
@@ -2030,7 +2030,7 @@ bool EditAlarmDlg::checkText(TQString& result, bool showErrorMessage) const
 TextEdit::TextEdit(TQWidget* parent, const char* name)
 	: KTextEdit(parent, name)
 {
-	TQSize tsize = sizeHint();
+	TQSize tsize = tqsizeHint();
 	tsize.setHeight(fontMetrics().lineSpacing()*13/4 + 2*frameWidth());
 	setMinimumSize(tsize);
 }
diff --git a/kalarm/eventlistviewbase.cpp b/kalarm/eventlistviewbase.cpp
index a0f5d495..23af4aaf 100644
--- a/kalarm/eventlistviewbase.cpp
+++ b/kalarm/eventlistviewbase.cpp
@@ -458,8 +458,8 @@ TQString EventListWhatsThisBase::text(const TQPoint& pt)
 	int column = -1;
 	TQPoint viewportPt = mListView->viewport()->mapFrom(mListView, pt);
 	TQRect frame = mListView->header()->frameGeometry();
-	if (frame.contains(pt)
-	||  mListView->itemAt(TQPoint(mListView->itemMargin(), viewportPt.y())) && frame.contains(TQPoint(pt.x(), frame.y())))
+	if (frame.tqcontains(pt)
+	||  mListView->itemAt(TQPoint(mListView->itemMargin(), viewportPt.y())) && frame.tqcontains(TQPoint(pt.x(), frame.y())))
 		column = mListView->header()->sectionAt(pt.x());
 	return mListView->whatsThisText(column);
 }
diff --git a/kalarm/find.cpp b/kalarm/find.cpp
index a0551782..1bec3c7a 100644
--- a/kalarm/find.cpp
+++ b/kalarm/find.cpp
@@ -90,24 +90,24 @@ void Find::display()
 		mDialog = new KFindDialog(false, mListView, "FindDlg", mOptions, mHistory, (mListView->selectedCount() > 1));
 #endif
 		mDialog->setHasSelection(false);
-		TQWidget* kalarmWidgets = mDialog->findExtension();
+		TQWidget* kalarmWidgets = mDialog->tqfindExtension();
 
 		// Alarm types
-		TQBoxLayout* layout = new TQVBoxLayout(kalarmWidgets, 0, KDialog::spacingHint());
+		TQBoxLayout* tqlayout = new TQVBoxLayout(kalarmWidgets, 0, KDialog::spacingHint());
 		TQGroupBox* group = new TQGroupBox(i18n("Alarm Type"), kalarmWidgets);
-		layout->addWidget(group);
+		tqlayout->addWidget(group);
 		TQGridLayout* grid = new TQGridLayout(group, 2, 2, KDialog::marginHint(), KDialog::spacingHint());
 		grid->addRowSpacing(0, mDialog->fontMetrics().lineSpacing()/2);
 		grid->setColStretch(1, 1);
 
 		// Live & expired alarm selection
 		mLive = new TQCheckBox(i18n("Acti&ve"), group);
-		mLive->setFixedSize(mLive->sizeHint());
+		mLive->setFixedSize(mLive->tqsizeHint());
 		TQWhatsThis::add(mLive, i18n("Check to include active alarms in the search."));
 		grid->addWidget(mLive, 1, 0, Qt::AlignAuto);
 
 		mExpired = new TQCheckBox(i18n("Ex&pired"), group);
-		mExpired->setFixedSize(mExpired->sizeHint());
+		mExpired->setFixedSize(mExpired->tqsizeHint());
 		TQWhatsThis::add(mExpired,
 		      i18n("Check to include expired alarms in the search. "
 		           "This option is only available if expired alarms are currently being displayed."));
@@ -118,22 +118,22 @@ void Find::display()
 
 		// Alarm actions
 		mMessageType = new TQCheckBox(i18n("Text"), group, "message");
-		mMessageType->setFixedSize(mMessageType->sizeHint());
+		mMessageType->setFixedSize(mMessageType->tqsizeHint());
 		TQWhatsThis::add(mMessageType, i18n("Check to include text message alarms in the search."));
 		grid->addWidget(mMessageType, 3, 0);
 
 		mFileType = new TQCheckBox(i18n("Fi&le"), group, "file");
-		mFileType->setFixedSize(mFileType->sizeHint());
+		mFileType->setFixedSize(mFileType->tqsizeHint());
 		TQWhatsThis::add(mFileType, i18n("Check to include file alarms in the search."));
 		grid->addWidget(mFileType, 3, 2);
 
 		mCommandType = new TQCheckBox(i18n("Co&mmand"), group, "command");
-		mCommandType->setFixedSize(mCommandType->sizeHint());
+		mCommandType->setFixedSize(mCommandType->tqsizeHint());
 		TQWhatsThis::add(mCommandType, i18n("Check to include command alarms in the search."));
 		grid->addWidget(mCommandType, 4, 0);
 
 		mEmailType = new TQCheckBox(i18n("&Email"), group, "email");
-		mEmailType->setFixedSize(mEmailType->sizeHint());
+		mEmailType->setFixedSize(mEmailType->tqsizeHint());
 		TQWhatsThis::add(mEmailType, i18n("Check to include email alarms in the search."));
 		grid->addWidget(mEmailType, 4, 2);
 
@@ -211,7 +211,7 @@ void Find::slotFind()
 {
 	if (!mDialog)
 		return;
-	mHistory = mDialog->findHistory();    // save search history so that it can be displayed again
+	mHistory = mDialog->tqfindHistory();    // save search history so that it can be displayed again
 	mOptions = mDialog->options() & ~FIND_KALARM_OPTIONS;
 	mOptions |= (mLive->isEnabled()        && mLive->isChecked()        ? FIND_LIVE : 0)
 	         |  (mExpired->isEnabled()     && mExpired->isChecked()     ? FIND_EXPIRED : 0)
diff --git a/kalarm/fontcolour.cpp b/kalarm/fontcolour.cpp
index 4273125a..94497b96 100644
--- a/kalarm/fontcolour.cpp
+++ b/kalarm/fontcolour.cpp
@@ -57,8 +57,8 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name,
 		topLayout = new TQVBoxLayout(page, KDialog::marginHint(), KDialog::spacingHint());
 		topLayout->addSpacing(fontMetrics().height() - KDialog::marginHint() + KDialog::spacingHint());
 	}
-	TQHBoxLayout* hlayout = new TQHBoxLayout(topLayout);
-	TQVBoxLayout* colourLayout = new TQVBoxLayout(hlayout);
+	TQHBoxLayout* htqlayout = new TQHBoxLayout(topLayout);
+	TQVBoxLayout* colourLayout = new TQVBoxLayout(htqlayout);
 	if (fg)
 	{
 		TQHBox* box = new TQHBox(page);    // to group widgets for TQWhatsThis text
@@ -83,35 +83,35 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name,
 	connect(mBgColourButton, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(setSampleColour()));
 	label->setBuddy(mBgColourButton);
 	TQWhatsThis::add(box, i18n("Select the alarm message background color"));
-	hlayout->addStretch();
+	htqlayout->addStretch();
 
 	if (editColours)
 	{
-		TQHBoxLayout* layout = new TQHBoxLayout(topLayout);
+		TQHBoxLayout* tqlayout = new TQHBoxLayout(topLayout);
 		TQPushButton* button = new TQPushButton(i18n("Add Co&lor..."), page);
-		button->setFixedSize(button->sizeHint());
+		button->setFixedSize(button->tqsizeHint());
 		connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddColour()));
 		TQWhatsThis::add(button, i18n("Choose a new color to add to the color selection list."));
-		layout->addWidget(button);
+		tqlayout->addWidget(button);
 
 		mRemoveColourButton = new TQPushButton(i18n("&Remove Color"), page);
-		mRemoveColourButton->setFixedSize(mRemoveColourButton->sizeHint());
+		mRemoveColourButton->setFixedSize(mRemoveColourButton->tqsizeHint());
 		connect(mRemoveColourButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveColour()));
 		TQWhatsThis::add(mRemoveColourButton,
 		      i18n("Remove the color currently shown in the background color chooser, from the color selection list."));
-		layout->addWidget(mRemoveColourButton);
+		tqlayout->addWidget(mRemoveColourButton);
 	}
 
 	if (defaultFont)
 	{
-		TQHBoxLayout* layout = new TQHBoxLayout(topLayout);
+		TQHBoxLayout* tqlayout = new TQHBoxLayout(topLayout);
 		mDefaultFont = new CheckBox(i18n("Use &default font"), page);
-		mDefaultFont->setMinimumSize(mDefaultFont->sizeHint());
+		mDefaultFont->setMinimumSize(mDefaultFont->tqsizeHint());
 		connect(mDefaultFont, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDefaultFontToggled(bool)));
 		TQWhatsThis::add(mDefaultFont,
 		      i18n("Check to use the default font current at the time the alarm is displayed."));
-		layout->addWidget(mDefaultFont);
-		layout->addWidget(new TQWidget(page));    // left adjust the widget
+		tqlayout->addWidget(mDefaultFont);
+		tqlayout->addWidget(new TQWidget(page));    // left adjust the widget
 	}
 	else
 		mDefaultFont = 0;
diff --git a/kalarm/fontcolourbutton.cpp b/kalarm/fontcolourbutton.cpp
index 48d0f922..62888d46 100644
--- a/kalarm/fontcolourbutton.cpp
+++ b/kalarm/fontcolourbutton.cpp
@@ -43,26 +43,26 @@ FontColourButton::FontColourButton(TQWidget* parent, const char* name)
 	  mReadOnly(false)
 {
 	setFrameStyle(NoFrame);
-	TQHBoxLayout* layout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
+	TQHBoxLayout* tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
 
 	mButton = new PushButton(i18n("Font && Co&lor..."), this);
-	mButton->setFixedSize(mButton->sizeHint());
+	mButton->setFixedSize(mButton->tqsizeHint());
 	connect(mButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonPressed()));
 	TQWhatsThis::add(mButton,
 	      i18n("Choose the font, and foreground and background color, for the alarm message."));
-	layout->addWidget(mButton);
+	tqlayout->addWidget(mButton);
 
 	// Font and colour sample display
 	mSample = new TQLineEdit(this);
 	mSample->setMinimumHeight(QMAX(mSample->fontMetrics().lineSpacing(), mButton->height()*3/2));
-	mSample->setSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::MinimumExpanding);
+	mSample->tqsetSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::MinimumExpanding);
 	mSample->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog"));
 	mSample->setCursorPosition(0);
-	mSample->setAlignment(Qt::AlignCenter);
+	mSample->tqsetAlignment(Qt::AlignCenter);
 	TQWhatsThis::add(mSample,
 	      i18n("This sample text illustrates the current font and color settings. "
 	           "You may edit it to test special characters."));
-	layout->addWidget(mSample);
+	tqlayout->addWidget(mSample);
 }
 
 void FontColourButton::setDefaultFont()
@@ -125,7 +125,7 @@ FontColourDlg::FontColourDlg(const TQColor& bgColour, const TQColor& fgColour, c
 {
 	TQWidget* page = new TQWidget(this);
 	setMainWidget(page);
-	TQVBoxLayout* layout = new TQVBoxLayout(page, 0, spacingHint());
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(page, 0, spacingHint());
 	mChooser = new FontColourChooser(page, 0, false, TQStringList(), TQString::null, false, true, true);
 	mChooser->setBgColour(bgColour);
 	mChooser->setFgColour(fgColour);
@@ -133,8 +133,8 @@ FontColourDlg::FontColourDlg(const TQColor& bgColour, const TQColor& fgColour, c
 		mChooser->setDefaultFont();
 	else
 		mChooser->setFont(font);
-	layout->addWidget(mChooser);
-	layout->addSpacing(KDialog::spacingHint());
+	tqlayout->addWidget(mChooser);
+	tqlayout->addSpacing(KDialog::spacingHint());
 }
 
 /******************************************************************************
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index 28f73499..db0ff7d3 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -174,7 +174,7 @@ bool addExpiredEvent(KAEvent& event)
 		return false;
 	bool archiving = (KAEvent::uidStatus(event.id()) == KAEvent::ACTIVE);
 	if (archiving)
-		event.setSaveDateTime(TQDateTime::currentDateTime());   // time stamp to control purging
+		event.setSaveDateTime(TQDateTime::tqcurrentDateTime());   // time stamp to control purging
 	KCal::Event* kcalEvent = cal->addEvent(event);
 	cal->save();
 
@@ -429,7 +429,7 @@ UpdateStatus reactivateEvent(KAEvent& event, AlarmListView* selectionView, bool
 	// Delete the event from the expired calendar file
 	if (KAEvent::uidStatus(id) == KAEvent::EXPIRED)
 	{
-		TQDateTime now = TQDateTime::currentDateTime();
+		TQDateTime now = TQDateTime::tqcurrentDateTime();
 		if (event.occursAfter(now, true))
 		{
 			if (event.recurs()  ||  event.repeatCount())
@@ -639,7 +639,7 @@ void outputAlarmWarnings(TQWidget* parent, const KAEvent* event)
 	{
 		if (KMessageBox::warningYesNo(parent, i18n("Alarms are currently disabled.\nDo you want to enable alarms now?"),
 		                              TQString::null, i18n("Enable"), i18n("Keep Disabled"),
-		                              TQString::fromLatin1("EditEnableAlarms"))
+		                              TQString::tqfromLatin1("EditEnableAlarms"))
 		                == KMessageBox::Yes)
 			Daemon::setAlarmsEnabled();
 	}
@@ -712,8 +712,8 @@ TQString runKMail(bool minimise)
 /******************************************************************************
 *  Start another program for DCOP access if it isn't already running.
 *  If 'windowName' is not empty, the program's window of that name is iconised.
-*  On exit, 'dcopName' contains the DCOP name to access the application, and
-*  'errorMessage' contains an error message if failure.
+*  On exit, 'dcopName' tqcontains the DCOP name to access the application, and
+*  'errorMessage' tqcontains an error message if failure.
 *  Reply = true if the program is now running.
 */
 bool runProgram(const TQCString& program, const TQCString& windowName, TQCString& dcopName, TQString& errorMessage)
@@ -721,7 +721,7 @@ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString
 	if (!kapp->dcopClient()->isApplicationRegistered(program))
 	{
 		// KOrganizer is not already running, so start it
-		if (KApplication::startServiceByDesktopName(TQString::fromLatin1(program), TQString::null, &errorMessage, &dcopName))
+		if (KApplication::startServiceByDesktopName(TQString::tqfromLatin1(program), TQString::null, &errorMessage, &dcopName))
 		{
 			kdError(5950) << "runProgram(): couldn't start " << program << " (" << errorMessage << ")\n";
 			return false;
@@ -746,10 +746,10 @@ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString
 bool readConfigWindowSize(const char* window, TQSize& result)
 {
 	KConfig* config = KGlobal::config();
-	config->setGroup(TQString::fromLatin1(window));
+	config->setGroup(TQString::tqfromLatin1(window));
 	TQWidget* desktop = KApplication::desktop();
-	TQSize s = TQSize(config->readNumEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), 0),
-	                config->readNumEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), 0));
+	TQSize s = TQSize(config->readNumEntry(TQString::tqfromLatin1("Width %1").arg(desktop->width()), 0),
+	                config->readNumEntry(TQString::tqfromLatin1("Height %1").arg(desktop->height()), 0));
 	if (s.isEmpty())
 		return false;
 	result = s;
@@ -763,10 +763,10 @@ bool readConfigWindowSize(const char* window, TQSize& result)
 void writeConfigWindowSize(const char* window, const TQSize& size)
 {
 	KConfig* config = KGlobal::config();
-	config->setGroup(TQString::fromLatin1(window));
+	config->setGroup(TQString::tqfromLatin1(window));
 	TQWidget* desktop = KApplication::desktop();
-	config->writeEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), size.width());
-	config->writeEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), size.height());
+	config->writeEntry(TQString::tqfromLatin1("Width %1").arg(desktop->width()), size.width());
+	config->writeEntry(TQString::tqfromLatin1("Height %1").arg(desktop->height()), size.height());
 	config->sync();
 }
 
@@ -793,7 +793,7 @@ int getVersionNumber(const TQString& version, TQString* subVersion)
 	//      if the representation returned by this method changes.
 	if (subVersion)
 		*subVersion = TQString::null;
-	int count = version.contains('.') + 1;
+	int count = version.tqcontains('.') + 1;
 	if (count < 2)
 		return 0;
 	bool ok;
@@ -834,20 +834,20 @@ FileType fileType(const TQString& mimetype)
 	static const char* formattedTextTypes[] = {
 		"html", "xml", 0 };
 
-	if (mimetype.startsWith(TQString::fromLatin1("image/")))
+	if (mimetype.startsWith(TQString::tqfromLatin1("image/")))
 		return Image;
 	int slash = mimetype.find('/');
 	if (slash < 0)
 		return Unknown;
 	TQString type = mimetype.mid(slash + 1);
 	const char* typel = type.latin1();
-	if (mimetype.startsWith(TQString::fromLatin1("application")))
+	if (mimetype.startsWith(TQString::tqfromLatin1("application")))
 	{
 		for (int i = 0;  applicationTypes[i];  ++i)
 			if (!strcmp(typel, applicationTypes[i]))
 				return TextApplication;
 	}
-	else if (mimetype.startsWith(TQString::fromLatin1("text")))
+	else if (mimetype.startsWith(TQString::tqfromLatin1("text")))
 	{
 		for (int i = 0;  formattedTextTypes[i];  ++i)
 			if (!strcmp(typel, formattedTextTypes[i]))
@@ -905,7 +905,7 @@ TQString stripAccel(const TQString& text)
 {
 	unsigned len = text.length();
 	TQString out = TQDeepCopy<TQString>(text);
-	TQChar *corig = (TQChar*)out.unicode();
+	TQChar *corig = (TQChar*)out.tqunicode();
 	TQChar *cout  = corig;
 	TQChar *cin   = cout;
 	while (len)
@@ -1032,7 +1032,7 @@ bool runKOrganizer()
 {
 	TQString error;
 	TQCString dcopService;
-	int result = KDCOPServiceStarter::self()->findServiceFor("DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService);
+	int result = KDCOPServiceStarter::self()->tqfindServiceFor("DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService);
 	if (result)
 	{
 		kdDebug(5950) << "Unable to start DCOP/Organizer: " << dcopService << " " << error << endl;
@@ -1042,7 +1042,7 @@ bool runKOrganizer()
 	// to load KOrganizer into Kontact. But if KOrganizer is running independently,
 	// the load() method doesn't exist.
 	TQCString dummy;
-	if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy))
+	if (!kapp->dcopClient()->tqfindObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy))
 	{
 		DCOPRef ref(dcopService, dcopService); // talk to the KUniqueApplication or its Kontact wrapper
 		DCOPReply reply = ref.call("load()");
@@ -1051,7 +1051,7 @@ bool runKOrganizer()
 			kdWarning(5950) << "Error loading " << dcopService << endl;
 			return false;
 		}
-		if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy))
+		if (!kapp->dcopClient()->tqfindObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy))
 		{
 			kdWarning(5950) << "Unable to access KOrganizer's "KORG_DCOP_OBJECT" DCOP object" << endl;
 			return false;
diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp
index 7607892d..a0f008f0 100644
--- a/kalarm/kalarmapp.cpp
+++ b/kalarm/kalarmapp.cpp
@@ -121,8 +121,8 @@ KAlarmApp::KAlarmApp()
 		connect(AlarmCalendar::expiredCalendar(), TQT_SIGNAL(purged()), TQT_SLOT(slotExpiredPurged()));
 
 		KConfig* config = kapp->config();
-		config->setGroup(TQString::fromLatin1("General"));
-		mNoSystemTray           = config->readBoolEntry(TQString::fromLatin1("NoSystemTray"), false);
+		config->setGroup(TQString::tqfromLatin1("General"));
+		mNoSystemTray           = config->readBoolEntry(TQString::tqfromLatin1("NoSystemTray"), false);
 		mSavedNoSystemTray      = mNoSystemTray;
 		mOldRunInSystemTray     = wantRunInSystemTray();
 		mDisableAlarmsIfStopped = mOldRunInSystemTray && !mNoSystemTray && Preferences::disableAlarmsIfStopped();
@@ -139,7 +139,7 @@ KAlarmApp::KAlarmApp()
 	if (!mSpeechEnabled)
 		kdDebug(5950) << "KAlarmApp::KAlarmApp(): speech synthesis disabled (KTTSD not found)" << endl;
 	// Check if KOrganizer is installed
-	TQString korg = TQString::fromLatin1("korganizer");
+	TQString korg = TQString::tqfromLatin1("korganizer");
 	mKOrganizerEnabled = !locate("exe", korg).isNull()  ||  !KStandardDirs::findExe(korg).isNull();
 	if (!mKOrganizerEnabled)
 		kdDebug(5950) << "KAlarmApp::KAlarmApp(): KOrganizer options disabled (KOrganizer not found)" << endl;
@@ -205,7 +205,7 @@ bool KAlarmApp::restoreSession()
 	for (int i = 1;  KMainWindow::canBeRestored(i);  ++i)
 	{
 		TQString type = KMainWindow::classNameOfToplevel(i);
-		if (type == TQString::fromLatin1("MainWindow"))
+		if (type == TQString::tqfromLatin1("MainWindow"))
 		{
 			MainWindow* win = MainWindow::create(true);
 			win->restore(i, false);
@@ -214,7 +214,7 @@ bool KAlarmApp::restoreSession()
 			else
 				win->show();
 		}
-		else if (type == TQString::fromLatin1("MessageWin"))
+		else if (type == TQString::tqfromLatin1("MessageWin"))
 		{
 			MessageWin* win = new MessageWin;
 			win->restore(i, false);
@@ -329,9 +329,9 @@ int KAlarmApp::newInstance()
 				if (args->isSet("triggerEvent"))  { function = EVENT_TRIGGER;  option = "triggerEvent";  ++count; }
 				if (args->isSet("cancelEvent"))   { function = EVENT_CANCEL;   option = "cancelEvent";   ++count; }
 				if (!count)
-					USAGE(i18n("%1 requires %2, %3 or %4").arg(TQString::fromLatin1("--calendarURL")).arg(TQString::fromLatin1("--handleEvent")).arg(TQString::fromLatin1("--triggerEvent")).arg(TQString::fromLatin1("--cancelEvent")))
+					USAGE(i18n("%1 requires %2, %3 or %4").arg(TQString::tqfromLatin1("--calendarURL")).arg(TQString::tqfromLatin1("--handleEvent")).arg(TQString::tqfromLatin1("--triggerEvent")).arg(TQString::tqfromLatin1("--cancelEvent")))
 				if (count > 1)
-					USAGE(i18n("%1, %2, %3 mutually exclusive").arg(TQString::fromLatin1("--handleEvent")).arg(TQString::fromLatin1("--triggerEvent")).arg(TQString::fromLatin1("--cancelEvent")));
+					USAGE(i18n("%1, %2, %3 mutually exclusive").arg(TQString::tqfromLatin1("--handleEvent")).arg(TQString::tqfromLatin1("--triggerEvent")).arg(TQString::tqfromLatin1("--cancelEvent")));
 				if (!initCheck(true))   // open the calendar, don't register with daemon yet
 				{
 					exitCode = 1;
@@ -341,11 +341,11 @@ int KAlarmApp::newInstance()
 				{
 					TQString calendarUrl = args->getOption("calendarURL");
 					if (KURL(calendarUrl).url() != AlarmCalendar::activeCalendar()->urlString())
-						USAGE(i18n("%1: wrong calendar file").arg(TQString::fromLatin1("--calendarURL")))
+						USAGE(i18n("%1: wrong calendar file").arg(TQString::tqfromLatin1("--calendarURL")))
 				}
 				TQString eventID = args->getOption(option);
 				args->clear();      // free up memory
-				if (eventID.startsWith(TQString::fromLatin1("ad:")))
+				if (eventID.startsWith(TQString::tqfromLatin1("ad:")))
 				{
 					// It's a notification from the alarm deamon
 					eventID = eventID.mid(3);
@@ -369,7 +369,7 @@ int KAlarmApp::newInstance()
 				}
 				if (!KAlarm::edit(eventID))
 				{
-					USAGE(i18n("%1: Event %2 not found, or not editable").arg(TQString::fromLatin1("--edit")).arg(eventID))
+					USAGE(i18n("%1: Event %2 not found, or not editable").arg(TQString::tqfromLatin1("--edit")).arg(eventID))
 					exitCode = 1;
 					break;
 				}
@@ -401,11 +401,11 @@ int KAlarmApp::newInstance()
 				{
 					kdDebug(5950)<<"KAlarmApp::newInstance(): file\n";
 					if (args->isSet("exec"))
-						USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--exec")).arg(TQString::fromLatin1("--file")))
+						USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--exec")).arg(TQString::tqfromLatin1("--file")))
 					if (args->isSet("mail"))
-						USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--mail")).arg(TQString::fromLatin1("--file")))
+						USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--mail")).arg(TQString::tqfromLatin1("--file")))
 					if (args->count())
-						USAGE(i18n("message incompatible with %1").arg(TQString::fromLatin1("--file")))
+						USAGE(i18n("message incompatible with %1").arg(TQString::tqfromLatin1("--file")))
 					alMessage = args->getOption("file");
 					action = KAEvent::FILE;
 				}
@@ -413,7 +413,7 @@ int KAlarmApp::newInstance()
 				{
 					kdDebug(5950)<<"KAlarmApp::newInstance(): exec\n";
 					if (args->isSet("mail"))
-						USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--mail")).arg(TQString::fromLatin1("--exec")))
+						USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--mail")).arg(TQString::tqfromLatin1("--exec")))
 					alMessage = args->getOption("exec");
 					int n = args->count();
 					for (int i = 0;  i < n;  ++i)
@@ -435,7 +435,7 @@ int KAlarmApp::newInstance()
 					{
 						TQString addr = TQString::fromLocal8Bit(*i);
 						if (!KAMail::checkAddress(addr))
-							USAGE(i18n("%1: invalid email address").arg(TQString::fromLatin1("--mail")))
+							USAGE(i18n("%1: invalid email address").arg(TQString::tqfromLatin1("--mail")))
 						alAddresses += KCal::Person(TQString::null, addr);
 					}
 					params = args->getOptionList("attach");
@@ -453,13 +453,13 @@ int KAlarmApp::newInstance()
 				if (action != KAEvent::EMAIL)
 				{
 					if (args->isSet("subject"))
-						USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--subject")).arg(TQString::fromLatin1("--mail")))
+						USAGE(i18n("%1 requires %2").arg(TQString::tqfromLatin1("--subject")).arg(TQString::tqfromLatin1("--mail")))
 					if (args->isSet("from-id"))
-						USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--from-id")).arg(TQString::fromLatin1("--mail")))
+						USAGE(i18n("%1 requires %2").arg(TQString::tqfromLatin1("--from-id")).arg(TQString::tqfromLatin1("--mail")))
 					if (args->isSet("attach"))
-						USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--attach")).arg(TQString::fromLatin1("--mail")))
+						USAGE(i18n("%1 requires %2").arg(TQString::tqfromLatin1("--attach")).arg(TQString::tqfromLatin1("--mail")))
 					if (args->isSet("bcc"))
-						USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--bcc")).arg(TQString::fromLatin1("--mail")))
+						USAGE(i18n("%1 requires %2").arg(TQString::tqfromLatin1("--bcc")).arg(TQString::tqfromLatin1("--mail")))
 				}
 
 				bool      alarmNoTime = false;
@@ -475,10 +475,10 @@ int KAlarmApp::newInstance()
 					TQCString colourText = args->getOption("color");
 					if (static_cast<const char*>(colourText)[0] == '0'
 					&&  tolower(static_cast<const char*>(colourText)[1]) == 'x')
-						colourText.replace(0, 2, "#");
+						colourText.tqreplace(0, 2, "#");
 					bgColour.setNamedColor(colourText);
 					if (!bgColour.isValid())
-						USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--color")))
+						USAGE(i18n("Invalid %1 parameter").arg(TQString::tqfromLatin1("--color")))
 				}
 				if (args->isSet("colorfg"))
 				{
@@ -486,28 +486,28 @@ int KAlarmApp::newInstance()
 					TQCString colourText = args->getOption("colorfg");
 					if (static_cast<const char*>(colourText)[0] == '0'
 					&&  tolower(static_cast<const char*>(colourText)[1]) == 'x')
-						colourText.replace(0, 2, "#");
+						colourText.tqreplace(0, 2, "#");
 					fgColour.setNamedColor(colourText);
 					if (!fgColour.isValid())
-						USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--colorfg")))
+						USAGE(i18n("Invalid %1 parameter").arg(TQString::tqfromLatin1("--colorfg")))
 				}
 
 				if (args->isSet("time"))
 				{
 					TQCString dateTime = args->getOption("time");
 					if (!convWakeTime(dateTime, alarmTime, alarmNoTime))
-						USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--time")))
+						USAGE(i18n("Invalid %1 parameter").arg(TQString::tqfromLatin1("--time")))
 				}
 				else
-					alarmTime = TQDateTime::currentDateTime();
+					alarmTime = TQDateTime::tqcurrentDateTime();
 
 				bool haveRecurrence = args->isSet("recurrence");
 				if (haveRecurrence)
 				{
 					if (args->isSet("login"))
-						USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--login")).arg(TQString::fromLatin1("--recurrence")))
+						USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--login")).arg(TQString::tqfromLatin1("--recurrence")))
 					if (args->isSet("until"))
-						USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--until")).arg(TQString::fromLatin1("--recurrence")))
+						USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--until")).arg(TQString::tqfromLatin1("--recurrence")))
 					TQCString rule = args->getOption("recurrence");
 					recurrence.set(TQString::fromLocal8Bit(static_cast<const char*>(rule)));
 				}
@@ -516,24 +516,24 @@ int KAlarmApp::newInstance()
 					// Repeat count is specified
 					int count;
 					if (args->isSet("login"))
-						USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--login")).arg(TQString::fromLatin1("--interval")))
+						USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--login")).arg(TQString::tqfromLatin1("--interval")))
 					bool ok;
 					if (args->isSet("repeat"))
 					{
 						count = args->getOption("repeat").toInt(&ok);
 						if (!ok || !count || count < -1 || (count < 0 && haveRecurrence))
-							USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--repeat")))
+							USAGE(i18n("Invalid %1 parameter").arg(TQString::tqfromLatin1("--repeat")))
 					}
 					else if (haveRecurrence)
-						USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--interval")).arg(TQString::fromLatin1("--repeat")))
+						USAGE(i18n("%1 requires %2").arg(TQString::tqfromLatin1("--interval")).arg(TQString::tqfromLatin1("--repeat")))
 					else if (args->isSet("until"))
 					{
 						count = 0;
 						TQCString dateTime = args->getOption("until");
 						if (!convWakeTime(dateTime, endTime, alarmNoTime))
-							USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--until")))
+							USAGE(i18n("Invalid %1 parameter").arg(TQString::tqfromLatin1("--until")))
 						if (endTime < alarmTime)
-							USAGE(i18n("%1 earlier than %2").arg(TQString::fromLatin1("--until")).arg(TQString::fromLatin1("--time")))
+							USAGE(i18n("%1 earlier than %2").arg(TQString::tqfromLatin1("--until")).arg(TQString::tqfromLatin1("--time")))
 					}
 					else
 						count = -1;
@@ -543,16 +543,16 @@ int KAlarmApp::newInstance()
 					KARecurrence::Type recurType;
 					if (!convInterval(args->getOption("interval"), recurType, interval, !haveRecurrence)
 					||  interval < 0)
-						USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--interval")))
+						USAGE(i18n("Invalid %1 parameter").arg(TQString::tqfromLatin1("--interval")))
 					if (alarmNoTime  &&  recurType == KARecurrence::MINUTELY)
-						USAGE(i18n("Invalid %1 parameter for date-only alarm").arg(TQString::fromLatin1("--interval")))
+						USAGE(i18n("Invalid %1 parameter for date-only alarm").arg(TQString::tqfromLatin1("--interval")))
 
 					if (haveRecurrence)
 					{
 						// There is a also a recurrence specified, so set up a sub-repetition
 						int longestInterval = recurrence.longestInterval();
 						if (count * interval > longestInterval)
-							USAGE(i18n("Invalid %1 and %2 parameters: repetition is longer than %3 interval").arg(TQString::fromLatin1("--interval")).arg(TQString::fromLatin1("--repeat")).arg(TQString::fromLatin1("--recurrence")));
+							USAGE(i18n("Invalid %1 and %2 parameters: repetition is longer than %3 interval").arg(TQString::tqfromLatin1("--interval")).arg(TQString::tqfromLatin1("--repeat")).arg(TQString::tqfromLatin1("--recurrence")));
 						repeatCount    = count;
 						repeatInterval = interval;
 					}
@@ -566,9 +566,9 @@ int KAlarmApp::newInstance()
 				else
 				{
 					if (args->isSet("repeat"))
-						USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--repeat")).arg(TQString::fromLatin1("--interval")))
+						USAGE(i18n("%1 requires %2").arg(TQString::tqfromLatin1("--repeat")).arg(TQString::tqfromLatin1("--interval")))
 					if (args->isSet("until"))
-						USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--until")).arg(TQString::fromLatin1("--interval")))
+						USAGE(i18n("%1 requires %2").arg(TQString::tqfromLatin1("--until")).arg(TQString::tqfromLatin1("--interval")))
 				}
 
 				TQCString audioFile;
@@ -582,11 +582,11 @@ int KAlarmApp::newInstance()
 				{
 					// Play a sound with the alarm
 					if (audioRepeat  &&  args->isSet("play"))
-						USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--play")).arg(TQString::fromLatin1("--play-repeat")))
+						USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--play")).arg(TQString::tqfromLatin1("--play-repeat")))
 					if (args->isSet("beep"))
-						USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--beep")).arg(TQString::fromLatin1(audioRepeat ? "--play-repeat" : "--play")))
+						USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--beep")).arg(TQString::tqfromLatin1(audioRepeat ? "--play-repeat" : "--play")))
 					if (args->isSet("speak"))
-						USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--speak")).arg(TQString::fromLatin1(audioRepeat ? "--play-repeat" : "--play")))
+						USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--speak")).arg(TQString::tqfromLatin1(audioRepeat ? "--play-repeat" : "--play")))
 					audioFile = args->getOption(audioRepeat ? "play-repeat" : "play");
 #ifndef WITHOUT_ARTS
 					if (args->isSet("volume"))
@@ -594,21 +594,21 @@ int KAlarmApp::newInstance()
 						bool ok;
 						int volumepc = args->getOption("volume").toInt(&ok);
 						if (!ok  ||  volumepc < 0  ||  volumepc > 100)
-							USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--volume")))
+							USAGE(i18n("Invalid %1 parameter").arg(TQString::tqfromLatin1("--volume")))
 						audioVolume = static_cast<float>(volumepc) / 100;
 					}
 #endif
 				}
 #ifndef WITHOUT_ARTS
 				else if (args->isSet("volume"))
-					USAGE(i18n("%1 requires %2 or %3").arg(TQString::fromLatin1("--volume")).arg(TQString::fromLatin1("--play")).arg(TQString::fromLatin1("--play-repeat")))
+					USAGE(i18n("%1 requires %2 or %3").arg(TQString::tqfromLatin1("--volume")).arg(TQString::tqfromLatin1("--play")).arg(TQString::tqfromLatin1("--play-repeat")))
 #endif
 				if (args->isSet("speak"))
 				{
 					if (args->isSet("beep"))
-						USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--beep")).arg(TQString::fromLatin1("--speak")))
+						USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--beep")).arg(TQString::tqfromLatin1("--speak")))
 					if (!mSpeechEnabled)
-						USAGE(i18n("%1 requires speech synthesis to be configured using KTTSD").arg(TQString::fromLatin1("--speak")))
+						USAGE(i18n("%1 requires speech synthesis to be configured using KTTSD").arg(TQString::tqfromLatin1("--speak")))
 				}
 				int reminderMinutes = 0;
 				bool onceOnly = args->isSet("reminder-once");
@@ -616,12 +616,12 @@ int KAlarmApp::newInstance()
 				{
 					// Issue a reminder alarm in advance of the main alarm
 					if (onceOnly  &&  args->isSet("reminder"))
-						USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--reminder")).arg(TQString::fromLatin1("--reminder-once")))
-					TQString opt = onceOnly ? TQString::fromLatin1("--reminder-once") : TQString::fromLatin1("--reminder");
+						USAGE(i18n("%1 incompatible with %2").arg(TQString::tqfromLatin1("--reminder")).arg(TQString::tqfromLatin1("--reminder-once")))
+					TQString opt = onceOnly ? TQString::tqfromLatin1("--reminder-once") : TQString::tqfromLatin1("--reminder");
 					if (args->isSet("exec"))
-						USAGE(i18n("%1 incompatible with %2").arg(opt).arg(TQString::fromLatin1("--exec")))
+						USAGE(i18n("%1 incompatible with %2").arg(opt).arg(TQString::tqfromLatin1("--exec")))
 					if (args->isSet("mail"))
-						USAGE(i18n("%1 incompatible with %2").arg(opt).arg(TQString::fromLatin1("--mail")))
+						USAGE(i18n("%1 incompatible with %2").arg(opt).arg(TQString::tqfromLatin1("--mail")))
 					KARecurrence::Type recurType;
 					TQString optval = args->getOption(onceOnly ? "reminder-once" : "reminder");
 					if (!convInterval(args->getOption(onceOnly ? "reminder-once" : "reminder"), recurType, reminderMinutes))
@@ -636,10 +636,10 @@ int KAlarmApp::newInstance()
 					KARecurrence::Type recurType;
 					bool ok = convInterval(args->getOption("late-cancel"), recurType, lateCancel);
 					if (!ok  ||  lateCancel <= 0)
-						USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("late-cancel")))
+						USAGE(i18n("Invalid %1 parameter").arg(TQString::tqfromLatin1("late-cancel")))
 				}
 				else if (args->isSet("auto-close"))
-					USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--auto-close")).arg(TQString::fromLatin1("--late-cancel")))
+					USAGE(i18n("%1 requires %2").arg(TQString::tqfromLatin1("--auto-close")).arg(TQString::tqfromLatin1("--late-cancel")))
 
 				int flags = KAEvent::DEFAULT_FONT;
 				if (args->isSet("ack-confirm"))
@@ -683,52 +683,52 @@ int KAlarmApp::newInstance()
 				// No arguments - run interactively & display the main window
 				kdDebug(5950)<<"KAlarmApp::newInstance(): interactive\n";
 				if (args->isSet("ack-confirm"))
-					usage += TQString::fromLatin1("--ack-confirm ");
+					usage += TQString::tqfromLatin1("--ack-confirm ");
 				if (args->isSet("attach"))
-					usage += TQString::fromLatin1("--attach ");
+					usage += TQString::tqfromLatin1("--attach ");
 				if (args->isSet("auto-close"))
-					usage += TQString::fromLatin1("--auto-close ");
+					usage += TQString::tqfromLatin1("--auto-close ");
 				if (args->isSet("bcc"))
-					usage += TQString::fromLatin1("--bcc ");
+					usage += TQString::tqfromLatin1("--bcc ");
 				if (args->isSet("beep"))
-					usage += TQString::fromLatin1("--beep ");
+					usage += TQString::tqfromLatin1("--beep ");
 				if (args->isSet("color"))
-					usage += TQString::fromLatin1("--color ");
+					usage += TQString::tqfromLatin1("--color ");
 				if (args->isSet("colorfg"))
-					usage += TQString::fromLatin1("--colorfg ");
+					usage += TQString::tqfromLatin1("--colorfg ");
 				if (args->isSet("disable"))
-					usage += TQString::fromLatin1("--disable ");
+					usage += TQString::tqfromLatin1("--disable ");
 				if (args->isSet("from-id"))
-					usage += TQString::fromLatin1("--from-id ");
+					usage += TQString::tqfromLatin1("--from-id ");
 				if (args->isSet("korganizer"))
-					usage += TQString::fromLatin1("--korganizer ");
+					usage += TQString::tqfromLatin1("--korganizer ");
 				if (args->isSet("late-cancel"))
-					usage += TQString::fromLatin1("--late-cancel ");
+					usage += TQString::tqfromLatin1("--late-cancel ");
 				if (args->isSet("login"))
-					usage += TQString::fromLatin1("--login ");
+					usage += TQString::tqfromLatin1("--login ");
 				if (args->isSet("play"))
-					usage += TQString::fromLatin1("--play ");
+					usage += TQString::tqfromLatin1("--play ");
 #ifndef WITHOUT_ARTS
 				if (args->isSet("play-repeat"))
-					usage += TQString::fromLatin1("--play-repeat ");
+					usage += TQString::tqfromLatin1("--play-repeat ");
 #endif
 				if (args->isSet("reminder"))
-					usage += TQString::fromLatin1("--reminder ");
+					usage += TQString::tqfromLatin1("--reminder ");
 				if (args->isSet("reminder-once"))
-					usage += TQString::fromLatin1("--reminder-once ");
+					usage += TQString::tqfromLatin1("--reminder-once ");
 				if (args->isSet("speak"))
-					usage += TQString::fromLatin1("--speak ");
+					usage += TQString::tqfromLatin1("--speak ");
 				if (args->isSet("subject"))
-					usage += TQString::fromLatin1("--subject ");
+					usage += TQString::tqfromLatin1("--subject ");
 				if (args->isSet("time"))
-					usage += TQString::fromLatin1("--time ");
+					usage += TQString::tqfromLatin1("--time ");
 #ifndef WITHOUT_ARTS
 				if (args->isSet("volume"))
-					usage += TQString::fromLatin1("--volume ");
+					usage += TQString::tqfromLatin1("--volume ");
 #endif
 				if (!usage.isEmpty())
 				{
-					usage += i18n(": option(s) only valid with a message/%1/%2").arg(TQString::fromLatin1("--file")).arg(TQString::fromLatin1("--exec"));
+					usage += i18n(": option(s) only valid with a message/%1/%2").arg(TQString::tqfromLatin1("--file")).arg(TQString::tqfromLatin1("--exec"));
 					break;
 				}
 
@@ -1043,8 +1043,8 @@ bool KAlarmApp::checkSystemTray()
 		// tray and alarms are disabled when KAlarm is not running, registering with
 		// NO_START_NOTIFY could result in alarms never being seen.
 		KConfig* config = kapp->config();
-		config->setGroup(TQString::fromLatin1("General"));
-		config->writeEntry(TQString::fromLatin1("NoSystemTray"), mNoSystemTray);
+		config->setGroup(TQString::tqfromLatin1("General"));
+		config->writeEntry(TQString::tqfromLatin1("NoSystemTray"), mNoSystemTray);
 		config->sync();
 
 		// Update other settings and reregister with the alarm daemon
@@ -1174,7 +1174,7 @@ bool KAlarmApp::scheduleEvent(KAEvent::Action action, const TQString& text, cons
 	kdDebug(5950) << "KAlarmApp::scheduleEvent(): " << text << endl;
 	if (!dateTime.isValid())
 		return false;
-	TQDateTime now = TQDateTime::currentDateTime();
+	TQDateTime now = TQDateTime::tqcurrentDateTime();
 	if (lateCancel  &&  dateTime < now.addSecs(-maxLateness(lateCancel)))
 		return true;               // alarm time was already expired too long ago
 	TQDateTime alarmTime = dateTime;
@@ -1266,7 +1266,7 @@ bool KAlarmApp::handleEvent(const TQString& eventID, EventFunc function)
 		case EVENT_TRIGGER:    // handle it if it's due, else execute it regardless
 		case EVENT_HANDLE:     // handle it if it's due
 		{
-			TQDateTime now = TQDateTime::currentDateTime();
+			TQDateTime now = TQDateTime::tqcurrentDateTime();
 			bool updateCalAndDisplay = false;
 			bool alarmToExecuteValid = false;
 			KAAlarm alarmToExecute;
@@ -1502,7 +1502,7 @@ void KAlarmApp::rescheduleAlarm(KAEvent& event, const KAAlarm& alarm, bool updat
 	else
 	{
 		// Reschedule the alarm for its next recurrence.
-		KAEvent::OccurType type = event.setNextOccurrence(TQDateTime::currentDateTime());
+		KAEvent::OccurType type = event.setNextOccurrence(TQDateTime::tqcurrentDateTime());
 		switch (type)
 		{
 			case KAEvent::NO_OCCURRENCE:
@@ -1592,9 +1592,9 @@ void* KAlarmApp::execAlarm(KAEvent& event, const KAAlarm& alarm, bool reschedule
 			MessageWin* win = MessageWin::findEvent(event.id());
 			// Find if we're changing a reminder message to the real message
 			bool reminder = (alarm.type() & KAAlarm::REMINDER_ALARM);
-			bool replaceReminder = !reminder && win && (win->alarmType() & KAAlarm::REMINDER_ALARM);
+			bool tqreplaceReminder = !reminder && win && (win->alarmType() & KAAlarm::REMINDER_ALARM);
 			if (!reminder  &&  !event.deferred()
-			&&  (replaceReminder || !win)  &&  !noPreAction
+			&&  (tqreplaceReminder || !win)  &&  !noPreAction
 			&&  !event.preAction().isEmpty()  &&  ShellProcess::authorised())
 			{
 				// It's not a reminder or a deferred alarm, and there is no message window
@@ -1622,11 +1622,11 @@ void* KAlarmApp::execAlarm(KAEvent& event, const KAAlarm& alarm, bool reschedule
 				delete win;        // event is disabled - close its window
 			else if (!win
 			     ||  !win->hasDefer() && !alarm.repeatAtLogin()
-			     ||  replaceReminder)
+			     ||  tqreplaceReminder)
 			{
 				// Either there isn't already a message for this event,
 				// or there is a repeat-at-login message with no Defer
-				// button, which needs to be replaced with a new message,
+				// button, which needs to be tqreplaced with a new message,
 				// or the caption needs to be changed from "Reminder" to "Message".
 				if (win)
 					win->setRecreating();    // prevent post-alarm actions
@@ -1704,43 +1704,43 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent&
 	{
 		// Execute the command in a terminal window.
 		cmd = Preferences::cmdXTermCommand();
-		cmd.replace("%t", aboutData()->programName());     // set the terminal window title
+		cmd.tqreplace("%t", aboutData()->programName());     // set the terminal window title
 		if (cmd.find("%C") >= 0)
 		{
 			// Execute the command from a temporary script file
 			if (flags & ProcData::TEMP_FILE)
-				cmd.replace("%C", command);    // the command is already calling a temporary file
+				cmd.tqreplace("%C", command);    // the command is already calling a temporary file
 			else
 			{
 				tmpXtermFile = createTempScriptFile(command, true, event, *alarm);
 				if (tmpXtermFile.isEmpty())
 					return 0;
-				cmd.replace("%C", tmpXtermFile);    // %C indicates where to insert the command
+				cmd.tqreplace("%C", tmpXtermFile);    // %C indicates where to insert the command
 			}
 		}
 		else if (cmd.find("%W") >= 0)
 		{
 			// Execute the command from a temporary script file,
 			// with a sleep after the command is executed
-			tmpXtermFile = createTempScriptFile(command + TQString::fromLatin1("\nsleep 86400\n"), true, event, *alarm);
+			tmpXtermFile = createTempScriptFile(command + TQString::tqfromLatin1("\nsleep 86400\n"), true, event, *alarm);
 			if (tmpXtermFile.isEmpty())
 				return 0;
-			cmd.replace("%W", tmpXtermFile);    // %w indicates where to insert the command
+			cmd.tqreplace("%W", tmpXtermFile);    // %w indicates where to insert the command
 		}
 		else if (cmd.find("%w") >= 0)
 		{
 			// Append a sleep to the command.
-			// Quote the command in case it contains characters such as [>|;].
-			TQString exec = KShellProcess::quote(command + TQString::fromLatin1("; sleep 86400"));
-			cmd.replace("%w", exec);    // %w indicates where to insert the command string
+			// Quote the command in case it tqcontains characters such as [>|;].
+			TQString exec = KShellProcess::quote(command + TQString::tqfromLatin1("; sleep 86400"));
+			cmd.tqreplace("%w", exec);    // %w indicates where to insert the command string
 		}
 		else
 		{
 			// Set the command to execute.
-			// Put it in quotes in case it contains characters such as [>|;].
+			// Put it in quotes in case it tqcontains characters such as [>|;].
 			TQString exec = KShellProcess::quote(command);
 			if (cmd.find("%c") >= 0)
-				cmd.replace("%c", exec);    // %c indicates where to insert the command string
+				cmd.tqreplace("%c", exec);    // %c indicates where to insert the command string
 			else
 				cmd.append(exec);           // otherwise, simply append the command string
 		}
@@ -1759,7 +1759,7 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent&
 		// Set up a logging process to write the command's output to.
 		connect(proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), TQT_SLOT(slotCommandOutput(KProcess*,char*,int)));
 		connect(proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotCommandOutput(KProcess*,char*,int)));
-		logproc = new ShellProcess(TQString::fromLatin1("cat >>%1").arg(event.logFile()));
+		logproc = new ShellProcess(TQString::tqfromLatin1("cat >>%1").arg(event.logFile()));
 		connect(logproc, TQT_SIGNAL(shellExited(ShellProcess*)), TQT_SLOT(slotLogProcExited(ShellProcess*)));
 		logproc->start(KProcess::Stdin);
 		TQCString heading;
@@ -2068,7 +2068,7 @@ static bool convWakeTime(const TQCString& timeParam, TQDateTime& dateTime, bool&
 	else
 	{
 		// Compile the values into a date/time structure
-		TQDateTime now = TQDateTime::currentDateTime();
+		TQDateTime now = TQDateTime::tqcurrentDateTime();
 		if (dt[0] < 0)
 			date.setYMD(now.date().year(),
 			            (dt[1] < 0 ? now.date().month() : dt[1]),
diff --git a/kalarm/kalarmd/adcalendar.cpp b/kalarm/kalarmd/adcalendar.cpp
index 1f325be4..1b738b04 100644
--- a/kalarm/kalarmd/adcalendar.cpp
+++ b/kalarm/kalarmd/adcalendar.cpp
@@ -37,7 +37,7 @@ TQStringList             ADCalendar::mCalendarUrls;    // never delete or reorde
 
 
 ADCalendar::ADCalendar(const TQString& url, const TQCString& appname)
-	: KCal::CalendarLocal(TQString::fromLatin1("UTC")),
+	: KCal::CalendarLocal(TQString::tqfromLatin1("UTC")),
 	  mUrlString(url),
 	  mAppName(appname),
 	  mLoaded(false),
diff --git a/kalarm/kalarmd/adconfigdata.cpp b/kalarm/kalarmd/adconfigdata.cpp
index c8c5dd35..68344fa2 100644
--- a/kalarm/kalarmd/adconfigdata.cpp
+++ b/kalarm/kalarmd/adconfigdata.cpp
@@ -31,13 +31,13 @@
 #include "adconfigdata.h"
 
 // Config file key strings
-const TQString CLIENT_GROUP(TQString::fromLatin1("Client "));
+const TQString CLIENT_GROUP(TQString::tqfromLatin1("Client "));
 const TQRegExp CLIENT_GROUP_SEARCH("^Client ");
 // Client data file key strings
-const TQString CALENDAR_KEY(TQString::fromLatin1("Calendar"));
-const TQString TITLE_KEY(TQString::fromLatin1("Title"));
-const TQString DCOP_OBJECT_KEY(TQString::fromLatin1("DCOP object"));
-const TQString START_CLIENT_KEY(TQString::fromLatin1("Start"));
+const TQString CALENDAR_KEY(TQString::tqfromLatin1("Calendar"));
+const TQString TITLE_KEY(TQString::tqfromLatin1("Title"));
+const TQString DCOP_OBJECT_KEY(TQString::tqfromLatin1("DCOP object"));
+const TQString START_CLIENT_KEY(TQString::tqfromLatin1("Start"));
 
 
 /******************************************************************************
@@ -139,8 +139,8 @@ void ADConfigData::enableAutoStart(bool on)
         kdDebug(5900) << "ADConfigData::enableAutoStart(" << on << ")\n";
         KConfig* config = KGlobal::config();
 	config->reparseConfiguration();
-        config->setGroup(TQString::fromLatin1(DAEMON_AUTOSTART_SECTION));
-        config->writeEntry(TQString::fromLatin1(DAEMON_AUTOSTART_KEY), on);
+        config->setGroup(TQString::tqfromLatin1(DAEMON_AUTOSTART_SECTION));
+        config->writeEntry(TQString::tqfromLatin1(DAEMON_AUTOSTART_KEY), on);
         config->sync();
 }
 
diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp
index d8bcf83a..4b649572 100644
--- a/kalarm/kalarmd/alarmdaemon.cpp
+++ b/kalarm/kalarmd/alarmdaemon.cpp
@@ -54,8 +54,8 @@ static const int KALARM_AUTOSTART_TIMEOUT = 30;
 static const int SECS_PER_DAY = 3600 * 24;
 
 // KAlarm config file keys
-static const TQString START_OF_DAY(TQString::fromLatin1("StartOfDay"));
-static const TQString AUTOSTART_TRAY(TQString::fromLatin1("AutostartTray"));
+static const TQString START_OF_DAY(TQString::tqfromLatin1("StartOfDay"));
+static const TQString AUTOSTART_TRAY(TQString::tqfromLatin1("AutostartTray"));
 
 
 AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name)
@@ -84,7 +84,7 @@ AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name)
 		 * itself and instead will simply open a new window.
 		 */
 		KConfig kaconfig(locate("config", "kalarmrc"));
-		kaconfig.setGroup(TQString::fromLatin1("General"));
+		kaconfig.setGroup(TQString::tqfromLatin1("General"));
 		autostart = kaconfig.readBoolEntry(AUTOSTART_TRAY, false);
 		if (autostart)
 		{
@@ -119,8 +119,8 @@ void AlarmDaemon::autostartKAlarm()
 	}
 	kdDebug(5900) << "AlarmDaemon::autostartKAlarm(): starting KAlarm\n";
 	TQStringList args;
-	args << TQString::fromLatin1("--tray");
-	int ret = KApplication::kdeinitExec(TQString::fromLatin1("kalarm"), args);
+	args << TQString::tqfromLatin1("--tray");
+	int ret = KApplication::kdeinitExec(TQString::tqfromLatin1("kalarm"), args);
 	if (ret)
 		kdError(5900) << "AlarmDaemon::autostartKAlarm(): error=" << ret << endl;
 	else
@@ -365,7 +365,7 @@ void AlarmDaemon::checkAlarms(ADCalendar* cal)
 	if (!cal->loaded()  ||  !cal->enabled())
 		return;
 
-	TQDateTime now  = TQDateTime::currentDateTime();
+	TQDateTime now  = TQDateTime::tqcurrentDateTime();
 	kdDebug(5901) << "  To: " << now.toString() << endl;
 	TQValueList<KCal::Alarm*> alarms = cal->alarmsTo(now);
 	if (!alarms.count())
@@ -385,7 +385,7 @@ void AlarmDaemon::checkAlarms(ADCalendar* cal)
 		// The times for non-due alarms are set invalid in 'alarmtimes'.
 		bool recurs = event->doesRecur();
 		const TQStringList cats = event->categories();
-		bool floats = (cats.find(TQString::fromLatin1("DATE")) != cats.end());
+		bool floats = (cats.find(TQString::tqfromLatin1("DATE")) != cats.end());
 		TQDateTime nextDateTime = event->dtStart();
 		if (recurs)
 		{
@@ -478,7 +478,7 @@ bool AlarmDaemon::notifyEvent(ADCalendar* calendar, const TQString& eventID)
 		return false;
 	}
 	kdDebug(5900) << "AlarmDaemon::notifyEvent(" << appname << ", " << eventID << "): notification type=" << client->startClient() << endl;
-	TQString id = TQString::fromLatin1("ad:") + eventID;    // prefix to indicate that the notification if from the daemon
+	TQString id = TQString::tqfromLatin1("ad:") + eventID;    // prefix to indicate that the notification if from the daemon
 
 	// Check if the client application is running and ready to receive notification
 	bool registered = kapp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname));
@@ -595,7 +595,7 @@ void AlarmDaemon::notifyCalStatus(const ADCalendar* cal)
 void AlarmDaemon::readKAlarmConfig()
 {
 	KConfig config(locate("config", "kalarmrc"));
-	config.setGroup(TQString::fromLatin1("General"));
+	config.setGroup(TQString::tqfromLatin1("General"));
 	TQDateTime defTime(TQDate(1900,1,1), TQTime());
 	mStartOfDay = config.readDateTimeEntry(START_OF_DAY, &defTime).time();
 	kdDebug(5900) << "AlarmDaemon::readKAlarmConfig()" << endl;
diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp
index 18bb0394..ab4747e3 100644
--- a/kalarm/kamail.cpp
+++ b/kalarm/kamail.cpp
@@ -100,7 +100,7 @@ KPIM::IdentityManager* KAMail::identityManager()
 /******************************************************************************
 * Send the email message specified in an event.
 * Reply = true if the message was sent - 'errmsgs' may contain copy error messages.
-*       = false if the message was not sent - 'errmsgs' contains the error messages.
+*       = false if the message was not sent - 'errmsgs' tqcontains the error messages.
 */
 bool KAMail::send(const KAEvent& event, TQStringList& errmsgs, bool allowNotify)
 {
@@ -153,30 +153,30 @@ bool KAMail::send(const KAEvent& event, TQStringList& errmsgs, bool allowNotify)
 	{
 		// Use sendmail to send the message
 		TQString textComplete;
-		TQString command = KStandardDirs::findExe(TQString::fromLatin1("sendmail"),
-		                                         TQString::fromLatin1("/sbin:/usr/sbin:/usr/lib"));
+		TQString command = KStandardDirs::findExe(TQString::tqfromLatin1("sendmail"),
+		                                         TQString::tqfromLatin1("/sbin:/usr/sbin:/usr/lib"));
 		if (!command.isNull())
 		{
-			command += TQString::fromLatin1(" -f ");
+			command += TQString::tqfromLatin1(" -f ");
 			command += KPIM::getEmailAddress(from);
-			command += TQString::fromLatin1(" -oi -t ");
+			command += TQString::tqfromLatin1(" -oi -t ");
 			textComplete = initHeaders(data, false);
 		}
 		else
 		{
-			command = KStandardDirs::findExe(TQString::fromLatin1("mail"));
+			command = KStandardDirs::findExe(TQString::tqfromLatin1("mail"));
 			if (command.isNull())
 			{
-				errmsgs = errors(i18n("%1 not found").arg(TQString::fromLatin1("sendmail"))); // give up
+				errmsgs = errors(i18n("%1 not found").arg(TQString::tqfromLatin1("sendmail"))); // give up
 				return false;
 			}
 
-			command += TQString::fromLatin1(" -s ");
+			command += TQString::tqfromLatin1(" -s ");
 			command += KShellProcess::quote(event.emailSubject());
 
 			if (!data.bcc.isEmpty())
 			{
-				command += TQString::fromLatin1(" -b ");
+				command += TQString::tqfromLatin1(" -b ");
 				command += KShellProcess::quote(data.bcc);
 			}
 
@@ -249,7 +249,7 @@ TQString KAMail::sendKMail(const KAMailData& data)
 		if (func.left(5) == "bool ")
 		{
 			func = func.mid(5);
-			func.replace(TQRegExp(" [0-9A-Za-z_:]+"), "");
+			func.tqreplace(TQRegExp(" [0-9A-Za-z_:]+"), "");
 			useSend = (func == sendFunction);
 		}
 	}
@@ -321,7 +321,7 @@ TQString KAMail::addToKMailFolder(const KAMailData& data, const char* folder, bo
 		// Notify KMail of the message in the temporary file
 		TQByteArray  callData;
 		TQDataStream arg(callData, IO_WriteOnly);
-		arg << TQString::fromLatin1(folder) << tmpFile.name();
+		arg << TQString::tqfromLatin1(folder) << tmpFile.name();
 		if (callKMail(callData, "KMailIface", "dcopAddMessage(TQString,TQString)", "int"))
 			return TQString::null;
 		err = i18n("Error calling KMail");
@@ -341,13 +341,13 @@ bool KAMail::callKMail(const TQByteArray& callData, const TQCString& iface, cons
 	||  replyType != funcType)
 	{
 		TQCString funcname = function;
-		funcname.replace(TQRegExp("(.+$"), "()");
+		funcname.tqreplace(TQRegExp("(.+$"), "()");
 		kdError(5950) << "KAMail::callKMail(): kmail " << funcname << " call failed\n";;
 		return false;
 	}
 	TQDataStream replyStream(replyData, IO_ReadOnly);
 	TQCString funcname = function;
-	funcname.replace(TQRegExp("(.+$"), "()");
+	funcname.tqreplace(TQRegExp("(.+$"), "()");
 	if (replyType == "int")
 	{
 		int result;
@@ -385,16 +385,16 @@ TQString KAMail::initHeaders(const KAMailData& data, bool dateId)
 		char buff[64];
 		strftime(buff, sizeof(buff), "Date: %a, %d %b %Y %H:%M:%S %z", localtime(&timenow));
 		TQString from = data.from;
-		from.replace(TQRegExp("^.*<"), TQString::null).replace(TQRegExp(">.*$"), TQString::null);
-		message = TQString::fromLatin1(buff);
-		message += TQString::fromLatin1("\nMessage-Id: <%1.%2.%3>\n").arg(timenow).arg(tod.tv_usec).arg(from);
+		from.tqreplace(TQRegExp("^.*<"), TQString::null).tqreplace(TQRegExp(">.*$"), TQString::null);
+		message = TQString::tqfromLatin1(buff);
+		message += TQString::tqfromLatin1("\nMessage-Id: <%1.%2.%3>\n").arg(timenow).arg(tod.tv_usec).arg(from);
 	}
-	message += TQString::fromLatin1("From: ") + data.from;
-	message += TQString::fromLatin1("\nTo: ") + data.event.emailAddresses(", ");
+	message += TQString::tqfromLatin1("From: ") + data.from;
+	message += TQString::tqfromLatin1("\nTo: ") + data.event.emailAddresses(", ");
 	if (!data.bcc.isEmpty())
-		message += TQString::fromLatin1("\nBcc: ") + data.bcc;
-	message += TQString::fromLatin1("\nSubject: ") + data.event.emailSubject();
-	message += TQString::fromLatin1("\nX-Mailer: %1/" KALARM_VERSION).arg(kapp->aboutData()->programName());
+		message += TQString::tqfromLatin1("\nBcc: ") + data.bcc;
+	message += TQString::tqfromLatin1("\nSubject: ") + data.event.emailSubject();
+	message += TQString::tqfromLatin1("\nX-Mailer: %1/" KALARM_VERSION).arg(kapp->aboutData()->programName());
 	return message;
 }
 
@@ -426,13 +426,13 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event)
 		time(&timenow);
 		TQCString boundary;
 		boundary.sprintf("------------_%lu_-%lx=", 2*timenow, timenow);
-		message += TQString::fromLatin1("\nMIME-Version: 1.0");
-		message += TQString::fromLatin1("\nContent-Type: multipart/mixed;\n  boundary=\"%1\"\n").arg(boundary);
+		message += TQString::tqfromLatin1("\nMIME-Version: 1.0");
+		message += TQString::tqfromLatin1("\nContent-Type: multipart/mixed;\n  boundary=\"%1\"\n").arg(boundary);
 
 		if (!event.message().isEmpty())
 		{
 			// There is a message body
-			message += TQString::fromLatin1("\n--%1\nContent-Type: text/plain\nContent-Transfer-Encoding: 8bit\n\n").arg(boundary);
+			message += TQString::tqfromLatin1("\n--%1\nContent-Type: text/plain\nContent-Transfer-Encoding: 8bit\n\n").arg(boundary);
 			message += event.message();
 		}
 
@@ -463,10 +463,10 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event)
 					text = (mimeType == textMimeTypes[i]);
 			}
 
-			message += TQString::fromLatin1("\n--%1").arg(boundary);
-			message += TQString::fromLatin1("\nContent-Type: %2; name=\"%3\"").arg(mimeType).arg(fi.text());
-			message += TQString::fromLatin1("\nContent-Transfer-Encoding: %1").arg(TQString::fromLatin1(text ? "8bit" : "BASE64"));
-			message += TQString::fromLatin1("\nContent-Disposition: attachment; filename=\"%4\"\n\n").arg(fi.text());
+			message += TQString::tqfromLatin1("\n--%1").arg(boundary);
+			message += TQString::tqfromLatin1("\nContent-Type: %2; name=\"%3\"").arg(mimeType).arg(fi.text());
+			message += TQString::tqfromLatin1("\nContent-Transfer-Encoding: %1").arg(TQString::tqfromLatin1(text ? "8bit" : "BASE64"));
+			message += TQString::tqfromLatin1("\nContent-Disposition: attachment; filename=\"%4\"\n\n").arg(fi.text());
 
 			// Read the file contents
 			TQString tmpFile;
@@ -481,7 +481,7 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event)
 			}
 			TQIODevice::Offset size = file.size();
 			char* contents = new char [size + 1];
-			Q_LONG bytes = file.readBlock(contents, size);
+			TQ_LONG bytes = file.readBlock(contents, size);
 			file.close();
 			contents[size] = 0;
 			bool atterror = false;
@@ -504,14 +504,14 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event)
 					atterror = true;
 				}
 				else
-					message += TQString::fromLatin1(base64, base64Size);
+					message += TQString::tqfromLatin1(base64, base64Size);
 				delete[] base64;
 			}
 			delete[] contents;
 			if (atterror)
 				return attachError.arg(attachment);
 		}
-		message += TQString::fromLatin1("\n--%1--\n.\n").arg(boundary);
+		message += TQString::tqfromLatin1("\n--%1--\n.\n").arg(boundary);
 	}
 	return TQString::null;
 }
@@ -523,7 +523,7 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event)
 void KAMail::notifyQueued(const KAEvent& event)
 {
 	KMime::Types::Address addr;
-	TQString localhost = TQString::fromLatin1("localhost");
+	TQString localhost = TQString::tqfromLatin1("localhost");
 	TQString hostname  = getHostName();
 	const EmailAddressList& addresses = event.emailAddresses();
 	for (TQValueList<KCal::Person>::ConstIterator it = addresses.begin();  it != addresses.end();  ++it)
@@ -925,7 +925,7 @@ TQStringList KAMail::errors(const TQString& err, bool sendfail)
 	                          : i18n("Error copying sent email to KMail %1 folder").arg(i18n_sent_mail());
 	if (err.isEmpty())
 		return TQStringList(error1);
-	TQStringList errs(TQString::fromLatin1("%1:").arg(error1));
+	TQStringList errs(TQString::tqfromLatin1("%1:").arg(error1));
 	errs += err;
 	return errs;
 }
@@ -933,7 +933,7 @@ TQStringList KAMail::errors(const TQString& err, bool sendfail)
 /******************************************************************************
 *  Get the body of an email, given its serial number.
 */
-TQString KAMail::getMailBody(Q_UINT32 serialNumber)
+TQString KAMail::getMailBody(TQ_UINT32 serialNumber)
 {
 	// Get the body of the email from KMail
 	TQCString    replyType;
@@ -943,7 +943,7 @@ TQString KAMail::getMailBody(Q_UINT32 serialNumber)
 	arg << serialNumber;
 	arg << (int)0;
 	TQString body;
-	if (kapp->dcopClient()->call("kmail", "KMailIface", "getDecodedBodyPart(Q_UINT32,int)", data, replyType, replyData)
+	if (kapp->dcopClient()->call("kmail", "KMailIface", "getDecodedBodyPart(TQ_UINT32,int)", data, replyType, replyData)
 	&&  replyType == "TQString")
 	{
 		TQDataStream reply_stream(replyData, IO_ReadOnly);
diff --git a/kalarm/kamail.h b/kalarm/kamail.h
index 3ef56150..6e2d0300 100644
--- a/kalarm/kamail.h
+++ b/kalarm/kamail.h
@@ -45,7 +45,7 @@ class KAMail
 		static bool        identitiesExist();
 		static uint        identityUoid(const TQString& identityUoidOrName);
 		static TQString     controlCentreAddress();
-		static TQString     getMailBody(Q_UINT32 serialNumber);
+		static TQString     getMailBody(TQ_UINT32 serialNumber);
 		static TQString     i18n_NeedFromEmailAddress();
 		static TQString     i18n_sent_mail();
 
diff --git a/kalarm/karecurrence.cpp b/kalarm/karecurrence.cpp
index 8b7e9068..4221a5ad 100644
--- a/kalarm/karecurrence.cpp
+++ b/kalarm/karecurrence.cpp
@@ -165,7 +165,7 @@ bool KARecurrence::init(RecurrenceRule::PeriodType recurType, int freq, int coun
  */
 bool KARecurrence::set(const TQString& icalRRULE)
 {
-	static TQString RRULE = TQString::fromLatin1("RRULE:");
+	static TQString RRULE = TQString::tqfromLatin1("RRULE:");
 	mCachedType = -1;
 	clear();
 	if (icalRRULE.isEmpty())
@@ -606,7 +606,7 @@ bool KARecurrence::recursOn(const TQDate& dt) const
 		return true;
 	// We know now that it isn't in EXDATES or EXRULES,
 	// so we just need to check if it's in RDATES or RRULES
-	if (rDates().contains(dt))
+	if (rDates().tqcontains(dt))
 		return true;
 	RecurrenceRule::List rulelist = rRules();
 	for (RecurrenceRule::List::ConstIterator rr = rulelist.begin();  rr != rulelist.end();  ++rr)
diff --git a/kalarm/latecancel.cpp b/kalarm/latecancel.cpp
index 3c7fab3b..274ad9b7 100644
--- a/kalarm/latecancel.cpp
+++ b/kalarm/latecancel.cpp
@@ -58,31 +58,31 @@ LateCancelSelector::LateCancelSelector(bool allowHourMinute, TQWidget* parent, c
 	mCheckboxFrame = new TQFrame(mStack);
 	mCheckboxFrame->setFrameStyle(TQFrame::NoFrame);
 	mStack->addWidget(mCheckboxFrame, 1);
-	TQBoxLayout* layout = new TQVBoxLayout(mCheckboxFrame, 0, 0);
+	TQBoxLayout* tqlayout = new TQVBoxLayout(mCheckboxFrame, 0, 0);
 	mCheckbox = new CheckBox(i18n_n_CancelIfLate(), mCheckboxFrame);
-	mCheckbox->setFixedSize(mCheckbox->sizeHint());
+	mCheckbox->setFixedSize(mCheckbox->tqsizeHint());
 	connect(mCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool)));
 	TQWhatsThis::add(mCheckbox, whatsThis);
-	layout->addWidget(mCheckbox, 0, Qt::AlignAuto);
+	tqlayout->addWidget(mCheckbox, 0, Qt::AlignAuto);
 
 	mTimeSelectorFrame = new TQFrame(mStack);
 	mTimeSelectorFrame->setFrameStyle(TQFrame::NoFrame);
 	mStack->addWidget(mTimeSelectorFrame, 2);
-	layout = new TQVBoxLayout(mTimeSelectorFrame, 0, 0);
+	tqlayout = new TQVBoxLayout(mTimeSelectorFrame, 0, 0);
 	mTimeSelector = new TimeSelector(i18n("Cancel if late by 10 minutes", "Ca&ncel if late by"), TQString::null,
 	                                 whatsThis, i18n("Enter how late will cause the alarm to be canceled"),
 	                                 allowHourMinute, mTimeSelectorFrame);
 	connect(mTimeSelector, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool)));
-	layout->addWidget(mTimeSelector);
+	tqlayout->addWidget(mTimeSelector);
 	mLayout->addWidget(mStack);
 
-	layout = new TQHBoxLayout(mLayout, KDialog::spacingHint());
-	layout->addSpacing(3*KDialog::spacingHint());
+	tqlayout = new TQHBoxLayout(mLayout, KDialog::spacingHint());
+	tqlayout->addSpacing(3*KDialog::spacingHint());
 	mAutoClose = new CheckBox(i18n_AutoCloseWin(), this);
-	mAutoClose->setFixedSize(mAutoClose->sizeHint());
+	mAutoClose->setFixedSize(mAutoClose->tqsizeHint());
 	TQWhatsThis::add(mAutoClose, i18n("Automatically close the alarm window after the expiry of the late-cancelation period"));
-	layout->addWidget(mAutoClose);
-	layout->addStretch();
+	tqlayout->addWidget(mAutoClose);
+	tqlayout->addStretch();
 
 	mAutoClose->hide();
 	mAutoClose->setEnabled(false);
diff --git a/kalarm/latecancel.h b/kalarm/latecancel.h
index 04d08d62..5b914648 100644
--- a/kalarm/latecancel.h
+++ b/kalarm/latecancel.h
@@ -54,8 +54,8 @@ class LateCancelSelector : public QFrame
 		void           slotToggled(bool);
 
 	private:
-		TQBoxLayout*    mLayout;            // overall layout for the widget
-		TQWidgetStack*  mStack;             // contains mCheckboxFrame and mTimeSelectorFrame
+		TQBoxLayout*    mLayout;            // overall tqlayout for the widget
+		TQWidgetStack*  mStack;             // tqcontains mCheckboxFrame and mTimeSelectorFrame
 		TQFrame*        mCheckboxFrame;
 		CheckBox*      mCheckbox;          // displayed when late cancellation is not selected
 		TQFrame*        mTimeSelectorFrame;
diff --git a/kalarm/lib/checkbox.h b/kalarm/lib/checkbox.h
index fc7f82cb..389e6623 100644
--- a/kalarm/lib/checkbox.h
+++ b/kalarm/lib/checkbox.h
@@ -62,7 +62,7 @@ class CheckBox : public QCheckBox
 		 */
 		virtual void setReadOnly(bool readOnly);
 		/** Returns the widget which receives focus when the user selects the check box by clicking on it. */
-		TQWidget*     focusWidget() const         { return mFocusWidget; }
+		TQWidget*     tqfocusWidget() const         { return mFocusWidget; }
 		/** Specifies a widget to receive focus when the user selects the check box by clicking on it.
 		 *  @param widget Widget to receive focus.
 		 *  @param enable If true, @p widget will be enabled before receiving focus. If
diff --git a/kalarm/lib/colourcombo.cpp b/kalarm/lib/colourcombo.cpp
index 9cf09ce1..0345104e 100644
--- a/kalarm/lib/colourcombo.cpp
+++ b/kalarm/lib/colourcombo.cpp
@@ -57,7 +57,7 @@ void ColourCombo::setColours(const ColourList& colours)
 {
 	mColourList = colours;
 	if (mSelectedColour != mCustomColour
-	&&  !mColourList.contains(mSelectedColour))
+	&&  !mColourList.tqcontains(mSelectedColour))
 	{
 		// The current colour has been deleted
 		mSelectedColour = mColourList.count() ? mColourList.first() : mCustomColour;
@@ -168,7 +168,7 @@ void ColourCombo::addColours()
 void ColourCombo::drawCustomItem(TQRect& rect, bool insert)
 {
 	TQPen pen;
-	if (qGray(mCustomColour.rgb()) < 128)
+	if (tqGray(mCustomColour.rgb()) < 128)
 		pen.setColor(Qt::white);
 	else
 		pen.setColor(Qt::black);
diff --git a/kalarm/lib/colourlist.h b/kalarm/lib/colourlist.h
index a20a44d6..8ec2b2a9 100644
--- a/kalarm/lib/colourlist.h
+++ b/kalarm/lib/colourlist.h
@@ -82,8 +82,8 @@ class ColourList
 		const_iterator fromLast() const                      { return mList.fromLast(); }
 		/** Returns an iterator pointing to the colour at position @p i in the list. */
 		const_iterator at(size_type i) const                 { return mList.at(i); }
-		/** Returns true if the list contains the colour @p c. */
-		size_type      contains(const TQColor& c) const       { return mList.contains(c.rgb()); }
+		/** Returns true if the list tqcontains the colour @p c. */
+		size_type      tqcontains(const TQColor& c) const       { return mList.tqcontains(c.rgb()); }
 		/** Returns an iterator pointing to the first occurrence of colour @p c in the list.
 		 *  Returns end() if colour @p c is not in the list.
 		 */
diff --git a/kalarm/lib/dateedit.cpp b/kalarm/lib/dateedit.cpp
index 2fef25de..2cc10698 100644
--- a/kalarm/lib/dateedit.cpp
+++ b/kalarm/lib/dateedit.cpp
@@ -77,7 +77,7 @@ void DateEdit::pastLimitMessage(const TQDate& limit, const TQString& error, cons
 	TQString errString = error;
 	if (errString.isNull())
 	{
-		if (limit == TQDate::currentDate())
+		if (limit == TQDate::tqcurrentDate())
 			errString = i18n("today");
 		else
 			errString = KGlobal::locale()->formatDate(limit, true);
diff --git a/kalarm/lib/dateedit.h b/kalarm/lib/dateedit.h
index c7c01578..7ea09e01 100644
--- a/kalarm/lib/dateedit.h
+++ b/kalarm/lib/dateedit.h
@@ -43,7 +43,7 @@ class DateEdit : public KDateEdit
 		 *  @param name The name of this widget.
 		 */
 		explicit DateEdit(TQWidget* parent = 0, const char* name = 0);
-		/** Returns true if the widget contains a valid date. */
+		/** Returns true if the widget tqcontains a valid date. */
 		bool         isValid() const              { return date().isValid(); }
 		/** Returns the earliest date which can be entered.
 		 *  If there is no minimum date, returns an invalid date.
diff --git a/kalarm/lib/label.cpp b/kalarm/lib/label.cpp
index 69cef754..92f07402 100644
--- a/kalarm/lib/label.cpp
+++ b/kalarm/lib/label.cpp
@@ -112,7 +112,7 @@ LabelFocusWidget::LabelFocusWidget(TQWidget* parent, const char* name)
 
 void LabelFocusWidget::focusInEvent(TQFocusEvent*)
 {
-	Label* parent = (Label*)parentWidget();
+	Label* parent = (Label*)tqparentWidget();
 	parent->activated();
 
 }
diff --git a/kalarm/lib/lineedit.cpp b/kalarm/lib/lineedit.cpp
index 64c79ea7..4dcdc15f 100644
--- a/kalarm/lib/lineedit.cpp
+++ b/kalarm/lib/lineedit.cpp
@@ -122,7 +122,7 @@ void LineEdit::dropEvent(TQDropEvent* e)
 			if (mType == Emails)
 				newText = mailList.first().from();
 			else
-				setText(mailList.first().subject());    // replace any existing text
+				setText(mailList.first().subject());    // tqreplace any existing text
 		}
 	}
 	// This must come before KURLDrag
@@ -144,12 +144,12 @@ void LineEdit::dropEvent(TQDropEvent* e)
 		{
 			case Url:
 				// URL entry field - ignore all but the first dropped URL
-				setText(files.first().prettyURL());    // replace any existing text
+				setText(files.first().prettyURL());    // tqreplace any existing text
 				break;
 			case Emails:
 			{
 				// Email entry field - ignore all but mailto: URLs
-				TQString mailto = TQString::fromLatin1("mailto");
+				TQString mailto = TQString::tqfromLatin1("mailto");
 				for (KURL::List::Iterator it = files.begin();  it != files.end();  ++it)
 				{
 					if ((*it).protocol() == mailto)
@@ -168,7 +168,7 @@ void LineEdit::dropEvent(TQDropEvent* e)
 		if (mType == Emails)
 		{
 			// Remove newlines from a list of email addresses, and allow an eventual mailto: protocol
-			TQString mailto = TQString::fromLatin1("mailto:");
+			TQString mailto = TQString::tqfromLatin1("mailto:");
 			newEmails = TQStringList::split(TQRegExp("[\r\n]+"), txt);
 			for (TQStringList::Iterator it = newEmails.begin();  it != newEmails.end();  ++it)
 			{
diff --git a/kalarm/lib/lineedit.h b/kalarm/lib/lineedit.h
index 612b12a3..5d36de3c 100644
--- a/kalarm/lib/lineedit.h
+++ b/kalarm/lib/lineedit.h
@@ -45,14 +45,14 @@ class LineEdit : public KLineEdit
 		Q_OBJECT
 	public:
 		/** Types of drag and drop content which will be accepted.
-		 *  @li Text   - the line edit contains general text. It accepts text, a URL
+		 *  @li Text   - the line edit tqcontains general text. It accepts text, a URL
 		 *               or an email from KMail (the subject line is used). If multiple
 		 *               URLs or emails are dropped, only the first is used; the
 		 *               rest are ignored.
-		 *  @li Url    - the line edit contains a URL. It accepts text or a URL. If
+		 *  @li Url    - the line edit tqcontains a URL. It accepts text or a URL. If
 		 *               multiple URLs are dropped, only the first URL is used; the
 		 *               rest are ignored.
-		 *  @li Emails - the line edit contains email addresses. It accepts text,
+		 *  @li Emails - the line edit tqcontains email addresses. It accepts text,
 		 *               mailto: URLs, emails from KMail (the From address is used)
 		 *               or vcard data (e.g. from KAddressBook). If multiple emails
 		 *               are dropped, only the first is used; the rest are ignored.
diff --git a/kalarm/lib/messagebox.cpp b/kalarm/lib/messagebox.cpp
index 48c18f1c..3345c9c4 100644
--- a/kalarm/lib/messagebox.cpp
+++ b/kalarm/lib/messagebox.cpp
@@ -109,7 +109,7 @@ bool MessageBox::setDefaultShouldBeShownContinue(const TQString& dontShowAgainNa
 		return false;
 	// First check whether there is an existing setting
 	KConfig* config = mConfig ? mConfig : KGlobal::config();
-	config->setGroup(TQString::fromLatin1("Notification Messages"));
+	config->setGroup(TQString::tqfromLatin1("Notification Messages"));
 	if (config->hasKey(dontShowAgainName))
 		return false;
 
@@ -168,10 +168,10 @@ void MessageBox::saveDontShowAgain(const TQString& dontShowAgainName, bool yesno
 	if (dontShowAgainName.isEmpty())
 		return;
 	KConfig* config = mConfig ? mConfig : KGlobal::config();
-	config->setGroup(TQString::fromLatin1("Notification Messages"));
+	config->setGroup(TQString::tqfromLatin1("Notification Messages"));
 	bool global = (dontShowAgainName[0] == ':');
 	if (yesno)
-		config->writeEntry(dontShowAgainName, TQString::fromLatin1(dontShow ? yesnoResult : ""), true, global);
+		config->writeEntry(dontShowAgainName, TQString::tqfromLatin1(dontShow ? yesnoResult : ""), true, global);
 	else
 		config->writeEntry(dontShowAgainName, !dontShow, true, global);
 	config->sync();
diff --git a/kalarm/lib/radiobutton.h b/kalarm/lib/radiobutton.h
index c87ef97b..d95d13fa 100644
--- a/kalarm/lib/radiobutton.h
+++ b/kalarm/lib/radiobutton.h
@@ -62,7 +62,7 @@ class RadioButton : public QRadioButton
 		 */
 		virtual void setReadOnly(bool readOnly);
 		/** Returns the widget which receives focus when the button is clicked. */
-		TQWidget* focusWidget() const         { return mFocusWidget; }
+		TQWidget* tqfocusWidget() const         { return mFocusWidget; }
 		/** Specifies a widget to receive focus when the button is clicked.
 		 *  @param widget Widget to receive focus.
 		 *  @param enable If true, @p widget will be enabled before receiving focus. If
diff --git a/kalarm/lib/spinbox.cpp b/kalarm/lib/spinbox.cpp
index 6145114a..42d91a91 100644
--- a/kalarm/lib/spinbox.cpp
+++ b/kalarm/lib/spinbox.cpp
@@ -468,9 +468,9 @@ int SpinBox::shiftStepAdjustment(int oldValue, int shiftStep)
 */
 int SpinBox::whichButton(const TQPoint& pos)
 {
-	if (upRect().contains(pos))
+	if (upRect().tqcontains(pos))
 		return UP;
-	if (downRect().contains(pos))
+	if (downRect().tqcontains(pos))
 		return DOWN;
 	return NO_BUTTON;
 }
diff --git a/kalarm/lib/spinbox2.cpp b/kalarm/lib/spinbox2.cpp
index 48b88d51..db74cc59 100644
--- a/kalarm/lib/spinbox2.cpp
+++ b/kalarm/lib/spinbox2.cpp
@@ -142,7 +142,7 @@ void SpinBox2::setLineStep(int step)
 {
 	mLineStep = step;
 	if (reverseButtons())
-		mUpdown2->setLineStep(step);   // reverse layout, but still set the right buttons
+		mUpdown2->setLineStep(step);   // reverse tqlayout, but still set the right buttons
 	else
 		mSpinbox->setLineStep(step);
 }
@@ -153,7 +153,7 @@ void SpinBox2::setSteps(int line, int page)
 	mPageStep = page;
 	if (reverseButtons())
 	{
-		mUpdown2->setLineStep(line);   // reverse layout, but still set the right buttons
+		mUpdown2->setLineStep(line);   // reverse tqlayout, but still set the right buttons
 		mSpinbox->setLineStep(page);
 	}
 	else
@@ -169,7 +169,7 @@ void SpinBox2::setShiftSteps(int line, int page)
 	mPageShiftStep = page;
 	if (reverseButtons())
 	{
-		mUpdown2->setLineShiftStep(line);   // reverse layout, but still set the right buttons
+		mUpdown2->setLineShiftStep(line);   // reverse tqlayout, but still set the right buttons
 		mSpinbox->setLineShiftStep(page);
 	}
 	else
@@ -225,18 +225,18 @@ void SpinBox2::showEvent(TQShowEvent*)
 	arrange();
 }
 
-TQSize SpinBox2::sizeHint() const
+TQSize SpinBox2::tqsizeHint() const
 {
 	getMetrics();
-	TQSize size = mSpinbox->sizeHint();
+	TQSize size = mSpinbox->tqsizeHint();
 	size.setWidth(size.width() - xSpinbox + wUpdown2 + wGap);
 	return size;
 }
 
-TQSize SpinBox2::minimumSizeHint() const
+TQSize SpinBox2::tqminimumSizeHint() const
 {
 	getMetrics();
-	TQSize size = mSpinbox->minimumSizeHint();
+	TQSize size = mSpinbox->tqminimumSizeHint();
 	size.setWidth(size.width() - xSpinbox + wUpdown2 + wGap);
 	return size;
 }
@@ -251,7 +251,7 @@ void SpinBox2::styleChange(TQStyle&)
 }
 
 /******************************************************************************
-* Called when the extra pair of spin buttons has repainted after a style change. 
+* Called when the extra pair of spin buttons has tqrepainted after a style change. 
 * Updates the mirror image of the spin buttons.
 */
 void SpinBox2::updateMirror()
@@ -265,14 +265,14 @@ void SpinBox2::updateMirror()
 void SpinBox2::arrange()
 {
 	getMetrics();
-	TQRect arrowRect = TQStyle::visualRect(TQRect(0, 0, wUpdown2, height()), this);
+	TQRect arrowRect = TQStyle::tqvisualRect(TQRect(0, 0, wUpdown2, height()), this);
 	mUpdown2Frame->setGeometry(arrowRect);
 	mUpdown2->setGeometry(-xUpdown2, 0, mUpdown2->width(), height());
-	mSpinboxFrame->setGeometry(TQStyle::visualRect(TQRect(wUpdown2 + wGap, 0, width() - wUpdown2 - wGap, height()), this));
+	mSpinboxFrame->setGeometry(TQStyle::tqvisualRect(TQRect(wUpdown2 + wGap, 0, width() - wUpdown2 - wGap, height()), this));
 	mSpinbox->setGeometry(-xSpinbox, 0, mSpinboxFrame->width() + xSpinbox, height());
 	mSpinMirror->resize(wUpdown2, mUpdown2->height());
 	mSpinMirror->setGeometry(arrowRect);
-//mSpinMirror->setGeometry(TQStyle::visualRect(TQRect(0, 11, wUpdown2, height()), this));
+//mSpinMirror->setGeometry(TQStyle::tqvisualRect(TQRect(0, 11, wUpdown2, height()), this));
 	mSpinMirror->setNormalButtons(TQPixmap::grabWidget(mUpdown2Frame, 0, 0));
 }
 
diff --git a/kalarm/lib/spinbox2.h b/kalarm/lib/spinbox2.h
index 06a48d1a..b1d2927d 100644
--- a/kalarm/lib/spinbox2.h
+++ b/kalarm/lib/spinbox2.h
@@ -114,8 +114,8 @@ class SpinBox2 : public QFrame
 		 */
 		bool                wrapping() const            { return mSpinbox->wrapping(); }
 
-		/** Set the text alignment of the widget */
-		void                setAlignment(int a)         { mSpinbox->setAlignment(a); }
+		/** Set the text tqalignment of the widget */
+		void                tqsetAlignment(int a)         { mSpinbox->tqsetAlignment(a); }
 		/** Sets the button symbols to use (arrows or plus/minus). */
 		virtual void        setButtonSymbols(TQSpinBox::ButtonSymbols);
 		/** Returns the button symbols currently in use (arrows or plus/minus). */
@@ -130,8 +130,8 @@ class SpinBox2 : public QFrame
 		 */
 		const TQValidator*   validator() const           { return mSpinbox->validator(); }
 
-		virtual TQSize       sizeHint() const;
-		virtual TQSize       minimumSizeHint() const;
+		virtual TQSize       tqsizeHint() const;
+		virtual TQSize       tqminimumSizeHint() const;
 
 		/** Returns the minimum value of the spin box. */
 		int                 minValue() const            { return mMinValue; }
@@ -148,13 +148,13 @@ class SpinBox2 : public QFrame
 		/** Returns the specified value clamped to the range of the spin box. */
 		int                 bound(int val) const;
 
-		/** Returns the geometry of the right-hand "up" button. */
+		/** Returns the tqgeometry of the right-hand "up" button. */
 		TQRect               upRect() const              { return mSpinbox->upRect(); }
-		/** Returns the geometry of the right-hand "down" button. */
+		/** Returns the tqgeometry of the right-hand "down" button. */
 		TQRect               downRect() const            { return mSpinbox->downRect(); }
-		/** Returns the geometry of the left-hand "up" button. */
+		/** Returns the tqgeometry of the left-hand "up" button. */
 		TQRect               up2Rect() const;
-		/** Returns the geometry of the left-hand "down" button. */
+		/** Returns the tqgeometry of the left-hand "down" button. */
 		TQRect               down2Rect() const;
 
 		/** Returns the unshifted step increment for the right-hand spin buttons,
@@ -285,7 +285,7 @@ class SpinBox2 : public QFrame
 				                : SpinBox(parent, name), owner(sb2) { }
 				MainSpinBox(int minValue, int maxValue, int step, SpinBox2* sb2, TQWidget* parent, const char* name = 0)
 				                : SpinBox(minValue, maxValue, step, parent, name), owner(sb2) { }
-				void            setAlignment(int a)       { editor()->setAlignment(a); }
+				void            tqsetAlignment(int a)       { editor()->tqsetAlignment(a); }
 				virtual TQString mapValueToText(int v)     { return owner->mapValueToText(v); }
 				virtual int     mapTextToValue(bool* ok)  { return owner->mapTextToValue(ok); }
 				TQString         mapValToText(int v)       { return SpinBox::mapValueToText(v); }
@@ -298,8 +298,8 @@ class SpinBox2 : public QFrame
 		enum { NO_BUTTON = -1, UP, DOWN, UP2, DOWN2 };
 
 		static int       mReverseLayout;  // widgets are mirrored right to left
-		TQFrame*          mUpdown2Frame;   // contains visible part of the extra pair of spin buttons
-		TQFrame*          mSpinboxFrame;   // contains the main spin box
+		TQFrame*          mUpdown2Frame;   // tqcontains visible part of the extra pair of spin buttons
+		TQFrame*          mSpinboxFrame;   // tqcontains the main spin box
 		ExtraSpinBox*    mUpdown2;        // the extra pair of spin buttons
 		MainSpinBox*     mSpinbox;        // the visible spin box
 		SpinMirror*      mSpinMirror;     // image of the extra pair of spin buttons
@@ -309,7 +309,7 @@ class SpinBox2 : public QFrame
 		int              mLineShiftStep;      // right button increment with shift pressed
 		int              mPageStep;           // left button increment
 		int              mPageShiftStep;      // left button increment with shift pressed
-		bool             mReverseWithLayout;  // reverse button positions if reverse layout (default = true)
+		bool             mReverseWithLayout;  // reverse button positions if reverse tqlayout (default = true)
 
 	friend class MainSpinBox;
 };
diff --git a/kalarm/lib/spinbox2private.h b/kalarm/lib/spinbox2private.h
index 682c84b8..d25579f9 100644
--- a/kalarm/lib/spinbox2private.h
+++ b/kalarm/lib/spinbox2private.h
@@ -45,7 +45,7 @@ class ExtraSpinBox : public SpinBox
 		virtual void paintEvent(TQPaintEvent*);
 		virtual void styleChange(TQStyle&)    { mNewStylePending = true; }
 	private:
-		bool         mNewStylePending;  // style has changed, but not yet repainted
+		bool         mNewStylePending;  // style has changed, but not yet tqrepainted
 };
 
 
diff --git a/kalarm/lib/synchtimer.cpp b/kalarm/lib/synchtimer.cpp
index eecef7d4..caed93d7 100644
--- a/kalarm/lib/synchtimer.cpp
+++ b/kalarm/lib/synchtimer.cpp
@@ -196,7 +196,7 @@ void DailyTimer::changeTime(const TQTime& newTimeOfDay, bool triggerMissed)
 void DailyTimer::start()
 {
 	// TIMEZONE = local time
-	TQDateTime now = TQDateTime::currentDateTime();
+	TQDateTime now = TQDateTime::tqcurrentDateTime();
 	// Find out whether to trigger today or tomorrow.
 	// In preference, use the last trigger date to determine this, since
 	// that will avoid possible errors due to daylight savings time changes.
@@ -224,7 +224,7 @@ void DailyTimer::start()
 void DailyTimer::slotTimer()
 {
 	// TIMEZONE = local time
-	TQDateTime now = TQDateTime::currentDateTime();
+	TQDateTime now = TQDateTime::tqcurrentDateTime();
 	mLastDate = now.date();
 	TQDateTime next = TQDateTime(mLastDate.addDays(1), mTime);
 	uint interval = next.toTime_t() - now.toTime_t();
diff --git a/kalarm/lib/timeedit.cpp b/kalarm/lib/timeedit.cpp
index 01152fce..17091492 100644
--- a/kalarm/lib/timeedit.cpp
+++ b/kalarm/lib/timeedit.cpp
@@ -37,13 +37,13 @@ TimeEdit::TimeEdit(TQWidget* parent, const char* name)
 {
 	bool use12hour = KGlobal::locale()->use12Clock();
 	mSpinBox = new TimeSpinBox(!use12hour, this);
-	mSpinBox->setFixedSize(mSpinBox->sizeHint());
+	mSpinBox->setFixedSize(mSpinBox->tqsizeHint());
 	connect(mSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)));
 	if (use12hour)
 	{
 		mAmPm = new ComboBox(this);
 		setAmPmCombo(1, 1);     // add "am" and "pm" options to the combo box
-		mAmPm->setFixedSize(mAmPm->sizeHint());
+		mAmPm->setFixedSize(mAmPm->tqsizeHint());
 		connect(mAmPm, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotAmPmChanged(int)));
 	}
 }
diff --git a/kalarm/lib/timeedit.h b/kalarm/lib/timeedit.h
index 9cbfb6f8..45c0abd8 100644
--- a/kalarm/lib/timeedit.h
+++ b/kalarm/lib/timeedit.h
@@ -64,7 +64,7 @@ class TimeEdit : public QHBox
 		 *  @param readOnly True to set the widget read-only, false to set it read-write.
 		 */
 		virtual void  setReadOnly(bool readOnly);
-		/** Returns true if the widget contains a valid value. */
+		/** Returns true if the widget tqcontains a valid value. */
 		bool          isValid() const;
 		/** Sets whether the edit value is valid.
 		 *  If newly invalid, the value is displayed as asterisks.
diff --git a/kalarm/lib/timeperiod.cpp b/kalarm/lib/timeperiod.cpp
index e372615a..291ba087 100644
--- a/kalarm/lib/timeperiod.cpp
+++ b/kalarm/lib/timeperiod.cpp
@@ -71,7 +71,7 @@ TimePeriod::TimePeriod(bool allowHourMinute, TQWidget* parent, const char* name)
 	connect(mTimeSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotTimeChanged(int)));
 	mSpinStack->addWidget(mTimeSpinBox, 1);
 
-	mSpinStack->setFixedSize(mSpinBox->sizeHint().expandedTo(mTimeSpinBox->sizeHint()));
+	mSpinStack->setFixedSize(mSpinBox->tqsizeHint().expandedTo(mTimeSpinBox->tqsizeHint()));
 	mHourMinuteRaised = mNoHourMinute;
 	showHourMin(!mNoHourMinute);
 
@@ -87,7 +87,7 @@ TimePeriod::TimePeriod(bool allowHourMinute, TQWidget* parent, const char* name)
 	mUnitsCombo->insertItem(i18n_days());
 	mUnitsCombo->insertItem(i18n_weeks());
 	mMaxUnitShown = WEEKS;
-	mUnitsCombo->setFixedSize(mUnitsCombo->sizeHint());
+	mUnitsCombo->setFixedSize(mUnitsCombo->tqsizeHint());
 	connect(mUnitsCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotUnitsSelected(int)));
 
 	setFocusProxy(mUnitsCombo);
diff --git a/kalarm/lib/timespinbox.cpp b/kalarm/lib/timespinbox.cpp
index 20073d87..ea10cb1a 100644
--- a/kalarm/lib/timespinbox.cpp
+++ b/kalarm/lib/timespinbox.cpp
@@ -69,7 +69,7 @@ TimeSpinBox::TimeSpinBox(bool use24hour, TQWidget* parent, const char* name)
 	setReverseWithLayout(false);   // keep buttons the same way round even if right-to-left language
 	setShiftSteps(5, 360);    // shift-left button increments 5 min / 6 hours
 	setSelectOnStep(false);
-	setAlignment(Qt::AlignHCenter);
+	tqsetAlignment(Qt::AlignHCenter);
 	connect(this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)));
 }
 
@@ -88,7 +88,7 @@ TimeSpinBox::TimeSpinBox(int minMinute, int maxMinute, TQWidget* parent, const c
 	setReverseWithLayout(false);   // keep buttons the same way round even if right-to-left language
 	setShiftSteps(5, 300);    // shift-left button increments 5 min / 5 hours
 	setSelectOnStep(false);
-	setAlignment(TQApplication::reverseLayout() ? Qt::AlignLeft : Qt::AlignRight);
+	tqsetAlignment(TQApplication::reverseLayout() ? Qt::AlignLeft : Qt::AlignRight);
 }
 
 TQString TimeSpinBox::shiftWhatsThis()
@@ -211,7 +211,7 @@ void TimeSpinBox::setValid(bool valid)
 	{
 		mInvalid = true;
 		SpinBox2::setMinValue(mMinimumValue - 1);
-		setSpecialValueText(TQString::fromLatin1("**:**"));
+		setSpecialValueText(TQString::tqfromLatin1("**:**"));
 		SpinBox2::setValue(mMinimumValue - 1);
 	}
 }
@@ -280,16 +280,16 @@ void TimeSpinBox::slotValueChanged(int value)
 	mPm = mValidator->mPm = (value >= 720);
 }
 
-TQSize TimeSpinBox::sizeHint() const
+TQSize TimeSpinBox::tqsizeHint() const
 {
-	TQSize sz = SpinBox2::sizeHint();
+	TQSize sz = SpinBox2::tqsizeHint();
 	TQFontMetrics fm(font());
 	return TQSize(sz.width() + fm.width(":"), sz.height());
 }
 
-TQSize TimeSpinBox::minimumSizeHint() const
+TQSize TimeSpinBox::tqminimumSizeHint() const
 {
-	TQSize sz = SpinBox2::minimumSizeHint();
+	TQSize sz = SpinBox2::tqminimumSizeHint();
 	TQFontMetrics fm(font());
 	return TQSize(sz.width() + fm.width(":"), sz.height());
 }
diff --git a/kalarm/lib/timespinbox.h b/kalarm/lib/timespinbox.h
index 909541ad..901c97e2 100644
--- a/kalarm/lib/timespinbox.h
+++ b/kalarm/lib/timespinbox.h
@@ -90,8 +90,8 @@ class TimeSpinBox : public SpinBox2
 		 */
 		static TQString  shiftWhatsThis();
 
-		virtual TQSize   sizeHint() const;
-		virtual TQSize   minimumSizeHint() const;
+		virtual TQSize   tqsizeHint() const;
+		virtual TQSize   tqminimumSizeHint() const;
 
 	public slots:
 		/** Sets the value of the spin box.
diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp
index a3e8e423..6ebe19c8 100644
--- a/kalarm/mainwindow.cpp
+++ b/kalarm/mainwindow.cpp
@@ -71,11 +71,11 @@ using namespace KCal;
 static const char* UI_FILE     = "kalarmui.rc";
 static const char* WINDOW_NAME = "MainWindow";
 
-static const TQString VIEW_GROUP         = TQString::fromLatin1("View");
-static const TQString SHOW_TIME_KEY      = TQString::fromLatin1("ShowAlarmTime");
-static const TQString SHOW_TIME_TO_KEY   = TQString::fromLatin1("ShowTimeToAlarm");
-static const TQString SHOW_ARCHIVED_KEY  = TQString::fromLatin1("ShowArchivedAlarms");
-static const TQString SHOW_RESOURCES_KEY = TQString::fromLatin1("ShowResources");
+static const TQString VIEW_GROUP         = TQString::tqfromLatin1("View");
+static const TQString SHOW_TIME_KEY      = TQString::tqfromLatin1("ShowAlarmTime");
+static const TQString SHOW_TIME_TO_KEY   = TQString::tqfromLatin1("ShowTimeToAlarm");
+static const TQString SHOW_ARCHIVED_KEY  = TQString::tqfromLatin1("ShowArchivedAlarms");
+static const TQString SHOW_RESOURCES_KEY = TQString::tqfromLatin1("ShowResources");
 
 static TQString   undoText;
 static TQString   undoTextStripped;
@@ -123,7 +123,7 @@ MainWindow::MainWindow(bool restored)
 	  mHiddenTrayParent(false)
 {
 	kdDebug(5950) << "MainWindow::MainWindow()\n";
-	setAutoSaveSettings(TQString::fromLatin1(WINDOW_NAME));    // save window sizes etc.
+	setAutoSaveSettings(TQString::tqfromLatin1(WINDOW_NAME));    // save window sizes etc.
 	setPlainCaption(kapp->aboutData()->programName());
 	KConfig* config = KGlobal::config();
 	config->setGroup(VIEW_GROUP);
@@ -136,8 +136,8 @@ MainWindow::MainWindow(bool restored)
 		if (KAlarm::readConfigWindowSize(WINDOW_NAME, s))
 			resize(s);
 	}
-	config->setGroup(TQString::fromLatin1(WINDOW_NAME));
-	TQValueList<int> order = config->readIntListEntry(TQString::fromLatin1("ColumnOrder"));
+	config->setGroup(TQString::tqfromLatin1(WINDOW_NAME));
+	TQValueList<int> order = config->readIntListEntry(TQString::tqfromLatin1("ColumnOrder"));
 
 	setAcceptDrops(true);         // allow drag-and-drop onto this window
 	if (!mShowTimeTo)
@@ -201,10 +201,10 @@ MainWindow::~MainWindow()
 */
 void MainWindow::saveProperties(KConfig* config)
 {
-	config->writeEntry(TQString::fromLatin1("HiddenTrayParent"), isTrayParent() && isHidden());
-	config->writeEntry(TQString::fromLatin1("ShowExpired"), mShowExpired);
-	config->writeEntry(TQString::fromLatin1("ShowTime"), mShowTime);
-	config->writeEntry(TQString::fromLatin1("ShowTimeTo"), mShowTimeTo);
+	config->writeEntry(TQString::tqfromLatin1("HiddenTrayParent"), isTrayParent() && isHidden());
+	config->writeEntry(TQString::tqfromLatin1("ShowExpired"), mShowExpired);
+	config->writeEntry(TQString::tqfromLatin1("ShowTime"), mShowTime);
+	config->writeEntry(TQString::tqfromLatin1("ShowTimeTo"), mShowTimeTo);
 }
 
 /******************************************************************************
@@ -214,10 +214,10 @@ void MainWindow::saveProperties(KConfig* config)
 */
 void MainWindow::readProperties(KConfig* config)
 {
-	mHiddenTrayParent = config->readBoolEntry(TQString::fromLatin1("HiddenTrayParent"));
-	mShowExpired      = config->readBoolEntry(TQString::fromLatin1("ShowExpired"));
-	mShowTime         = config->readBoolEntry(TQString::fromLatin1("ShowTime"));
-	mShowTimeTo       = config->readBoolEntry(TQString::fromLatin1("ShowTimeTo"));
+	mHiddenTrayParent = config->readBoolEntry(TQString::tqfromLatin1("HiddenTrayParent"));
+	mShowExpired      = config->readBoolEntry(TQString::tqfromLatin1("ShowExpired"));
+	mShowTime         = config->readBoolEntry(TQString::tqfromLatin1("ShowTime"));
+	mShowTimeTo       = config->readBoolEntry(TQString::tqfromLatin1("ShowTimeTo"));
 }
 
 /******************************************************************************
@@ -294,7 +294,7 @@ void MainWindow::show()
 		// Show error message now that the main window has been displayed.
 		// Waiting until now lets the user easily associate the message with
 		// the main window which is faulty.
-		KMessageBox::error(this, i18n("Failure to create menus\n(perhaps %1 missing or corrupted)").arg(TQString::fromLatin1(UI_FILE)));
+		KMessageBox::error(this, i18n("Failure to create menus\n(perhaps %1 missing or corrupted)").arg(TQString::tqfromLatin1(UI_FILE)));
 		mMenuError = false;
 	}
 }
@@ -315,8 +315,8 @@ void MainWindow::hideEvent(TQHideEvent* he)
 void MainWindow::columnsReordered()
 {
 	KConfig* config = KGlobal::config();
-	config->setGroup(TQString::fromLatin1(WINDOW_NAME));
-	config->writeEntry(TQString::fromLatin1("ColumnOrder"), mListView->columnOrder());
+	config->setGroup(TQString::tqfromLatin1(WINDOW_NAME));
+	config->writeEntry(TQString::tqfromLatin1("ColumnOrder"), mListView->columnOrder());
 	config->sync();
 }
 
@@ -367,8 +367,8 @@ void MainWindow::initActions()
 	mActionUndo = new KToolBarPopupAction(undoText, undoIcon, undoShortcut, this, TQT_SLOT(slotUndo()), actions, "edit_undo");
 	mActionRedo = new KToolBarPopupAction(redoText, redoIcon, redoShortcut, this, TQT_SLOT(slotRedo()), actions, "edit_redo");
 	KStdAction::find(mListView, TQT_SLOT(slotFind()), actions);
-	mActionFindNext = KStdAction::findNext(mListView, TQT_SLOT(slotFindNext()), actions);
-	mActionFindPrev = KStdAction::findPrev(mListView, TQT_SLOT(slotFindPrev()), actions);
+	mActionFindNext = KStdAction::tqfindNext(mListView, TQT_SLOT(slotFindNext()), actions);
+	mActionFindPrev = KStdAction::tqfindPrev(mListView, TQT_SLOT(slotFindPrev()), actions);
 	KStdAction::selectAll(mListView, TQT_SLOT(slotSelectAll()), actions);
 	KStdAction::deselect(mListView, TQT_SLOT(slotDeselect()), actions);
 	KStdAction::quit(this, TQT_SLOT(slotQuit()), actions);
@@ -1196,7 +1196,7 @@ void MainWindow::executeDropEvent(MainWindow* win, TQDropEvent* e)
 	AlarmText      alarmText;
 	KPIM::MailList mailList;
 	KURL::List     files;
-	KCal::CalendarLocal calendar(TQString::fromLatin1("UTC"));
+	KCal::CalendarLocal calendar(TQString::tqfromLatin1("UTC"));
 	calendar.setLocalTime();    // default to local time (i.e. no time zone)
 #ifndef NDEBUG
 	TQCString fmts;
@@ -1213,7 +1213,7 @@ void MainWindow::executeDropEvent(MainWindow* win, TQDropEvent* e)
 	 * Don't change them without careful thought !!
 	 */
 	if (e->provides("message/rfc822")
-	&&  !(bytes = e->encodedData("message/rfc822")).isEmpty())
+	&&  !(bytes = e->tqencodedData("message/rfc822")).isEmpty())
 	{
 		// Email message(s). Ignore all but the first.
 		kdDebug(5950) << "MainWindow::executeDropEvent(email)" << endl;
@@ -1299,7 +1299,7 @@ void MainWindow::slotSelection()
 	bool enableEnableDisable = true;
 	bool enableEnable = false;
 	bool enableDisable = false;
-	TQDateTime now = TQDateTime::currentDateTime();
+	TQDateTime now = TQDateTime::tqcurrentDateTime();
 	for (TQValueList<EventListViewItemBase*>::Iterator it = items.begin();  it != items.end();  ++it)
 	{
 		const KAEvent& event = ((AlarmListViewItem*)(*it))->event();
diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp
index 35d769c5..0b527ac3 100644
--- a/kalarm/messagewin.cpp
+++ b/kalarm/messagewin.cpp
@@ -101,7 +101,7 @@ class MessageText : public QTextEdit
 		}
 		int scrollBarHeight() const     { return horizontalScrollBar()->height(); }
 		int scrollBarWidth() const      { return verticalScrollBar()->width(); }
-		virtual TQSize sizeHint() const  { return TQSize(contentsWidth() + scrollBarWidth(), contentsHeight() + scrollBarHeight()); }
+		virtual TQSize tqsizeHint() const  { return TQSize(contentsWidth() + scrollBarWidth(), contentsHeight() + scrollBarHeight()); }
 };
 
 
@@ -125,7 +125,7 @@ class MWMimeSourceFactory : public QMimeSourceFactory
 // Basic flags for the window
 static const Qt::WFlags WFLAGS = Qt::WStyle_StaysOnTop | Qt::WDestructiveClose;
 
-// Error message bit masks
+// Error message bit tqmasks
 enum {
 	ErrMsg_Speak     = 0x01,
 	ErrMsg_AudioFile = 0x02,
@@ -191,7 +191,7 @@ MessageWin::MessageWin(const KAEvent& event, const KAAlarm& alarm, bool reschedu
 	kdDebug(5950) << "MessageWin::MessageWin(event)" << endl;
 	// Set to save settings automatically, but don't save window size.
 	// File alarm window size is saved elsewhere.
-	setAutoSaveSettings(TQString::fromLatin1("MessageWin"), false);
+	setAutoSaveSettings(TQString::tqfromLatin1("MessageWin"), false);
 	initView();
 	mWindowList.append(this);
 	if (event.autoClose())
@@ -298,13 +298,13 @@ void MessageWin::initView()
 	{
 		// Show the alarm date/time, together with an "Advance reminder" text where appropriate
 		TQFrame* frame = 0;
-		TQVBoxLayout* layout = topLayout;
+		TQVBoxLayout* tqlayout = topLayout;
 		if (reminder)
 		{
 			frame = new TQFrame(topWidget);
 			frame->setFrameStyle(TQFrame::Box | TQFrame::Raised);
 			topLayout->addWidget(frame, 0, Qt::AlignHCenter);
-			layout = new TQVBoxLayout(frame, leading + frame->frameWidth(), leading);
+			tqlayout = new TQVBoxLayout(frame, leading + frame->frameWidth(), leading);
 		}
 
 		// Alarm date/time
@@ -314,8 +314,8 @@ void MessageWin::initView()
 		               : KGlobal::locale()->formatDateTime(mDateTime.dateTime()));
 		if (!frame)
 			label->setFrameStyle(TQFrame::Box | TQFrame::Raised);
-		label->setFixedSize(label->sizeHint());
-		layout->addWidget(label, 0, Qt::AlignHCenter);
+		label->setFixedSize(label->tqsizeHint());
+		tqlayout->addWidget(label, 0, Qt::AlignHCenter);
 		TQWhatsThis::add(label,
 		      i18n("The scheduled date/time for the message (as opposed to the actual time of display)."));
 
@@ -323,9 +323,9 @@ void MessageWin::initView()
 		{
 			label = new TQLabel(frame);
 			label->setText(i18n("Reminder"));
-			label->setFixedSize(label->sizeHint());
-			layout->addWidget(label, 0, Qt::AlignHCenter);
-			frame->setFixedSize(frame->sizeHint());
+			label->setFixedSize(label->tqsizeHint());
+			tqlayout->addWidget(label, 0, Qt::AlignHCenter);
+			frame->setFixedSize(frame->tqsizeHint());
 		}
 	}
 
@@ -339,7 +339,7 @@ void MessageWin::initView()
 				// Display the file name
 				TQLabel* label = new TQLabel(mMessage, topWidget);
 				label->setFrameStyle(TQFrame::Box | TQFrame::Raised);
-				label->setFixedSize(label->sizeHint());
+				label->setFixedSize(label->tqsizeHint());
 				TQWhatsThis::add(label, i18n("The file whose contents are displayed below"));
 				topLayout->addWidget(label, 0, Qt::AlignHCenter);
 
@@ -357,7 +357,7 @@ void MessageWin::initView()
 						opened = true;
 						KTextBrowser* view = new KTextBrowser(topWidget, "fileContents");
 						MWMimeSourceFactory msf(tmpFile, view);
-						view->setMinimumSize(view->sizeHint());
+						view->setMinimumSize(view->tqsizeHint());
 						topLayout->addWidget(view);
 
 						// Set the default size to 20 lines square.
@@ -365,7 +365,7 @@ void MessageWin::initView()
 						// is overridden by the user-set default stored in the config file.
 						// So there is no need to calculate an accurate size.
 						int h = 20*view->fontMetrics().lineSpacing() + 2*view->frameWidth();
-						view->resize(TQSize(h, h).expandedTo(view->sizeHint()));
+						view->resize(TQSize(h, h).expandedTo(view->tqsizeHint()));
 						TQWhatsThis::add(view, i18n("The contents of the file to be displayed"));
 					}
 					KIO::NetAccess::removeTempFile(tmpFile);
@@ -388,7 +388,7 @@ void MessageWin::initView()
 				text->setPaletteForegroundColor(mFgColour);
 				text->setFont(mFont);
 				int lineSpacing = text->fontMetrics().lineSpacing();
-				TQSize s = text->sizeHint();
+				TQSize s = text->tqsizeHint();
 				int h = s.height();
 				text->setMaximumHeight(h + text->scrollBarHeight());
 				text->setMinimumHeight(QMIN(h, lineSpacing*4));
@@ -401,14 +401,14 @@ void MessageWin::initView()
 				// Don't include any horizontal margins if message is 2/3 screen width
 				if (!mWinModule)
 					mWinModule = new KWinModule(0, KWinModule::INFO_DESKTOP);
-				if (text->sizeHint().width() >= mWinModule->workArea().width()*2/3)
+				if (text->tqsizeHint().width() >= mWinModule->workArea().width()*2/3)
 					topLayout->addWidget(text, 1, Qt::AlignHCenter);
 				else
 				{
-					TQBoxLayout* layout = new TQHBoxLayout(topLayout);
-					layout->addSpacing(hspace);
-					layout->addWidget(text, 1, Qt::AlignHCenter);
-					layout->addSpacing(hspace);
+					TQBoxLayout* tqlayout = new TQHBoxLayout(topLayout);
+					tqlayout->addSpacing(hspace);
+					tqlayout->addWidget(text, 1, Qt::AlignHCenter);
+					tqlayout->addSpacing(hspace);
 				}
 				if (!reminder)
 					topLayout->addStretch();
@@ -426,7 +426,7 @@ void MessageWin::initView()
 			mRemainingText = new TQLabel(topWidget);
 			mRemainingText->setFrameStyle(TQFrame::Box | TQFrame::Raised);
 			mRemainingText->setMargin(leading);
-			if (mDateTime.isDateOnly()  ||  TQDate::currentDate().daysTo(mDateTime.date()) > 0)
+			if (mDateTime.isDateOnly()  ||  TQDate::tqcurrentDate().daysTo(mDateTime.date()) > 0)
 			{
 				setRemainingTextDay();
 				MidnightTimer::connect(this, TQT_SLOT(setRemainingTextDay()));    // update every day
@@ -456,17 +456,17 @@ void MessageWin::initView()
 				TQGridLayout* grid = new TQGridLayout(frame, 2, 2, KDialog::marginHint(), KDialog::spacingHint());
 
 				TQLabel* label = new TQLabel(i18n("Email addressee", "To:"), frame);
-				label->setFixedSize(label->sizeHint());
+				label->setFixedSize(label->tqsizeHint());
 				grid->addWidget(label, 0, 0, Qt::AlignLeft);
 				label = new TQLabel(mEvent.emailAddresses("\n"), frame);
-				label->setFixedSize(label->sizeHint());
+				label->setFixedSize(label->tqsizeHint());
 				grid->addWidget(label, 0, 1, Qt::AlignLeft);
 
 				label = new TQLabel(i18n("Email subject", "Subject:"), frame);
-				label->setFixedSize(label->sizeHint());
+				label->setFixedSize(label->tqsizeHint());
 				grid->addWidget(label, 1, 0, Qt::AlignLeft);
 				label = new TQLabel(mEvent.emailSubject(), frame);
-				label->setFixedSize(label->sizeHint());
+				label->setFixedSize(label->tqsizeHint());
 				grid->addWidget(label, 1, 1, Qt::AlignLeft);
 				break;
 			}
@@ -484,21 +484,21 @@ void MessageWin::initView()
 	else
 	{
 		setCaption(i18n("Error"));
-		TQBoxLayout* layout = new TQHBoxLayout(topLayout);
-		layout->setMargin(2*KDialog::marginHint());
-		layout->addStretch();
+		TQBoxLayout* tqlayout = new TQHBoxLayout(topLayout);
+		tqlayout->setMargin(2*KDialog::marginHint());
+		tqlayout->addStretch();
 		TQLabel* label = new TQLabel(topWidget);
 		label->setPixmap(DesktopIcon("error"));
-		label->setFixedSize(label->sizeHint());
-		layout->addWidget(label, 0, Qt::AlignRight);
-		TQBoxLayout* vlayout = new TQVBoxLayout(layout);
+		label->setFixedSize(label->tqsizeHint());
+		tqlayout->addWidget(label, 0, Qt::AlignRight);
+		TQBoxLayout* vtqlayout = new TQVBoxLayout(tqlayout);
 		for (TQStringList::Iterator it = mErrorMsgs.begin();  it != mErrorMsgs.end();  ++it)
 		{
 			label = new TQLabel(*it, topWidget);
-			label->setFixedSize(label->sizeHint());
-			vlayout->addWidget(label, 0, Qt::AlignLeft);
+			label->setFixedSize(label->tqsizeHint());
+			vtqlayout->addWidget(label, 0, Qt::AlignLeft);
 		}
-		layout->addStretch();
+		tqlayout->addStretch();
 	}
 
 	TQGridLayout* grid = new TQGridLayout(1, 4);
@@ -511,7 +511,7 @@ void MessageWin::initView()
 	// Prevent accidental acknowledgement of the message if the user is typing when the window appears
 	mOkButton->clearFocus();
 	mOkButton->setFocusPolicy(TQWidget::ClickFocus);    // don't allow keyboard selection
-	mOkButton->setFixedSize(mOkButton->sizeHint());
+	mOkButton->setFixedSize(mOkButton->tqsizeHint());
 	connect(mOkButton, TQT_SIGNAL(clicked()), TQT_SLOT(close()));
 	grid->addWidget(mOkButton, 0, gridIndex++, AlignHCenter);
 	TQWhatsThis::add(mOkButton, i18n("Acknowledge the alarm"));
@@ -521,7 +521,7 @@ void MessageWin::initView()
 		// Edit button
 		mEditButton = new TQPushButton(i18n("&Edit..."), topWidget);
 		mEditButton->setFocusPolicy(TQWidget::ClickFocus);    // don't allow keyboard selection
-		mEditButton->setFixedSize(mEditButton->sizeHint());
+		mEditButton->setFixedSize(mEditButton->tqsizeHint());
 		connect(mEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit()));
 		grid->addWidget(mEditButton, 0, gridIndex++, AlignHCenter);
 		TQWhatsThis::add(mEditButton, i18n("Edit the alarm."));
@@ -532,7 +532,7 @@ void MessageWin::initView()
 		// Defer button
 		mDeferButton = new TQPushButton(i18n("&Defer..."), topWidget);
 		mDeferButton->setFocusPolicy(TQWidget::ClickFocus);    // don't allow keyboard selection
-		mDeferButton->setFixedSize(mDeferButton->sizeHint());
+		mDeferButton->setFixedSize(mDeferButton->tqsizeHint());
 		connect(mDeferButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefer()));
 		grid->addWidget(mDeferButton, 0, gridIndex++, AlignHCenter);
 		TQWhatsThis::add(mDeferButton,
@@ -549,7 +549,7 @@ void MessageWin::initView()
 		TQPixmap pixmap = MainBarIcon("player_stop");
 		mSilenceButton = new TQPushButton(topWidget);
 		mSilenceButton->setPixmap(pixmap);
-		mSilenceButton->setFixedSize(mSilenceButton->sizeHint());
+		mSilenceButton->setFixedSize(mSilenceButton->tqsizeHint());
 		connect(mSilenceButton, TQT_SIGNAL(clicked()), TQT_SLOT(stopPlay()));
 		grid->addWidget(mSilenceButton, 0, gridIndex++, AlignHCenter);
 		TQToolTip::add(mSilenceButton, i18n("Stop sound"));
@@ -563,10 +563,10 @@ void MessageWin::initView()
 	if (mKMailSerialNumber)
 	{
 		// KMail button
-		TQPixmap pixmap = iconLoader.loadIcon(TQString::fromLatin1("kmail"), KIcon::MainToolbar);
+		TQPixmap pixmap = iconLoader.loadIcon(TQString::tqfromLatin1("kmail"), KIcon::MainToolbar);
 		mKMailButton = new TQPushButton(topWidget);
 		mKMailButton->setPixmap(pixmap);
-		mKMailButton->setFixedSize(mKMailButton->sizeHint());
+		mKMailButton->setFixedSize(mKMailButton->tqsizeHint());
 		connect(mKMailButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotShowKMailMessage()));
 		grid->addWidget(mKMailButton, 0, gridIndex++, AlignHCenter);
 		TQToolTip::add(mKMailButton, i18n("Locate this email in KMail", "Locate in KMail"));
@@ -576,10 +576,10 @@ void MessageWin::initView()
 		mKMailButton = 0;
 
 	// KAlarm button
-	TQPixmap pixmap = iconLoader.loadIcon(TQString::fromLatin1(kapp->aboutData()->appName()), KIcon::MainToolbar);
+	TQPixmap pixmap = iconLoader.loadIcon(TQString::tqfromLatin1(kapp->aboutData()->appName()), KIcon::MainToolbar);
 	mKAlarmButton = new TQPushButton(topWidget);
 	mKAlarmButton->setPixmap(pixmap);
-	mKAlarmButton->setFixedSize(mKAlarmButton->sizeHint());
+	mKAlarmButton->setFixedSize(mKAlarmButton->tqsizeHint());
 	connect(mKAlarmButton, TQT_SIGNAL(clicked()), TQT_SLOT(displayMainWindow()));
 	grid->addWidget(mKAlarmButton, 0, gridIndex++, AlignHCenter);
 	TQString actKAlarm = i18n("Activate KAlarm");
@@ -598,7 +598,7 @@ void MessageWin::initView()
 	mKAlarmButton->setEnabled(false);
 
 	topLayout->activate();
-	setMinimumSize(TQSize(grid->sizeHint().width() + 2*KDialog::marginHint(), sizeHint().height()));
+	setMinimumSize(TQSize(grid->tqsizeHint().width() + 2*KDialog::marginHint(), tqsizeHint().height()));
 
 	bool modal = !(getWFlags() & Qt::WX11BypassWM);
 
@@ -615,7 +615,7 @@ void MessageWin::initView()
 void MessageWin::setRemainingTextDay()
 {
 	TQString text;
-	int days = TQDate::currentDate().daysTo(mDateTime.date());
+	int days = TQDate::tqcurrentDate().daysTo(mDateTime.date());
 	if (days <= 0  &&  !mDateTime.isDateOnly())
 	{
 		// The alarm is due today, so start refreshing every minute
@@ -642,7 +642,7 @@ void MessageWin::setRemainingTextDay()
 void MessageWin::setRemainingTextMinute()
 {
 	TQString text;
-	int mins = (TQDateTime::currentDateTime().secsTo(mDateTime.dateTime()) + 59) / 60;
+	int mins = (TQDateTime::tqcurrentDateTime().secsTo(mDateTime.dateTime()) + 59) / 60;
 	if (mins < 60)
 		text = i18n("in 1 minute's time", "in %n minutes' time", (mins > 0 ? mins : 0));
 	else if (mins % 60 == 0)
@@ -662,38 +662,38 @@ void MessageWin::saveProperties(KConfig* config)
 {
 	if (mShown  &&  !mErrorWindow)
 	{
-		config->writeEntry(TQString::fromLatin1("EventID"), mEventID);
-		config->writeEntry(TQString::fromLatin1("AlarmType"), mAlarmType);
-		config->writeEntry(TQString::fromLatin1("Message"), mMessage);
-		config->writeEntry(TQString::fromLatin1("Type"), mAction);
-		config->writeEntry(TQString::fromLatin1("Font"), mFont);
-		config->writeEntry(TQString::fromLatin1("BgColour"), mBgColour);
-		config->writeEntry(TQString::fromLatin1("FgColour"), mFgColour);
-		config->writeEntry(TQString::fromLatin1("ConfirmAck"), mConfirmAck);
+		config->writeEntry(TQString::tqfromLatin1("EventID"), mEventID);
+		config->writeEntry(TQString::tqfromLatin1("AlarmType"), mAlarmType);
+		config->writeEntry(TQString::tqfromLatin1("Message"), mMessage);
+		config->writeEntry(TQString::tqfromLatin1("Type"), mAction);
+		config->writeEntry(TQString::tqfromLatin1("Font"), mFont);
+		config->writeEntry(TQString::tqfromLatin1("BgColour"), mBgColour);
+		config->writeEntry(TQString::tqfromLatin1("FgColour"), mFgColour);
+		config->writeEntry(TQString::tqfromLatin1("ConfirmAck"), mConfirmAck);
 		if (mDateTime.isValid())
 		{
-			config->writeEntry(TQString::fromLatin1("Time"), mDateTime.dateTime());
-			config->writeEntry(TQString::fromLatin1("DateOnly"), mDateTime.isDateOnly());
+			config->writeEntry(TQString::tqfromLatin1("Time"), mDateTime.dateTime());
+			config->writeEntry(TQString::tqfromLatin1("DateOnly"), mDateTime.isDateOnly());
 		}
 		if (mCloseTime.isValid())
-			config->writeEntry(TQString::fromLatin1("Expiry"), mCloseTime);
+			config->writeEntry(TQString::tqfromLatin1("Expiry"), mCloseTime);
 #ifndef WITHOUT_ARTS
 		if (mAudioRepeat  &&  mSilenceButton  &&  mSilenceButton->isEnabled())
 		{
 			// Only need to restart sound file playing if it's being repeated
-			config->writePathEntry(TQString::fromLatin1("AudioFile"), mAudioFile);
-			config->writeEntry(TQString::fromLatin1("Volume"), static_cast<int>(mVolume * 100));
+			config->writePathEntry(TQString::tqfromLatin1("AudioFile"), mAudioFile);
+			config->writeEntry(TQString::tqfromLatin1("Volume"), static_cast<int>(mVolume * 100));
 		}
 #endif
-		config->writeEntry(TQString::fromLatin1("Speak"), mSpeak);
-		config->writeEntry(TQString::fromLatin1("Height"), height());
-		config->writeEntry(TQString::fromLatin1("DeferMins"), mDefaultDeferMinutes);
-		config->writeEntry(TQString::fromLatin1("NoDefer"), mNoDefer);
-		config->writeEntry(TQString::fromLatin1("NoPostAction"), mNoPostAction);
-		config->writeEntry(TQString::fromLatin1("KMailSerial"), mKMailSerialNumber);
+		config->writeEntry(TQString::tqfromLatin1("Speak"), mSpeak);
+		config->writeEntry(TQString::tqfromLatin1("Height"), height());
+		config->writeEntry(TQString::tqfromLatin1("DeferMins"), mDefaultDeferMinutes);
+		config->writeEntry(TQString::tqfromLatin1("NoDefer"), mNoDefer);
+		config->writeEntry(TQString::tqfromLatin1("NoPostAction"), mNoPostAction);
+		config->writeEntry(TQString::tqfromLatin1("KMailSerial"), mKMailSerialNumber);
 	}
 	else
-		config->writeEntry(TQString::fromLatin1("Invalid"), true);
+		config->writeEntry(TQString::tqfromLatin1("Invalid"), true);
 }
 
 /******************************************************************************
@@ -703,34 +703,34 @@ void MessageWin::saveProperties(KConfig* config)
 */
 void MessageWin::readProperties(KConfig* config)
 {
-	mInvalid             = config->readBoolEntry(TQString::fromLatin1("Invalid"), false);
-	mEventID             = config->readEntry(TQString::fromLatin1("EventID"));
-	mAlarmType           = KAAlarm::Type(config->readNumEntry(TQString::fromLatin1("AlarmType")));
-	mMessage             = config->readEntry(TQString::fromLatin1("Message"));
-	mAction              = KAEvent::Action(config->readNumEntry(TQString::fromLatin1("Type")));
-	mFont                = config->readFontEntry(TQString::fromLatin1("Font"));
-	mBgColour            = config->readColorEntry(TQString::fromLatin1("BgColour"));
-	mFgColour            = config->readColorEntry(TQString::fromLatin1("FgColour"));
-	mConfirmAck          = config->readBoolEntry(TQString::fromLatin1("ConfirmAck"));
+	mInvalid             = config->readBoolEntry(TQString::tqfromLatin1("Invalid"), false);
+	mEventID             = config->readEntry(TQString::tqfromLatin1("EventID"));
+	mAlarmType           = KAAlarm::Type(config->readNumEntry(TQString::tqfromLatin1("AlarmType")));
+	mMessage             = config->readEntry(TQString::tqfromLatin1("Message"));
+	mAction              = KAEvent::Action(config->readNumEntry(TQString::tqfromLatin1("Type")));
+	mFont                = config->readFontEntry(TQString::tqfromLatin1("Font"));
+	mBgColour            = config->readColorEntry(TQString::tqfromLatin1("BgColour"));
+	mFgColour            = config->readColorEntry(TQString::tqfromLatin1("FgColour"));
+	mConfirmAck          = config->readBoolEntry(TQString::tqfromLatin1("ConfirmAck"));
 	TQDateTime invalidDateTime;
-	TQDateTime dt         = config->readDateTimeEntry(TQString::fromLatin1("Time"), &invalidDateTime);
-	bool dateOnly        = config->readBoolEntry(TQString::fromLatin1("DateOnly"));
+	TQDateTime dt         = config->readDateTimeEntry(TQString::tqfromLatin1("Time"), &invalidDateTime);
+	bool dateOnly        = config->readBoolEntry(TQString::tqfromLatin1("DateOnly"));
 	mDateTime.set(dt, dateOnly);
-	mCloseTime           = config->readDateTimeEntry(TQString::fromLatin1("Expiry"), &invalidDateTime);
+	mCloseTime           = config->readDateTimeEntry(TQString::tqfromLatin1("Expiry"), &invalidDateTime);
 #ifndef WITHOUT_ARTS
-	mAudioFile           = config->readPathEntry(TQString::fromLatin1("AudioFile"));
-	mVolume              = static_cast<float>(config->readNumEntry(TQString::fromLatin1("Volume"))) / 100;
+	mAudioFile           = config->readPathEntry(TQString::tqfromLatin1("AudioFile"));
+	mVolume              = static_cast<float>(config->readNumEntry(TQString::tqfromLatin1("Volume"))) / 100;
 	mFadeVolume          = -1;
 	mFadeSeconds         = 0;
 	if (!mAudioFile.isEmpty())
 		mAudioRepeat = true;
 #endif
-	mSpeak               = config->readBoolEntry(TQString::fromLatin1("Speak"));
-	mRestoreHeight       = config->readNumEntry(TQString::fromLatin1("Height"));
-	mDefaultDeferMinutes = config->readNumEntry(TQString::fromLatin1("DeferMins"));
-	mNoDefer             = config->readBoolEntry(TQString::fromLatin1("NoDefer"));
-	mNoPostAction        = config->readBoolEntry(TQString::fromLatin1("NoPostAction"));
-	mKMailSerialNumber   = config->readUnsignedLongNumEntry(TQString::fromLatin1("KMailSerial"));
+	mSpeak               = config->readBoolEntry(TQString::tqfromLatin1("Speak"));
+	mRestoreHeight       = config->readNumEntry(TQString::tqfromLatin1("Height"));
+	mDefaultDeferMinutes = config->readNumEntry(TQString::tqfromLatin1("DeferMins"));
+	mNoDefer             = config->readBoolEntry(TQString::tqfromLatin1("NoDefer"));
+	mNoPostAction        = config->readBoolEntry(TQString::tqfromLatin1("NoPostAction"));
+	mKMailSerialNumber   = config->readUnsignedLongNumEntry(TQString::tqfromLatin1("KMailSerial"));
 	mShowEdit            = false;
 	kdDebug(5950) << "MessageWin::readProperties(" << mEventID << ")" << endl;
 	if (mAlarmType != KAAlarm::INVALID_ALARM)
@@ -789,7 +789,7 @@ void MessageWin::playAudio()
 			return;    // ensure zero volume doesn't play anything
 #ifdef WITHOUT_ARTS
 		TQString play = mAudioFile;
-		TQString file = TQString::fromLatin1("file:");
+		TQString file = TQString::tqfromLatin1("file:");
 		if (mAudioFile.startsWith(file))
 			play = mAudioFile.mid(file.length());
 		KAudioPlayer::play(TQFile::encodeName(play));
@@ -883,7 +883,7 @@ void MessageWin::slotPlayAudio()
 			if (!haveErrorMessage(ErrMsg_Volume))
 			{
 				KMessageBox::information(this, i18n("Unable to set master volume\n(Error accessing KMix:\n%1)").arg(mKMixError),
-				                         TQString::null, TQString::fromLatin1("KMixError"));
+				                         TQString::null, TQString::tqfromLatin1("KMixError"));
 				clearErrorMessage(ErrMsg_Volume);
 			}
 		}
@@ -1183,7 +1183,7 @@ void MessageWin::show()
 	if (mCloseTime.isValid())
 	{
 		// Set a timer to auto-close the window
-		int delay = TQDateTime::currentDateTime().secsTo(mCloseTime);
+		int delay = TQDateTime::tqcurrentDateTime().secsTo(mCloseTime);
 		if (delay < 0)
 			delay = 0;
 		TQTimer::singleShot(delay * 1000, this, TQT_SLOT(close()));
@@ -1200,18 +1200,18 @@ void MessageWin::show()
 *  For message windows, the size if limited to fit inside the working area of
 *  the desktop.
 */
-TQSize MessageWin::sizeHint() const
+TQSize MessageWin::tqsizeHint() const
 {
 	if (mAction != KAEvent::MESSAGE)
-		return MainWindowBase::sizeHint();
+		return MainWindowBase::tqsizeHint();
 	if (!mWinModule)
 		mWinModule = new KWinModule(0, KWinModule::INFO_DESKTOP);
 	TQSize frame = frameGeometry().size();
-	TQSize contents = geometry().size();
+	TQSize contents = tqgeometry().size();
 	TQSize desktop  = mWinModule->workArea().size();
 	TQSize maxSize(desktop.width() - (frame.width() - contents.width()),
 	              desktop.height() - (frame.height() - contents.height()));
-	return MainWindowBase::sizeHint().boundedTo(maxSize);
+	return MainWindowBase::tqsizeHint().boundedTo(maxSize);
 }
 
 /******************************************************************************
@@ -1233,7 +1233,7 @@ void MessageWin::showEvent(TQShowEvent* se)
 			 * method is called, so for large windows the size needs to be
 			 * set again later.
 			 */
-			TQSize s = sizeHint();     // fit the window round the message
+			TQSize s = tqsizeHint();     // fit the window round the message
 			if (mAction == KAEvent::FILE  &&  !mErrorMsgs.count())
 				KAlarm::readConfigWindowSize("FileMessage", s);
 			resize(s);
@@ -1246,10 +1246,10 @@ void MessageWin::showEvent(TQShowEvent* se)
 				 * To achieve this, move the window so that the OK button is as far away
 				 * from the cursor as possible. If the buttons are still too close to the
 				 * cursor, disable the buttons for a short time.
-				 * N.B. This can't be done in show(), since the geometry of the window
+				 * N.B. This can't be done in show(), since the tqgeometry of the window
 				 *      is not known until it is displayed. Unfortunately by moving the
 				 *      window in showEvent(), a flicker is unavoidable.
-				 *      See the Qt documentation on window geometry for more details.
+				 *      See the Qt documentation on window tqgeometry for more details.
 				 */
 				// PROBLEM: The frame size is not known yet!
 
@@ -1267,7 +1267,7 @@ void MessageWin::showEvent(TQShowEvent* se)
 					desk &= dw->screenGeometry(dw->screenNumber(cursor));
 
 				TQRect frame = frameGeometry();
-				TQRect rect  = geometry();
+				TQRect rect  = tqgeometry();
 				// Find the offsets from the outside of the frame to the edges of the OK button
 				TQRect button(mOkButton->mapToParent(TQPoint(0, 0)), mOkButton->mapToParent(mOkButton->rect().bottomRight()));
 				int buttonLeft   = button.left() + rect.left() - frame.left();
@@ -1282,7 +1282,7 @@ void MessageWin::showEvent(TQShowEvent* se)
 
 				// Find the enclosing rectangle for the new button positions
 				// and check if the cursor is too near
-				TQRect buttons = mOkButton->geometry().unite(mKAlarmButton->geometry());
+				TQRect buttons = mOkButton->tqgeometry().unite(mKAlarmButton->tqgeometry());
 				buttons.moveBy(rect.left() + x - frame.left(), rect.top() + y - frame.top());
 				int minDistance = proximityMultiple * mOkButton->height();
 				if ((abs(cursor.x() - buttons.left()) < minDistance
@@ -1328,7 +1328,7 @@ void MessageWin::moveEvent(TQMoveEvent* e)
 */
 void MessageWin::setMaxSize()
 {
-	TQSize s = sizeHint();
+	TQSize s = tqsizeHint();
 	if (width() > s.width()  ||  height() > s.height())
 		resize(s);
 }
@@ -1437,8 +1437,8 @@ void MessageWin::slotShowKMailMessage()
 	TQCString    replyType;
 	TQByteArray  data, replyData;
 	TQDataStream arg(data, IO_WriteOnly);
-	arg << (Q_UINT32)mKMailSerialNumber << TQString::null;
-	if (kapp->dcopClient()->call("kmail", KMAIL_DCOP_OBJECT, "showMail(Q_UINT32,TQString)", data, replyType, replyData)
+	arg << (TQ_UINT32)mKMailSerialNumber << TQString::null;
+	if (kapp->dcopClient()->call("kmail", KMAIL_DCOP_OBJECT, "showMail(TQ_UINT32,TQString)", data, replyType, replyData)
 	&&  replyType == "bool")
 	{
 		bool result;
@@ -1468,7 +1468,7 @@ void MessageWin::slotEdit()
 		KAlarm::UpdateStatus status;
 		if (AlarmCalendar::activeCalendar()->event(mEventID))
 		{
-			// The old alarm hasn't expired yet, so replace it
+			// The old alarm hasn't expired yet, so tqreplace it
 			status = KAlarm::modifyEvent(mEvent, event, 0, &editDlg);
 			Undo::saveEdit(mEvent, event);
 		}
@@ -1516,7 +1516,7 @@ void MessageWin::checkDeferralLimit()
 {
 	if (!mDeferButton  ||  !mDeferLimit.isValid())
 		return;
-	int n = TQDate::currentDate().daysTo(mDeferLimit.date());
+	int n = TQDate::tqcurrentDate().daysTo(mDeferLimit.date());
 	if (n > 0)
 		return;
 	MidnightTimer::disconnect(this, TQT_SLOT(checkDeferralLimit()));
@@ -1540,7 +1540,7 @@ void MessageWin::checkDeferralLimit()
 */
 void MessageWin::slotDefer()
 {
-	mDeferDlg = new DeferAlarmDlg(i18n("Defer Alarm"), TQDateTime::currentDateTime().addSecs(60),
+	mDeferDlg = new DeferAlarmDlg(i18n("Defer Alarm"), TQDateTime::tqcurrentDateTime().addSecs(60),
 	                              false, this, "deferDlg");
 	if (mDefaultDeferMinutes > 0)
 		mDeferDlg->setDeferMinutes(mDefaultDeferMinutes);
@@ -1622,7 +1622,7 @@ void MessageWin::displayMainWindow()
 */
 bool MessageWin::haveErrorMessage(unsigned msg) const
 {
-	if (!mErrorMessages.contains(mEventID))
+	if (!mErrorMessages.tqcontains(mEventID))
 		mErrorMessages.insert(mEventID, 0);
 	bool result = (mErrorMessages[mEventID] & msg);
 	mErrorMessages[mEventID] |= msg;
@@ -1631,7 +1631,7 @@ bool MessageWin::haveErrorMessage(unsigned msg) const
 
 void MessageWin::clearErrorMessage(unsigned msg) const
 {
-	if (mErrorMessages.contains(mEventID))
+	if (mErrorMessages.tqcontains(mEventID))
 	{
 		if (mErrorMessages[mEventID] == msg)
 			mErrorMessages.remove(mEventID);
@@ -1673,7 +1673,7 @@ MWMimeSourceFactory::MWMimeSourceFactory(const TQString& absPath, KTextBrowser*
 	  mLast(0)
 {
 	view->setMimeSourceFactory(this);
-	TQString type = KMimeType::findByPath(absPath)->name();
+	TQString type = KMimeType::tqfindByPath(absPath)->name();
 	switch (KAlarm::fileType(type))
 	{
 		case KAlarm::TextPlain:
diff --git a/kalarm/messagewin.h b/kalarm/messagewin.h
index f3ac45f4..52c86c5f 100644
--- a/kalarm/messagewin.h
+++ b/kalarm/messagewin.h
@@ -56,7 +56,7 @@ class MessageWin : public MainWindowBase
 		bool                hasDefer() const       { return !!mDeferButton; }
 		bool                isValid() const        { return !mInvalid; }
 		virtual void        show();
-		virtual TQSize       sizeHint() const;
+		virtual TQSize       tqsizeHint() const;
 		static int          instanceCount()        { return mWindowList.count(); }
 		static MessageWin*  findEvent(const TQString& eventID);
 
diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp
index ff312416..70e720dc 100644
--- a/kalarm/prefdlg.cpp
+++ b/kalarm/prefdlg.cpp
@@ -81,12 +81,12 @@
 // %C = temporary command file to execute in terminal
 // %W = temporary command file to execute in terminal, with 'sleep 86400' appended
 static TQString xtermCommands[] = {
-	TQString::fromLatin1("xterm -sb -hold -title %t -e %c"),
-	TQString::fromLatin1("konsole --noclose -T %t -e ${SHELL:-sh} -c %c"),
-	TQString::fromLatin1("gnome-terminal -t %t -e %W"),
-	TQString::fromLatin1("eterm --pause -T %t -e %C"),    // some systems use eterm...
-	TQString::fromLatin1("Eterm --pause -T %t -e %C"),    // while some use Eterm
-	TQString::fromLatin1("rxvt -title %t -e ${SHELL:-sh} -c %w"),
+	TQString::tqfromLatin1("xterm -sb -hold -title %t -e %c"),
+	TQString::tqfromLatin1("konsole --noclose -T %t -e ${SHELL:-sh} -c %c"),
+	TQString::tqfromLatin1("gnome-terminal -t %t -e %W"),
+	TQString::tqfromLatin1("eterm --pause -T %t -e %C"),    // some systems use eterm...
+	TQString::tqfromLatin1("Eterm --pause -T %t -e %C"),    // while some use Eterm
+	TQString::tqfromLatin1("rxvt -title %t -e ${SHELL:-sh} -c %w"),
 	TQString::null       // end of list indicator - don't change!
 };
 
@@ -169,7 +169,7 @@ void KAlarmPrefDlg::slotApply()
 	TQString errmsg = mEmailPage->validate();
 	if (!errmsg.isEmpty())
 	{
-		showPage(pageIndex(mEmailPage->parentWidget()));
+		showPage(pageIndex(mEmailPage->tqparentWidget()));
 		if (KMessageBox::warningYesNo(this, errmsg) != KMessageBox::Yes)
 		{
 			mValid = false;
@@ -179,7 +179,7 @@ void KAlarmPrefDlg::slotApply()
 	errmsg = mEditPage->validate();
 	if (!errmsg.isEmpty())
 	{
-		showPage(pageIndex(mEditPage->parentWidget()));
+		showPage(pageIndex(mEditPage->tqparentWidget()));
 		KMessageBox::sorry(this, errmsg);
 		mValid = false;
 		return;
@@ -250,8 +250,8 @@ void PrefsTabBase::apply(bool syncToDisc)
 MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	: PrefsTabBase(frame)
 {
-	// Get alignment to use in TQGridLayout (AlignAuto doesn't work correctly there)
-	int alignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft;
+	// Get tqalignment to use in TQGridLayout (AlignAuto doesn't work correctly there)
+	int tqalignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft;
 
 	TQGroupBox* group = new TQButtonGroup(i18n("Run Mode"), mPage, "modeGroup");
 	TQGridLayout* grid = new TQGridLayout(group, 6, 2, KDialog::marginHint(), KDialog::spacingHint());
@@ -262,18 +262,18 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 
 	// Run-on-demand radio button
 	mRunOnDemand = new TQRadioButton(i18n("&Run only on demand"), group, "runDemand");
-	mRunOnDemand->setFixedSize(mRunOnDemand->sizeHint());
+	mRunOnDemand->setFixedSize(mRunOnDemand->tqsizeHint());
 	connect(mRunOnDemand, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRunModeToggled(bool)));
 	TQWhatsThis::add(mRunOnDemand,
 	      i18n("Check to run KAlarm only when required.\n\n"
 	           "Notes:\n"
 	           "1. Alarms are displayed even when KAlarm is not running, since alarm monitoring is done by the alarm daemon.\n"
 	           "2. With this option selected, the system tray icon can be displayed or hidden independently of KAlarm."));
-	grid->addMultiCellWidget(mRunOnDemand, 1, 1, 0, 2, alignment);
+	grid->addMultiCellWidget(mRunOnDemand, 1, 1, 0, 2, tqalignment);
 
 	// Run-in-system-tray radio button
 	mRunInSystemTray = new TQRadioButton(i18n("Run continuously in system &tray"), group, "runTray");
-	mRunInSystemTray->setFixedSize(mRunInSystemTray->sizeHint());
+	mRunInSystemTray->setFixedSize(mRunInSystemTray->tqsizeHint());
 	connect(mRunInSystemTray, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRunModeToggled(bool)));
 	TQWhatsThis::add(mRunInSystemTray,
 	      i18n("Check to run KAlarm continuously in the KDE system tray.\n\n"
@@ -281,39 +281,39 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	           "1. With this option selected, closing the system tray icon will quit KAlarm.\n"
 	           "2. You do not need to select this option in order for alarms to be displayed, since alarm monitoring is done by the alarm daemon."
 	           " Running in the system tray simply provides easy access and a status indication."));
-	grid->addMultiCellWidget(mRunInSystemTray, 2, 2, 0, 2, alignment);
+	grid->addMultiCellWidget(mRunInSystemTray, 2, 2, 0, 2, tqalignment);
 
 	// Run continuously options
 	mDisableAlarmsIfStopped = new TQCheckBox(i18n("Disa&ble alarms while not running"), group, "disableAl");
-	mDisableAlarmsIfStopped->setFixedSize(mDisableAlarmsIfStopped->sizeHint());
+	mDisableAlarmsIfStopped->setFixedSize(mDisableAlarmsIfStopped->tqsizeHint());
 	connect(mDisableAlarmsIfStopped, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDisableIfStoppedToggled(bool)));
 	TQWhatsThis::add(mDisableAlarmsIfStopped,
 	      i18n("Check to disable alarms whenever KAlarm is not running. Alarms will only appear while the system tray icon is visible."));
-	grid->addMultiCellWidget(mDisableAlarmsIfStopped, 3, 3, 1, 2, alignment);
+	grid->addMultiCellWidget(mDisableAlarmsIfStopped, 3, 3, 1, 2, tqalignment);
 
 	mQuitWarn = new TQCheckBox(i18n("Warn before &quitting"), group, "disableAl");
-	mQuitWarn->setFixedSize(mQuitWarn->sizeHint());
+	mQuitWarn->setFixedSize(mQuitWarn->tqsizeHint());
 	TQWhatsThis::add(mQuitWarn,
 	      i18n("Check to display a warning prompt before quitting KAlarm."));
-	grid->addWidget(mQuitWarn, 4, 2, alignment);
+	grid->addWidget(mQuitWarn, 4, 2, tqalignment);
 
 	mAutostartTrayIcon = new TQCheckBox(i18n("Autostart at &login"), group, "autoTray");
 #ifdef AUTOSTART_BY_KALARMD
 	connect(mAutostartTrayIcon, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAutostartToggled(bool)));
 #endif
-	grid->addMultiCellWidget(mAutostartTrayIcon, 5, 5, 0, 2, alignment);
+	grid->addMultiCellWidget(mAutostartTrayIcon, 5, 5, 0, 2, tqalignment);
 
 	// Autostart alarm daemon
 	mAutostartDaemon = new TQCheckBox(i18n("Start alarm monitoring at lo&gin"), group, "startDaemon");
-	mAutostartDaemon->setFixedSize(mAutostartDaemon->sizeHint());
+	mAutostartDaemon->setFixedSize(mAutostartDaemon->tqsizeHint());
 	connect(mAutostartDaemon, TQT_SIGNAL(clicked()), TQT_SLOT(slotAutostartDaemonClicked()));
 	TQWhatsThis::add(mAutostartDaemon,
 	      i18n("Automatically start alarm monitoring whenever you start KDE, by running the alarm daemon (%1).\n\n"
 	           "This option should always be checked unless you intend to discontinue use of KAlarm.")
-	          .arg(TQString::fromLatin1(DAEMON_APP_NAME)));
-	grid->addMultiCellWidget(mAutostartDaemon, 6, 6, 0, 2, alignment);
+	          .arg(TQString::tqfromLatin1(DAEMON_APP_NAME)));
+	grid->addMultiCellWidget(mAutostartDaemon, 6, 6, 0, 2, tqalignment);
 
-	group->setFixedHeight(group->sizeHint().height());
+	group->setFixedHeight(group->tqsizeHint().height());
 
 	// Start-of-day time
 	TQHBox* itemBox = new TQHBox(mPage);
@@ -321,22 +321,22 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	box->setSpacing(KDialog::spacingHint());
 	TQLabel* label = new TQLabel(i18n("&Start of day for date-only alarms:"), box);
 	mStartOfDay = new TimeEdit(box);
-	mStartOfDay->setFixedSize(mStartOfDay->sizeHint());
+	mStartOfDay->setFixedSize(mStartOfDay->tqsizeHint());
 	label->setBuddy(mStartOfDay);
 	static const TQString startOfDayText = i18n("The earliest time of day at which a date-only alarm (i.e. "
 	                                           "an alarm with \"any time\" specified) will be triggered.");
 	TQWhatsThis::add(box, TQString("%1\n\n%2").arg(startOfDayText).arg(TimeSpinBox::shiftWhatsThis()));
 	itemBox->setStretchFactor(new TQWidget(itemBox), 1);    // left adjust the controls
-	itemBox->setFixedHeight(box->sizeHint().height());
+	itemBox->setFixedHeight(box->tqsizeHint().height());
 
 	// Confirm alarm deletion?
 	itemBox = new TQHBox(mPage);   // this is to allow left adjustment
 	mConfirmAlarmDeletion = new TQCheckBox(i18n("Con&firm alarm deletions"), itemBox, "confirmDeletion");
-	mConfirmAlarmDeletion->setMinimumSize(mConfirmAlarmDeletion->sizeHint());
+	mConfirmAlarmDeletion->setMinimumSize(mConfirmAlarmDeletion->tqsizeHint());
 	TQWhatsThis::add(mConfirmAlarmDeletion,
 	      i18n("Check to be prompted for confirmation each time you delete an alarm."));
 	itemBox->setStretchFactor(new TQWidget(itemBox), 1);    // left adjust the controls
-	itemBox->setFixedHeight(itemBox->sizeHint().height());
+	itemBox->setFixedHeight(itemBox->tqsizeHint().height());
 
 	// Expired alarms
 	group = new TQGroupBox(i18n("Expired Alarms"), mPage);
@@ -345,35 +345,35 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	grid->addColSpacing(0, indentWidth());
 	grid->addRowSpacing(0, fontMetrics().lineSpacing()/2);
 	mKeepExpired = new TQCheckBox(i18n("Keep alarms after e&xpiry"), group, "keepExpired");
-	mKeepExpired->setFixedSize(mKeepExpired->sizeHint());
+	mKeepExpired->setFixedSize(mKeepExpired->tqsizeHint());
 	connect(mKeepExpired, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotExpiredToggled(bool)));
 	TQWhatsThis::add(mKeepExpired,
 	      i18n("Check to store alarms after expiry or deletion (except deleted alarms which were never triggered)."));
-	grid->addMultiCellWidget(mKeepExpired, 1, 1, 0, 1, alignment);
+	grid->addMultiCellWidget(mKeepExpired, 1, 1, 0, 1, tqalignment);
 
 	box = new TQHBox(group);
 	box->setSpacing(KDialog::spacingHint());
 	mPurgeExpired = new TQCheckBox(i18n("Discard ex&pired alarms after:"), box, "purgeExpired");
-	mPurgeExpired->setMinimumSize(mPurgeExpired->sizeHint());
+	mPurgeExpired->setMinimumSize(mPurgeExpired->tqsizeHint());
 	connect(mPurgeExpired, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotExpiredToggled(bool)));
 	mPurgeAfter = new SpinBox(box);
 	mPurgeAfter->setMinValue(1);
 	mPurgeAfter->setLineShiftStep(10);
-	mPurgeAfter->setMinimumSize(mPurgeAfter->sizeHint());
+	mPurgeAfter->setMinimumSize(mPurgeAfter->tqsizeHint());
 	mPurgeAfterLabel = new TQLabel(i18n("da&ys"), box);
-	mPurgeAfterLabel->setMinimumSize(mPurgeAfterLabel->sizeHint());
+	mPurgeAfterLabel->setMinimumSize(mPurgeAfterLabel->tqsizeHint());
 	mPurgeAfterLabel->setBuddy(mPurgeAfter);
 	TQWhatsThis::add(box,
 	      i18n("Uncheck to store expired alarms indefinitely. Check to enter how long expired alarms should be stored."));
-	grid->addWidget(box, 2, 1, alignment);
+	grid->addWidget(box, 2, 1, tqalignment);
 
 	mClearExpired = new TQPushButton(i18n("Clear Expired Alar&ms"), group);
-	mClearExpired->setFixedSize(mClearExpired->sizeHint());
+	mClearExpired->setFixedSize(mClearExpired->tqsizeHint());
 	connect(mClearExpired, TQT_SIGNAL(clicked()), TQT_SLOT(slotClearExpired()));
 	TQWhatsThis::add(mClearExpired,
 	      i18n("Delete all existing expired alarms."));
-	grid->addWidget(mClearExpired, 3, 1, alignment);
-	group->setFixedHeight(group->sizeHint().height());
+	grid->addWidget(mClearExpired, 3, 1, tqalignment);
+	group->setFixedHeight(group->tqsizeHint().height());
 
 	// Terminal window to use for command alarms
 	group = new TQGroupBox(i18n("Terminal for Command Alarms"), mPage);
@@ -395,15 +395,15 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 		if (args.isEmpty()  ||  KStandardDirs::findExe(args[0]).isEmpty())
 			continue;
 		TQRadioButton* radio = new TQRadioButton(args[0], group);
-		radio->setMinimumSize(radio->sizeHint());
+		radio->setMinimumSize(radio->tqsizeHint());
 		mXtermType->insert(radio, mXtermCount);
 		if (mXtermFirst < 0)
 			mXtermFirst = mXtermCount;   // note the id of the first button
-		cmd.replace("%t", kapp->aboutData()->programName());
-		cmd.replace("%c", "<command>");
-		cmd.replace("%w", "<command; sleep>");
-		cmd.replace("%C", "[command]");
-		cmd.replace("%W", "[command; sleep]");
+		cmd.tqreplace("%t", kapp->aboutData()->programName());
+		cmd.tqreplace("%c", "<command>");
+		cmd.tqreplace("%w", "<command; sleep>");
+		cmd.tqreplace("%C", "[command]");
+		cmd.tqreplace("%W", "[command; sleep]");
 		TQWhatsThis::add(radio, whatsThis.arg(cmd));
 		grid->addWidget(radio, (row = index/3 + 1), index % 3, Qt::AlignAuto);
 		++index;
@@ -412,7 +412,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	box = new TQHBox(group);
 	grid->addMultiCellWidget(box, row + 1, row + 1, 0, 2, Qt::AlignAuto);
 	TQRadioButton* radio = new TQRadioButton(i18n("Other:"), box);
-	radio->setFixedSize(radio->sizeHint());
+	radio->setFixedSize(radio->tqsizeHint());
 	connect(radio, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotOtherTerminalToggled(bool)));
 	mXtermType->insert(radio, mXtermCount);
 	if (mXtermFirst < 0)
@@ -604,13 +604,13 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 	mEmailClient = new ButtonGroup(box);
 	mEmailClient->hide();
 	RadioButton* radio = new RadioButton(i18n("&KMail"), box, "kmail");
-	radio->setMinimumSize(radio->sizeHint());
+	radio->setMinimumSize(radio->tqsizeHint());
 	mEmailClient->insert(radio, Preferences::KMAIL);
 	radio = new RadioButton(i18n("&Sendmail"), box, "sendmail");
-	radio->setMinimumSize(radio->sizeHint());
+	radio->setMinimumSize(radio->tqsizeHint());
 	mEmailClient->insert(radio, Preferences::SENDMAIL);
 	connect(mEmailClient, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotEmailClientChanged(int)));
-	box->setFixedHeight(box->sizeHint().height());
+	box->setFixedHeight(box->tqsizeHint().height());
 	TQWhatsThis::add(box,
 	      i18n("Choose how to send email when an email alarm is triggered.\n"
 	           "KMail: The email is sent automatically via KMail. KMail is started first if necessary.\n"
@@ -619,11 +619,11 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 
 	box = new TQHBox(mPage);   // this is to allow left adjustment
 	mEmailCopyToKMail = new TQCheckBox(i18n("Co&py sent emails into KMail's %1 folder").arg(KAMail::i18n_sent_mail()), box);
-	mEmailCopyToKMail->setFixedSize(mEmailCopyToKMail->sizeHint());
+	mEmailCopyToKMail->setFixedSize(mEmailCopyToKMail->tqsizeHint());
 	TQWhatsThis::add(mEmailCopyToKMail,
 	      i18n("After sending an email, store a copy in KMail's %1 folder").arg(KAMail::i18n_sent_mail()));
 	box->setStretchFactor(new TQWidget(box), 1);    // left adjust the controls
-	box->setFixedHeight(box->sizeHint().height());
+	box->setFixedHeight(box->tqsizeHint().height());
 
 	// Your Email Address group box
 	TQGroupBox* group = new TQGroupBox(i18n("Your Email Address"), mPage);
@@ -633,7 +633,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 
 	// 'From' email address controls ...
 	label = new Label(EditAlarmDlg::i18n_f_EmailFrom(), group);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	grid->addWidget(label, 1, 0);
 	mFromAddressGroup = new ButtonGroup(group);
 	mFromAddressGroup->hide();
@@ -642,7 +642,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 	// Line edit to enter a 'From' email address
 	radio = new RadioButton(group);
 	mFromAddressGroup->insert(radio, Preferences::MAIL_FROM_ADDR);
-	radio->setFixedSize(radio->sizeHint());
+	radio->setFixedSize(radio->tqsizeHint());
 	label->setBuddy(radio);
 	grid->addWidget(radio, 1, 1);
 	mEmailAddress = new TQLineEdit(group);
@@ -655,7 +655,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 
 	// 'From' email address to be taken from Control Centre
 	radio = new RadioButton(i18n("&Use address from Control Center"), group);
-	radio->setFixedSize(radio->sizeHint());
+	radio->setFixedSize(radio->tqsizeHint());
 	mFromAddressGroup->insert(radio, Preferences::MAIL_FROM_CONTROL_CENTRE);
 	TQWhatsThis::add(radio,
 	      i18n("Check to use the email address set in the KDE Control Center, to identify you as the sender when sending email alarms."));
@@ -663,7 +663,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 
 	// 'From' email address to be picked from KMail's identities when the email alarm is configured
 	radio = new RadioButton(i18n("Use KMail &identities"), group);
-	radio->setFixedSize(radio->sizeHint());
+	radio->setFixedSize(radio->tqsizeHint());
 	mFromAddressGroup->insert(radio, Preferences::MAIL_FROM_KMAIL);
 	TQWhatsThis::add(radio,
 	      i18n("Check to use KMail's email identities to identify you as the sender when sending email alarms. "
@@ -674,7 +674,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 	// 'Bcc' email address controls ...
 	grid->addRowSpacing(4, KDialog::spacingHint());
 	label = new Label(i18n("'Bcc' email address", "&Bcc:"), group);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	grid->addWidget(label, 5, 0);
 	mBccAddressGroup = new ButtonGroup(group);
 	mBccAddressGroup->hide();
@@ -682,7 +682,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 
 	// Line edit to enter a 'Bcc' email address
 	radio = new RadioButton(group);
-	radio->setFixedSize(radio->sizeHint());
+	radio->setFixedSize(radio->tqsizeHint());
 	mBccAddressGroup->insert(radio, Preferences::MAIL_FROM_ADDR);
 	label->setBuddy(radio);
 	grid->addWidget(radio, 5, 1);
@@ -696,22 +696,22 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 
 	// 'Bcc' email address to be taken from Control Centre
 	radio = new RadioButton(i18n("Us&e address from Control Center"), group);
-	radio->setFixedSize(radio->sizeHint());
+	radio->setFixedSize(radio->tqsizeHint());
 	mBccAddressGroup->insert(radio, Preferences::MAIL_FROM_CONTROL_CENTRE);
 	TQWhatsThis::add(radio,
 	      i18n("Check to use the email address set in the KDE Control Center, for blind copying email alarms to yourself."));
 	grid->addMultiCellWidget(radio, 6, 6, 1, 2, Qt::AlignAuto);
 
-	group->setFixedHeight(group->sizeHint().height());
+	group->setFixedHeight(group->tqsizeHint().height());
 
 	box = new TQHBox(mPage);   // this is to allow left adjustment
 	mEmailQueuedNotify = new TQCheckBox(i18n("&Notify when remote emails are queued"), box);
-	mEmailQueuedNotify->setFixedSize(mEmailQueuedNotify->sizeHint());
+	mEmailQueuedNotify->setFixedSize(mEmailQueuedNotify->tqsizeHint());
 	TQWhatsThis::add(mEmailQueuedNotify,
 	      i18n("Display a notification message whenever an email alarm has queued an email for sending to a remote system. "
 	           "This could be useful if, for example, you have a dial-up connection, so that you can then ensure that the email is actually transmitted."));
 	box->setStretchFactor(new TQWidget(box), 1);    // left adjust the controls
-	box->setFixedHeight(box->sizeHint().height());
+	box->setFixedHeight(box->tqsizeHint().height());
 
 	mPage->setStretchFactor(new TQWidget(mPage), 1);    // top adjust the widgets
 }
@@ -825,12 +825,12 @@ FontColourPrefTab::FontColourPrefTab(TQVBox* frame)
 	mFontChooser = new FontColourChooser(mPage, 0, false, TQStringList(), i18n("Message Font && Color"), true, false);
 	mPage->setStretchFactor(mFontChooser, 1);
 
-	TQFrame* layoutBox = new TQFrame(mPage);
-	TQHBoxLayout* hlayout = new TQHBoxLayout(layoutBox);
-	TQVBoxLayout* colourLayout = new TQVBoxLayout(hlayout, KDialog::spacingHint());
-	hlayout->addStretch();
+	TQFrame* tqlayoutBox = new TQFrame(mPage);
+	TQHBoxLayout* htqlayout = new TQHBoxLayout(tqlayoutBox);
+	TQVBoxLayout* colourLayout = new TQVBoxLayout(htqlayout, KDialog::spacingHint());
+	htqlayout->addStretch();
 
-	TQHBox* box = new TQHBox(layoutBox);    // to group widgets for TQWhatsThis text
+	TQHBox* box = new TQHBox(tqlayoutBox);    // to group widgets for TQWhatsThis text
 	box->setSpacing(KDialog::spacingHint()/2);
 	colourLayout->addWidget(box);
 	TQLabel* label1 = new TQLabel(i18n("Di&sabled alarm color:"), box);
@@ -840,7 +840,7 @@ FontColourPrefTab::FontColourPrefTab(TQVBox* frame)
 	TQWhatsThis::add(box,
 	      i18n("Choose the text color in the alarm list for disabled alarms."));
 
-	box = new TQHBox(layoutBox);    // to group widgets for TQWhatsThis text
+	box = new TQHBox(tqlayoutBox);    // to group widgets for TQWhatsThis text
 	box->setSpacing(KDialog::spacingHint()/2);
 	colourLayout->addWidget(box);
 	TQLabel* label2 = new TQLabel(i18n("E&xpired alarm color:"), box);
@@ -887,9 +887,9 @@ void FontColourPrefTab::setDefaults()
 EditPrefTab::EditPrefTab(TQVBox* frame)
 	: PrefsTabBase(frame)
 {
-	// Get alignment to use in TQLabel::setAlignment(alignment | Qt::WordBreak)
+	// Get tqalignment to use in TQLabel::tqsetAlignment(tqalignment | Qt::WordBreak)
 	// (AlignAuto doesn't work correctly there)
-	int alignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft;
+	int tqalignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft;
 
 	int groupTopMargin = fontMetrics().lineSpacing()/2;
 	TQString defsetting   = i18n("The default setting for \"%1\" in the alarm edit dialog.");
@@ -897,118 +897,118 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 
 	// DISPLAY ALARMS
 	TQGroupBox* group = new TQGroupBox(i18n("Display Alarms"), mPage);
-	TQBoxLayout* layout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint());
-	layout->addSpacing(groupTopMargin);
+	TQBoxLayout* tqlayout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint());
+	tqlayout->addSpacing(groupTopMargin);
 
 	mConfirmAck = new TQCheckBox(EditAlarmDlg::i18n_k_ConfirmAck(), group, "defConfAck");
-	mConfirmAck->setMinimumSize(mConfirmAck->sizeHint());
+	mConfirmAck->setMinimumSize(mConfirmAck->tqsizeHint());
 	TQWhatsThis::add(mConfirmAck, defsetting.arg(EditAlarmDlg::i18n_ConfirmAck()));
-	layout->addWidget(mConfirmAck, 0, Qt::AlignAuto);
+	tqlayout->addWidget(mConfirmAck, 0, Qt::AlignAuto);
 
 	mAutoClose = new TQCheckBox(LateCancelSelector::i18n_i_AutoCloseWinLC(), group, "defAutoClose");
-	mAutoClose->setMinimumSize(mAutoClose->sizeHint());
+	mAutoClose->setMinimumSize(mAutoClose->tqsizeHint());
 	TQWhatsThis::add(mAutoClose, defsetting.arg(LateCancelSelector::i18n_AutoCloseWin()));
-	layout->addWidget(mAutoClose, 0, Qt::AlignAuto);
+	tqlayout->addWidget(mAutoClose, 0, Qt::AlignAuto);
 
 	TQHBox* box = new TQHBox(group);
 	box->setSpacing(KDialog::spacingHint());
-	layout->addWidget(box);
+	tqlayout->addWidget(box);
 	TQLabel* label = new TQLabel(i18n("Reminder &units:"), box);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	mReminderUnits = new TQComboBox(box, "defWarnUnits");
 	mReminderUnits->insertItem(TimePeriod::i18n_Minutes(), TimePeriod::MINUTES);
 	mReminderUnits->insertItem(TimePeriod::i18n_Hours_Mins(), TimePeriod::HOURS_MINUTES);
 	mReminderUnits->insertItem(TimePeriod::i18n_Days(), TimePeriod::DAYS);
 	mReminderUnits->insertItem(TimePeriod::i18n_Weeks(), TimePeriod::WEEKS);
-	mReminderUnits->setFixedSize(mReminderUnits->sizeHint());
+	mReminderUnits->setFixedSize(mReminderUnits->tqsizeHint());
 	label->setBuddy(mReminderUnits);
 	TQWhatsThis::add(box,
 	      i18n("The default units for the reminder in the alarm edit dialog."));
 	box->setStretchFactor(new TQWidget(box), 1);    // left adjust the control
 
 	mSpecialActionsButton = new SpecialActionsButton(EditAlarmDlg::i18n_SpecialActions(), box);
-	mSpecialActionsButton->setFixedSize(mSpecialActionsButton->sizeHint());
+	mSpecialActionsButton->setFixedSize(mSpecialActionsButton->tqsizeHint());
 
 	// SOUND
 	TQButtonGroup* bgroup = new TQButtonGroup(SoundPicker::i18n_Sound(), mPage, "soundGroup");
-	layout = new TQVBoxLayout(bgroup, KDialog::marginHint(), KDialog::spacingHint());
-	layout->addSpacing(groupTopMargin);
+	tqlayout = new TQVBoxLayout(bgroup, KDialog::marginHint(), KDialog::spacingHint());
+	tqlayout->addSpacing(groupTopMargin);
 
-	TQBoxLayout* hlayout = new TQHBoxLayout(layout, KDialog::spacingHint());
+	TQBoxLayout* htqlayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
 	mSound = new TQComboBox(false, bgroup, "defSound");
 	mSound->insertItem(SoundPicker::i18n_None());         // index 0
 	mSound->insertItem(SoundPicker::i18n_Beep());         // index 1
 	mSound->insertItem(SoundPicker::i18n_File());         // index 2
 	if (theApp()->speechEnabled())
 		mSound->insertItem(SoundPicker::i18n_Speak());  // index 3
-	mSound->setMinimumSize(mSound->sizeHint());
+	mSound->setMinimumSize(mSound->tqsizeHint());
 	TQWhatsThis::add(mSound, defsetting.arg(SoundPicker::i18n_Sound()));
-	hlayout->addWidget(mSound);
-	hlayout->addStretch(1);
+	htqlayout->addWidget(mSound);
+	htqlayout->addStretch(1);
 
 #ifndef WITHOUT_ARTS
 	mSoundRepeat = new TQCheckBox(i18n("Repea&t sound file"), bgroup, "defRepeatSound");
-	mSoundRepeat->setMinimumSize(mSoundRepeat->sizeHint());
+	mSoundRepeat->setMinimumSize(mSoundRepeat->tqsizeHint());
 	TQWhatsThis::add(mSoundRepeat, i18n("sound file \"Repeat\" checkbox", "The default setting for sound file \"%1\" in the alarm edit dialog.").arg(SoundDlg::i18n_Repeat()));
-	hlayout->addWidget(mSoundRepeat);
+	htqlayout->addWidget(mSoundRepeat);
 #endif
 
 	box = new TQHBox(bgroup);   // this is to control the TQWhatsThis text display area
 	box->setSpacing(KDialog::spacingHint());
 	mSoundFileLabel = new TQLabel(i18n("Sound &file:"), box);
-	mSoundFileLabel->setFixedSize(mSoundFileLabel->sizeHint());
+	mSoundFileLabel->setFixedSize(mSoundFileLabel->tqsizeHint());
 	mSoundFile = new TQLineEdit(box);
 	mSoundFileLabel->setBuddy(mSoundFile);
 	mSoundFileBrowse = new TQPushButton(box);
 	mSoundFileBrowse->setPixmap(SmallIcon("fileopen"));
-	mSoundFileBrowse->setFixedSize(mSoundFileBrowse->sizeHint());
+	mSoundFileBrowse->setFixedSize(mSoundFileBrowse->tqsizeHint());
 	connect(mSoundFileBrowse, TQT_SIGNAL(clicked()), TQT_SLOT(slotBrowseSoundFile()));
 	TQToolTip::add(mSoundFileBrowse, i18n("Choose a sound file"));
 	TQWhatsThis::add(box,
 	      i18n("Enter the default sound file to use in the alarm edit dialog."));
-	box->setFixedHeight(box->sizeHint().height());
-	layout->addWidget(box);
-	bgroup->setFixedHeight(bgroup->sizeHint().height());
+	box->setFixedHeight(box->tqsizeHint().height());
+	tqlayout->addWidget(box);
+	bgroup->setFixedHeight(bgroup->tqsizeHint().height());
 
 	// COMMAND ALARMS
 	group = new TQGroupBox(i18n("Command Alarms"), mPage);
-	layout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint());
-	layout->addSpacing(groupTopMargin);
-	layout = new TQHBoxLayout(layout, KDialog::spacingHint());
+	tqlayout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint());
+	tqlayout->addSpacing(groupTopMargin);
+	tqlayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
 
 	mCmdScript = new TQCheckBox(EditAlarmDlg::i18n_p_EnterScript(), group, "defCmdScript");
-	mCmdScript->setMinimumSize(mCmdScript->sizeHint());
+	mCmdScript->setMinimumSize(mCmdScript->tqsizeHint());
 	TQWhatsThis::add(mCmdScript, defsetting.arg(EditAlarmDlg::i18n_EnterScript()));
-	layout->addWidget(mCmdScript);
-	layout->addStretch();
+	tqlayout->addWidget(mCmdScript);
+	tqlayout->addStretch();
 
 	mCmdXterm = new TQCheckBox(EditAlarmDlg::i18n_w_ExecInTermWindow(), group, "defCmdXterm");
-	mCmdXterm->setMinimumSize(mCmdXterm->sizeHint());
+	mCmdXterm->setMinimumSize(mCmdXterm->tqsizeHint());
 	TQWhatsThis::add(mCmdXterm, defsetting.arg(EditAlarmDlg::i18n_ExecInTermWindow()));
-	layout->addWidget(mCmdXterm);
+	tqlayout->addWidget(mCmdXterm);
 
 	// EMAIL ALARMS
 	group = new TQGroupBox(i18n("Email Alarms"), mPage);
-	layout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint());
-	layout->addSpacing(groupTopMargin);
+	tqlayout = new TQVBoxLayout(group, KDialog::marginHint(), KDialog::spacingHint());
+	tqlayout->addSpacing(groupTopMargin);
 
 	// BCC email to sender
 	mEmailBcc = new TQCheckBox(EditAlarmDlg::i18n_e_CopyEmailToSelf(), group, "defEmailBcc");
-	mEmailBcc->setMinimumSize(mEmailBcc->sizeHint());
+	mEmailBcc->setMinimumSize(mEmailBcc->tqsizeHint());
 	TQWhatsThis::add(mEmailBcc, defsetting.arg(EditAlarmDlg::i18n_CopyEmailToSelf()));
-	layout->addWidget(mEmailBcc, 0, Qt::AlignAuto);
+	tqlayout->addWidget(mEmailBcc, 0, Qt::AlignAuto);
 
 	// MISCELLANEOUS
 	// Show in KOrganizer
 	mCopyToKOrganizer = new TQCheckBox(EditAlarmDlg::i18n_g_ShowInKOrganizer(), mPage, "defShowKorg");
-	mCopyToKOrganizer->setMinimumSize(mCopyToKOrganizer->sizeHint());
+	mCopyToKOrganizer->setMinimumSize(mCopyToKOrganizer->tqsizeHint());
 	TQWhatsThis::add(mCopyToKOrganizer, defsetting.arg(EditAlarmDlg::i18n_ShowInKOrganizer()));
 
 	// Late cancellation
 	box = new TQHBox(mPage);
 	box->setSpacing(KDialog::spacingHint());
 	mLateCancel = new TQCheckBox(LateCancelSelector::i18n_n_CancelIfLate(), box, "defCancelLate");
-	mLateCancel->setMinimumSize(mLateCancel->sizeHint());
+	mLateCancel->setMinimumSize(mLateCancel->tqsizeHint());
 	TQWhatsThis::add(mLateCancel, defsetting.arg(LateCancelSelector::i18n_CancelIfLate()));
 	box->setStretchFactor(new TQWidget(box), 1);    // left adjust the control
 
@@ -1016,7 +1016,7 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 	TQHBox* itemBox = new TQHBox(box);   // this is to control the TQWhatsThis text display area
 	itemBox->setSpacing(KDialog::spacingHint());
 	label = new TQLabel(i18n("&Recurrence:"), itemBox);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	mRecurPeriod = new TQComboBox(itemBox, "defRecur");
 	mRecurPeriod->insertItem(RecurrenceEdit::i18n_NoRecur());
 	mRecurPeriod->insertItem(RecurrenceEdit::i18n_AtLogin());
@@ -1025,17 +1025,17 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 	mRecurPeriod->insertItem(RecurrenceEdit::i18n_Weekly());
 	mRecurPeriod->insertItem(RecurrenceEdit::i18n_Monthly());
 	mRecurPeriod->insertItem(RecurrenceEdit::i18n_Yearly());
-	mRecurPeriod->setFixedSize(mRecurPeriod->sizeHint());
+	mRecurPeriod->setFixedSize(mRecurPeriod->tqsizeHint());
 	label->setBuddy(mRecurPeriod);
 	TQWhatsThis::add(itemBox,
 	      i18n("The default setting for the recurrence rule in the alarm edit dialog."));
-	box->setFixedHeight(itemBox->sizeHint().height());
+	box->setFixedHeight(itemBox->tqsizeHint().height());
 
 	// How to handle February 29th in yearly recurrences
 	TQVBox* vbox = new TQVBox(mPage);   // this is to control the TQWhatsThis text display area
 	vbox->setSpacing(KDialog::spacingHint());
 	label = new TQLabel(i18n("In non-leap years, repeat yearly February 29th alarms on:"), vbox);
-	label->setAlignment(alignment | Qt::WordBreak);
+	label->tqsetAlignment(tqalignment | Qt::WordBreak);
 	itemBox = new TQHBox(vbox);
 	itemBox->setSpacing(2*KDialog::spacingHint());
 	mFeb29 = new TQButtonGroup(itemBox);
@@ -1043,15 +1043,15 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 	TQWidget* widget = new TQWidget(itemBox);
 	widget->setFixedWidth(3*KDialog::spacingHint());
 	TQRadioButton* radio = new TQRadioButton(i18n("February 2&8th"), itemBox);
-	radio->setMinimumSize(radio->sizeHint());
+	radio->setMinimumSize(radio->tqsizeHint());
 	mFeb29->insert(radio, KARecurrence::FEB29_FEB28);
 	radio = new TQRadioButton(i18n("March &1st"), itemBox);
-	radio->setMinimumSize(radio->sizeHint());
+	radio->setMinimumSize(radio->tqsizeHint());
 	mFeb29->insert(radio, KARecurrence::FEB29_MAR1);
 	radio = new TQRadioButton(i18n("Do &not repeat"), itemBox);
-	radio->setMinimumSize(radio->sizeHint());
+	radio->setMinimumSize(radio->tqsizeHint());
 	mFeb29->insert(radio, KARecurrence::FEB29_FEB29);
-	itemBox->setFixedHeight(itemBox->sizeHint().height());
+	itemBox->setFixedHeight(itemBox->tqsizeHint().height());
 	TQWhatsThis::add(vbox,
 	      i18n("For yearly recurrences, choose what date, if any, alarms due on February 29th should occur in non-leap years.\n"
 	           "Note that the next scheduled occurrence of existing alarms is not re-evaluated when you change this setting."));
@@ -1200,7 +1200,7 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame)
 	grid->addRowSpacing(0, fontMetrics().lineSpacing()/2);
 
 	mTooltipShowAlarms = new TQCheckBox(i18n("Show next &24 hours' alarms"), group, "tooltipShow");
-	mTooltipShowAlarms->setMinimumSize(mTooltipShowAlarms->sizeHint());
+	mTooltipShowAlarms->setMinimumSize(mTooltipShowAlarms->tqsizeHint());
 	connect(mTooltipShowAlarms, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipAlarmsToggled(bool)));
 	TQWhatsThis::add(mTooltipShowAlarms,
 	      i18n("Specify whether to include in the system tray tooltip, a summary of alarms due in the next 24 hours"));
@@ -1209,25 +1209,25 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame)
 	TQHBox* box = new TQHBox(group);
 	box->setSpacing(KDialog::spacingHint());
 	mTooltipMaxAlarms = new TQCheckBox(i18n("Ma&ximum number of alarms to show:"), box, "tooltipMax");
-	mTooltipMaxAlarms->setMinimumSize(mTooltipMaxAlarms->sizeHint());
+	mTooltipMaxAlarms->setMinimumSize(mTooltipMaxAlarms->tqsizeHint());
 	connect(mTooltipMaxAlarms, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipMaxToggled(bool)));
 	mTooltipMaxAlarmCount = new SpinBox(1, 99, 1, box);
 	mTooltipMaxAlarmCount->setLineShiftStep(5);
-	mTooltipMaxAlarmCount->setMinimumSize(mTooltipMaxAlarmCount->sizeHint());
+	mTooltipMaxAlarmCount->setMinimumSize(mTooltipMaxAlarmCount->tqsizeHint());
 	TQWhatsThis::add(box,
 	      i18n("Uncheck to display all of the next 24 hours' alarms in the system tray tooltip. "
 	           "Check to enter an upper limit on the number to be displayed."));
 	grid->addMultiCellWidget(box, 2, 2, 1, 2, Qt::AlignAuto);
 
 	mTooltipShowTime = new TQCheckBox(MainWindow::i18n_m_ShowAlarmTime(), group, "tooltipTime");
-	mTooltipShowTime->setMinimumSize(mTooltipShowTime->sizeHint());
+	mTooltipShowTime->setMinimumSize(mTooltipShowTime->tqsizeHint());
 	connect(mTooltipShowTime, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipTimeToggled(bool)));
 	TQWhatsThis::add(mTooltipShowTime,
 	      i18n("Specify whether to show in the system tray tooltip, the time at which each alarm is due"));
 	grid->addMultiCellWidget(mTooltipShowTime, 3, 3, 1, 2, Qt::AlignAuto);
 
 	mTooltipShowTimeTo = new TQCheckBox(MainWindow::i18n_l_ShowTimeToAlarm(), group, "tooltipTimeTo");
-	mTooltipShowTimeTo->setMinimumSize(mTooltipShowTimeTo->sizeHint());
+	mTooltipShowTimeTo->setMinimumSize(mTooltipShowTimeTo->tqsizeHint());
 	connect(mTooltipShowTimeTo, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipTimeToToggled(bool)));
 	TQWhatsThis::add(mTooltipShowTimeTo,
 	      i18n("Specify whether to show in the system tray tooltip, how long until each alarm is due"));
@@ -1236,17 +1236,17 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame)
 	box = new TQHBox(group);   // this is to control the TQWhatsThis text display area
 	box->setSpacing(KDialog::spacingHint());
 	mTooltipTimeToPrefixLabel = new TQLabel(i18n("&Prefix:"), box);
-	mTooltipTimeToPrefixLabel->setFixedSize(mTooltipTimeToPrefixLabel->sizeHint());
+	mTooltipTimeToPrefixLabel->setFixedSize(mTooltipTimeToPrefixLabel->tqsizeHint());
 	mTooltipTimeToPrefix = new TQLineEdit(box);
 	mTooltipTimeToPrefixLabel->setBuddy(mTooltipTimeToPrefix);
 	TQWhatsThis::add(box,
 	      i18n("Enter the text to be displayed in front of the time until the alarm, in the system tray tooltip"));
-	box->setFixedHeight(box->sizeHint().height());
+	box->setFixedHeight(box->tqsizeHint().height());
 	grid->addWidget(box, 5, 2, Qt::AlignAuto);
-	group->setMaximumHeight(group->sizeHint().height());
+	group->setMaximumHeight(group->tqsizeHint().height());
 
 	mModalMessages = new TQCheckBox(i18n("Message &windows have a title bar and take keyboard focus"), mPage, "modalMsg");
-	mModalMessages->setMinimumSize(mModalMessages->sizeHint());
+	mModalMessages->setMinimumSize(mModalMessages->tqsizeHint());
 	TQWhatsThis::add(mModalMessages,
 	      i18n("Specify the characteristics of alarm message windows:\n"
 	           "- If checked, the window is a normal window with a title bar, which grabs keyboard input when it is displayed.\n"
@@ -1259,13 +1259,13 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame)
 	TQLabel* label = new TQLabel(i18n("System tray icon &update interval:"), box);
 	mDaemonTrayCheckInterval = new SpinBox(1, 9999, 1, box, "daemonCheck");
 	mDaemonTrayCheckInterval->setLineShiftStep(10);
-	mDaemonTrayCheckInterval->setMinimumSize(mDaemonTrayCheckInterval->sizeHint());
+	mDaemonTrayCheckInterval->setMinimumSize(mDaemonTrayCheckInterval->tqsizeHint());
 	label->setBuddy(mDaemonTrayCheckInterval);
 	label = new TQLabel(i18n("seconds"), box);
 	TQWhatsThis::add(box,
 	      i18n("How often to update the system tray icon to indicate whether or not the Alarm Daemon is monitoring alarms."));
 	itemBox->setStretchFactor(new TQWidget(itemBox), 1);    // left adjust the controls
-	itemBox->setFixedHeight(box->sizeHint().height());
+	itemBox->setFixedHeight(box->tqsizeHint().height());
 
 	mPage->setStretchFactor(new TQWidget(mPage), 1);    // top adjust the widgets
 }
diff --git a/kalarm/preferences.cpp b/kalarm/preferences.cpp
index 3c2b5f18..93e6a60b 100644
--- a/kalarm/preferences.cpp
+++ b/kalarm/preferences.cpp
@@ -58,7 +58,7 @@ const int                        Preferences::default_messageButtonDelay      =
 const int                        Preferences::default_tooltipAlarmCount       = 5;
 const bool                       Preferences::default_showTooltipAlarmTime    = true;
 const bool                       Preferences::default_showTooltipTimeToAlarm  = true;
-const TQString                    Preferences::default_tooltipTimeToPrefix     = TQString::fromLatin1("+");
+const TQString                    Preferences::default_tooltipTimeToPrefix     = TQString::tqfromLatin1("+");
 const int                        Preferences::default_daemonTrayCheckInterval = 10;     // (seconds)
 const bool                       Preferences::default_emailCopyToKMail        = false;
 const bool                       Preferences::default_emailQueuedNotify       = false;
@@ -139,65 +139,65 @@ TQTime                      Preferences::mOldStartOfDay;
 bool                       Preferences::mStartOfDayChanged;
 
 
-static const TQString defaultFeb29RecurType    = TQString::fromLatin1("Mar1");
-static const TQString defaultEmailClient       = TQString::fromLatin1("kmail");
+static const TQString defaultFeb29RecurType    = TQString::tqfromLatin1("Mar1");
+static const TQString defaultEmailClient       = TQString::tqfromLatin1("kmail");
 
 // Config file entry names
-static const TQString GENERAL_SECTION          = TQString::fromLatin1("General");
-static const TQString VERSION_NUM              = TQString::fromLatin1("Version");
-static const TQString MESSAGE_COLOURS          = TQString::fromLatin1("MessageColours");
-static const TQString MESSAGE_BG_COLOUR        = TQString::fromLatin1("MessageBackgroundColour");
-static const TQString MESSAGE_FONT             = TQString::fromLatin1("MessageFont");
-static const TQString RUN_IN_SYSTEM_TRAY       = TQString::fromLatin1("RunInSystemTray");
-static const TQString DISABLE_IF_STOPPED       = TQString::fromLatin1("DisableAlarmsIfStopped");
-static const TQString AUTOSTART_TRAY           = TQString::fromLatin1("AutostartTray");
-static const TQString FEB29_RECUR_TYPE         = TQString::fromLatin1("Feb29Recur");
-static const TQString MODAL_MESSAGES           = TQString::fromLatin1("ModalMessages");
-static const TQString MESSAGE_BUTTON_DELAY     = TQString::fromLatin1("MessageButtonDelay");
-static const TQString TOOLTIP_ALARM_COUNT      = TQString::fromLatin1("TooltipAlarmCount");
-static const TQString TOOLTIP_ALARM_TIME       = TQString::fromLatin1("ShowTooltipAlarmTime");
-static const TQString TOOLTIP_TIME_TO_ALARM    = TQString::fromLatin1("ShowTooltipTimeToAlarm");
-static const TQString TOOLTIP_TIME_TO_PREFIX   = TQString::fromLatin1("TooltipTimeToPrefix");
-static const TQString DAEMON_TRAY_INTERVAL     = TQString::fromLatin1("DaemonTrayCheckInterval");
-static const TQString EMAIL_CLIENT             = TQString::fromLatin1("EmailClient");
-static const TQString EMAIL_COPY_TO_KMAIL      = TQString::fromLatin1("EmailCopyToKMail");
-static const TQString EMAIL_FROM               = TQString::fromLatin1("EmailFrom");
-static const TQString EMAIL_BCC_ADDRESS        = TQString::fromLatin1("EmailBccAddress");
-static const TQString CMD_XTERM_COMMAND        = TQString::fromLatin1("CmdXTerm");
-static const TQString START_OF_DAY             = TQString::fromLatin1("StartOfDay");
-static const TQString START_OF_DAY_CHECK       = TQString::fromLatin1("Sod");
-static const TQString DISABLED_COLOUR          = TQString::fromLatin1("DisabledColour");
-static const TQString EXPIRED_COLOUR           = TQString::fromLatin1("ExpiredColour");
-static const TQString EXPIRED_KEEP_DAYS        = TQString::fromLatin1("ExpiredKeepDays");
-static const TQString DEFAULTS_SECTION         = TQString::fromLatin1("Defaults");
-static const TQString DEF_LATE_CANCEL          = TQString::fromLatin1("DefLateCancel");
-static const TQString DEF_AUTO_CLOSE           = TQString::fromLatin1("DefAutoClose");
-static const TQString DEF_CONFIRM_ACK          = TQString::fromLatin1("DefConfirmAck");
-static const TQString DEF_COPY_TO_KORG         = TQString::fromLatin1("DefCopyKOrg");
-static const TQString DEF_SOUND_TYPE           = TQString::fromLatin1("DefSoundType");
-static const TQString DEF_SOUND_FILE           = TQString::fromLatin1("DefSoundFile");
-static const TQString DEF_SOUND_VOLUME         = TQString::fromLatin1("DefSoundVolume");
-static const TQString DEF_SOUND_REPEAT         = TQString::fromLatin1("DefSoundRepeat");
-static const TQString DEF_CMD_SCRIPT           = TQString::fromLatin1("DefCmdScript");
-static const TQString DEF_CMD_LOG_TYPE         = TQString::fromLatin1("DefCmdLogType");
-static const TQString DEF_LOG_FILE             = TQString::fromLatin1("DefLogFile");
-static const TQString DEF_EMAIL_BCC            = TQString::fromLatin1("DefEmailBcc");
-static const TQString DEF_RECUR_PERIOD         = TQString::fromLatin1("DefRecurPeriod");
-static const TQString DEF_REMIND_UNITS         = TQString::fromLatin1("RemindUnits");
-static const TQString DEF_PRE_ACTION           = TQString::fromLatin1("DefPreAction");
-static const TQString DEF_POST_ACTION          = TQString::fromLatin1("DefPostAction");
+static const TQString GENERAL_SECTION          = TQString::tqfromLatin1("General");
+static const TQString VERSION_NUM              = TQString::tqfromLatin1("Version");
+static const TQString MESSAGE_COLOURS          = TQString::tqfromLatin1("MessageColours");
+static const TQString MESSAGE_BG_COLOUR        = TQString::tqfromLatin1("MessageBackgroundColour");
+static const TQString MESSAGE_FONT             = TQString::tqfromLatin1("MessageFont");
+static const TQString RUN_IN_SYSTEM_TRAY       = TQString::tqfromLatin1("RunInSystemTray");
+static const TQString DISABLE_IF_STOPPED       = TQString::tqfromLatin1("DisableAlarmsIfStopped");
+static const TQString AUTOSTART_TRAY           = TQString::tqfromLatin1("AutostartTray");
+static const TQString FEB29_RECUR_TYPE         = TQString::tqfromLatin1("Feb29Recur");
+static const TQString MODAL_MESSAGES           = TQString::tqfromLatin1("ModalMessages");
+static const TQString MESSAGE_BUTTON_DELAY     = TQString::tqfromLatin1("MessageButtonDelay");
+static const TQString TOOLTIP_ALARM_COUNT      = TQString::tqfromLatin1("TooltipAlarmCount");
+static const TQString TOOLTIP_ALARM_TIME       = TQString::tqfromLatin1("ShowTooltipAlarmTime");
+static const TQString TOOLTIP_TIME_TO_ALARM    = TQString::tqfromLatin1("ShowTooltipTimeToAlarm");
+static const TQString TOOLTIP_TIME_TO_PREFIX   = TQString::tqfromLatin1("TooltipTimeToPrefix");
+static const TQString DAEMON_TRAY_INTERVAL     = TQString::tqfromLatin1("DaemonTrayCheckInterval");
+static const TQString EMAIL_CLIENT             = TQString::tqfromLatin1("EmailClient");
+static const TQString EMAIL_COPY_TO_KMAIL      = TQString::tqfromLatin1("EmailCopyToKMail");
+static const TQString EMAIL_FROM               = TQString::tqfromLatin1("EmailFrom");
+static const TQString EMAIL_BCC_ADDRESS        = TQString::tqfromLatin1("EmailBccAddress");
+static const TQString CMD_XTERM_COMMAND        = TQString::tqfromLatin1("CmdXTerm");
+static const TQString START_OF_DAY             = TQString::tqfromLatin1("StartOfDay");
+static const TQString START_OF_DAY_CHECK       = TQString::tqfromLatin1("Sod");
+static const TQString DISABLED_COLOUR          = TQString::tqfromLatin1("DisabledColour");
+static const TQString EXPIRED_COLOUR           = TQString::tqfromLatin1("ExpiredColour");
+static const TQString EXPIRED_KEEP_DAYS        = TQString::tqfromLatin1("ExpiredKeepDays");
+static const TQString DEFAULTS_SECTION         = TQString::tqfromLatin1("Defaults");
+static const TQString DEF_LATE_CANCEL          = TQString::tqfromLatin1("DefLateCancel");
+static const TQString DEF_AUTO_CLOSE           = TQString::tqfromLatin1("DefAutoClose");
+static const TQString DEF_CONFIRM_ACK          = TQString::tqfromLatin1("DefConfirmAck");
+static const TQString DEF_COPY_TO_KORG         = TQString::tqfromLatin1("DefCopyKOrg");
+static const TQString DEF_SOUND_TYPE           = TQString::tqfromLatin1("DefSoundType");
+static const TQString DEF_SOUND_FILE           = TQString::tqfromLatin1("DefSoundFile");
+static const TQString DEF_SOUND_VOLUME         = TQString::tqfromLatin1("DefSoundVolume");
+static const TQString DEF_SOUND_REPEAT         = TQString::tqfromLatin1("DefSoundRepeat");
+static const TQString DEF_CMD_SCRIPT           = TQString::tqfromLatin1("DefCmdScript");
+static const TQString DEF_CMD_LOG_TYPE         = TQString::tqfromLatin1("DefCmdLogType");
+static const TQString DEF_LOG_FILE             = TQString::tqfromLatin1("DefLogFile");
+static const TQString DEF_EMAIL_BCC            = TQString::tqfromLatin1("DefEmailBcc");
+static const TQString DEF_RECUR_PERIOD         = TQString::tqfromLatin1("DefRecurPeriod");
+static const TQString DEF_REMIND_UNITS         = TQString::tqfromLatin1("RemindUnits");
+static const TQString DEF_PRE_ACTION           = TQString::tqfromLatin1("DefPreAction");
+static const TQString DEF_POST_ACTION          = TQString::tqfromLatin1("DefPostAction");
 
 // Config file entry name for temporary use
-static const TQString TEMP                     = TQString::fromLatin1("Temp");
+static const TQString TEMP                     = TQString::tqfromLatin1("Temp");
 
 // Values for EmailFrom entry
-static const TQString FROM_CONTROL_CENTRE      = TQString::fromLatin1("@ControlCenter");
-static const TQString FROM_KMAIL               = TQString::fromLatin1("@KMail");
+static const TQString FROM_CONTROL_CENTRE      = TQString::tqfromLatin1("@ControlCenter");
+static const TQString FROM_KMAIL               = TQString::tqfromLatin1("@KMail");
 
 // Config file entry names for notification messages
-const TQString Preferences::QUIT_WARN              = TQString::fromLatin1("QuitWarn");
-const TQString Preferences::CONFIRM_ALARM_DELETION = TQString::fromLatin1("ConfirmAlarmDeletion");
-const TQString Preferences::EMAIL_QUEUED_NOTIFY    = TQString::fromLatin1("EmailQueuedNotify");
+const TQString Preferences::QUIT_WARN              = TQString::tqfromLatin1("QuitWarn");
+const TQString Preferences::CONFIRM_ALARM_DELETION = TQString::tqfromLatin1("ConfirmAlarmDeletion");
+const TQString Preferences::EMAIL_QUEUED_NOTIFY    = TQString::tqfromLatin1("EmailQueuedNotify");
 
 static const int SODxor = 0x82451630;
 inline int Preferences::startOfDayCheck()
@@ -338,10 +338,10 @@ void Preferences::read()
 	TQCString feb29            = config->readEntry(FEB29_RECUR_TYPE, defaultFeb29RecurType).local8Bit();
 	mDefaultFeb29Type         = (feb29 == "Mar1") ? KARecurrence::FEB29_MAR1 : (feb29 == "Feb28") ? KARecurrence::FEB29_FEB28 : KARecurrence::FEB29_FEB29;
 	TQString remindUnits       = config->readEntry(DEF_REMIND_UNITS);
-	mDefaultReminderUnits     = (remindUnits == TQString::fromLatin1("Minutes"))      ? TimePeriod::MINUTES
-	                          : (remindUnits == TQString::fromLatin1("HoursMinutes")) ? TimePeriod::HOURS_MINUTES
-	                          : (remindUnits == TQString::fromLatin1("Days"))         ? TimePeriod::DAYS
-	                          : (remindUnits == TQString::fromLatin1("Weeks"))        ? TimePeriod::WEEKS : default_defaultReminderUnits;
+	mDefaultReminderUnits     = (remindUnits == TQString::tqfromLatin1("Minutes"))      ? TimePeriod::MINUTES
+	                          : (remindUnits == TQString::tqfromLatin1("HoursMinutes")) ? TimePeriod::HOURS_MINUTES
+	                          : (remindUnits == TQString::tqfromLatin1("Days"))         ? TimePeriod::DAYS
+	                          : (remindUnits == TQString::tqfromLatin1("Weeks"))        ? TimePeriod::WEEKS : default_defaultReminderUnits;
 	mDefaultPreAction         = config->readEntry(DEF_PRE_ACTION, default_defaultPreAction);
 	mDefaultPostAction        = config->readEntry(DEF_POST_ACTION, default_defaultPostAction);
 	mInstance->emitPreferencesChanged();
@@ -406,10 +406,10 @@ void Preferences::save(bool syncToDisc)
 	TQString value;
 	switch (mDefaultReminderUnits)
 	{
-		case TimePeriod::MINUTES:       value = TQString::fromLatin1("Minutes");      break;
-		case TimePeriod::HOURS_MINUTES: value = TQString::fromLatin1("HoursMinutes"); break;
-		case TimePeriod::DAYS:          value = TQString::fromLatin1("Days");         break;
-		case TimePeriod::WEEKS:         value = TQString::fromLatin1("Weeks");        break;
+		case TimePeriod::MINUTES:       value = TQString::tqfromLatin1("Minutes");      break;
+		case TimePeriod::HOURS_MINUTES: value = TQString::tqfromLatin1("HoursMinutes"); break;
+		case TimePeriod::DAYS:          value = TQString::tqfromLatin1("Days");         break;
+		case TimePeriod::WEEKS:         value = TQString::tqfromLatin1("Weeks");        break;
 		default:                        value = TQString::null; break;
 	}
 	config->writeEntry(DEF_REMIND_UNITS, value);
@@ -558,12 +558,12 @@ void Preferences::convertOldPrefs()
 	if (version <= KAlarm::Version(1,4,21))
 	{
 		// Convert KAlarm 1.4.21 preferences
-		static const TQString OLD_REMIND_UNITS = TQString::fromLatin1("DefRemindUnits");
+		static const TQString OLD_REMIND_UNITS = TQString::tqfromLatin1("DefRemindUnits");
 		config->setGroup(DEFAULTS_SECTION);
 		int intUnit     = config->readNumEntry(OLD_REMIND_UNITS, 0);
-		TQString strUnit = (intUnit == 1) ? TQString::fromLatin1("Days")
-		                : (intUnit == 2) ? TQString::fromLatin1("Weeks")
-		                :                  TQString::fromLatin1("HoursMinutes");
+		TQString strUnit = (intUnit == 1) ? TQString::tqfromLatin1("Days")
+		                : (intUnit == 2) ? TQString::tqfromLatin1("Weeks")
+		                :                  TQString::tqfromLatin1("HoursMinutes");
 		config->deleteEntry(OLD_REMIND_UNITS);
 		config->writeEntry(DEF_REMIND_UNITS, strUnit);
 	}
@@ -571,11 +571,11 @@ void Preferences::convertOldPrefs()
 	if (version <= KAlarm::Version(1,4,20))
 	{
 		// Convert KAlarm 1.4.20 preferences
-		static const TQString VIEW_SECTION = TQString::fromLatin1("View");
-		static const TQString SHOW_ARCHIVED_ALARMS = TQString::fromLatin1("ShowArchivedAlarms");
-		static const TQString SHOW_EXPIRED_ALARMS  = TQString::fromLatin1("ShowExpiredAlarms");
-		static const TQString SHOW_ALARM_TIME      = TQString::fromLatin1("ShowAlarmTime");
-		static const TQString SHOW_TIME_TO_ALARM   = TQString::fromLatin1("ShowTimeToAlarm");
+		static const TQString VIEW_SECTION = TQString::tqfromLatin1("View");
+		static const TQString SHOW_ARCHIVED_ALARMS = TQString::tqfromLatin1("ShowArchivedAlarms");
+		static const TQString SHOW_EXPIRED_ALARMS  = TQString::tqfromLatin1("ShowExpiredAlarms");
+		static const TQString SHOW_ALARM_TIME      = TQString::tqfromLatin1("ShowAlarmTime");
+		static const TQString SHOW_TIME_TO_ALARM   = TQString::tqfromLatin1("ShowTimeToAlarm");
 		config->setGroup(GENERAL_SECTION);
 		bool showExpired = config->readBoolEntry(SHOW_EXPIRED_ALARMS, false);
 		bool showTime    = config->readBoolEntry(SHOW_ALARM_TIME, true);
@@ -592,7 +592,7 @@ void Preferences::convertOldPrefs()
 	if (version <= KAlarm::Version(1,4,5))
 	{
 		// Convert KAlarm 1.4.5 preferences
-		static const TQString DEF_SOUND = TQString::fromLatin1("DefSound");
+		static const TQString DEF_SOUND = TQString::tqfromLatin1("DefSound");
 		config->setGroup(DEFAULTS_SECTION);
 		bool sound = config->readBoolEntry(DEF_SOUND, false);
 		if (!sound)
@@ -603,9 +603,9 @@ void Preferences::convertOldPrefs()
 	if (version < KAlarm::Version(1,3,0))
 	{
 		// Convert KAlarm pre-1.3 preferences
-		static const TQString EMAIL_ADDRESS             = TQString::fromLatin1("EmailAddress");
-		static const TQString EMAIL_USE_CTRL_CENTRE     = TQString::fromLatin1("EmailUseControlCenter");
-		static const TQString EMAIL_BCC_USE_CTRL_CENTRE = TQString::fromLatin1("EmailBccUseControlCenter");
+		static const TQString EMAIL_ADDRESS             = TQString::tqfromLatin1("EmailAddress");
+		static const TQString EMAIL_USE_CTRL_CENTRE     = TQString::tqfromLatin1("EmailUseControlCenter");
+		static const TQString EMAIL_BCC_USE_CTRL_CENTRE = TQString::tqfromLatin1("EmailBccUseControlCenter");
 		TQMap<TQString, TQString> entries = config->entryMap(GENERAL_SECTION);
 		if (entries.find(EMAIL_FROM) == entries.end()
 		&&  entries.find(EMAIL_USE_CTRL_CENTRE) != entries.end())
@@ -628,7 +628,7 @@ void Preferences::convertOldPrefs()
 			config->deleteEntry(EMAIL_USE_CTRL_CENTRE);
 		}
 		// Convert KAlarm 1.2 preferences
-		static const TQString DEF_CMD_XTERM = TQString::fromLatin1("DefCmdXterm");
+		static const TQString DEF_CMD_XTERM = TQString::tqfromLatin1("DefCmdXterm");
 		config->setGroup(DEFAULTS_SECTION);
 		if (config->hasKey(DEF_CMD_XTERM))
 		{
diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp
index bc70e4fe..3924d428 100644
--- a/kalarm/recurrenceedit.cpp
+++ b/kalarm/recurrenceedit.cpp
@@ -93,7 +93,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	  mNoEmitTypeChanged(true),
 	  mReadOnly(readOnly)
 {
-	TQBoxLayout* layout;
+	TQBoxLayout* tqlayout;
 	TQVBoxLayout* topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
 	/* Create the recurrence rule Group box which holds the recurrence period
@@ -106,11 +106,11 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	TQGroupBox* recurGroup = new TQGroupBox(1, Qt::Vertical, i18n("Recurrence Rule"), this, "recurGroup");
 	topLayout->addWidget(recurGroup);
 	TQFrame* ruleFrame = new TQFrame(recurGroup, "ruleFrame");
-	layout = new TQVBoxLayout(ruleFrame, 0);
-	layout->addSpacing(KDialog::spacingHint()/2);
+	tqlayout = new TQVBoxLayout(ruleFrame, 0);
+	tqlayout->addSpacing(KDialog::spacingHint()/2);
 
-	layout = new TQHBoxLayout(layout, 0);
-	TQBoxLayout* lay = new TQVBoxLayout(layout, 0);
+	tqlayout = new TQHBoxLayout(tqlayout, 0);
+	TQBoxLayout* lay = new TQVBoxLayout(tqlayout, 0);
 	mRuleButtonGroup = new ButtonGroup(1, Qt::Horizontal, ruleFrame);
 	mRuleButtonGroup->setInsideMargin(0);
 	mRuleButtonGroup->setFrameStyle(TQFrame::NoFrame);
@@ -119,43 +119,43 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	connect(mRuleButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(periodClicked(int)));
 
 	mNoneButton = new RadioButton(i18n_Norecur(), mRuleButtonGroup);
-	mNoneButton->setFixedSize(mNoneButton->sizeHint());
+	mNoneButton->setFixedSize(mNoneButton->tqsizeHint());
 	mNoneButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mNoneButton, i18n("Do not repeat the alarm"));
 
 	mAtLoginButton = new RadioButton(i18n_l_Atlogin(), mRuleButtonGroup);
-	mAtLoginButton->setFixedSize(mAtLoginButton->sizeHint());
+	mAtLoginButton->setFixedSize(mAtLoginButton->tqsizeHint());
 	mAtLoginButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mAtLoginButton,
 	      i18n("Trigger the alarm at the specified date/time and at every login until then.\n"
 	           "Note that it will also be triggered any time the alarm daemon is restarted."));
 
 	mSubDailyButton = new RadioButton(i18n_u_HourlyMinutely(), mRuleButtonGroup);
-	mSubDailyButton->setFixedSize(mSubDailyButton->sizeHint());
+	mSubDailyButton->setFixedSize(mSubDailyButton->tqsizeHint());
 	mSubDailyButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mSubDailyButton,
 	      i18n("Repeat the alarm at hourly/minutely intervals"));
 
 	mDailyButton = new RadioButton(i18n_d_Daily(), mRuleButtonGroup);
-	mDailyButton->setFixedSize(mDailyButton->sizeHint());
+	mDailyButton->setFixedSize(mDailyButton->tqsizeHint());
 	mDailyButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mDailyButton,
 	      i18n("Repeat the alarm at daily intervals"));
 
 	mWeeklyButton = new RadioButton(i18n_w_Weekly(), mRuleButtonGroup);
-	mWeeklyButton->setFixedSize(mWeeklyButton->sizeHint());
+	mWeeklyButton->setFixedSize(mWeeklyButton->tqsizeHint());
 	mWeeklyButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mWeeklyButton,
 	      i18n("Repeat the alarm at weekly intervals"));
 
 	mMonthlyButton = new RadioButton(i18n_m_Monthly(), mRuleButtonGroup);
-	mMonthlyButton->setFixedSize(mMonthlyButton->sizeHint());
+	mMonthlyButton->setFixedSize(mMonthlyButton->tqsizeHint());
 	mMonthlyButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mMonthlyButton,
 	      i18n("Repeat the alarm at monthly intervals"));
 
 	mYearlyButton = new RadioButton(i18n_y_Yearly(), mRuleButtonGroup);
-	mYearlyButton->setFixedSize(mYearlyButton->sizeHint());
+	mYearlyButton->setFixedSize(mYearlyButton->tqsizeHint());
 	mYearlyButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mYearlyButton,
 	      i18n("Repeat the alarm at annual intervals"));
@@ -170,7 +170,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 
 	// Sub-repetition button
 	mSubRepetition = new RepetitionButton(i18n("Sub-Repetition"), true, ruleFrame);
-	mSubRepetition->setFixedSize(mSubRepetition->sizeHint());
+	mSubRepetition->setFixedSize(mSubRepetition->tqsizeHint());
 	mSubRepetition->setReadOnly(mReadOnly);
 	connect(mSubRepetition, TQT_SIGNAL(needsInitialisation()), TQT_SIGNAL(repeatNeedsInitialisation()));
 	connect(mSubRepetition, TQT_SIGNAL(changed()), TQT_SIGNAL(frequencyChanged()));
@@ -178,16 +178,16 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	lay->addSpacing(KDialog::spacingHint());
 	lay->addWidget(mSubRepetition);
 
-	lay = new TQVBoxLayout(layout);
+	lay = new TQVBoxLayout(tqlayout);
 
 	lay->addStretch();
-	layout = new TQHBoxLayout(lay);
+	tqlayout = new TQHBoxLayout(lay);
 
-	layout->addSpacing(KDialog::marginHint());
+	tqlayout->addSpacing(KDialog::marginHint());
 	TQFrame* divider = new TQFrame(ruleFrame);
 	divider->setFrameStyle(TQFrame::VLine | TQFrame::Sunken);
-	layout->addWidget(divider);
-	layout->addSpacing(KDialog::marginHint());
+	tqlayout->addWidget(divider);
+	tqlayout->addSpacing(KDialog::marginHint());
 
 	mNoRule       = new NoRule(ruleFrame, "noFrame");
 	mSubDailyRule = new SubDailyRule(mReadOnly, ruleFrame, "subdayFrame");
@@ -203,39 +203,39 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	connect(mYearlyRule, TQT_SIGNAL(frequencyChanged()), this, TQT_SIGNAL(frequencyChanged()));
 
 	mRuleStack = new TQWidgetStack(ruleFrame);
-	layout->addWidget(mRuleStack);
-	layout->addStretch(1);
+	tqlayout->addWidget(mRuleStack);
+	tqlayout->addStretch(1);
 	mRuleStack->addWidget(mNoRule, 0);
 	mRuleStack->addWidget(mSubDailyRule, 1);
 	mRuleStack->addWidget(mDailyRule, 2);
 	mRuleStack->addWidget(mWeeklyRule, 3);
 	mRuleStack->addWidget(mMonthlyRule, 4);
 	mRuleStack->addWidget(mYearlyRule, 5);
-	layout->addSpacing(KDialog::marginHint());
+	tqlayout->addSpacing(KDialog::marginHint());
 
-	// Create the recurrence range group which contains the controls
+	// Create the recurrence range group which tqcontains the controls
 	// which specify how long the recurrence is to last.
 
 	mRangeButtonGroup = new ButtonGroup(i18n("Recurrence End"), this, "mRangeButtonGroup");
 	connect(mRangeButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(rangeTypeClicked()));
 	topLayout->addWidget(mRangeButtonGroup);
 
-	TQVBoxLayout* vlayout = new TQVBoxLayout(mRangeButtonGroup, KDialog::marginHint(), KDialog::spacingHint());
-	vlayout->addSpacing(fontMetrics().lineSpacing()/2);
+	TQVBoxLayout* vtqlayout = new TQVBoxLayout(mRangeButtonGroup, KDialog::marginHint(), KDialog::spacingHint());
+	vtqlayout->addSpacing(fontMetrics().lineSpacing()/2);
 	mNoEndDateButton = new RadioButton(i18n("No &end"), mRangeButtonGroup);
-	mNoEndDateButton->setFixedSize(mNoEndDateButton->sizeHint());
+	mNoEndDateButton->setFixedSize(mNoEndDateButton->tqsizeHint());
 	mNoEndDateButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mNoEndDateButton, i18n("Repeat the alarm indefinitely"));
-	vlayout->addWidget(mNoEndDateButton, 1, Qt::AlignAuto);
+	vtqlayout->addWidget(mNoEndDateButton, 1, Qt::AlignAuto);
 	TQSize size = mNoEndDateButton->size();
 
-	layout = new TQHBoxLayout(vlayout, KDialog::spacingHint());
+	tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint());
 	mRepeatCountButton = new RadioButton(i18n("End a&fter:"), mRangeButtonGroup);
 	mRepeatCountButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mRepeatCountButton,
 	      i18n("Repeat the alarm for the number of times specified"));
 	mRepeatCountEntry = new SpinBox(1, 9999, 1, mRangeButtonGroup);
-	mRepeatCountEntry->setFixedSize(mRepeatCountEntry->sizeHint());
+	mRepeatCountEntry->setFixedSize(mRepeatCountEntry->tqsizeHint());
 	mRepeatCountEntry->setLineShiftStep(10);
 	mRepeatCountEntry->setSelectOnStep(false);
 	mRepeatCountEntry->setReadOnly(mReadOnly);
@@ -244,44 +244,44 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	      i18n("Enter the total number of times to trigger the alarm"));
 	mRepeatCountButton->setFocusWidget(mRepeatCountEntry);
 	mRepeatCountLabel = new TQLabel(i18n("occurrence(s)"), mRangeButtonGroup);
-	mRepeatCountLabel->setFixedSize(mRepeatCountLabel->sizeHint());
-	layout->addWidget(mRepeatCountButton);
-	layout->addSpacing(KDialog::spacingHint());
-	layout->addWidget(mRepeatCountEntry);
-	layout->addWidget(mRepeatCountLabel);
-	layout->addStretch();
-	size = size.expandedTo(mRepeatCountButton->sizeHint());
-
-	layout = new TQHBoxLayout(vlayout, KDialog::spacingHint());
+	mRepeatCountLabel->setFixedSize(mRepeatCountLabel->tqsizeHint());
+	tqlayout->addWidget(mRepeatCountButton);
+	tqlayout->addSpacing(KDialog::spacingHint());
+	tqlayout->addWidget(mRepeatCountEntry);
+	tqlayout->addWidget(mRepeatCountLabel);
+	tqlayout->addStretch();
+	size = size.expandedTo(mRepeatCountButton->tqsizeHint());
+
+	tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint());
 	mEndDateButton = new RadioButton(i18n("End &by:"), mRangeButtonGroup);
 	mEndDateButton->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mEndDateButton,
 	      i18n("Repeat the alarm until the date/time specified.\n\n"
 	           "Note: This applies to the main recurrence only. It does not limit any sub-repetition which will occur regardless after the last main recurrence."));
 	mEndDateEdit = new DateEdit(mRangeButtonGroup);
-	mEndDateEdit->setFixedSize(mEndDateEdit->sizeHint());
+	mEndDateEdit->setFixedSize(mEndDateEdit->tqsizeHint());
 	mEndDateEdit->setReadOnly(mReadOnly);
 	TQWhatsThis::add(mEndDateEdit,
 	      i18n("Enter the last date to repeat the alarm"));
 	mEndDateButton->setFocusWidget(mEndDateEdit);
 	mEndTimeEdit = new TimeEdit(mRangeButtonGroup);
-	mEndTimeEdit->setFixedSize(mEndTimeEdit->sizeHint());
+	mEndTimeEdit->setFixedSize(mEndTimeEdit->tqsizeHint());
 	mEndTimeEdit->setReadOnly(mReadOnly);
 	static const TQString lastTimeText = i18n("Enter the last time to repeat the alarm.");
 	TQWhatsThis::add(mEndTimeEdit, TQString("%1\n\n%2").arg(lastTimeText).arg(TimeSpinBox::shiftWhatsThis()));
 	mEndAnyTimeCheckBox = new CheckBox(i18n("Any time"), mRangeButtonGroup);
-	mEndAnyTimeCheckBox->setFixedSize(mEndAnyTimeCheckBox->sizeHint());
+	mEndAnyTimeCheckBox->setFixedSize(mEndAnyTimeCheckBox->tqsizeHint());
 	mEndAnyTimeCheckBox->setReadOnly(mReadOnly);
 	connect(mEndAnyTimeCheckBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAnyTimeToggled(bool)));
 	TQWhatsThis::add(mEndAnyTimeCheckBox,
 	      i18n("Stop repeating the alarm after your first login on or after the specified end date"));
-	layout->addWidget(mEndDateButton);
-	layout->addSpacing(KDialog::spacingHint());
-	layout->addWidget(mEndDateEdit);
-	layout->addWidget(mEndTimeEdit);
-	layout->addWidget(mEndAnyTimeCheckBox);
-	layout->addStretch();
-	size = size.expandedTo(mEndDateButton->sizeHint());
+	tqlayout->addWidget(mEndDateButton);
+	tqlayout->addSpacing(KDialog::spacingHint());
+	tqlayout->addWidget(mEndDateEdit);
+	tqlayout->addWidget(mEndTimeEdit);
+	tqlayout->addWidget(mEndAnyTimeCheckBox);
+	tqlayout->addStretch();
+	size = size.expandedTo(mEndDateButton->tqsizeHint());
 
 	// Line up the widgets to the right of the radio buttons
 	mRepeatCountButton->setFixedSize(size);
@@ -293,17 +293,17 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	mExceptionGroup = new TQGroupBox(i18n("E&xceptions"), this, "mExceptionGroup");
 	topLayout->addWidget(mExceptionGroup);
 	topLayout->setStretchFactor(mExceptionGroup, 2);
-	vlayout = new TQVBoxLayout(mExceptionGroup, KDialog::marginHint(), KDialog::spacingHint());
-	vlayout->addSpacing(fontMetrics().lineSpacing()/2);
-	layout = new TQHBoxLayout(vlayout, KDialog::spacingHint());
-	vlayout = new TQVBoxLayout(layout);
+	vtqlayout = new TQVBoxLayout(mExceptionGroup, KDialog::marginHint(), KDialog::spacingHint());
+	vtqlayout->addSpacing(fontMetrics().lineSpacing()/2);
+	tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint());
+	vtqlayout = new TQVBoxLayout(tqlayout);
 
 	mExceptionDateList = new TQListBox(mExceptionGroup);
-	mExceptionDateList->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+	mExceptionDateList->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
 	connect(mExceptionDateList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(enableExceptionButtons()));
 	TQWhatsThis::add(mExceptionDateList,
 	      i18n("The list of exceptions, i.e. dates/times excluded from the recurrence"));
-	vlayout->addWidget(mExceptionDateList);
+	vtqlayout->addWidget(mExceptionDateList);
 
 	if (mReadOnly)
 	{
@@ -313,36 +313,36 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
 	}
 	else
 	{
-		vlayout = new TQVBoxLayout(layout);
+		vtqlayout = new TQVBoxLayout(tqlayout);
 		mExceptionDateEdit = new DateEdit(mExceptionGroup);
-		mExceptionDateEdit->setFixedSize(mExceptionDateEdit->sizeHint());
-		mExceptionDateEdit->setDate(TQDate::currentDate());
+		mExceptionDateEdit->setFixedSize(mExceptionDateEdit->tqsizeHint());
+		mExceptionDateEdit->setDate(TQDate::tqcurrentDate());
 		TQWhatsThis::add(mExceptionDateEdit,
 		      i18n("Enter a date to insert in the exceptions list. "
 		           "Use in conjunction with the Add or Change button below."));
-		vlayout->addWidget(mExceptionDateEdit);
+		vtqlayout->addWidget(mExceptionDateEdit);
 
-		layout = new TQHBoxLayout(vlayout, KDialog::spacingHint());
+		tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint());
 		TQPushButton* button = new TQPushButton(i18n("Add"), mExceptionGroup);
-		button->setFixedSize(button->sizeHint());
+		button->setFixedSize(button->tqsizeHint());
 		connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addException()));
 		TQWhatsThis::add(button,
 		      i18n("Add the date entered above to the exceptions list"));
-		layout->addWidget(button);
+		tqlayout->addWidget(button);
 
 		mChangeExceptionButton = new TQPushButton(i18n("Change"), mExceptionGroup);
-		mChangeExceptionButton->setFixedSize(mChangeExceptionButton->sizeHint());
+		mChangeExceptionButton->setFixedSize(mChangeExceptionButton->tqsizeHint());
 		connect(mChangeExceptionButton, TQT_SIGNAL(clicked()), TQT_SLOT(changeException()));
 		TQWhatsThis::add(mChangeExceptionButton,
 		      i18n("Replace the currently highlighted item in the exceptions list with the date entered above"));
-		layout->addWidget(mChangeExceptionButton);
+		tqlayout->addWidget(mChangeExceptionButton);
 
 		mDeleteExceptionButton = new TQPushButton(i18n("Delete"), mExceptionGroup);
-		mDeleteExceptionButton->setFixedSize(mDeleteExceptionButton->sizeHint());
+		mDeleteExceptionButton->setFixedSize(mDeleteExceptionButton->tqsizeHint());
 		connect(mDeleteExceptionButton, TQT_SIGNAL(clicked()), TQT_SLOT(deleteException()));
 		TQWhatsThis::add(mDeleteExceptionButton,
 		      i18n("Remove the currently highlighted item from the exceptions list"));
-		layout->addWidget(mDeleteExceptionButton);
+		tqlayout->addWidget(mDeleteExceptionButton);
 	}
 
 	mNoEmitTypeChanged = false;
@@ -1029,30 +1029,30 @@ Rule::Rule(const TQString& freqText, const TQString& freqWhatsThis, bool time, b
 	box->setSpacing(KDialog::spacingHint());
 
 	TQLabel* label = new TQLabel(i18n("Recur e&very"), box);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	if (time)
 	{
 		mIntSpinBox = 0;
 		mSpinBox = mTimeSpinBox = new TimeSpinBox(1, 5999, box);
-		mTimeSpinBox->setFixedSize(mTimeSpinBox->sizeHint());
+		mTimeSpinBox->setFixedSize(mTimeSpinBox->tqsizeHint());
 		mTimeSpinBox->setReadOnly(readOnly);
 	}
 	else
 	{
 		mTimeSpinBox = 0;
 		mSpinBox = mIntSpinBox = new SpinBox(1, 999, 1, box);
-		mIntSpinBox->setFixedSize(mIntSpinBox->sizeHint());
+		mIntSpinBox->setFixedSize(mIntSpinBox->tqsizeHint());
 		mIntSpinBox->setReadOnly(readOnly);
 	}
 	connect(mSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(frequencyChanged()));
 	label->setBuddy(mSpinBox);
 	label = new TQLabel(freqText, box);
-	label->setFixedSize(label->sizeHint());
-	box->setFixedSize(sizeHint());
+	label->setFixedSize(label->tqsizeHint());
+	box->setFixedSize(tqsizeHint());
 	TQWhatsThis::add(box, freqWhatsThis);
 
 	new TQWidget(freqBox);     // left adjust the visible widgets
-	freqBox->setFixedHeight(freqBox->sizeHint().height());
+	freqBox->setFixedHeight(freqBox->tqsizeHint().height());
 	freqBox->setFocusProxy(mSpinBox);
 }
 
@@ -1112,11 +1112,11 @@ DayWeekRule::DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis
 	: Rule(freqText, freqWhatsThis, false, readOnly, parent, name),
 	  mSavedDays(7)
 {
-	TQGridLayout* grid = new TQGridLayout(layout(), 1, 4, KDialog::spacingHint());
+	TQGridLayout* grid = new TQGridLayout(tqlayout(), 1, 4, KDialog::spacingHint());
 	grid->setRowStretch(0, 1);
 
 	TQLabel* label = new TQLabel(i18n("On: Tuesday", "O&n:"), this);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	grid->addWidget(label, 0, 0, Qt::AlignRight | Qt::AlignTop);
 	grid->addColSpacing(1, KDialog::spacingHint());
 
@@ -1129,11 +1129,11 @@ DayWeekRule::DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis
 	{
 		int day = KAlarm::localeDayInWeek_to_weekDay(i);
 		mDayBox[i] = new CheckBox(calendar->weekDayName(day), box);
-		mDayBox[i]->setFixedSize(mDayBox[i]->sizeHint());
+		mDayBox[i]->setFixedSize(mDayBox[i]->tqsizeHint());
 		mDayBox[i]->setReadOnly(readOnly);
 		dgrid->addWidget(mDayBox[i], i%4, i/4, Qt::AlignAuto);
 	}
-	box->setFixedSize(box->sizeHint());
+	box->setFixedSize(box->tqsizeHint());
 	TQWhatsThis::add(box, daysWhatsThis);
 	grid->addWidget(box, 0, 2, Qt::AlignAuto);
 	label->setBuddy(mDayBox[0]);
@@ -1258,10 +1258,10 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats
 	// Month day selector
 	TQHBox* box = new TQHBox(this);
 	box->setSpacing(KDialog::spacingHint());
-	layout()->addWidget(box);
+	tqlayout()->addWidget(box);
 
 	mDayButton = new RadioButton(i18n("On day number in the month", "O&n day"), box);
-	mDayButton->setFixedSize(mDayButton->sizeHint());
+	mDayButton->setFixedSize(mDayButton->tqsizeHint());
 	mDayButton->setReadOnly(readOnly);
 	mDayButtonId = mButtonGroup->insert(mDayButton);
 	TQWhatsThis::add(mDayButton, i18n("Repeat the alarm on the selected day of the month"));
@@ -1271,22 +1271,22 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats
 	for (int i = 0;  i < 31;  ++i)
 		mDayCombo->insertItem(TQString::number(i + 1));
 	mDayCombo->insertItem(i18n("Last day of month", "Last"));
-	mDayCombo->setFixedSize(mDayCombo->sizeHint());
+	mDayCombo->setFixedSize(mDayCombo->tqsizeHint());
 	mDayCombo->setReadOnly(readOnly);
 	TQWhatsThis::add(mDayCombo, i18n("Select the day of the month on which to repeat the alarm"));
 	mDayButton->setFocusWidget(mDayCombo);
 	connect(mDayCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotDaySelected(int)));
 
 	box->setStretchFactor(new TQWidget(box), 1);    // left adjust the controls
-	box->setFixedHeight(box->sizeHint().height());
+	box->setFixedHeight(box->tqsizeHint().height());
 
 	// Month position selector
 	box = new TQHBox(this);
 	box->setSpacing(KDialog::spacingHint());
-	layout()->addWidget(box);
+	tqlayout()->addWidget(box);
 
 	mPosButton = new RadioButton(i18n("On the 1st Tuesday", "On t&he"), box);
-	mPosButton->setFixedSize(mPosButton->sizeHint());
+	mPosButton->setFixedSize(mPosButton->tqsizeHint());
 	mPosButton->setReadOnly(readOnly);
 	mPosButtonId = mButtonGroup->insert(mPosButton);
 	TQWhatsThis::add(mPosButton,
@@ -1309,7 +1309,7 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats
 		mWeekCombo->setSizeLimit(11);
 	}
 	TQWhatsThis::add(mWeekCombo, i18n("Select the week of the month in which to repeat the alarm"));
-	mWeekCombo->setFixedSize(mWeekCombo->sizeHint());
+	mWeekCombo->setFixedSize(mWeekCombo->tqsizeHint());
 	mWeekCombo->setReadOnly(readOnly);
 	mPosButton->setFocusWidget(mWeekCombo);
 
@@ -1324,7 +1324,7 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats
 	TQWhatsThis::add(mDayOfWeekCombo, i18n("Select the day of the week on which to repeat the alarm"));
 
 	box->setStretchFactor(new TQWidget(box), 1);    // left adjust the controls
-	box->setFixedHeight(box->sizeHint().height());
+	box->setFixedHeight(box->tqsizeHint().height());
 	connect(mButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(clicked(int)));
 }
 
@@ -1456,47 +1456,47 @@ YearlyRule::YearlyRule(bool readOnly, TQWidget* parent, const char* name)
 	       true, readOnly, parent, name)
 {
 	// Set up the month selection widgets
-	TQBoxLayout* hlayout = new TQHBoxLayout(layout(), KDialog::spacingHint());
+	TQBoxLayout* htqlayout = new TQHBoxLayout(tqlayout(), KDialog::spacingHint());
 	TQLabel* label = new TQLabel(i18n("List of months to select", "Months:"), this);
-	label->setFixedSize(label->sizeHint());
-	hlayout->addWidget(label, 0, Qt::AlignAuto | Qt::AlignTop);
+	label->setFixedSize(label->tqsizeHint());
+	htqlayout->addWidget(label, 0, Qt::AlignAuto | Qt::AlignTop);
 
 	// List the months of the year.
 	TQWidget* w = new TQWidget(this);   // this is to control the TQWhatsThis text display area
-	hlayout->addWidget(w, 1, Qt::AlignAuto);
+	htqlayout->addWidget(w, 1, Qt::AlignAuto);
 	TQGridLayout* grid = new TQGridLayout(w, 4, 3, 0, KDialog::spacingHint());
 	const KCalendarSystem* calendar = KGlobal::locale()->calendar();
-	int year = TQDate::currentDate().year();
+	int year = TQDate::tqcurrentDate().year();
 	for (int i = 0;  i < 12;  ++i)
 	{
 		mMonthBox[i] = new CheckBox(calendar->monthName(i + 1, year, true), w);
-		mMonthBox[i]->setFixedSize(mMonthBox[i]->sizeHint());
+		mMonthBox[i]->setFixedSize(mMonthBox[i]->tqsizeHint());
 		mMonthBox[i]->setReadOnly(readOnly);
 		grid->addWidget(mMonthBox[i], i%3, i/3, Qt::AlignAuto);
 	}
 	connect(mMonthBox[1], TQT_SIGNAL(toggled(bool)), TQT_SLOT(enableFeb29()));
-	w->setFixedHeight(w->sizeHint().height());
+	w->setFixedHeight(w->tqsizeHint().height());
 	TQWhatsThis::add(w, i18n("Select the months of the year in which to repeat the alarm"));
 
 	// February 29th handling option
 	TQHBox* f29box = new TQHBox(this);
-	layout()->addWidget(f29box);
+	tqlayout()->addWidget(f29box);
 	TQHBox* box = new TQHBox(f29box);    // this is to control the TQWhatsThis text display area
 	box->setSpacing(KDialog::spacingHint());
 	mFeb29Label = new TQLabel(i18n("February 2&9th alarm in non-leap years:"), box);
-	mFeb29Label->setFixedSize(mFeb29Label->sizeHint());
+	mFeb29Label->setFixedSize(mFeb29Label->tqsizeHint());
 	mFeb29Combo = new ComboBox(false, box);
 	mFeb29Combo->insertItem(i18n("No date", "None"));
 	mFeb29Combo->insertItem(i18n("1st March (short form)", "1 Mar"));
 	mFeb29Combo->insertItem(i18n("28th February (short form)", "28 Feb"));
-	mFeb29Combo->setFixedSize(mFeb29Combo->sizeHint());
+	mFeb29Combo->setFixedSize(mFeb29Combo->tqsizeHint());
 	mFeb29Combo->setReadOnly(readOnly);
 	mFeb29Label->setBuddy(mFeb29Combo);
-	box->setFixedSize(box->sizeHint());
+	box->setFixedSize(box->tqsizeHint());
 	TQWhatsThis::add(box,
 	      i18n("Select which date, if any, the February 29th alarm should trigger in non-leap years"));
 	new TQWidget(f29box);     // left adjust the visible widgets
-	f29box->setFixedHeight(f29box->sizeHint().height());
+	f29box->setFixedHeight(f29box->tqsizeHint().height());
 }
 
 void YearlyRule::setDefaultValues(int dayOfMonth, int dayOfWeek, int month)
diff --git a/kalarm/recurrenceeditprivate.h b/kalarm/recurrenceeditprivate.h
index 47dfaa6c..51a7085d 100644
--- a/kalarm/recurrenceeditprivate.h
+++ b/kalarm/recurrenceeditprivate.h
@@ -53,7 +53,7 @@ class Rule : public NoRule
 		int              frequency() const;
 		void             setFrequency(int);
 		virtual void     setFrequencyFocus()     { mSpinBox->setFocus(); }
-		TQVBoxLayout*     layout() const          { return mLayout; }
+		TQVBoxLayout*     tqlayout() const          { return mLayout; }
 		virtual TQWidget* validate(TQString&)      { return 0; }
 		virtual void     saveState();
 		virtual bool     stateChanged() const;
diff --git a/kalarm/reminder.cpp b/kalarm/reminder.cpp
index 60c60336..e10e04e2 100644
--- a/kalarm/reminder.cpp
+++ b/kalarm/reminder.cpp
@@ -51,19 +51,19 @@ Reminder::Reminder(const TQString& caption, const TQString& reminderWhatsThis, c
 
 	mTime = new TimeSelector(caption, i18n("in advance"), reminderWhatsThis,
 	                       valueWhatsThis, allowHourMinute, this, "timeOption");
-	mTime->setFixedSize(mTime->sizeHint());
+	mTime->setFixedSize(mTime->tqsizeHint());
 	connect(mTime, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotReminderToggled(bool)));
 	topLayout->addWidget(mTime);
 
 	if (showOnceOnly)
 	{
-		TQBoxLayout* layout = new TQHBoxLayout(topLayout, KDialog::spacingHint());
-		layout->addSpacing(3*KDialog::spacingHint());
+		TQBoxLayout* tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint());
+		tqlayout->addSpacing(3*KDialog::spacingHint());
 		mOnceOnly = new CheckBox(i18n_u_first_recurrence_only(), this);
-		mOnceOnly->setFixedSize(mOnceOnly->sizeHint());
+		mOnceOnly->setFixedSize(mOnceOnly->tqsizeHint());
 		TQWhatsThis::add(mOnceOnly, i18n("Display the reminder only before the first time the alarm is scheduled"));
-		layout->addWidget(mOnceOnly);
-		layout->addStretch();
+		tqlayout->addWidget(mOnceOnly);
+		tqlayout->addStretch();
 	}
 	else
 		mOnceOnly = 0;
diff --git a/kalarm/repetition.cpp b/kalarm/repetition.cpp
index 2df20130..b2241b71 100644
--- a/kalarm/repetition.cpp
+++ b/kalarm/repetition.cpp
@@ -165,7 +165,7 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p
 	                       "checking this option makes the alarm trigger multiple times at each recurrence."),
 	                  i18n("Enter the time between repetitions of the alarm"),
 	                  true, page);
-	mTimeSelector->setFixedSize(mTimeSelector->sizeHint());
+	mTimeSelector->setFixedSize(mTimeSelector->tqsizeHint());
 	connect(mTimeSelector, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(intervalChanged(int)));
 	connect(mTimeSelector, TQT_SIGNAL(toggled(bool)), TQT_SLOT(repetitionToggled(bool)));
 	topLayout->addWidget(mTimeSelector, 0, Qt::AlignAuto);
@@ -174,38 +174,38 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p
 	connect(mButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(typeClicked()));
 	topLayout->addWidget(mButtonGroup);
 
-	TQBoxLayout* vlayout = new TQVBoxLayout(mButtonGroup, marginHint(), spacing);
-	TQBoxLayout* layout = new TQHBoxLayout(vlayout, spacing);
+	TQBoxLayout* vtqlayout = new TQVBoxLayout(mButtonGroup, marginHint(), spacing);
+	TQBoxLayout* tqlayout = new TQHBoxLayout(vtqlayout, spacing);
 	mCountButton = new RadioButton(i18n("&Number of repetitions:"), mButtonGroup);
-	mCountButton->setFixedSize(mCountButton->sizeHint());
+	mCountButton->setFixedSize(mCountButton->tqsizeHint());
 	TQWhatsThis::add(mCountButton,
 	      i18n("Check to specify the number of times the alarm should repeat after each recurrence"));
-	layout->addWidget(mCountButton);
+	tqlayout->addWidget(mCountButton);
 	mCount = new SpinBox(1, MAX_COUNT, 1, mButtonGroup);
-	mCount->setFixedSize(mCount->sizeHint());
+	mCount->setFixedSize(mCount->tqsizeHint());
 	mCount->setLineShiftStep(10);
 	mCount->setSelectOnStep(false);
 	connect(mCount, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(countChanged(int)));
 	TQWhatsThis::add(mCount,
 	      i18n("Enter the number of times to trigger the alarm after its initial occurrence"));
-	layout->addWidget(mCount);
+	tqlayout->addWidget(mCount);
 	mCountButton->setFocusWidget(mCount);
-	layout->addStretch();
+	tqlayout->addStretch();
 
-	layout = new TQHBoxLayout(vlayout, spacing);
+	tqlayout = new TQHBoxLayout(vtqlayout, spacing);
 	mDurationButton = new RadioButton(i18n("&Duration:"), mButtonGroup);
-	mDurationButton->setFixedSize(mDurationButton->sizeHint());
+	mDurationButton->setFixedSize(mDurationButton->tqsizeHint());
 	TQWhatsThis::add(mDurationButton,
 	      i18n("Check to specify how long the alarm is to be repeated"));
-	layout->addWidget(mDurationButton);
+	tqlayout->addWidget(mDurationButton);
 	mDuration = new TimePeriod(true, mButtonGroup);
-	mDuration->setFixedSize(mDuration->sizeHint());
+	mDuration->setFixedSize(mDuration->tqsizeHint());
 	connect(mDuration, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(durationChanged(int)));
 	TQWhatsThis::add(mDuration,
 	      i18n("Enter the length of time to repeat the alarm"));
-	layout->addWidget(mDuration);
+	tqlayout->addWidget(mDuration);
 	mDurationButton->setFocusWidget(mDuration);
-	layout->addStretch();
+	tqlayout->addStretch();
 
 	mCountButton->setChecked(true);
 	repetitionToggled(false);
diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp
index 2df7542b..691ba936 100644
--- a/kalarm/sounddlg.cpp
+++ b/kalarm/sounddlg.cpp
@@ -78,14 +78,14 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad
 {
 	TQWidget* page = new TQWidget(this);
 	setMainWidget(page);
-	TQVBoxLayout* layout = new TQVBoxLayout(page, 0, spacingHint());
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(page, 0, spacingHint());
 
 	// File play button
 	TQHBox* box = new TQHBox(page);
-	layout->addWidget(box);
+	tqlayout->addWidget(box);
 	mFilePlay = new TQPushButton(box);
 	mFilePlay->setPixmap(SmallIcon("player_play"));
-	mFilePlay->setFixedSize(mFilePlay->sizeHint());
+	mFilePlay->setFixedSize(mFilePlay->tqsizeHint());
 	connect(mFilePlay, TQT_SIGNAL(clicked()), TQT_SLOT(playSound()));
 	TQToolTip::add(mFilePlay, i18n("Test the sound"));
 	TQWhatsThis::add(mFilePlay, i18n("Play the selected sound file."));
@@ -98,36 +98,36 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad
 	// File browse button
 	mFileBrowseButton = new PushButton(box);
 	mFileBrowseButton->setPixmap(SmallIcon("fileopen"));
-	mFileBrowseButton->setFixedSize(mFileBrowseButton->sizeHint());
+	mFileBrowseButton->setFixedSize(mFileBrowseButton->tqsizeHint());
 	connect(mFileBrowseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotPickFile()));
 	TQToolTip::add(mFileBrowseButton, i18n("Choose a file"));
 	TQWhatsThis::add(mFileBrowseButton, i18n("Select a sound file to play."));
 
 	// Sound repetition checkbox
 	mRepeatCheckbox = new CheckBox(i18n_p_Repeat(), page);
-	mRepeatCheckbox->setFixedSize(mRepeatCheckbox->sizeHint());
+	mRepeatCheckbox->setFixedSize(mRepeatCheckbox->tqsizeHint());
 	TQWhatsThis::add(mRepeatCheckbox,
 	      i18n("If checked, the sound file will be played repeatedly for as long as the message is displayed."));
-	layout->addWidget(mRepeatCheckbox);
+	tqlayout->addWidget(mRepeatCheckbox);
 
 	// Volume
 	TQGroupBox* group = new TQGroupBox(i18n("Volume"), page);
-	layout->addWidget(group);
+	tqlayout->addWidget(group);
 	TQGridLayout* grid = new TQGridLayout(group, 4, 3, marginHint(), spacingHint());
 	grid->addRowSpacing(0, fontMetrics().height() - marginHint() + spacingHint());
 	grid->setColStretch(2, 1);
 	int indentWidth = 3 * KDialog::spacingHint();
 	grid->addColSpacing(0, indentWidth);
 	grid->addColSpacing(1, indentWidth);
-	// Get alignment to use in TQGridLayout (AlignAuto doesn't work correctly there)
-	int alignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft;
+	// Get tqalignment to use in TQGridLayout (AlignAuto doesn't work correctly there)
+	int tqalignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft;
 
 	// 'Set volume' checkbox
 	box = new TQHBox(group);
 	box->setSpacing(spacingHint());
 	grid->addMultiCellWidget(box, 1, 1, 0, 2);
 	mVolumeCheckbox = new CheckBox(i18n_v_SetVolume(), box);
-	mVolumeCheckbox->setFixedSize(mVolumeCheckbox->sizeHint());
+	mVolumeCheckbox->setFixedSize(mVolumeCheckbox->tqsizeHint());
 	connect(mVolumeCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotVolumeToggled(bool)));
 	TQWhatsThis::add(mVolumeCheckbox,
 	      i18n("Select to choose the volume for playing the sound file."));
@@ -136,30 +136,30 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad
 	mVolumeSlider = new Slider(0, 100, 10, 0, Qt::Horizontal, box);
 	mVolumeSlider->setTickmarks(TQSlider::Below);
 	mVolumeSlider->setTickInterval(10);
-	mVolumeSlider->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
+	mVolumeSlider->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
 	TQWhatsThis::add(mVolumeSlider, i18n("Choose the volume for playing the sound file."));
 	mVolumeCheckbox->setFocusWidget(mVolumeSlider);
 
 	// Fade checkbox
 	mFadeCheckbox = new CheckBox(i18n("Fade"), group);
-	mFadeCheckbox->setFixedSize(mFadeCheckbox->sizeHint());
+	mFadeCheckbox->setFixedSize(mFadeCheckbox->tqsizeHint());
 	connect(mFadeCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotFadeToggled(bool)));
 	TQWhatsThis::add(mFadeCheckbox,
 	      i18n("Select to fade the volume when the sound file first starts to play."));
-	grid->addMultiCellWidget(mFadeCheckbox, 2, 2, 1, 2, alignment);
+	grid->addMultiCellWidget(mFadeCheckbox, 2, 2, 1, 2, tqalignment);
 
 	// Fade time
 	mFadeBox = new TQHBox(group);
 	mFadeBox->setSpacing(spacingHint());
-	grid->addWidget(mFadeBox, 3, 2, alignment);
+	grid->addWidget(mFadeBox, 3, 2, tqalignment);
 	TQLabel* label = new TQLabel(i18n("Time period over which to fade the sound", "Fade time:"), mFadeBox);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	mFadeTime = new SpinBox(1, 999, 1, mFadeBox);
 	mFadeTime->setLineShiftStep(10);
-	mFadeTime->setFixedSize(mFadeTime->sizeHint());
+	mFadeTime->setFixedSize(mFadeTime->tqsizeHint());
 	label->setBuddy(mFadeTime);
 	label = new TQLabel(i18n("seconds"), mFadeBox);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	TQWhatsThis::add(mFadeBox, i18n("Enter how many seconds to fade the sound before reaching the set volume."));
 
 	// Fade slider
@@ -167,11 +167,11 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad
 	mFadeVolumeBox->setSpacing(spacingHint());
 	grid->addWidget(mFadeVolumeBox, 4, 2);
 	label = new TQLabel(i18n("Initial volume:"), mFadeVolumeBox);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	mFadeSlider = new Slider(0, 100, 10, 0, Qt::Horizontal, mFadeVolumeBox);
 	mFadeSlider->setTickmarks(TQSlider::Below);
 	mFadeSlider->setTickInterval(10);
-	mFadeSlider->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
+	mFadeSlider->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
 	label->setBuddy(mFadeSlider);
 	TQWhatsThis::add(mFadeVolumeBox, i18n("Choose the initial volume for playing the sound file."));
 
@@ -412,7 +412,7 @@ bool SoundDlg::checkFile()
 #endif
 	{
 		// It's a relative path.
-		// Find the first sound resource that contains files.
+		// Find the first sound resource that tqcontains files.
 		TQStringList soundDirs = KGlobal::dirs()->resourceDirs("sound");
 		if (!soundDirs.isEmpty())
 		{
diff --git a/kalarm/soundpicker.cpp b/kalarm/soundpicker.cpp
index cd40a778..ec09c2b8 100644
--- a/kalarm/soundpicker.cpp
+++ b/kalarm/soundpicker.cpp
@@ -64,7 +64,7 @@ SoundPicker::SoundPicker(TQWidget* parent, const char* name)
 	mTypeBox->setSpacing(KDialog::spacingHint());
 
 	TQLabel* label = new TQLabel(i18n("An audio sound", "&Sound:"), mTypeBox);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 
 	// Sound type combo box
 	// The order of combo box entries must correspond with the 'Type' enum.
@@ -81,7 +81,7 @@ SoundPicker::SoundPicker(TQWidget* parent, const char* name)
 	// Sound file picker button
 	mFilePicker = new PushButton(this);
 	mFilePicker->setPixmap(SmallIcon("playsound"));
-	mFilePicker->setFixedSize(mFilePicker->sizeHint());
+	mFilePicker->setFixedSize(mFilePicker->tqsizeHint());
 	connect(mFilePicker, TQT_SIGNAL(clicked()), TQT_SLOT(slotPickFile()));
 	TQToolTip::add(mFilePicker, i18n("Configure sound file"));
 	TQWhatsThis::add(mFilePicker, i18n("Configure a sound file to play when the alarm is displayed."));
@@ -283,7 +283,7 @@ TQString SoundPicker::browseFile(TQString& defaultDir, const TQString& initialFi
 		defaultDir = kdeSoundDir;
 	}
 #ifdef WITHOUT_ARTS
-	TQString filter = TQString::fromLatin1("*.wav *.mp3 *.ogg|%1\n*|%2").arg(i18n("Sound Files")).arg(i18n("All Files"));
+	TQString filter = TQString::tqfromLatin1("*.wav *.mp3 *.ogg|%1\n*|%2").arg(i18n("Sound Files")).arg(i18n("All Files"));
 #else
 	TQStringList filters = KDE::PlayObjectFactory::mimeTypes();
 	TQString filter = filters.join(" ");
diff --git a/kalarm/specialactions.cpp b/kalarm/specialactions.cpp
index ed855585..fabff6ed 100644
--- a/kalarm/specialactions.cpp
+++ b/kalarm/specialactions.cpp
@@ -95,12 +95,12 @@ SpecialActionsDlg::SpecialActionsDlg(const TQString& preAction, const TQString&
 {
 	TQWidget* page = new TQWidget(this);
 	setMainWidget(page);
-	TQVBoxLayout* layout = new TQVBoxLayout(page, 0, spacingHint());
+	TQVBoxLayout* tqlayout = new TQVBoxLayout(page, 0, spacingHint());
 
 	mActions = new SpecialActions(page);
 	mActions->setActions(preAction, postAction);
-	layout->addWidget(mActions);
-	layout->addSpacing(KDialog::spacingHint());
+	tqlayout->addWidget(mActions);
+	tqlayout->addSpacing(KDialog::spacingHint());
 
 	TQSize s;
 	if (KAlarm::readConfigWindowSize(SPEC_ACT_DIALOG_NAME, s))
@@ -142,7 +142,7 @@ SpecialActions::SpecialActions(TQWidget* parent, const char* name)
 
 	// Pre-alarm action
 	TQLabel* label = new TQLabel(i18n("Pre-a&larm action:"), this);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	topLayout->addWidget(label, 0, Qt::AlignAuto);
 
 	mPreAction = new KLineEdit(this);
@@ -156,7 +156,7 @@ SpecialActions::SpecialActions(TQWidget* parent, const char* name)
 
 	// Post-alarm action
 	label = new TQLabel(i18n("Post-alar&m action:"), this);
-	label->setFixedSize(label->sizeHint());
+	label->setFixedSize(label->tqsizeHint());
 	topLayout->addWidget(label, 0, Qt::AlignAuto);
 
 	mPostAction = new KLineEdit(this);
diff --git a/kalarm/templatedlg.cpp b/kalarm/templatedlg.cpp
index f586f2e7..dab8b45d 100644
--- a/kalarm/templatedlg.cpp
+++ b/kalarm/templatedlg.cpp
@@ -50,34 +50,34 @@ TemplateDlg::TemplateDlg(TQWidget* parent, const char* name)
 	TQBoxLayout* topLayout = new TQHBoxLayout(topWidget);
 	topLayout->setSpacing(spacingHint());
 
-	TQBoxLayout* layout = new TQVBoxLayout(topLayout);
+	TQBoxLayout* tqlayout = new TQVBoxLayout(topLayout);
 	mTemplateList = new TemplateListView(true, i18n("The list of alarm templates"), topWidget);
 	mTemplateList->setSelectionMode(TQListView::Extended);
-	mTemplateList->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+	mTemplateList->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
 	connect(mTemplateList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged()));
-	layout->addWidget(mTemplateList);
+	tqlayout->addWidget(mTemplateList);
 
-	layout = new TQVBoxLayout(topLayout);
+	tqlayout = new TQVBoxLayout(topLayout);
 	TQPushButton* button = new TQPushButton(i18n("&New..."), topWidget);
 	connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(slotNew()));
 	TQWhatsThis::add(button, i18n("Create a new alarm template"));
-	layout->addWidget(button);
+	tqlayout->addWidget(button);
 
 	mEditButton = new TQPushButton(i18n("&Edit..."), topWidget);
 	connect(mEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit()));
 	TQWhatsThis::add(mEditButton, i18n("Edit the currently highlighted alarm template"));
-	layout->addWidget(mEditButton);
+	tqlayout->addWidget(mEditButton);
 
 	mCopyButton = new TQPushButton(i18n("Co&py"), topWidget);
 	connect(mCopyButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotCopy()));
 	TQWhatsThis::add(mCopyButton,
 	      i18n("Create a new alarm template based on a copy of the currently highlighted template"));
-	layout->addWidget(mCopyButton);
+	tqlayout->addWidget(mCopyButton);
 
 	mDeleteButton = new TQPushButton(i18n("&Delete"), topWidget);
 	connect(mDeleteButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDelete()));
 	TQWhatsThis::add(mDeleteButton, i18n("Delete the currently highlighted alarm template"));
-	layout->addWidget(mDeleteButton);
+	tqlayout->addWidget(mDeleteButton);
 
 	KAccel* accel = new KAccel(this);
 	accel->insert(KStdAccel::SelectAll, mTemplateList, TQT_SLOT(slotSelectAll()));
diff --git a/kalarm/timeselector.cpp b/kalarm/timeselector.cpp
index 9ec5c981..31e69d74 100644
--- a/kalarm/timeselector.cpp
+++ b/kalarm/timeselector.cpp
@@ -41,18 +41,18 @@ TimeSelector::TimeSelector(const TQString& selectText, const TQString& postfix,
 {
 	setFrameStyle(TQFrame::NoFrame);
 	TQVBoxLayout* topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
-	TQHBoxLayout* layout = new TQHBoxLayout(topLayout, KDialog::spacingHint());
+	TQHBoxLayout* tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint());
 	mSelect = new CheckBox(selectText, this);
-	mSelect->setFixedSize(mSelect->sizeHint());
+	mSelect->setFixedSize(mSelect->tqsizeHint());
 	connect(mSelect, TQT_SIGNAL(toggled(bool)), TQT_SLOT(selectToggled(bool)));
 	TQWhatsThis::add(mSelect, selectWhatsThis);
-	layout->addWidget(mSelect);
+	tqlayout->addWidget(mSelect);
 
 	TQHBox* box = new TQHBox(this);    // to group widgets for TQWhatsThis text
 	box->setSpacing(KDialog::spacingHint());
-	layout->addWidget(box);
+	tqlayout->addWidget(box);
 	mPeriod = new TimePeriod(allowHourMinute, box);
-	mPeriod->setFixedSize(mPeriod->sizeHint());
+	mPeriod->setFixedSize(mPeriod->tqsizeHint());
 	mPeriod->setSelectOnStep(false);
 	connect(mPeriod, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(periodChanged(int)));
 	mSelect->setFocusWidget(mPeriod);
diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp
index 14ee6bf4..41fd9e4d 100644
--- a/kalarm/traywindow.cpp
+++ b/kalarm/traywindow.cpp
@@ -226,7 +226,7 @@ void TrayWindow::tooltipAlarmText(TQString& text) const
 	KAEvent event;
 	const TQString& prefix = Preferences::tooltipTimeToPrefix();
 	int maxCount = Preferences::tooltipAlarmCount();
-	TQDateTime now = TQDateTime::currentDateTime();
+	TQDateTime now = TQDateTime::tqcurrentDateTime();
 
 	// Get today's and tomorrow's alarms, sorted in time order
 	TQValueList<TipItem> items;
@@ -348,7 +348,7 @@ bool TrayWindow::inSystemTray() const
 */
 void TrayTooltip::maybeTip(const TQPoint&)
 {
-	TrayWindow* parent = (TrayWindow*)parentWidget();
+	TrayWindow* parent = (TrayWindow*)tqparentWidget();
 	TQString text;
 	if (Daemon::monitoringAlarms())
 		text = kapp->aboutData()->programName();
diff --git a/kalarm/undo.cpp b/kalarm/undo.cpp
index 8d6a46a3..e1998e9c 100644
--- a/kalarm/undo.cpp
+++ b/kalarm/undo.cpp
@@ -68,7 +68,7 @@ class UndoItem
 		UndoItem(Undo::Type);
 		static TQString    addDeleteActionText(KAEvent::Status, bool add);
 		TQString           description(const KAEvent&) const;
-		void              replaceWith(UndoItem* item)   { Undo::replace(this, item); }
+		void              tqreplaceWith(UndoItem* item)   { Undo::tqreplace(this, item); }
 
 		int               mId;     // unique identifier (only for mType = UNDO, REDO)
 		Undo::Type        mType;   // which list (if any) the object is in
@@ -298,7 +298,7 @@ void Undo::removeRedos(const TQString& eventID)
 		{
 			if (item->deleteID(id))
 			{
-				// The old multi-redo was replaced with a new single redo
+				// The old multi-redo was tqreplaced with a new single redo
 				delete item;
 			}
 			++it;
@@ -398,7 +398,7 @@ void Undo::remove(UndoItem* item, bool undo)
 /******************************************************************************
 *  Replace an undo item in one of the lists.
 */
-void Undo::replace(UndoItem* old, UndoItem* New)
+void Undo::tqreplace(UndoItem* old, UndoItem* New)
 {
 	Type type = old->type();
 	List* list = (type == UNDO) ? &mUndoList : (type == REDO) ? &mRedoList : 0;
@@ -654,8 +654,8 @@ UndoItem* UndoMulti<T>::restore()
 /******************************************************************************
 *  If one of the multiple items has the specified ID, delete it.
 *  If an item is deleted and there is only one item left, the UndoMulti
-*  instance is removed from its list and replaced by the remaining UndoItem instead.
-*  Reply = true if this instance was replaced. The caller must delete it.
+*  instance is removed from its list and tqreplaced by the remaining UndoItem instead.
+*  Reply = true if this instance was tqreplaced. The caller must delete it.
 *        = false otherwise.
 */
 template <class T>
@@ -672,7 +672,7 @@ bool UndoMulti<T>::deleteID(const TQString& id)
 			{
 				// There is only one entry left after removal.
 				// Replace 'this' multi instance with the remaining single entry.
-				replaceWith(item);
+				tqreplaceWith(item);
 				return true;
 			}
 			else
diff --git a/kalarm/undo.h b/kalarm/undo.h
index 0af18153..cca197f8 100644
--- a/kalarm/undo.h
+++ b/kalarm/undo.h
@@ -70,7 +70,7 @@ class Undo : public QObject
 		// Methods for use by UndoItem class
 		static void        add(UndoItem*, bool undo);
 		static void        remove(UndoItem*, bool undo);
-		static void        replace(UndoItem* old, UndoItem* New);
+		static void        tqreplace(UndoItem* old, UndoItem* New);
 
 	private:
 		typedef TQValueList<UndoItem*>::Iterator Iterator;
diff --git a/kandy/src/cmdpropertiesdialog_base.ui b/kandy/src/cmdpropertiesdialog_base.ui
index 092074c6..7231a6be 100644
--- a/kandy/src/cmdpropertiesdialog_base.ui
+++ b/kandy/src/cmdpropertiesdialog_base.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>CmdPropertiesDialog_base</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -110,7 +110,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>79</width>
                     <height>20</height>
@@ -168,5 +168,5 @@
     <slot>editParameterName(QListViewItem *)</slot>
     <slot access="protected">slotAccept()</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kandy/src/mobilegui.cpp b/kandy/src/mobilegui.cpp
index 86f07514..fec40b7f 100644
--- a/kandy/src/mobilegui.cpp
+++ b/kandy/src/mobilegui.cpp
@@ -430,7 +430,7 @@ void MobileGui::writePhonebook()
 void MobileGui::writePhonebookPostProcessing()
 {
   mLastWriteId = "";
-  emit transientStatusMessage( i18n( "Wrote mobile phonebook." ) );
+  emit transienStatusMessage( i18n( "Wrote mobile phonebook." ) );
   PushButton12->setEnabled( true );
   setMobState( LOADED );
   updateMobileBook();
@@ -640,7 +640,7 @@ void MobileGui::readKabc()
   // Display KAB entries
   updateKabBook();
   
-  emit transientStatusMessage( i18n( "Read KDE address book." ) );
+  emit transienStatusMessage( i18n( "Read KDE address book." ) );
   
   setKabState( LOADED );
 }
@@ -922,7 +922,7 @@ void MobileGui::writeKabc()
         *fields = TQStringList::split( ',', name );
 	
 	if ( fields->count() > 1 ) {
-	  // Name string contains comma separated entry so that we
+	  // Name string tqcontains comma separated entry so that we
 	  // need to build family and given names out of them.
 	  TQString givenName = "";
 	  
@@ -933,7 +933,7 @@ void MobileGui::writeKabc()
 	    givenName += stripWhiteSpaces( (*fields)[ i ] ) + " ";
 	  entry.setGivenName( stripWhiteSpaces( givenName ) );
 	} else
-	  // Name string contains only one string without comma.
+	  // Name string tqcontains only one string without comma.
 	  entry.setFamilyName( stripWhiteSpaces( name ) );
 
         entry.insertPhoneNumber( KABC::PhoneNumber( phoneNumber, phoneType ) );
@@ -948,7 +948,7 @@ void MobileGui::writeKabc()
   
   addressBook->save( ticket );
   
-  emit transientStatusMessage( i18n( "Wrote KDE address book." ) );
+  emit transienStatusMessage( i18n( "Wrote KDE address book." ) );
   
   setKabState( LOADED );
 }
@@ -1159,7 +1159,7 @@ void MobileGui::fillPhonebook( ATCommand *cmd )
   // Display mobile entries
   updateMobileBook();
 
-  emit transientStatusMessage(i18n("Read mobile phonebook."));
+  emit transienStatusMessage(i18n("Read mobile phonebook."));
   emit phonebookRead();
   
   setMobState( LOADED );
@@ -1398,7 +1398,7 @@ void MobileGui::mergePhonebooks()
   updateKabBook();
   updateMobileBook();
 
-  emit transientStatusMessage( i18n( "Synced phonebooks." ) );
+  emit transienStatusMessage( i18n( "Synced phonebooks." ) );
   PushButton8_3->setEnabled( true );
 }
 
@@ -1561,7 +1561,7 @@ void MobileGui::warnKabState( ABState newState )
 {
   if ( ( mKabState == MODIFIED ) && ( newState != MODIFIED ) ) {
     TQString text = "<qt><b>" + i18n( "Warning" ) + "</b><br>";
-    text += i18n( "The KDE address book contains unsaved changes." ) +
+    text += i18n( "The KDE address book tqcontains unsaved changes." ) +
             "<br></qt>";
       
     TQMessageBox *msg = new TQMessageBox( i18n( "Unsaved Changes" ), text,
@@ -1646,7 +1646,7 @@ bool MobileGui::warnMobState( ABState newState )
   if ( ( mMobState == MODIFIED ) && ( newState != MODIFIED ) )
   {
     TQString text = "<qt><b>" + i18n( "Warning" ) + "</b><br>";
-    text += i18n( "The mobile phone book contains unsaved changes." ) +
+    text += i18n( "The mobile phone book tqcontains unsaved changes." ) +
             "<br></qt>";
       
     TQMessageBox *msg = new TQMessageBox( i18n( "Unsaved Changes" ), text,
diff --git a/kandy/src/mobilegui.h b/kandy/src/mobilegui.h
index 2d0f3b07..de698729 100644
--- a/kandy/src/mobilegui.h
+++ b/kandy/src/mobilegui.h
@@ -52,7 +52,7 @@ class MobileGui : public MobileGui_base, virtual public KandyIface
     void phonebookRead();
 
     void statusMessage( const TQString & );
-    void transientStatusMessage( const TQString & );
+    void transienStatusMessage( const TQString & );
     void connectModem();
     void disconnectModem();
 
diff --git a/kandy/src/mobilegui_base.ui b/kandy/src/mobilegui_base.ui
index 6361e547..9379abab 100644
--- a/kandy/src/mobilegui_base.ui
+++ b/kandy/src/mobilegui_base.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>MobileGui_base</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -124,7 +124,7 @@
                     <property name="sizeType">
                 	<enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                 	<size>
                 	    <width>20</width>
                 	    <height>20</height>
@@ -207,7 +207,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -261,7 +261,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>40</height>
@@ -318,7 +318,7 @@
                     </widget>
                     <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>layout21</cstring>
+                            <cstring>tqlayout21</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -342,7 +342,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>321</width>
                                         <height>20</height>
@@ -439,7 +439,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <height>20</height>
                         </size>
@@ -579,5 +579,5 @@
     <slot>toggleConnection()</slot>
     <slot>deleteMobPhonebook()</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp
index 6143dec7..851b7829 100644
--- a/kandy/src/mobilemain.cpp
+++ b/kandy/src/mobilemain.cpp
@@ -57,8 +57,8 @@ MobileMain::MobileMain(CommandScheduler *scheduler, KandyPrefs *prefs)
   statusBar()->insertItem(i18n(" Disconnected "),1,0,true);
   connect(mView,TQT_SIGNAL(statusMessage(const TQString &)),
           TQT_SLOT(showStatusMessage(const TQString &)));
-  connect(mView,TQT_SIGNAL(transientStatusMessage(const TQString &)),
-          TQT_SLOT(showTransientStatusMessage(const TQString &)));
+  connect(mView,TQT_SIGNAL(transienStatusMessage(const TQString &)),
+          TQT_SLOT(showTransienStatusMessage(const TQString &)));
 
   statusBar()->show();
 
@@ -152,7 +152,7 @@ void MobileMain::showStatusMessage(const TQString& text)
   statusBar()->message(text);
 }
 
-void MobileMain::showTransientStatusMessage(const TQString& text)
+void MobileMain::showTransienStatusMessage(const TQString& text)
 {
   // display the text on the statusbar for 2 s.
   statusBar()->message(text,2000);
diff --git a/kandy/src/mobilemain.h b/kandy/src/mobilemain.h
index 46c8bc57..d414d15e 100644
--- a/kandy/src/mobilemain.h
+++ b/kandy/src/mobilemain.h
@@ -95,7 +95,7 @@ class MobileMain : public KMainWindow
     void newToolbarConfig();
 
     void showStatusMessage(const TQString& text);
-    void showTransientStatusMessage(const TQString& text);
+    void showTransienStatusMessage(const TQString& text);
     void changeCaption(const TQString& text);
 
 
diff --git a/karm/csvexportdialog_base.ui b/karm/csvexportdialog_base.ui
index 45ecde5d..0c985127 100644
--- a/karm/csvexportdialog_base.ui
+++ b/karm/csvexportdialog_base.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>CSVExportDialogBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>29</height>
@@ -46,7 +46,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>160</width>
                     <height>20</height>
@@ -317,7 +317,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>30</width>
                             <height>32767</height>
@@ -405,7 +405,7 @@
 <slots>
     <slot>enableExportButton()</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kdateedit.h</includehint>
     <includehint>kdateedit.h</includehint>
diff --git a/karm/desktoptracker.cpp b/karm/desktoptracker.cpp
index deab8754..04f4d9d1 100644
--- a/karm/desktoptracker.cpp
+++ b/karm/desktoptracker.cpp
@@ -96,7 +96,7 @@ void DesktopTracker::registerForDesktops( Task* task, DesktopList desktopList)
     return;
   }
 
-  // If desktop contains entries then configure desktopTracker
+  // If desktop tqcontains entries then configure desktopTracker
   // If a desktop was disabled, it will not be stopped automatically.
   // If enabled: Start it now.
   if (desktopList.size()>0) {
diff --git a/karm/desktoptracker.h b/karm/desktoptracker.h
index aa8de2e2..f7fdd69c 100644
--- a/karm/desktoptracker.h
+++ b/karm/desktoptracker.h
@@ -33,7 +33,7 @@ class DesktopTracker: public QObject
     KWinModule kWinModule;
 
     // define vectors for at most 16 virtual desktops
-    // E.g.: desktopTrackerStop[3] contains a vector with
+    // E.g.: desktopTrackerStop[3] tqcontains a vector with
     // all tasks to be notified, when switching to/from desk 3.
     TaskVector desktopTracker[maxDesktops];
     int _previousDesktop;
diff --git a/karm/edittaskdialog.cpp b/karm/edittaskdialog.cpp
index 74d3417b..b7b1abe7 100644
--- a/karm/edittaskdialog.cpp
+++ b/karm/edittaskdialog.cpp
@@ -87,7 +87,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
   // Time
   _timeLA = new TQLabel( i18n("&Time:"), page, "time" );
   lay3->addWidget( _timeLA, 0, 0 );
-  _timeLA->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, 
+  _timeLA->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, 
                                          (TQSizePolicy::SizeType)0, 
                                          0, 
                                          0, 
@@ -110,7 +110,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
   _sessionTW = new KArmTimeWidget( page, "_sessionTW" );
   lay3->addWidget( _sessionTW, 1, 1 );
   _sessionLA->setBuddy( _sessionTW );
-  _sessionLA->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, 
+  _sessionLA->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, 
                                          (TQSizePolicy::SizeType)0, 
                                          0, 
                                          0, 
@@ -132,9 +132,9 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
   lay4->addSpacing(20);
   
   _operator = new TQComboBox(page);
-  _operator->insertItem( TQString::fromLatin1( "+" ) );
-  _operator->insertItem( TQString::fromLatin1( "-" ) );
-  _operator->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, 
+  _operator->insertItem( TQString::tqfromLatin1( "+" ) );
+  _operator->insertItem( TQString::tqfromLatin1( "-" ) );
+  _operator->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, 
                                          (TQSizePolicy::SizeType)0, 
                                          0, 
                                          0, 
@@ -148,7 +148,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
 
   desktopCount = kwinmodule.numberOfDesktops();
   
-  // If desktopList contains higher numbered desktops than desktopCount then
+  // If desktopList tqcontains higher numbered desktops than desktopCount then
   // delete those from desktopList. This may be the case if the user has
   // configured virtual desktops. The values in desktopList are sorted.
   if ( (desktopList != 0) && (desktopList->size() > 0) ) 
diff --git a/karm/idletimedetector.cpp b/karm/idletimedetector.cpp
index b2b17a29..53f17c8c 100644
--- a/karm/idletimedetector.cpp
+++ b/karm/idletimedetector.cpp
@@ -67,7 +67,7 @@ void IdleTimeDetector::informOverrun(int idleSeconds)
 
   _timer->stop();
 
-  TQDateTime idleStart = TQDateTime::currentDateTime().addSecs(-idleSeconds);
+  TQDateTime idleStart = TQDateTime::tqcurrentDateTime().addSecs(-idleSeconds);
   TQString idleStartQString = KGlobal::locale()->formatTime(idleStart.time());
 
   int id =  TQMessageBox::warning( 0, i18n("Idle Detection"),
@@ -76,13 +76,13 @@ void IdleTimeDetector::informOverrun(int idleSeconds)
                                      i18n("Revert && Stop"),
                                      i18n("Revert && Continue"),
                                      i18n("Continue Timing"),0,2);
-  TQDateTime end = TQDateTime::currentDateTime();
+  TQDateTime end = TQDateTime::tqcurrentDateTime();
   int diff = idleStart.secsTo(end)/secsPerMinute;
 
   if (id == 0) 
   {
     // Revert And Stop
-    kdDebug(5970) << "Now it is " << TQDateTime::currentDateTime() << endl;
+    kdDebug(5970) << "Now it is " << TQDateTime::tqcurrentDateTime() << endl;
     kdDebug(5970) << "Reverting timer to " << KGlobal::locale()->formatTime(idleStart.time()).ascii() << endl;
     emit(extractTime(idleSeconds/60+diff)); // we need to subtract the time that has been added during idleness.
     emit(stopAllTimersAt(idleStart));
diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp
index c535bec4..d44c4ac1 100644
--- a/karm/karm_part.cpp
+++ b/karm/karm_part.cpp
@@ -21,17 +21,17 @@
 #include <tqpopupmenu.h>
 #include "mainwindow.h"
 
-karmPart::karmPart( TQWidget *parentWidget, const char *widgetName,
+karmPart::karmPart( TQWidget *tqparentWidget, const char *widgetName,
                                   TQObject *parent, const char *name )
     : DCOPObject ( "KarmDCOPIface" ), KParts::ReadWritePart(parent, name), 
-    _accel     ( new KAccel( parentWidget ) ),
-    _watcher   ( new KAccelMenuWatch( _accel, parentWidget ) )
+    _accel     ( new KAccel( tqparentWidget ) ),
+    _watcher   ( new KAccelMenuWatch( _accel, tqparentWidget ) )
 {
     // we need an instance
     setInstance( karmPartFactory::instance() );
 
     // this should be your custom internal widget
-    _taskView = new TaskView( parentWidget, widgetName );
+    _taskView = new TaskView( tqparentWidget, widgetName );
 
     // setup PreferenceDialog.
     _preferences = Preferences::instance();
@@ -134,12 +134,12 @@ void karmPart::makeMenus()
       actionCollection(),
       "reset_all_times");
   actionStart = new KAction( i18n("&Start"),
-      TQString::fromLatin1("1rightarrow"), Key_S,
+      TQString::tqfromLatin1("1rightarrow"), Key_S,
       _taskView,
       TQT_SLOT( startCurrentTimer() ), actionCollection(),
       "start");
   actionStop = new KAction( i18n("S&top"),
-      TQString::fromLatin1("stop"), 0,
+      TQString::tqfromLatin1("stop"), 0,
       _taskView,
       TQT_SLOT( stopCurrentTimer() ), actionCollection(),
       "stop");
@@ -151,55 +151,55 @@ void karmPart::makeMenus()
   actionStopAll->setEnabled(false);
 
   actionNew = new KAction( i18n("&New..."),
-      TQString::fromLatin1("filenew"), CTRL+Key_N,
+      TQString::tqfromLatin1("filenew"), CTRL+Key_N,
       _taskView,
       TQT_SLOT( newTask() ), actionCollection(),
       "new_task");
   actionNewSub = new KAction( i18n("New &Subtask..."),
-      TQString::fromLatin1("kmultiple"), CTRL+ALT+Key_N,
+      TQString::tqfromLatin1("kmultiple"), CTRL+ALT+Key_N,
       _taskView,
       TQT_SLOT( newSubTask() ), actionCollection(),
       "new_sub_task");
   actionDelete = new KAction( i18n("&Delete"),
-      TQString::fromLatin1("editdelete"), Key_Delete,
+      TQString::tqfromLatin1("editdelete"), Key_Delete,
       _taskView,
       TQT_SLOT( deleteTask() ), actionCollection(),
       "delete_task");
   actionEdit = new KAction( i18n("&Edit..."),
-      TQString::fromLatin1("edit"), CTRL + Key_E,
+      TQString::tqfromLatin1("edit"), CTRL + Key_E,
       _taskView,
       TQT_SLOT( editTask() ), actionCollection(),
       "edit_task");
 //  actionAddComment = new KAction( i18n("&Add Comment..."),
-//      TQString::fromLatin1("document"),
+//      TQString::tqfromLatin1("document"),
 //      CTRL+ALT+Key_E,
 //      _taskView,
 //      TQT_SLOT( addCommentToTask() ),
 //      actionCollection(),
 //      "add_comment_to_task");
   actionMarkAsComplete = new KAction( i18n("&Mark as Complete"),
-      TQString::fromLatin1("document"),
+      TQString::tqfromLatin1("document"),
       CTRL+Key_M,
       _taskView,
       TQT_SLOT( markTaskAsComplete() ),
       actionCollection(),
       "mark_as_complete");
   actionMarkAsIncomplete = new KAction( i18n("&Mark as Incomplete"),
-      TQString::fromLatin1("document"),
+      TQString::tqfromLatin1("document"),
       CTRL+Key_M,
       _taskView,
       TQT_SLOT( markTaskAsIncomplete() ),
       actionCollection(),
       "mark_as_incomplete");
   actionClipTotals = new KAction( i18n("&Copy Totals to Clipboard"),
-      TQString::fromLatin1("klipper"),
+      TQString::tqfromLatin1("klipper"),
       CTRL+Key_C,
       _taskView,
       TQT_SLOT( clipTotals() ),
       actionCollection(),
       "clip_totals");
   actionClipHistory = new KAction( i18n("Copy &History to Clipboard"),
-      TQString::fromLatin1("klipper"),
+      TQString::tqfromLatin1("klipper"),
       CTRL+ALT+Key_C,
       _taskView,
       TQT_SLOT( clipHistory() ),
@@ -322,7 +322,7 @@ bool karmPart::openFile()
     _taskView->load(m_file);
 
     // just for fun, set the status bar
-    emit setStatusBarText( m_url.prettyURL() );
+    emit seStatusBarText( m_url.prettyURL() );
 
     return true;
 }
@@ -387,12 +387,12 @@ karmPartFactory::~karmPartFactory()
     s_instance = 0L;
 }
 
-KParts::Part* karmPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
+KParts::Part* karmPartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName,
                                                         TQObject *parent, const char *name,
                                                         const char *classname, const TQStringList &args )
 {
     // Create an instance of our Part
-    karmPart* obj = new karmPart( parentWidget, widgetName, parent, name );
+    karmPart* obj = new karmPart( tqparentWidget, widgetName, parent, name );
 
     // See if we are to be read-write or not
     if (TQCString(classname) == "KParts::ReadOnlyPart")
diff --git a/karm/karm_part.h b/karm/karm_part.h
index ed0098ad..2d5b98bf 100644
--- a/karm/karm_part.h
+++ b/karm/karm_part.h
@@ -58,7 +58,7 @@ class karmPart : public KParts::ReadWritePart, virtual public KarmDCOPIface
     friend class KarmTray;
 
 public:
-    karmPart(TQWidget *parentWidget, const char *widgetName,
+    karmPart(TQWidget *tqparentWidget, const char *widgetName,
              TQObject *parent, const char *name);
     // DCOP
     void quit();
@@ -124,7 +124,7 @@ class karmPartFactory : public KParts::Factory
 public:
     karmPartFactory();
     virtual ~karmPartFactory();
-    virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
+    virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName,
                                             TQObject *parent, const char *name,
                                             const char *classname, const TQStringList &args );
     static KInstance* instance();
diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp
index e895d263..7a6bfcb9 100644
--- a/karm/karmstorage.cpp
+++ b/karm/karmstorage.cpp
@@ -102,7 +102,7 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt
 
   // If file doesn't exist, create a blank one to avoid ResourceLocal load
   // error.  We make it user and group read/write, others read.  This is
-  // masked by the users umask.  (See man creat)
+  // tqmasked by the users umask.  (See man creat)
   if ( ! remoteResource( _icalfile ) )
   {
     int handle;
@@ -135,7 +135,7 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt
   TQObject::connect (_calendar, TQT_SIGNAL(resourceChanged(ResourceCalendar *)),
   	            view, TQT_SLOT(iCalFileModified(ResourceCalendar *)));
   _calendar->setTimeZoneId( KPimPrefs::timezone() );
-  _calendar->setResourceName( TQString::fromLatin1("KArm") );
+  _calendar->setResourceName( TQString::tqfromLatin1("KArm") );
   _calendar->open();
   _calendar->load();
 
@@ -608,7 +608,7 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview,
   while ( tasknr < taskview->count() && !dialog.wasCancelled() )
   {
     dialog.progressBar()->advance( 1 );
-    if ( tasknr % 15 == 0 ) kapp->processEvents(); // repainting is slow
+    if ( tasknr % 15 == 0 ) kapp->processEvents(); // tqrepainting is slow
     if ( taskview->item_at_index(tasknr)->depth() > maxdepth )
       maxdepth = taskview->item_at_index(tasknr)->depth();
     tasknr++;
@@ -627,9 +627,9 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview,
 
     /*
     // CSV compliance
-    // Surround the field with quotes if the field contains
+    // Surround the field with quotes if the field tqcontains
     // a comma (delim) or a double quote
-    if (task->name().contains(delim) || task->name().contains(dquote))
+    if (task->name().tqcontains(delim) || task->name().tqcontains(dquote))
       to_quote = true;
     else
       to_quote = false;
@@ -639,8 +639,8 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview,
     if (to_quote)
       retval += dquote;
 
-    // Double quotes replaced by a pair of consecutive double quotes
-    retval += task->name().replace( dquote, double_dquote );
+    // Double quotes tqreplaced by a pair of consecutive double quotes
+    retval += task->name().tqreplace( dquote, double_dquote );
 
     if (to_quote)
       retval += dquote;
@@ -661,7 +661,7 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview,
   }
 
   // save, either locally or remote
-  if ((rc.url.isLocalFile()) || (!rc.url.url().contains("/")))
+  if ((rc.url.isLocalFile()) || (!rc.url.url().tqcontains("/")))
   {
     TQString filename=rc.url.path();
     if (filename.isEmpty()) filename=rc.url.url();
@@ -680,13 +680,13 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview,
   else // use remote file
   {
     KTempFile tmpFile;
-    if ( tmpFile.status() != 0 ) err = TQString::fromLatin1( "Unable to get temporary file" );
+    if ( tmpFile.status() != 0 ) err = TQString::tqfromLatin1( "Unable to get temporary file" );
     else
     {
       TQTextStream *stream=tmpFile.textStream();
       *stream << retval;
       tmpFile.close();
-      if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::fromLatin1("Could not upload");
+      if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::tqfromLatin1("Could not upload");
     }
   }
 
@@ -794,7 +794,7 @@ long KarmStorage::printTaskHistory (
   TQString double_dquote = dquote + dquote;
   bool to_quote = true;
 
-  const TQString cr = TQString::fromLatin1("\n");
+  const TQString cr = TQString::tqfromLatin1("\n");
   TQString buf;
   TQString daytaskkey, daykey;
   TQDate day;
@@ -807,19 +807,19 @@ long KarmStorage::printTaskHistory (
   while (day <= to)
   {
     // write the time in seconds for the given task for the given day to s
-    daykey = day.toString(TQString::fromLatin1("yyyyMMdd"));
-    daytaskkey = TQString::fromLatin1("%1_%2")
+    daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd"));
+    daytaskkey = TQString::tqfromLatin1("%1_%2")
       .arg(daykey)
       .arg(task->uid());
 
-    if (taskdaytotals.contains(daytaskkey))
+    if (taskdaytotals.tqcontains(daytaskkey))
     {
-      cell.push_back(TQString::fromLatin1("%1")
+      cell.push_back(TQString::tqfromLatin1("%1")
         .arg(formatTime(taskdaytotals[daytaskkey]/60, rc.decimalMinutes)));
       sum += taskdaytotals[daytaskkey];  // in seconds
 
-      if (daytotals.contains(daykey))
-        daytotals.replace(daykey, daytotals[daykey]+taskdaytotals[daytaskkey]);
+      if (daytotals.tqcontains(daykey))
+        daytotals.tqreplace(daykey, daytotals[daykey]+taskdaytotals[daytaskkey]);
       else
         daytotals.insert(daykey, taskdaytotals[daytaskkey]);
     }
@@ -829,7 +829,7 @@ long KarmStorage::printTaskHistory (
   }
 
   // Total for task
-  cell.push_back(TQString::fromLatin1("%1").arg(formatTime(sum/60, rc.decimalMinutes)));
+  cell.push_back(TQString::tqfromLatin1("%1").arg(formatTime(sum/60, rc.decimalMinutes)));
 
   // room for the recursive total time (that cannot be calculated now)
   cell.push_back(delim);
@@ -842,16 +842,16 @@ long KarmStorage::printTaskHistory (
 
   /*
   // CSV compliance
-  // Surround the field with quotes if the field contains
+  // Surround the field with quotes if the field tqcontains
   // a comma (delim) or a double quote
-  to_quote = task->name().contains(delim) || task->name().contains(dquote);
+  to_quote = task->name().tqcontains(delim) || task->name().tqcontains(dquote);
   */
   to_quote = true;
   if ( to_quote) cell.push_back(dquote);
 
 
-  // Double quotes replaced by a pair of consecutive double quotes
-  cell.push_back(task->name().replace( dquote, double_dquote ));
+  // Double quotes tqreplaced by a pair of consecutive double quotes
+  cell.push_back(task->name().tqreplace( dquote, double_dquote ));
 
   if ( to_quote) cell.push_back(dquote);
 
@@ -865,7 +865,7 @@ long KarmStorage::printTaskHistory (
     add += printTaskHistory( subTask, taskdaytotals, daytotals, from, to , level+1, matrix,
                       rc );
   }
-  cell[colrectot]=(TQString::fromLatin1("%1").arg(formatTime((add+sum)/60, rc.decimalMinutes )));
+  cell[colrectot]=(TQString::tqfromLatin1("%1").arg(formatTime((add+sum)/60, rc.decimalMinutes )));
   for (unsigned int i=0; i < cell.size(); i++) matrix[ownline]+=cell[i];
   return add+sum;
 }
@@ -890,7 +890,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
                                             const ReportCriteria &rc)
 {
   TQString delim = rc.delimiter;
-  const TQString cr = TQString::fromLatin1("\n");
+  const TQString cr = TQString::tqfromLatin1("\n");
   TQString err;
 
   // below taken from timekard.cpp
@@ -910,7 +910,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
   // parameter-plausi
   if ( from > to )
   {
-    err = TQString::fromLatin1 (
+    err = TQString::tqfromLatin1 (
             "'to' has to be a date later than or equal to 'from'.");
   }
 
@@ -921,7 +921,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
     .arg(KGlobal::locale()->formatDate(to));
   retval += cr;
   retval += i18n("Printed on: %1")
-    .arg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()));
+    .arg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()));
   retval += cr;
 
   day=from;
@@ -936,13 +936,13 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
   // so times are accumulated for each task.
   for (event = events.begin(); event != events.end(); ++event)
   {
-    daykey = (*event).start().date().toString(TQString::fromLatin1("yyyyMMdd"));
-    daytaskkey = TQString(TQString::fromLatin1("%1_%2"))
+    daykey = (*event).start().date().toString(TQString::tqfromLatin1("yyyyMMdd"));
+    daytaskkey = TQString(TQString::tqfromLatin1("%1_%2"))
         .arg(daykey)
         .arg((*event).todoUid());
 
-    if (taskdaytotals.contains(daytaskkey))
-        taskdaytotals.replace(daytaskkey,
+    if (taskdaytotals.tqcontains(daytaskkey))
+        taskdaytotals.tqreplace(daytaskkey,
                 taskdaytotals[daytaskkey] + (*event).duration());
     else
         taskdaytotals.insert(daytaskkey, (*event).duration());
@@ -953,7 +953,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
   while ( dayheading <= to )
   {
     // Use ISO 8601 format for date.
-    retval += dayheading.toString(TQString::fromLatin1("yyyy-MM-dd"));
+    retval += dayheading.toString(TQString::tqfromLatin1("yyyy-MM-dd"));
     retval += delim;
     dayheading=dayheading.addDays(1);
   }
@@ -993,11 +993,11 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
     day = from;
     while (day<=to)
     {
-      daykey = day.toString(TQString::fromLatin1("yyyyMMdd"));
+      daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd"));
 
-      if (daytotals.contains(daykey))
+      if (daytotals.tqcontains(daykey))
       {
-        retval += TQString::fromLatin1("%1")
+        retval += TQString::tqfromLatin1("%1")
             .arg(formatTime(daytotals[daykey]/60, rc.decimalMinutes));
         sum += daytotals[daykey];  // in seconds
       }
@@ -1005,7 +1005,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
       day = day.addDays(1);
     }
 
-    retval += TQString::fromLatin1("%1%2%3%4")
+    retval += TQString::tqfromLatin1("%1%2%3%4")
         .arg( formatTime( sum/60, rc.decimalMinutes ) )
         .arg( delim ).arg( delim )
         .arg( i18n( "Total" ) );
@@ -1015,7 +1015,7 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
 
   // save, either locally or remote
 
-  if ((rc.url.isLocalFile()) || (!rc.url.url().contains("/")))
+  if ((rc.url.isLocalFile()) || (!rc.url.url().tqcontains("/")))
   {
     TQString filename=rc.url.path();
     if (filename.isEmpty()) filename=rc.url.url();
@@ -1036,14 +1036,14 @@ TQString KarmStorage::exportcsvHistory ( TaskView      *taskview,
     KTempFile tmpFile;
     if ( tmpFile.status() != 0 )
     {
-      err = TQString::fromLatin1( "Unable to get temporary file" );
+      err = TQString::tqfromLatin1( "Unable to get temporary file" );
     }
     else
     {
       TQTextStream *stream=tmpFile.textStream();
       *stream << retval;
       tmpFile.close();
-      if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::fromLatin1("Could not upload");
+      if (!KIO::NetAccess::upload( tmpFile.name(), rc.url, 0 )) err=TQString::tqfromLatin1("Could not upload");
     }
   }
   return err;
@@ -1166,7 +1166,7 @@ TQValueList<HistoryEvent> KarmStorage::getHistory(const TQDate& from,
     {
 
       // KArm events have the custom property X-KDE-Karm-duration
-      if (! processed.contains( (*event)->uid()))
+      if (! processed.tqcontains( (*event)->uid()))
       {
         // If an event spans multiple days, CalendarLocal::rawEventsForDate
         // will return the same event on both days.  To avoid double-counting
diff --git a/karm/karmstorage.h b/karm/karmstorage.h
index c9d91e15..d94064f6 100644
--- a/karm/karmstorage.h
+++ b/karm/karmstorage.h
@@ -239,7 +239,7 @@ class KarmStorage
      *
      * @param task   The task the timer was stopped for.
      */
-    void stopTimer(const Task* task, TQDateTime when=TQDateTime::currentDateTime());
+    void stopTimer(const Task* task, TQDateTime when=TQDateTime::tqcurrentDateTime());
 
     /**
      * Log a new comment for this task.
diff --git a/karm/karmutility.cpp b/karm/karmutility.cpp
index 8a2de530..d13a3f6e 100644
--- a/karm/karmutility.cpp
+++ b/karm/karmutility.cpp
@@ -12,7 +12,7 @@ TQString formatTime( long minutes, bool decimal )
   TQString time;
   if ( decimal ) {
     time.sprintf("%.2f", minutes / 60.0);
-    time.replace( '.', KGlobal::locale()->decimalSymbol() );
+    time.tqreplace( '.', KGlobal::locale()->decimalSymbol() );
   }
   else time.sprintf("%s%ld:%02ld",
     (minutes < 0) ? KGlobal::locale()->negativeSign().utf8().data() : "",
diff --git a/karm/ktimewidget.cpp b/karm/ktimewidget.cpp
index 9de79d9d..dba305fe 100644
--- a/karm/ktimewidget.cpp
+++ b/karm/ktimewidget.cpp
@@ -63,38 +63,38 @@ protected:
 KArmTimeWidget::KArmTimeWidget( TQWidget* parent, const char* name )
   : TQWidget(parent, name)
 {
-  TQHBoxLayout *layout = new TQHBoxLayout(this);
+  TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
 
   _hourLE = new TQLineEdit( this);
   // 9999 hours > 1 year!
   // 999 hours = 41 days  (That should be enough ...)
   _hourLE->setFixedWidth( fontMetrics().maxWidth() * 3
                           + 2 * _hourLE->frameWidth() + 2);
-  layout->addWidget(_hourLE);
+  tqlayout->addWidget(_hourLE);
   TimeValidator *validator = new TimeValidator( HOUR, _hourLE,
                                                 "Validator for _hourLE");
   _hourLE->setValidator( validator );
-  _hourLE->setAlignment( Qt::AlignRight );
+  _hourLE->tqsetAlignment( Qt::AlignRight );
 
 
   TQLabel *hr = new TQLabel( i18n( "abbreviation for hours", " hr. " ), this );
-  layout->addWidget( hr );
+  tqlayout->addWidget( hr );
 
   _minuteLE = new KarmLineEdit(this);
 
   // Minutes lineedit: Make room for 2 digits
   _minuteLE->setFixedWidth( fontMetrics().maxWidth() * 2
                             + 2 * _minuteLE->frameWidth() + 2);
-  layout->addWidget(_minuteLE);
+  tqlayout->addWidget(_minuteLE);
   validator = new TimeValidator( MINUTE, _minuteLE, "Validator for _minuteLE");
   _minuteLE->setValidator( validator );
   _minuteLE->setMaxLength(2);
-  _minuteLE->setAlignment( Qt::AlignRight );
+  _minuteLE->tqsetAlignment( Qt::AlignRight );
 
   TQLabel *min = new TQLabel( i18n( "abbreviation for minutes", " min. " ), this );
-  layout->addWidget( min );
+  tqlayout->addWidget( min );
 
-  layout->addStretch(1);
+  tqlayout->addStretch(1);
   setFocusProxy( _hourLE );
 }
 
@@ -111,7 +111,7 @@ void KArmTimeWidget::setTime( long minutes )
 
   dummy.setNum( minutepart );
   if (minutepart < 10 ) {
-    dummy = TQString::fromLatin1( "0" ) + dummy;
+    dummy = TQString::tqfromLatin1( "0" ) + dummy;
   }
   _minuteLE->setText( dummy );
 }
diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp
index 6a80fa00..4440ab1a 100644
--- a/karm/mainwindow.cpp
+++ b/karm/mainwindow.cpp
@@ -47,7 +47,7 @@ MainWindow::MainWindow( const TQString &icsfile )
 
   setCentralWidget( _taskView );
   // status bar
-  startStatusBar();
+  starStatusBar();
 
   // setup PreferenceDialog.
   _preferences = Preferences::instance();
@@ -63,8 +63,8 @@ MainWindow::MainWindow( const TQString &icsfile )
            this, TQT_SLOT(slotSelectionChanged()));
   connect( _taskView, TQT_SIGNAL( updateButtons() ),
            this, TQT_SLOT(slotSelectionChanged()));
-  connect( _taskView, TQT_SIGNAL( setStatusBar( TQString ) ),
-           this, TQT_SLOT(setStatusBar( TQString )));
+  connect( _taskView, TQT_SIGNAL( seStatusBar( TQString ) ),
+           this, TQT_SLOT(seStatusBar( TQString )));
 
   loadGeometry();
 
@@ -134,7 +134,7 @@ void MainWindow::slotSelectionChanged()
 //  actionAddComment->setEnabled( on );
 //}
 
-void MainWindow::setStatusBar(TQString qs)
+void MainWindow::seStatusBar(TQString qs)
 {
   statusBar()->message(i18n(qs.ascii()));
 }
@@ -208,7 +208,7 @@ void MainWindow::updateStatusBar( )
   statusBar()->changeItem( i18n("Total: %1" ).arg(time), 1);
 }
 
-void MainWindow::startStatusBar()
+void MainWindow::starStatusBar()
 {
   statusBar()->insertItem( i18n("Session"), 0, 0, true );
   statusBar()->insertItem( i18n("Total" ), 1, 0, true );
@@ -272,12 +272,12 @@ void MainWindow::makeMenus()
       actionCollection(),
       "reset_all_times");
   actionStart = new KAction( i18n("&Start"),
-      TQString::fromLatin1("1rightarrow"), Key_S,
+      TQString::tqfromLatin1("1rightarrow"), Key_S,
       _taskView,
       TQT_SLOT( startCurrentTimer() ), actionCollection(),
       "start");
   actionStop = new KAction( i18n("S&top"),
-      TQString::fromLatin1("stop"), Key_S,
+      TQString::tqfromLatin1("stop"), Key_S,
       _taskView,
       TQT_SLOT( stopCurrentTimer() ), actionCollection(),
       "stop");
@@ -289,48 +289,48 @@ void MainWindow::makeMenus()
   actionStopAll->setEnabled(false);
 
   actionNew = new KAction( i18n("&New..."),
-      TQString::fromLatin1("filenew"), CTRL+Key_N,
+      TQString::tqfromLatin1("filenew"), CTRL+Key_N,
       _taskView,
       TQT_SLOT( newTask() ), actionCollection(),
       "new_task");
   actionNewSub = new KAction( i18n("New &Subtask..."),
-      TQString::fromLatin1("kmultiple"), CTRL+ALT+Key_N,
+      TQString::tqfromLatin1("kmultiple"), CTRL+ALT+Key_N,
       _taskView,
       TQT_SLOT( newSubTask() ), actionCollection(),
       "new_sub_task");
   actionDelete = new KAction( i18n("&Delete"),
-      TQString::fromLatin1("editdelete"), Key_Delete,
+      TQString::tqfromLatin1("editdelete"), Key_Delete,
       _taskView,
       TQT_SLOT( deleteTask() ), actionCollection(),
       "delete_task");
   actionEdit = new KAction( i18n("&Edit..."),
-      TQString::fromLatin1("edit"), CTRL + Key_E,
+      TQString::tqfromLatin1("edit"), CTRL + Key_E,
       _taskView,
       TQT_SLOT( editTask() ), actionCollection(),
       "edit_task");
 //  actionAddComment = new KAction( i18n("&Add Comment..."),
-//      TQString::fromLatin1("document"),
+//      TQString::tqfromLatin1("document"),
 //      CTRL+ALT+Key_E,
 //      _taskView,
 //      TQT_SLOT( addCommentToTask() ),
 //      actionCollection(),
 //      "add_comment_to_task");
   actionMarkAsComplete = new KAction( i18n("&Mark as Complete"),
-      TQString::fromLatin1("document"),
+      TQString::tqfromLatin1("document"),
       CTRL+Key_M,
       _taskView,
       TQT_SLOT( markTaskAsComplete() ),
       actionCollection(),
       "mark_as_complete");
   actionMarkAsIncomplete = new KAction( i18n("&Mark as Incomplete"),
-      TQString::fromLatin1("document"),
+      TQString::tqfromLatin1("document"),
       CTRL+Key_M,
       _taskView,
       TQT_SLOT( markTaskAsIncomplete() ),
       actionCollection(),
       "mark_as_incomplete");
   actionClipTotals = new KAction( i18n("&Copy Totals to Clipboard"),
-      TQString::fromLatin1("klipper"),
+      TQString::tqfromLatin1("klipper"),
       CTRL+Key_C,
       _taskView,
       TQT_SLOT( clipTotals() ),
@@ -338,14 +338,14 @@ void MainWindow::makeMenus()
       "clip_totals");
   // actionClipTotals will never be used again, overwrite it
   actionClipTotals = new KAction( i18n("&Copy Session Time to Clipboard"),
-      TQString::fromLatin1("klipper"),
+      TQString::tqfromLatin1("klipper"),
       0,
       _taskView,
       TQT_SLOT( clipSession() ),
       actionCollection(),
       "clip_session");
   actionClipHistory = new KAction( i18n("Copy &History to Clipboard"),
-      TQString::fromLatin1("klipper"),
+      TQString::tqfromLatin1("klipper"),
       CTRL+ALT+Key_C,
       _taskView,
       TQT_SLOT( clipHistory() ),
@@ -372,7 +372,7 @@ void MainWindow::makeMenus()
                             "import_korg_events");
   */
 
-  setXMLFile( TQString::fromLatin1("karmui.rc") );
+  setXMLFile( TQString::tqfromLatin1("karmui.rc") );
   createGUI( 0 );
 
   // Tool tips must be set after the createGUI.
@@ -442,11 +442,11 @@ void MainWindow::loadGeometry()
   {
     KConfig &config = *kapp->config();
 
-    config.setGroup( TQString::fromLatin1("Main Window Geometry") );
-    int w = config.readNumEntry( TQString::fromLatin1("Width"), 100 );
-    int h = config.readNumEntry( TQString::fromLatin1("Height"), 100 );
-    w = QMAX( w, sizeHint().width() );
-    h = QMAX( h, sizeHint().height() );
+    config.setGroup( TQString::tqfromLatin1("Main Window Geometry") );
+    int w = config.readNumEntry( TQString::tqfromLatin1("Width"), 100 );
+    int h = config.readNumEntry( TQString::tqfromLatin1("Height"), 100 );
+    w = QMAX( w, tqsizeHint().width() );
+    h = QMAX( h, tqsizeHint().height() );
     resize(w, h);
   }
 }
@@ -455,9 +455,9 @@ void MainWindow::loadGeometry()
 void MainWindow::saveGeometry()
 {
   KConfig &config = *KGlobal::config();
-  config.setGroup( TQString::fromLatin1("Main Window Geometry"));
-  config.writeEntry( TQString::fromLatin1("Width"), width());
-  config.writeEntry( TQString::fromLatin1("Height"), height());
+  config.setGroup( TQString::tqfromLatin1("Main Window Geometry"));
+  config.writeEntry( TQString::tqfromLatin1("Width"), width());
+  config.writeEntry( TQString::tqfromLatin1("Height"), height());
   config.sync();
 }
 
diff --git a/karm/mainwindow.h b/karm/mainwindow.h
index b6d77e8a..2f275be1 100644
--- a/karm/mainwindow.h
+++ b/karm/mainwindow.h
@@ -88,7 +88,7 @@ class MainWindow : public KParts::MainWindow, virtual public KarmDCOPIface
     TQString importplannerfile( TQString filename );
 
   public slots:
-    void setStatusBar( TQString );
+    void seStatusBar( TQString );
     void quit();
 
   protected slots:
@@ -107,7 +107,7 @@ class MainWindow : public KParts::MainWindow, virtual public KarmDCOPIface
 //    void timeLoggingChanged( bool on );
 
   protected:
-    void startStatusBar();
+    void starStatusBar();
     virtual void saveProperties( KConfig* );
     virtual void readProperties( KConfig* );
     void saveGeometry();
diff --git a/karm/plannerparser.cpp b/karm/plannerparser.cpp
index 67f7bd53..7ac13a5e 100644
--- a/karm/plannerparser.cpp
+++ b/karm/plannerparser.cpp
@@ -55,15 +55,15 @@ test cases:
     int     taskComplete=0;
     
     // only <task>s within <tasks> are processed
-    if (qName == TQString::fromLatin1("tasks")) withInTasks=true;
-    if ((qName == TQString::fromLatin1("task")) && (withInTasks))
+    if (qName == TQString::tqfromLatin1("tasks")) withInTasks=true;
+    if ((qName == TQString::tqfromLatin1("task")) && (withInTasks))
     {
 	
       // find out name and percent-complete
       for (int i=0; i<att.length(); i++)
       {
-        if (att.qName(i) == TQString::fromLatin1("name")) taskName=att.value(i);
-        if (att.qName(i)==TQString::fromLatin1("percent-complete")) taskComplete=att.value(i).toInt();
+        if (att.qName(i) == TQString::tqfromLatin1("name")) taskName=att.value(i);
+        if (att.qName(i)==TQString::tqfromLatin1("percent-complete")) taskComplete=att.value(i).toInt();
       }
     
       // at the moment, task is still the old task or the old father task (if an endElement occurred) or not existing (if the
diff --git a/karm/preferences.cpp b/karm/preferences.cpp
index efc62180..b270a2b2 100644
--- a/karm/preferences.cpp
+++ b/karm/preferences.cpp
@@ -51,8 +51,8 @@ void Preferences::makeBehaviorPage()
       icon );
 
   TQVBoxLayout* topLevel = new TQVBoxLayout( behaviorPage, 0, spacingHint() );
-  TQGridLayout* layout = new TQGridLayout( topLevel, 2, 2 );
-  layout->setColStretch( 1, 1 );
+  TQGridLayout* tqlayout = new TQGridLayout( topLevel, 2, 2 );
+  tqlayout->setColStretch( 1, 1 );
 
   _doIdleDetectionW = new QCheckBox
     ( i18n("Detect desktop as idle after"), behaviorPage, "_doIdleDetectionW");
@@ -62,9 +62,9 @@ void Preferences::makeBehaviorPage()
   _promptDeleteW = new QCheckBox
     ( i18n( "Prompt before deleting tasks" ), behaviorPage, "_promptDeleteW" );
 
-  layout->addWidget(_doIdleDetectionW, 0, 0 );
-  layout->addWidget(_idleDetectValueW, 0, 1 );
-  layout->addWidget(_promptDeleteW, 1, 0 );
+  tqlayout->addWidget(_doIdleDetectionW, 0, 0 );
+  tqlayout->addWidget(_idleDetectValueW, 0, 1 );
+  tqlayout->addWidget(_promptDeleteW, 1, 0 );
 
   topLevel->addStretch();
 
@@ -79,8 +79,8 @@ void Preferences::makeDisplayPage()
       icon );
 
   TQVBoxLayout* topLevel = new TQVBoxLayout( displayPage, 0, spacingHint() );
-  TQGridLayout* layout = new TQGridLayout( topLevel, 5, 2 );
-  layout->setColStretch( 1, 1 );
+  TQGridLayout* tqlayout = new TQGridLayout( topLevel, 5, 2 );
+  tqlayout->setColStretch( 1, 1 );
 
   TQLabel* _displayColumnsLabelW = new TQLabel( i18n("Columns displayed:"),
       displayPage );
@@ -93,11 +93,11 @@ void Preferences::makeDisplayPage()
   _displayTotalTimeW = new TQCheckBox ( i18n("Total task time"),
       displayPage, "_displayTotalTimeW");
 
-  layout->addMultiCellWidget( _displayColumnsLabelW, 0, 0, 0, 1 );
-  layout->addWidget(_displaySessionW, 1, 1 );
-  layout->addWidget(_displayTimeW, 2, 1 );
-  layout->addWidget(_displayTotalSessionW, 3, 1 );
-  layout->addWidget(_displayTotalTimeW, 4, 1 );
+  tqlayout->addMultiCellWidget( _displayColumnsLabelW, 0, 0, 0, 1 );
+  tqlayout->addWidget(_displaySessionW, 1, 1 );
+  tqlayout->addWidget(_displayTimeW, 2, 1 );
+  tqlayout->addWidget(_displayTotalSessionW, 3, 1 );
+  tqlayout->addWidget(_displayTotalTimeW, 4, 1 );
 
   topLevel->addStretch();
 }
@@ -109,8 +109,8 @@ void Preferences::makeStoragePage()
       icon );
 
   TQVBoxLayout* topLevel = new TQVBoxLayout( storagePage, 0, spacingHint() );
-  TQGridLayout* layout = new TQGridLayout( topLevel, 4, 2 );
-  layout->setColStretch( 1, 1 );
+  TQGridLayout* tqlayout = new TQGridLayout( topLevel, 4, 2 );
+  tqlayout->setColStretch( 1, 1 );
 
   // autosave
   _doAutoSaveW = new QCheckBox
@@ -121,19 +121,19 @@ void Preferences::makeStoragePage()
   // iCalendar
   TQLabel* _iCalFileLabel = new TQLabel( i18n("iCalendar file:"), storagePage);
   _iCalFileW = new KURLRequester(storagePage, "_iCalFileW");
-  _iCalFileW->setFilter(TQString::fromLatin1("*.ics"));
+  _iCalFileW->setFilter(TQString::tqfromLatin1("*.ics"));
   _iCalFileW->setMode(KFile::File);
 
   // Log time?
   _loggingW = new TQCheckBox 
     ( i18n("Log history"), storagePage, "_loggingW" );
 
-  // add widgets to layout
-  layout->addWidget(_doAutoSaveW, 0, 0);
-  layout->addWidget(_autoSaveValueW, 0, 1);
-  layout->addWidget(_iCalFileLabel, 1, 0 );
-  layout->addWidget(_iCalFileW, 1, 1 );
-  layout->addWidget(_loggingW, 2, 0 );
+  // add widgets to tqlayout
+  tqlayout->addWidget(_doAutoSaveW, 0, 0);
+  tqlayout->addWidget(_autoSaveValueW, 0, 1);
+  tqlayout->addWidget(_iCalFileLabel, 1, 0 );
+  tqlayout->addWidget(_iCalFileW, 1, 1 );
+  tqlayout->addWidget(_loggingW, 2, 0 );
 
   topLevel->addStretch();
 
@@ -253,32 +253,32 @@ void Preferences::load()
 {
   KConfig &config = *kapp->config();
 
-  config.setGroup( TQString::fromLatin1("Idle detection") );
-  _doIdleDetectionV = config.readBoolEntry( TQString::fromLatin1("enabled"),
+  config.setGroup( TQString::tqfromLatin1("Idle detection") );
+  _doIdleDetectionV = config.readBoolEntry( TQString::tqfromLatin1("enabled"),
      true );
-  _idleDetectValueV = config.readNumEntry(TQString::fromLatin1("period"), 15);
+  _idleDetectValueV = config.readNumEntry(TQString::tqfromLatin1("period"), 15);
 
-  config.setGroup( TQString::fromLatin1("Saving") );
+  config.setGroup( TQString::tqfromLatin1("Saving") );
   _iCalFileV = config.readPathEntry
-    ( TQString::fromLatin1("ical file"), 
-      locateLocal( "appdata", TQString::fromLatin1( "karm.ics")));
+    ( TQString::tqfromLatin1("ical file"), 
+      locateLocal( "appdata", TQString::tqfromLatin1( "karm.ics")));
   _doAutoSaveV = config.readBoolEntry
-    ( TQString::fromLatin1("auto save"), true);
+    ( TQString::tqfromLatin1("auto save"), true);
   _autoSaveValueV = config.readNumEntry
-    ( TQString::fromLatin1("auto save period"), 5);
+    ( TQString::tqfromLatin1("auto save period"), 5);
   _promptDeleteV = config.readBoolEntry
-    ( TQString::fromLatin1("prompt delete"), true);
+    ( TQString::tqfromLatin1("prompt delete"), true);
   _loggingV = config.readBoolEntry
-    ( TQString::fromLatin1("logging"), true);
+    ( TQString::tqfromLatin1("logging"), true);
 
   _displayColumnV[0] = config.readBoolEntry
-    ( TQString::fromLatin1("display session time"), true);
+    ( TQString::tqfromLatin1("display session time"), true);
   _displayColumnV[1] = config.readBoolEntry
-    ( TQString::fromLatin1("display time"), true);
+    ( TQString::tqfromLatin1("display time"), true);
   _displayColumnV[2] = config.readBoolEntry
-    ( TQString::fromLatin1("display total session time"), true);
+    ( TQString::tqfromLatin1("display total session time"), true);
   _displayColumnV[3] = config.readBoolEntry
-    ( TQString::fromLatin1("display total time"), true);
+    ( TQString::tqfromLatin1("display total time"), true);
 
   KEMailSettings settings;
   _userRealName = settings.getSetting( KEMailSettings::RealName );
@@ -288,24 +288,24 @@ void Preferences::save()
 {
   KConfig &config = *KGlobal::config();
 
-  config.setGroup( TQString::fromLatin1("Idle detection"));
-  config.writeEntry( TQString::fromLatin1("enabled"), _doIdleDetectionV);
-  config.writeEntry( TQString::fromLatin1("period"), _idleDetectValueV);
+  config.setGroup( TQString::tqfromLatin1("Idle detection"));
+  config.writeEntry( TQString::tqfromLatin1("enabled"), _doIdleDetectionV);
+  config.writeEntry( TQString::tqfromLatin1("period"), _idleDetectValueV);
 
-  config.setGroup( TQString::fromLatin1("Saving"));
-  config.writePathEntry( TQString::fromLatin1("ical file"), _iCalFileV);
-  config.writeEntry( TQString::fromLatin1("auto save"), _doAutoSaveV);
-  config.writeEntry( TQString::fromLatin1("logging"), _loggingV);
-  config.writeEntry( TQString::fromLatin1("auto save period"), _autoSaveValueV);
-  config.writeEntry( TQString::fromLatin1("prompt delete"), _promptDeleteV);
+  config.setGroup( TQString::tqfromLatin1("Saving"));
+  config.writePathEntry( TQString::tqfromLatin1("ical file"), _iCalFileV);
+  config.writeEntry( TQString::tqfromLatin1("auto save"), _doAutoSaveV);
+  config.writeEntry( TQString::tqfromLatin1("logging"), _loggingV);
+  config.writeEntry( TQString::tqfromLatin1("auto save period"), _autoSaveValueV);
+  config.writeEntry( TQString::tqfromLatin1("prompt delete"), _promptDeleteV);
 
-  config.writeEntry( TQString::fromLatin1("display session time"),
+  config.writeEntry( TQString::tqfromLatin1("display session time"),
       _displayColumnV[0]);
-  config.writeEntry( TQString::fromLatin1("display time"),
+  config.writeEntry( TQString::tqfromLatin1("display time"),
       _displayColumnV[1]);
-  config.writeEntry( TQString::fromLatin1("display total session time"),
+  config.writeEntry( TQString::tqfromLatin1("display total session time"),
       _displayColumnV[2]);
-  config.writeEntry( TQString::fromLatin1("display total time"),
+  config.writeEntry( TQString::tqfromLatin1("display total time"),
       _displayColumnV[3]);
 
   config.sync();
diff --git a/karm/print.cpp b/karm/print.cpp
index 1badb4f9..a7ddd4ba 100644
--- a/karm/print.cpp
+++ b/karm/print.cpp
@@ -75,7 +75,7 @@ void MyPrinter::print()
     painter.setFont(newFont);
     
     int height = metrics.height();
-    TQString now = KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime());
+    TQString now = KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime());
     
     painter.drawText(xMargin, yoff, pageWidth, height,
          TQPainter::AlignCenter, 
diff --git a/karm/printdialog.cpp b/karm/printdialog.cpp
index 92a306a0..6b3ca85b 100644
--- a/karm/printdialog.cpp
+++ b/karm/printdialog.cpp
@@ -48,14 +48,14 @@ PrintDialog::PrintDialog()
   setMainWidget(page);
   int year, month;
 
-  TQVBoxLayout *layout = new TQVBoxLayout(page, KDialog::spacingHint());
-  layout->addSpacing(10);
-  layout->addStretch(1);
+  TQVBoxLayout *tqlayout = new TQVBoxLayout(page, KDialog::spacingHint());
+  tqlayout->addSpacing(10);
+  tqlayout->addStretch(1);
 
   // Date Range
   TQGroupBox *rangeGroup = new TQGroupBox(1, Horizontal, i18n("Date Range"),
       page);
-  layout->addWidget(rangeGroup);
+  tqlayout->addWidget(rangeGroup);
 
   TQWidget *rangeWidget = new TQWidget(rangeGroup);
   TQHBoxLayout *rangeLayout = new TQHBoxLayout(rangeWidget, 0, spacingHint());
@@ -64,29 +64,29 @@ PrintDialog::PrintDialog()
   _from = new KDateEdit(rangeWidget);
 
   // Default from date to beginning of the month
-  year = TQDate::currentDate().year();
-  month = TQDate::currentDate().month();
+  year = TQDate::tqcurrentDate().year();
+  month = TQDate::tqcurrentDate().month();
   _from->setDate(TQDate(year, month, 1));
   rangeLayout->addWidget(_from);
   rangeLayout->addWidget(new TQLabel(i18n("To:"), rangeWidget));
   _to = new KDateEdit(rangeWidget);
   rangeLayout->addWidget(_to);
 
-  layout->addSpacing(10);
-  layout->addStretch(1);
+  tqlayout->addSpacing(10);
+  tqlayout->addStretch(1);
 
   _allTasks = new TQComboBox( page );
   _allTasks->insertItem( i18n( "Selected Task" ) );
   _allTasks->insertItem( i18n( "All Tasks" ) );
-  layout->addWidget( _allTasks );
+  tqlayout->addWidget( _allTasks );
 
   _perWeek = new TQCheckBox( i18n( "Summarize per week" ), page );
-  layout->addWidget( _perWeek );
+  tqlayout->addWidget( _perWeek );
   _totalsOnly = new TQCheckBox( i18n( "Totals only" ), page );
-  layout->addWidget( _totalsOnly );
+  tqlayout->addWidget( _totalsOnly );
 
-  layout->addSpacing(10);
-  layout->addStretch(1);
+  tqlayout->addSpacing(10);
+  tqlayout->addStretch(1);
 }
 
 TQDate PrintDialog::from() const
diff --git a/karm/reportcriteria.h b/karm/reportcriteria.h
index c6c1106e..dae6a48e 100644
--- a/karm/reportcriteria.h
+++ b/karm/reportcriteria.h
@@ -29,7 +29,7 @@ class TQString;
  Stores entries from export dialog.
 
  Keeps details (like CSV export dialog control names) out of the TaskView
- class, which contains the slot triggered by the export action.  
+ class, which tqcontains the slot triggered by the export action.  
  
  The dialog and the report logic can change all they want and the TaskView
  logic can stay the same.
diff --git a/karm/task.cpp b/karm/task.cpp
index 7d84bcd2..b150a94d 100644
--- a/karm/task.cpp
+++ b/karm/task.cpp
@@ -75,13 +75,13 @@ void Task::init( const TQString& taskName, long minutes, long sessionTime,
 
   _removing = false;
   _name = taskName.stripWhiteSpace();
-  _lastStart = TQDateTime::currentDateTime();
+  _lastStart = TQDateTime::tqcurrentDateTime();
   _totalTime = _time = minutes;
   _totalSessionTime = _sessionTime = sessionTime;
   _timer = new TQTimer(this);
   _desktops = desktops;
   connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateActiveIcon()));
-  setPixmap(1, UserIcon(TQString::fromLatin1("empty-watch.xpm")));
+  setPixmap(1, UserIcon(TQString::tqfromLatin1("empty-watch.xpm")));
   _currentPic = 0;
   _percentcomplete = percent_complete;
 
@@ -119,7 +119,7 @@ void Task::setRunning( bool on, KarmStorage* storage, TQDateTime whenStarted, TQ
       if ( ! _removing ) 
       {
         storage->stopTimer(this, whenStopped);
-        setPixmap(1, UserIcon(TQString::fromLatin1("empty-watch.xpm")));
+        setPixmap(1, UserIcon(TQString::tqfromLatin1("empty-watch.xpm")));
       }
     }
   }
@@ -290,7 +290,7 @@ TQString Task::fullName() const
   if (isRoot())
     return name();
   else
-    return parent()->fullName() + TQString::fromLatin1("/") + name();
+    return parent()->fullName() + TQString::tqfromLatin1("/") + name();
 }
 
 KCal::Todo* Task::asTodo(KCal::Todo* todo) const
@@ -349,7 +349,7 @@ bool Task::parseIncidence( KCal::Incidence* incident, long& minutes,
 
   TQString desktopList = incident->customProperty( kapp->instanceName(),
       TQCString( "desktopList" ) );
-  TQStringList desktopStrList = TQStringList::split( TQString::fromLatin1(","),
+  TQStringList desktopStrList = TQStringList::split( TQString::tqfromLatin1(","),
       desktopList );
   desktops.clear();
 
@@ -380,7 +380,7 @@ TQString Task::getDesktopStr() const
   for ( DesktopList::const_iterator iter = _desktops.begin();
         iter != _desktops.end();
         ++iter ) {
-    desktopstr += TQString::number( *iter ) + TQString::fromLatin1( "," );
+    desktopstr += TQString::number( *iter ) + TQString::tqfromLatin1( "," );
   }
   desktopstr.remove( desktopstr.length() - 1, 1 );
   return desktopstr;
@@ -419,7 +419,7 @@ void Task::update()
 
 void Task::addComment( TQString comment, KarmStorage* storage )
 {
-  _comment = _comment + TQString::fromLatin1("\n") + comment;
+  _comment = _comment + TQString::tqfromLatin1("\n") + comment;
   storage->addComment(this, comment);
 }
 
diff --git a/karm/task.h b/karm/task.h
index 8114b3cb..276b2503 100644
--- a/karm/task.h
+++ b/karm/task.h
@@ -179,11 +179,11 @@ class Task : public TQObject, public QListViewItem
        *  @param on       true or false for starting or stopping a task
        *  @param storage a pointer to a KarmStorage object.
        *  @param whenStarted time when the task was started. Normally
-				    TQDateTime::currentDateTime, but if calendar has 
+				    TQDateTime::tqcurrentDateTime, but if calendar has 
 				    been changed by another program and being reloaded
  				    the task is set to running with another start date
        */
-      void setRunning( bool on, KarmStorage* storage, TQDateTime whenStarted=TQDateTime::currentDateTime(), TQDateTime whenStopped=TQDateTime::currentDateTime());
+      void setRunning( bool on, KarmStorage* storage, TQDateTime whenStarted=TQDateTime::tqcurrentDateTime(), TQDateTime whenStopped=TQDateTime::tqcurrentDateTime());
 
       /** return the state of a task - if it's running or not
        *  @return         true or false depending on whether the task is running
diff --git a/karm/taskview.cpp b/karm/taskview.cpp
index 0af5c7bd..a410806a 100644
--- a/karm/taskview.cpp
+++ b/karm/taskview.cpp
@@ -367,7 +367,7 @@ TQString TaskView::save()
 {
   kdDebug(5970) << "Entering TaskView::save" << endl;
   TQString err = _storage->save(this);
-  emit(setStatusBar(err));
+  emit(seStatusBar(err));
   return err;
 }
 
diff --git a/karm/taskview.h b/karm/taskview.h
index a3a1a676..a3b88413 100644
--- a/karm/taskview.h
+++ b/karm/taskview.h
@@ -172,7 +172,7 @@ class TaskView : public KListView
      * @param task      task to start timer of
      * @param startTime if taskview has been modified by another program, we 
 			     have to set the starting time to not-now. */
-    void startTimerFor( Task* task, TQDateTime startTime = TQDateTime::currentDateTime() );
+    void startTimerFor( Task* task, TQDateTime startTime = TQDateTime::tqcurrentDateTime() );
     void stopTimerFor( Task* task );
 
     /** clears all active tasks. Needed e.g. if iCal file was modified by
@@ -200,7 +200,7 @@ class TaskView : public KListView
     void timersActive();
     void timersInactive();
     void tasksChanged( TQPtrList<Task> activeTasks );
-    void setStatusBar( TQString );
+    void seStatusBar( TQString );
 
   private: // member variables
     IdleTimeDetector *_idleTimeDetector;
diff --git a/karm/test/lockerthread.cpp b/karm/test/lockerthread.cpp
index 91468221..aeff6cc7 100644
--- a/karm/test/lockerthread.cpp
+++ b/karm/test/lockerthread.cpp
@@ -26,7 +26,7 @@ void LockerThread::run()
   KCal::ResourceCalendar          *calendar  = 0;
   KCal::CalendarResources::Ticket *lock      = 0;
 
-  calendars = new KCal::CalendarResources( TQString::fromLatin1( "UTC" ) );
+  calendars = new KCal::CalendarResources( TQString::tqfromLatin1( "UTC" ) );
   calendar  = new KCal::ResourceLocal( m_icsfile );
   lock      = calendars->requestSaveTicket( calendar );
   if ( lock )
diff --git a/karm/test/locking.cpp b/karm/test/locking.cpp
index 940a344d..2c18d4fe 100644
--- a/karm/test/locking.cpp
+++ b/karm/test/locking.cpp
@@ -23,7 +23,7 @@ short test1()
   KCal::ResourceCalendar          *calendar  = 0;
   KCal::CalendarResources::Ticket *lock      = 0;
 
-  calendars = new KCal::CalendarResources( TQString::fromLatin1( "UTC" ) );
+  calendars = new KCal::CalendarResources( TQString::tqfromLatin1( "UTC" ) );
   calendar  = new KCal::ResourceLocal( icalfilename );
   lock      = calendars->requestSaveTicket( calendar );
 
@@ -62,7 +62,7 @@ short test2()
   KCal::ResourceCalendar          *calendar  = 0;
   KCal::CalendarResources::Ticket *lock      = 0;
 
-  calendars = new KCal::CalendarResources( TQString::fromLatin1( "UTC" ) );
+  calendars = new KCal::CalendarResources( TQString::tqfromLatin1( "UTC" ) );
   calendar  = new KCal::ResourceLocal( icalfilename );
 
   LockerThread thread( icalfilename );
@@ -88,7 +88,7 @@ short test3()
   KCal::ResourceCalendar          *calendar  = 0;
   KCal::CalendarResources::Ticket *lock      = 0;
 
-  calendars = new KCal::CalendarResources( TQString::fromLatin1( "UTC" ) );
+  calendars = new KCal::CalendarResources( TQString::tqfromLatin1( "UTC" ) );
   calendar  = new KCal::ResourceLocal( icalfilename );
 
   // lock then unlock
diff --git a/karm/test/script.cpp b/karm/test/script.cpp
index f9fa9d9e..81631436 100644
--- a/karm/test/script.cpp
+++ b/karm/test/script.cpp
@@ -94,7 +94,7 @@ void Script::terminate()
 
 void Script::exit()
 {
-  m_status = m_proc->exitStatus();
+  m_status = m_proc->exiStatus();
   delete m_proc;
   m_proc = 0;
 }
diff --git a/karm/timekard.cpp b/karm/timekard.cpp
index 984baf74..d7de4840 100644
--- a/karm/timekard.cpp
+++ b/karm/timekard.cpp
@@ -43,7 +43,7 @@ const int timeWidth = 6;
 const int totalTimeWidth = 7;
 const int reportWidth = taskWidth + timeWidth;
 
-const TQString cr = TQString::fromLatin1("\n");
+const TQString cr = TQString::tqfromLatin1("\n");
 
 TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime which)
 // Print the total Times as text. If justThisTask, use activeTask, else, all tasks
@@ -59,9 +59,9 @@ TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime
 
   // header
   retval += i18n("Task Totals") + cr;
-  retval += KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime());
+  retval += KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime());
   retval += cr + cr;
-  retval += TQString(TQString::fromLatin1("%1    %2"))
+  retval += TQString(TQString::tqfromLatin1("%1    %2"))
     .arg(i18n("Time"), timeWidth)
     .arg(i18n("Task"));
   retval += cr;
@@ -92,8 +92,8 @@ TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime
 
     // total
     buf.fill('-', reportWidth);
-    retval += TQString(TQString::fromLatin1("%1")).arg(buf, timeWidth) + cr;
-    retval += TQString(TQString::fromLatin1("%1 %2"))
+    retval += TQString(TQString::tqfromLatin1("%1")).arg(buf, timeWidth) + cr;
+    retval += TQString(TQString::tqfromLatin1("%1 %2"))
       .arg(formatTime(sum),timeWidth)
       .arg(i18n("Total"));
   }
@@ -109,7 +109,7 @@ void TimeKard::printTask(Task *task, TQString &s, int level, WhichTime which)
   TQString buf;
 
   s += buf.fill(' ', level);
-  s += TQString(TQString::fromLatin1("%1    %2"))
+  s += TQString(TQString::tqfromLatin1("%1    %2"))
     .arg(formatTime(which == TotalTime?task->totalTime():task->totalSessionTime()), timeWidth)
     .arg(task->name());
   s += cr;
@@ -134,22 +134,22 @@ void TimeKard::printTaskHistory(const Task *task,
   long sectionsum = 0;
   for ( TQDate day = from; day <= to; day = day.addDays(1) )
   {
-    TQString daykey = day.toString(TQString::fromLatin1("yyyyMMdd"));
-    TQString daytaskkey = TQString::fromLatin1("%1_%2")
+    TQString daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd"));
+    TQString daytaskkey = TQString::tqfromLatin1("%1_%2")
                          .arg(daykey)
                          .arg(task->uid());
 
-    if (taskdaytotals.contains(daytaskkey))
+    if (taskdaytotals.tqcontains(daytaskkey))
     {
       if ( !totalsOnly )
       {
-        s += TQString::fromLatin1("%1")
+        s += TQString::tqfromLatin1("%1")
              .arg(formatTime(taskdaytotals[daytaskkey]/60), timeWidth);
       }
       sectionsum += taskdaytotals[daytaskkey];  // in seconds
 
-      if (daytotals.contains(daykey))
-        daytotals.replace(daykey, daytotals[daykey] + taskdaytotals[daytaskkey]);
+      if (daytotals.tqcontains(daykey))
+        daytotals.tqreplace(daykey, daytotals[daykey] + taskdaytotals[daytaskkey]);
       else
         daytotals.insert(daykey, taskdaytotals[daytaskkey]);
     }
@@ -162,12 +162,12 @@ void TimeKard::printTaskHistory(const Task *task,
   }
 
   // Total for task this section (e.g. week)
-  s += TQString::fromLatin1("%1").arg(formatTime(sectionsum/60), totalTimeWidth);
+  s += TQString::tqfromLatin1("%1").arg(formatTime(sectionsum/60), totalTimeWidth);
 
   // Task name
   TQString buf;
   s += buf.fill(' ', level + 1);
-  s += TQString::fromLatin1("%1").arg(task->name());
+  s += TQString::tqfromLatin1("%1").arg(task->name());
   s += cr;
 
   for (Task* subTask = task->firstChild();
@@ -221,13 +221,13 @@ TQString TimeKard::sectionHistoryAsText(
   // so times are accumulated for each task.
   for (TQValueList<HistoryEvent>::iterator event = events.begin(); event != events.end(); ++event)
   {
-    TQString daykey = (*event).start().date().toString(TQString::fromLatin1("yyyyMMdd"));
-    TQString daytaskkey = TQString::fromLatin1("%1_%2")
+    TQString daykey = (*event).start().date().toString(TQString::tqfromLatin1("yyyyMMdd"));
+    TQString daytaskkey = TQString::tqfromLatin1("%1_%2")
                          .arg(daykey)
                          .arg((*event).todoUid());
 
-    if (taskdaytotals.contains(daytaskkey))
-      taskdaytotals.replace(daytaskkey,
+    if (taskdaytotals.tqcontains(daytaskkey))
+      taskdaytotals.tqreplace(daytaskkey,
                             taskdaytotals[daytaskkey] + (*event).duration());
     else
       taskdaytotals.insert(daytaskkey, (*event).duration());
@@ -246,7 +246,7 @@ TQString TimeKard::sectionHistoryAsText(
     // day headings
     for (TQDate day = sectionFrom; day <= sectionTo; day = day.addDays(1))
     {
-      retval += TQString::fromLatin1("%1").arg(day.day(), timeWidth);
+      retval += TQString::tqfromLatin1("%1").arg(day.day(), timeWidth);
     }
     retval += cr;
     retval += line;
@@ -280,13 +280,13 @@ TQString TimeKard::sectionHistoryAsText(
     long sum = 0;
     for (TQDate day = sectionFrom; day <= sectionTo; day = day.addDays(1))
     {
-      TQString daykey = day.toString(TQString::fromLatin1("yyyyMMdd"));
+      TQString daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd"));
 
-      if (daytotals.contains(daykey))
+      if (daytotals.tqcontains(daykey))
       {
         if ( !totalsOnly )
         {
-          retval += TQString::fromLatin1("%1")
+          retval += TQString::tqfromLatin1("%1")
                     .arg(formatTime(daytotals[daykey]/60), timeWidth);
         }
         sum += daytotals[daykey];  // in seconds
@@ -298,7 +298,7 @@ TQString TimeKard::sectionHistoryAsText(
       }
     }
 
-    retval += TQString::fromLatin1("%1 %2")
+    retval += TQString::tqfromLatin1("%1 %2")
               .arg(formatTime(sum/60), totalTimeWidth)
               .arg(i18n("Total"));
   }
@@ -317,7 +317,7 @@ TQString TimeKard::historyAsText(TaskView* taskview, const TQDate& from,
     .arg(KGlobal::locale()->formatDate(to));
   retval += cr;
   retval += i18n("Printed on: %1")
-    .arg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()));
+    .arg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()));
 
   if ( perWeek )
   {
diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp
index bdd166c5..79d7e18d 100644
--- a/kdgantt/KDGanttMinimizeSplitter.cpp
+++ b/kdgantt/KDGanttMinimizeSplitter.cpp
@@ -46,7 +46,7 @@
 #define TQPtrList QList
 #define TQMemArray QArray
 #endif
-#include "qlayoutengine_p.h"
+#include "tqlayoutengine_p.h"
 #include "tqobjectlist.h"
 #include "tqstyle.h"
 #include "tqapplication.h" //sendPostedEvents
@@ -73,7 +73,7 @@ KDGanttSplitterHandle::KDGanttSplitterHandle( Qt::Orientation o,
     setMouseTracking( true );
 }
 
-TQSize KDGanttSplitterHandle::sizeHint() const
+TQSize KDGanttSplitterHandle::tqsizeHint() const
 {
     return TQSize(8,8);
 }
@@ -99,7 +99,7 @@ void KDGanttSplitterHandle::mouseMoveEvent( TQMouseEvent *e )
     if ( _activeButton != 0)
         return;
 
-    QCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos()))
+    QCOORD pos = s->pick(tqparentWidget()->mapFromGlobal(e->globalPos()))
 		 - mouseOffset;
     if ( opaque() ) {
 	s->moveSplitter( pos, id() );
@@ -117,7 +117,7 @@ void KDGanttSplitterHandle::mousePressEvent( TQMouseEvent *e )
         _activeButton = onButton( e->pos() );
         mouseOffset = s->pick(e->pos());
         if ( _activeButton != 0)
-            repaint();
+            tqrepaint();
         updateCursor( e->pos() );
     }
 }
@@ -168,13 +168,13 @@ void KDGanttSplitterHandle::mouseReleaseEvent( TQMouseEvent *e )
     }
     else {
         if ( !opaque() && e->button() == LeftButton ) {
-            QCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos()))
+            QCOORD pos = s->pick(tqparentWidget()->mapFromGlobal(e->globalPos()))
                 - mouseOffset;
             s->setRubberband( -1 );
             s->moveSplitter( pos, id() );
         }
     }
-    repaint();
+    tqrepaint();
 }
 
 int KDGanttSplitterHandle::onButton( const TQPoint& p )
@@ -187,7 +187,7 @@ int KDGanttSplitterHandle::onButton( const TQPoint& p )
         rect.setRight( rect.right() + 4);
         rect.setTop( rect.top()- 4 );
         rect.setBottom( rect.bottom() + 4);
-        if ( rect.contains( p ) ) {
+        if ( rect.tqcontains( p ) ) {
             return index;
         }
         index++;
@@ -247,16 +247,16 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * )
     TQPainter p( &buffer );
 
     // Draw the splitter rectangle
-    p.setBrush( colorGroup().background() );
-    p.setPen( colorGroup().foreground() );
+    p.setBrush( tqcolorGroup().background() );
+    p.setPen( tqcolorGroup().foreground() );
     p.drawRect( rect() );
-    parentWidget()->style().drawPrimitive( TQStyle::PE_Panel, &p, rect(),
-                                           parentWidget()->colorGroup());
+    tqparentWidget()->style().drawPrimitive( TQStyle::PE_Panel, &p, rect(),
+                                           tqparentWidget()->tqcolorGroup());
 
     int sw = 8; // Hardcoded, given I didn't use styles anymore, I didn't like to use their size
 
     // arrow color
-    TQColor col = colorGroup().background().dark( 200 );
+    TQColor col = tqcolorGroup().background().dark( 200 );
     p.setBrush( col );
     p.setPen( col  );
 
@@ -265,8 +265,8 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * )
     for ( TQValueList<TQPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) {
         if ( index == _activeButton ) {
             p.save();
-            p.translate( parentWidget()->style().pixelMetric( TQStyle::PM_ButtonShiftHorizontal ),
-                         parentWidget()->style().pixelMetric( TQStyle::PM_ButtonShiftVertical ) );
+            p.translate( tqparentWidget()->style().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal ),
+                         tqparentWidget()->style().tqpixelMetric( TQStyle::PM_ButtonShiftVertical ) );
             p.drawPolygon( *it, true );
             p.restore();
         }
@@ -374,10 +374,10 @@ static TQSize minSize( const TQWidget* /*w*/ )
 // This is the original version of minSize
 static TQSize minSizeHint( const TQWidget* w )
 {
-    TQSize min = w->minimumSize();
+    TQSize min = w->tqminimumSize();
     TQSize s;
     if ( min.height() <= 0 || min.width() <= 0 )
-	s = w->minimumSizeHint();
+	s = w->tqminimumSizeHint();
     if ( min.height() > 0 )
 	s.setHeight( min.height() );
     if ( min.width() > 0 )
@@ -430,9 +430,9 @@ void KDGanttMinimizeSplitter::init()
 {
     data = new QSplitterData;
     if ( orient == Horizontal )
-	setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Minimum) );
+	tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Minimum) );
     else
-	setSizePolicy( TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Expanding) );
+	tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Expanding) );
 }
 #endif
 
@@ -452,9 +452,9 @@ void KDGanttMinimizeSplitter::setOrientation( Orientation o )
     orient = o;
 
     if ( orient == Horizontal )
-	setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ) );
+	tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ) );
     else
-	setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
+	tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
 
     QSplitterLayoutStruct *s = data->list.first();
     while ( s ) {
@@ -499,7 +499,7 @@ QSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( TQWidget *w, bool fir
 	s->wid = newHandle;
 	newHandle->setId(data->list.count());
 	s->isSplitter = TRUE;
-	s->sizer = pick( newHandle->sizeHint() );
+	s->sizer = pick( newHandle->tqsizeHint() );
 	if ( first )
 	    data->list.insert( 0, s );
 	else
@@ -508,8 +508,8 @@ QSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( TQWidget *w, bool fir
     s = new QSplitterLayoutStruct;
     s->mode = Stretch;
     s->wid = w;
-    if ( !testWState( WState_Resized ) && w->sizeHint().isValid() )
-	s->sizer = pick( w->sizeHint() );
+    if ( !testWState( WState_Resized ) && w->tqsizeHint().isValid() )
+	s->sizer = pick( w->tqsizeHint() );
     else
 	s->sizer = pick( w->size() );
     s->isSplitter = FALSE;
@@ -582,7 +582,7 @@ void KDGanttMinimizeSplitter::setRubberband( int p )
     paint.setRasterOp( XorROP );
     TQRect r = contentsRect();
     const int rBord = 3; //Themable????
-    int sw = style().pixelMetric(TQStyle::PM_SplitterWidth, this);
+    int sw = style().tqpixelMetric(TQStyle::PM_SplitterWidth, this);
     if ( orient == Horizontal ) {
 	if ( opaqueOldPos >= 0 )
 	    paint.drawRect( opaqueOldPos + sw/2 - rBord , r.y(),
@@ -622,7 +622,7 @@ bool KDGanttMinimizeSplitter::event( TQEvent *e )
 void KDGanttMinimizeSplitter::drawSplitter( TQPainter *p,
 			      QCOORD x, QCOORD y, QCOORD w, QCOORD h )
 {
-    style().drawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), colorGroup(),
+    style().drawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), tqcolorGroup(),
 			  (orientation() == Qt::Horizontal ?
 			   TQStyle::Style_Horizontal : 0));
 }
@@ -653,7 +653,7 @@ int KDGanttMinimizeSplitter::idAfter( TQWidget* w ) const
   close as possible to position \a p, which is the distance from the
   left (or top) edge of the widget.
 
-  For Arabic and Hebrew the layout is reversed, and using this
+  For Arabic and Hebrew the tqlayout is reversed, and using this
   function to set the position of the splitter might lead to
   unexpected results, since in Arabic and Hebrew the position of
   splitter one is to the left of the position of splitter zero.
@@ -726,13 +726,13 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft )
     } else {
 	int dd, newLeft, nextPos;
 	if( TQApplication::reverseLayout() && orient == Horizontal ) {
-	    dd = w->geometry().right() - pos;
-	    dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->maximumSize())));
+	    dd = w->tqgeometry().right() - pos;
+	    dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->tqmaximumSize())));
 	    newLeft = pos+1;
 	    nextPos = newLeft + dd;
 	} else {
 	    dd = pos - pick( w->pos() ) + 1;
-	    dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->maximumSize())));
+	    dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->tqmaximumSize())));
 	    newLeft = pos-dd+1;
 	    nextPos = newLeft - 1;
 	}
@@ -781,13 +781,13 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft )
 	int right, dd,/* newRight,*/ newLeft, nextPos;
 	if ( TQApplication::reverseLayout() && orient == Horizontal ) {
 	    dd = pos - left + 1;
-	    dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->maximumSize())));
+	    dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->tqmaximumSize())));
 	    newLeft = pos-dd+1;
 	    nextPos = newLeft - 1;
 	} else {
-	    right = pick( w->geometry().bottomRight() );
+	    right = pick( w->tqgeometry().bottomRight() );
 	    dd = right - pos + 1;
-	    dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->maximumSize())));
+	    dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->tqmaximumSize())));
 	    /*newRight = pos+dd-1;*/
 	    newLeft = pos;
 	    nextPos = newLeft + dd;
@@ -841,7 +841,7 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max )
 	    maxB += s->sizer;
 	} else {
 	    minB += pick( minSize(s->wid) );
-	    maxB += pick( s->wid->maximumSize() );
+	    maxB += pick( s->wid->tqmaximumSize() );
 	}
     }
     for ( i = id; i < n; i++ ) {
@@ -853,12 +853,12 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max )
 	    maxA += s->sizer;
 	} else {
 	    minA += pick( minSize(s->wid) );
-	    maxA += pick( s->wid->maximumSize() );
+	    maxA += pick( s->wid->tqmaximumSize() );
 	}
     }
     TQRect r = contentsRect();
     if ( orient == Horizontal && TQApplication::reverseLayout() ) {
-	int splitterWidth = style().pixelMetric(TQStyle::PM_SplitterWidth, this);
+	int splitterWidth = style().tqpixelMetric(TQStyle::PM_SplitterWidth, this);
 	if ( min )
 	    *min = pick(r.topRight()) - QMIN( maxB, pick(r.size())-minA ) - splitterWidth;
 	if ( max )
@@ -900,27 +900,27 @@ void KDGanttMinimizeSplitter::doResize()
 	QSplitterLayoutStruct *s = data->list.at(i);
 	if ( s->wid->isHidden() ) {
 	    a[i].stretch = 0;
-	    a[i].sizeHint = a[i].minimumSize = 0;
-	    a[i].maximumSize = 0;
+	    a[i].tqsizeHint = a[i].tqminimumSize = 0;
+	    a[i].tqmaximumSize = 0;
 	} else if ( s->isSplitter ) {
 	    a[i].stretch = 0;
-	    a[i].sizeHint = a[i].minimumSize = a[i].maximumSize = s->sizer;
+	    a[i].tqsizeHint = a[i].tqminimumSize = a[i].tqmaximumSize = s->sizer;
 	    a[i].empty = FALSE;
 	} else if ( s->mode == KeepSize ) {
 	    a[i].stretch = 0;
-	    a[i].minimumSize = pick( minSize(s->wid) );
-	    a[i].sizeHint = s->sizer;
-	    a[i].maximumSize = pick( s->wid->maximumSize() );
+	    a[i].tqminimumSize = pick( minSize(s->wid) );
+	    a[i].tqsizeHint = s->sizer;
+	    a[i].tqmaximumSize = pick( s->wid->tqmaximumSize() );
 	    a[i].empty = FALSE;
 	} else if ( s->mode == FollowSizeHint ) {
 	    a[i].stretch = 0;
-	    a[i].minimumSize = a[i].sizeHint = pick( s->wid->sizeHint() );
-	    a[i].maximumSize = pick( s->wid->maximumSize() );
+	    a[i].tqminimumSize = a[i].tqsizeHint = pick( s->wid->tqsizeHint() );
+	    a[i].tqmaximumSize = pick( s->wid->tqmaximumSize() );
 	    a[i].empty = FALSE;
 	} else { //proportional
 	    a[i].stretch = s->sizer;
-	    a[i].maximumSize = pick( s->wid->maximumSize() );
-	    a[i].sizeHint = a[i].minimumSize = pick( minSize(s->wid) );
+	    a[i].tqmaximumSize = pick( s->wid->tqmaximumSize() );
+	    a[i].tqsizeHint = a[i].tqminimumSize = pick( minSize(s->wid) );
 	    a[i].empty = FALSE;
 	}
     }
@@ -974,16 +974,16 @@ void KDGanttMinimizeSplitter::recalc( bool update )
 	    } else {
 		TQSize minS = minSize(s->wid);
 		minl += pick( minS );
-		maxl += pick( s->wid->maximumSize() );
+		maxl += pick( s->wid->tqmaximumSize() );
 		mint = QMAX( mint, trans( minS ));
-		int tm = trans( s->wid->maximumSize() );
+		int tm = trans( s->wid->tqmaximumSize() );
 		if ( tm > 0 )
 		    maxt = QMIN( maxt, tm );
 	    }
 	}
     }
     if ( empty ) {
-        if ( parentWidget() != 0 && parentWidget()->inherits("KDGanttMinimizeSplitter") ) {
+        if ( tqparentWidget() != 0 && tqparentWidget()->inherits("KDGanttMinimizeSplitter") ) {
             // nested splitters; be nice
             maxl = maxt = 0;
         } else {
@@ -1126,7 +1126,7 @@ void KDGanttMinimizeSplitter::recalcId()
 
 /*! Reimplemented from superclass.
 */
-TQSize KDGanttMinimizeSplitter::sizeHint() const
+TQSize KDGanttMinimizeSplitter::tqsizeHint() const
 {
     constPolish();
     int l = 0;
@@ -1140,7 +1140,7 @@ TQSize KDGanttMinimizeSplitter::sizeHint() const
 	    ++it;
 	    if ( o->isWidgetType() &&
 		 !((TQWidget*)o)->isHidden() ) {
-		TQSize s = ((TQWidget*)o)->sizeHint();
+		TQSize s = ((TQWidget*)o)->tqsizeHint();
 		if ( s.isValid() ) {
 		    l += pick( s );
 		    t = QMAX( t, trans( s ) );
@@ -1156,7 +1156,7 @@ TQSize KDGanttMinimizeSplitter::sizeHint() const
 \reimp
 */
 
-TQSize KDGanttMinimizeSplitter::minimumSizeHint() const
+TQSize KDGanttMinimizeSplitter::tqminimumSizeHint() const
 {
     constPolish();
     int l = 0;
@@ -1250,7 +1250,7 @@ bool KDGanttMinimizeSplitter::isHidden( TQWidget *w ) const
   splitter.
 
   Giving the values to another splitter's setSizes() function will
-  produce a splitter with the same layout as this one.
+  produce a splitter with the same tqlayout as this one.
 
   Note that if you want to iterate over the list, you should
   iterate over a copy, e.g.
@@ -1291,7 +1291,7 @@ TQValueList<int> KDGanttMinimizeSplitter::sizes() const
   top to bottom.
   Extra values in \a list are ignored.
 
-  If \a list contains too few values, the result is undefined
+  If \a list tqcontains too few values, the result is undefined
   but the program will still be well-behaved.
 
   \sa sizes()
@@ -1330,7 +1330,7 @@ void KDGanttMinimizeSplitter::processChildEvents()
 
 void KDGanttMinimizeSplitter::styleChange( TQStyle& old )
 {
-    int sw = style().pixelMetric(TQStyle::PM_SplitterWidth, this);
+    int sw = style().tqpixelMetric(TQStyle::PM_SplitterWidth, this);
     QSplitterLayoutStruct *s = data->list.first();
     while ( s ) {
 	if ( s->isSplitter )
@@ -1364,7 +1364,7 @@ KDGanttMinimizeSplitter::Direction KDGanttMinimizeSplitter::minimizeDirection()
 }
 
 /*
-  This is a copy of qGeomCalc() in qlayoutengine.cpp which
+  This is a copy of qGeomCalc() in qtqlayoutengine.cpp which
   unfortunately isn't exported.
 */
 static inline int toFixed( int i ) { return i * 256; }
@@ -1387,9 +1387,9 @@ void kdganttGeomCalc( TQMemArray<QLayoutStruct> &chain, int start, int count, in
     int i;
     for ( i = start; i < start + count; i++ ) {
 	chain[i].done = FALSE;
-	cHint += chain[i].sizeHint;
-	cMin += chain[i].minimumSize;
-	cMax += chain[i].maximumSize;
+	cHint += chain[i].tqsizeHint;
+	cMin += chain[i].tqminimumSize;
+	cMax += chain[i].tqmaximumSize;
 	sumStretch += chain[i].stretch;
 	if ( !chain[i].empty )
 	    spacerCount++;
@@ -1402,11 +1402,11 @@ void kdganttGeomCalc( TQMemArray<QLayoutStruct> &chain, int start, int count, in
     if ( space < cMin + spacerCount * spacer ) {
 	//	qDebug("not enough space");
 	for ( i = start; i < start+count; i++ ) {
-	    chain[i].size = chain[i].minimumSize;
+	    chain[i].size = chain[i].tqminimumSize;
 	    chain[i].done = TRUE;
 	}
     } else if ( space < cHint + spacerCount*spacer ) {
-	// Less space than sizeHint, but more than minimum.
+	// Less space than tqsizeHint, but more than minimum.
 	// Currently take space equally from each, like in Qt 2.x.
 	// Commented-out lines will give more space to stretchier items.
 	int n = count;
@@ -1414,10 +1414,10 @@ void kdganttGeomCalc( TQMemArray<QLayoutStruct> &chain, int start, int count, in
 	int overdraft = cHint - space_left;
 	//first give to the fixed ones:
 	for ( i = start; i < start+count; i++ ) {
-	    if ( !chain[i].done && chain[i].minimumSize >= chain[i].sizeHint) {
-		chain[i].size = chain[i].sizeHint;
+	    if ( !chain[i].done && chain[i].tqminimumSize >= chain[i].tqsizeHint) {
+		chain[i].size = chain[i].tqsizeHint;
 		chain[i].done = TRUE;
-		space_left -= chain[i].sizeHint;
+		space_left -= chain[i].tqsizeHint;
 		// sumStretch -= chain[i].stretch;
 		n--;
 	    }
@@ -1436,13 +1436,13 @@ void kdganttGeomCalc( TQMemArray<QLayoutStruct> &chain, int start, int count, in
 		// else
 		//    fp_w += (fp_over * chain[i].stretch) / sumStretch;
 		int w = fRound( fp_w );
-		chain[i].size = chain[i].sizeHint - w;
+		chain[i].size = chain[i].tqsizeHint - w;
 		fp_w -= toFixed( w ); //give the difference to the next
-		if ( chain[i].size < chain[i].minimumSize ) {
+		if ( chain[i].size < chain[i].tqminimumSize ) {
 		    chain[i].done = TRUE;
-		    chain[i].size = chain[i].minimumSize;
+		    chain[i].size = chain[i].tqminimumSize;
 		    finished = FALSE;
-		    overdraft -= chain[i].sizeHint - chain[i].minimumSize;
+		    overdraft -= chain[i].tqsizeHint - chain[i].tqminimumSize;
 		    // sumStretch -= chain[i].stretch;
 		    n--;
 		    break;
@@ -1454,11 +1454,11 @@ void kdganttGeomCalc( TQMemArray<QLayoutStruct> &chain, int start, int count, in
 	int space_left = space - spacerCount*spacer;
 	// first give to the fixed ones, and handle non-expansiveness
 	for ( i = start; i < start + count; i++ ) {
-	    if ( !chain[i].done && (chain[i].maximumSize <= chain[i].sizeHint
+	    if ( !chain[i].done && (chain[i].tqmaximumSize <= chain[i].tqsizeHint
 				    || wannaGrow && !chain[i].expansive) ) {
-		chain[i].size = chain[i].sizeHint;
+		chain[i].size = chain[i].tqsizeHint;
 		chain[i].done = TRUE;
-		space_left -= chain[i].sizeHint;
+		space_left -= chain[i].tqsizeHint;
 		sumStretch -= chain[i].stretch;
 		n--;
 	    }
@@ -1490,20 +1490,20 @@ void kdganttGeomCalc( TQMemArray<QLayoutStruct> &chain, int start, int count, in
 		int w = fRound( fp_w );
 		chain[i].size = w;
 		fp_w -= toFixed( w ); // give the difference to the next
-		if ( w < chain[i].sizeHint ) {
-		    deficit +=  chain[i].sizeHint - w;
-		} else if ( w > chain[i].maximumSize ) {
-		    surplus += w - chain[i].maximumSize;
+		if ( w < chain[i].tqsizeHint ) {
+		    deficit +=  chain[i].tqsizeHint - w;
+		} else if ( w > chain[i].tqmaximumSize ) {
+		    surplus += w - chain[i].tqmaximumSize;
 		}
 	    }
 	    if ( deficit > 0 && surplus <= deficit ) {
 		// give to the ones that have too little
 		for ( i = start; i < start+count; i++ ) {
 		    if ( !chain[i].done &&
-			 chain[i].size < chain[i].sizeHint ) {
-			chain[i].size = chain[i].sizeHint;
+			 chain[i].size < chain[i].tqsizeHint ) {
+			chain[i].size = chain[i].tqsizeHint;
 			chain[i].done = TRUE;
-			space_left -= chain[i].sizeHint;
+			space_left -= chain[i].tqsizeHint;
 			sumStretch -= chain[i].stretch;
 			n--;
 		    }
@@ -1513,10 +1513,10 @@ void kdganttGeomCalc( TQMemArray<QLayoutStruct> &chain, int start, int count, in
 		// take from the ones that have too much
 		for ( i = start; i < start+count; i++ ) {
 		    if ( !chain[i].done &&
-			 chain[i].size > chain[i].maximumSize ) {
-			chain[i].size = chain[i].maximumSize;
+			 chain[i].size > chain[i].tqmaximumSize ) {
+			chain[i].size = chain[i].tqmaximumSize;
 			chain[i].done = TRUE;
-			space_left -= chain[i].maximumSize;
+			space_left -= chain[i].tqmaximumSize;
 			sumStretch -= chain[i].stretch;
 			n--;
 		    }
diff --git a/kdgantt/KDGanttMinimizeSplitter.h b/kdgantt/KDGanttMinimizeSplitter.h
index 801fc011..15429e5a 100644
--- a/kdgantt/KDGanttMinimizeSplitter.h
+++ b/kdgantt/KDGanttMinimizeSplitter.h
@@ -74,8 +74,8 @@ public:
     void moveToLast( TQWidget * );
 
     void refresh() { recalc( TRUE ); }
-    virtual TQSize sizeHint() const;
-    virtual TQSize minimumSizeHint() const;
+    virtual TQSize tqsizeHint() const;
+    virtual TQSize tqminimumSizeHint() const;
 
     TQValueList<int> sizes() const;
     void setSizes( TQValueList<int> );
@@ -152,7 +152,7 @@ public:
 
     bool opaque() const { return s->opaqueResize(); }
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
     int id() const { return myId; } // data->list.at(id())->wid == this
     void setId( int i ) { myId = i; }
diff --git a/kdgantt/KDGanttSemiSizingControl.cpp b/kdgantt/KDGanttSemiSizingControl.cpp
index e81b7781..47d08950 100644
--- a/kdgantt/KDGanttSemiSizingControl.cpp
+++ b/kdgantt/KDGanttSemiSizingControl.cpp
@@ -247,9 +247,9 @@ KDGanttSemiSizingControl::ArrowPosition KDGanttSemiSizingControl::arrowPosition(
 void KDGanttSemiSizingControl::init()
 {
     _but = new TQPushButton( this );
-    _but->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+    _but->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
     connect( _but, TQT_SIGNAL( clicked() ), this, TQT_SLOT(changeState()) );
-    _layout = 0;
+    _tqlayout = 0;
     TQWhatsThis::add( _but, "Click on this button to show the \nlegend at the bottom of the widget");
     TQToolTip::add( _but, "Show / hide legend");
 
@@ -258,19 +258,19 @@ void KDGanttSemiSizingControl::init()
 
 void KDGanttSemiSizingControl::setup()
 {
-    //-------------------------------------------------- Setup layout
-    delete _layout;
-    TQBoxLayout* butLayout; // _layout will delete me
+    //-------------------------------------------------- Setup tqlayout
+    delete _tqlayout;
+    TQBoxLayout* butLayout; // _tqlayout will delete me
 
     if ( _orient == Horizontal || isMinimized() )
-        _layout = new TQHBoxLayout( this );
+        _tqlayout = new TQHBoxLayout( this );
     else
-        _layout = new TQVBoxLayout( this );
+        _tqlayout = new TQVBoxLayout( this );
 
     if ( _orient == Vertical && !isMinimized() )
-        butLayout = new TQHBoxLayout( _layout );
+        butLayout = new TQHBoxLayout( _tqlayout );
     else
-        butLayout = new TQVBoxLayout( _layout );
+        butLayout = new TQVBoxLayout( _tqlayout );
 
 
 
@@ -306,9 +306,9 @@ void KDGanttSemiSizingControl::setup()
        widget = _maximizedWidget;
        if( widget ) {
        if ( _arrowPos == Before  || _orient == Vertical && !isMinimized() )
-       _layout->addWidget( widget, 1 );
+       _tqlayout->addWidget( widget, 1 );
        else
-       _layout->insertWidget( 0, widget, 1 );
+       _tqlayout->insertWidget( 0, widget, 1 );
 	}
      ************************************************** */
     // hack for the usage in KDGantt as pop-up legend widget
@@ -319,16 +319,16 @@ void KDGanttSemiSizingControl::setup()
        widget = _minimizedWidget;
        if( widget ) {
 	 if ( _arrowPos == Before  || _orient == Vertical && !isMinimized() )
-	   _layout->addWidget( widget, 1 );
+	   _tqlayout->addWidget( widget, 1 );
 	 else
-	   _layout->insertWidget( 0, widget, 1 );
+	   _tqlayout->insertWidget( 0, widget, 1 );
        }
     }
     else {
       if ( _arrowPos == Before  || _orient == Vertical && !isMinimized() )
-	_layout->addStretch( 1 );
+	_tqlayout->addStretch( 1 );
       else
-	_layout->insertStretch( 0, 1 );
+	_tqlayout->insertStretch( 0, 1 );
       widget = _maximizedWidget;
       // the following is only the special case
       // arrowPos == Before  and  _orient == Vertical
@@ -395,7 +395,7 @@ TQPixmap KDGanttSemiSizingControl::pixmap( Direction direction ) {
 
     TQPainter p( &pix );
     p.setPen( black );
-    p.setBrush( colorGroup().button() );
+    p.setBrush( tqcolorGroup().button() );
     p.drawPolygon( arr );
     TQBitmap bit( s, s );
     bit.fill( color0 );
diff --git a/kdgantt/KDGanttSemiSizingControl.h b/kdgantt/KDGanttSemiSizingControl.h
index ad756995..6b43f7c2 100644
--- a/kdgantt/KDGanttSemiSizingControl.h
+++ b/kdgantt/KDGanttSemiSizingControl.h
@@ -82,7 +82,7 @@ private:
     ArrowPosition _arrowPos;
     TQWidget* _minimizedWidget;
     TQWidget* _maximizedWidget;
-    TQBoxLayout* _layout;
+    TQBoxLayout* _tqlayout;
     TQPushButton* _but;
 };
 
diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp
index 9403c10f..6e2e4b4b 100644
--- a/kdgantt/KDGanttView.cpp
+++ b/kdgantt/KDGanttView.cpp
@@ -69,7 +69,7 @@
   In order to set up a Gantt view, create an object of this class, and
   populate it with a number of \a KDGanttViewItem objects.
 
-  If you experience problems with the repainting of the content of the
+  If you experience problems with the tqrepainting of the content of the
   Gantt View after scrolling, call \a setRepaintMode().
 */
 
@@ -186,7 +186,7 @@ KDGanttView::KDGanttView( TQWidget* parent, const char* name  )
     fDropEnabled = false;
     closingBlocked = false;
    myTimeHeader->computeTicks();
-   centerTimelineAfterShow( TQDateTime::currentDateTime () );
+   centerTimelineAfterShow( TQDateTime::tqcurrentDateTime () );
    setDisplayEmptyTasksAsLine( false );
    TQValueList<int> list;
    list.append(240);
@@ -296,7 +296,7 @@ void KDGanttView::show()
 }
 /*!
   Closes the widget.
-  The closing is rejected, if a repainting is currently being done.
+  The closing is rejected, if a tqrepainting is currently being done.
   \param alsoDelete if true, the widget is deleted
   \return true, if the widget was closed
 */
@@ -313,12 +313,12 @@ bool KDGanttView::close ( bool alsoDelete )
 /*!
   Returns a useful size for the view.
   Returned width:
-  sizeHint().width() of the list view + width of TimeTable
+  tqsizeHint().width() of the list view + width of TimeTable
   Returned height:
   height() of TimeHeader + height() of TimeTable + height() of Legend (if shown)
 */
 
-TQSize KDGanttView::sizeHint() const
+TQSize KDGanttView::tqsizeHint() const
 {
   bool block = myTimeTable->blockUpdating();
   myTimeTable->setBlockUpdating( false );
@@ -328,7 +328,7 @@ TQSize KDGanttView::sizeHint() const
    * there is a legitimate gui updating issue here somewhere, it will need
    * to be solved differently.
    */
-  //qApp->processEvents();
+  //tqApp->processEvents();
   int hintHeight = myTimeHeader->height();
   int legendHeight = 0;
   if ( showLegendButton() )
@@ -342,9 +342,9 @@ TQSize KDGanttView::sizeHint() const
   if ( myLegend->isShown() )
     hintHeight += myLegend->legendSizeHint().height() +10;
   hintHeight += myTimeTable->minimumHeight+myListView->frameWidth()*2+2;
-  int hintWid = myListView->sizeHint().width();
+  int hintWid = myListView->tqsizeHint().width();
   //hintWid += myTimeHeader->mySizeHint+myCanvasView->verticalScrollBar()->width();
-  hintWid += myCanvasView->sizeHint().width();
+  hintWid += myCanvasView->tqsizeHint().width();
   // add 10 for the splitter-bars
   // qDebug("sizehint %d %d ",hintWid+10, hintHeight );
   myTimeTable->setBlockUpdating( block );
@@ -525,14 +525,14 @@ void KDGanttView::slotMouseButtonPressed ( int button, TQListViewItem * item,
 
 
 /*!
-  Specifies whether the content should be repainted after scrolling or
+  Specifies whether the content should be tqrepainted after scrolling or
   not.
 
-  \param mode If No, there is no repainting after scrolling. This is
+  \param mode If No, there is no tqrepainting after scrolling. This is
                  the fastest mode.
-              If Medium, there is extra repainting after releasing the
+              If Medium, there is extra tqrepainting after releasing the
                  scrollbar. This provides fast scrolling with updated content
-                 after scrolling. Recommended, when repaint problems occur.
+                 after scrolling. Recommended, when tqrepaint problems occur.
                  This is the default value after startup.
               If Always, there is an extra update after every move of the
                  scrollbar. This entails slow scrolling with updated
@@ -615,7 +615,7 @@ void KDGanttView::slotHeaderSizeChanged()
     // legend is cleared - reinit legend with list
     legendItem* li;
     for ( li = myLegendItems->first(); li; li = myLegendItems->next() ) {
-      myLegend->addLegendItem(li->shape, li->color, li->text );
+      myLegend->addLegendItem(li->tqshape, li->color, li->text );
     }
   }
 }
@@ -691,9 +691,9 @@ void KDGanttView::setShowListView( bool show )
     if(listViewIsVisible == show) return;
     listViewIsVisible = show;
     if (listViewIsVisible)
-        myListView->parentWidget()->show();
+        myListView->tqparentWidget()->show();
     else
-        myListView->parentWidget()->hide();
+        myListView->tqparentWidget()->hide();
 }
 
 
@@ -868,7 +868,7 @@ void KDGanttView::print( TQPrinter* printer ,
   TQSize size = drawContents( 0, printListView, printTimeLine, printLegend );
 
   // at the top, we want to print current time/date
-  TQString date = "Printing Time: " + TQDateTime::currentDateTime().toString();
+  TQString date = "Printing Time: " + TQDateTime::tqcurrentDateTime().toString();
   int hei = p.boundingRect(0,0, 5, 5, Qt::AlignLeft, date ).height();
   p.drawText( 0, 0, date );
 
@@ -979,7 +979,7 @@ TQSize KDGanttView::drawContents( TQPainter* p,
     }
     if ( drawTimeLine ) {
       p->translate( myCanvasView->frameWidth(), 0);
-      myTimeHeader->repaintMe( 0, myTimeHeader->width(), p );
+      myTimeHeader->tqrepaintMe( 0, myTimeHeader->width(), p );
       p->translate( -myCanvasView->frameWidth(), thY);
       myCanvasView->drawToPainter( p );
       if ( drawListView )
@@ -1209,7 +1209,7 @@ bool KDGanttView::showTaskLinks() const
 void KDGanttView::setFont(const TQFont& font)
 {
     myListView->setFont(font);
-    myListView->repaint();
+    myListView->tqrepaint();
     myTimeHeader->setFont(font);
     myLegend->setFont( font );
     TQWidget::setFont( font );
@@ -1299,21 +1299,21 @@ bool KDGanttView::showTimeTablePopupMenu() const
 
 
 /*!
-  Sets the shapes for a certain type of Gantt item. Not all items use
-  all three shapes (e.g., only summary items use the middle shape).
+  Sets the tqshapes for a certain type of Gantt item. Not all items use
+  all three tqshapes (e.g., only summary items use the middle tqshape).
 
-  This setting overrides any shape settings made on individual items.
+  This setting overrides any tqshape settings made on individual items.
   These settings will be taken as initial values of any newly created
   item of this certain type.
   See also the documentation of the KDGanttViewItem class.
 
-  \param type the type of Gantt items for which to set the shapes
-  \param start the shape to use for the beginning of the item
-  \param middle the shape to use for the middle of the item
-  \param end the shape to use for the end of the item
-  \param overwriteExisting if true, overwrites existing shape settings
+  \param type the type of Gantt items for which to set the tqshapes
+  \param start the tqshape to use for the beginning of the item
+  \param middle the tqshape to use for the middle of the item
+  \param end the tqshape to use for the end of the item
+  \param overwriteExisting if true, overwrites existing tqshape settings
   in the individual items
-  \sa shapes()
+  \sa tqshapes()
 */
 void KDGanttView::setShapes( KDGanttViewItem::Type type,
                              KDGanttViewItem::Shape start,
@@ -1337,18 +1337,18 @@ void KDGanttView::setShapes( KDGanttViewItem::Type type,
 
 
 /*!
-  Queries the shapes for a particular type of Gantt item.
+  Queries the tqshapes for a particular type of Gantt item.
 
-  \param type the type of Gantt items for which to query the shapes
-  \param start the start shape is returned in this parameter
-  \param middle the middle shape is returned in this parameter
-  \param end the end shape is returned in this parameter
-  \return true if there was a general shape set for the specified
-  type. If the return value is false, the values of the three shape
+  \param type the type of Gantt items for which to query the tqshapes
+  \param start the start tqshape is returned in this parameter
+  \param middle the middle tqshape is returned in this parameter
+  \param end the end tqshape is returned in this parameter
+  \return true if there was a general tqshape set for the specified
+  type. If the return value is false, the values of the three tqshape
   parameters are undefined.
   \sa setShapes()
 */
-bool KDGanttView::shapes( KDGanttViewItem::Type type,
+bool KDGanttView::tqshapes( KDGanttViewItem::Type type,
                           KDGanttViewItem::Shape& start,
                           KDGanttViewItem::Shape& middle,
                           KDGanttViewItem::Shape& end ) const
@@ -1562,19 +1562,19 @@ void KDGanttView::clearLegend( )
 /*!
   Adds an item to the legend.
 
-  \param shape the shape to display
-  \param shapeColor the color in which to display the shape
+  \param tqshape the tqshape to display
+  \param tqshapeColor the color in which to display the tqshape
   \param text the text to display
   \sa clearLegend()
 */
-void KDGanttView::addLegendItem( KDGanttViewItem::Shape shape,
-                                 const TQColor& shapeColor,
+void KDGanttView::addLegendItem( KDGanttViewItem::Shape tqshape,
+                                 const TQColor& tqshapeColor,
                                  const TQString& text )
 {
-    myLegend->addLegendItem( shape,shapeColor,text );
+    myLegend->addLegendItem( tqshape,tqshapeColor,text );
     legendItem* item = new legendItem;
-    item->shape = shape;
-    item->color = shapeColor;
+    item->tqshape = tqshape;
+    item->color = tqshapeColor;
     item->text = text;
     myLegendItems->append( item );
 }
@@ -2341,7 +2341,7 @@ KDGanttViewItem* KDGanttView::firstChild() const
 /*!
   This method turns calendar mode on and off.  In calendar mode, only
   those items can be opened which have subitems which have
-  subitems. I.e., if an item contains multiple calendars, it can be
+  subitems. I.e., if an item tqcontains multiple calendars, it can be
   opened, but not a calendar item itself.  If you want to use this
   GanttView as a calendar view, you have to call
   setDisplaySubitemsAsGroup( true ); to use the root items as calendar
@@ -3415,58 +3415,58 @@ TQDomDocument KDGanttView::saveXML( bool withPI ) const
                            showTimeTablePopupMenu() );
 
     // the Shapes element
-    TQDomElement shapesElement = doc.createElement( "Shapes" );
-    docRoot.appendChild( shapesElement );
-    TQDomElement shapesEventElement = doc.createElement( "Event" );
-    shapesElement.appendChild( shapesEventElement );
+    TQDomElement tqshapesElement = doc.createElement( "Shapes" );
+    docRoot.appendChild( tqshapesElement );
+    TQDomElement tqshapesEventElement = doc.createElement( "Event" );
+    tqshapesElement.appendChild( tqshapesEventElement );
     KDGanttViewItem::Shape start, middle, end;
-    if( shapes( KDGanttViewItem::Event, start, middle, end ) ) {
-        KDGanttXML::createStringNode( doc, shapesEventElement, "Start",
-                                 KDGanttViewItem::shapeToString( start ) );
-        KDGanttXML::createStringNode( doc, shapesEventElement, "Middle",
-                                 KDGanttViewItem::shapeToString( middle ) );
-        KDGanttXML::createStringNode( doc, shapesEventElement, "End",
-                                 KDGanttViewItem::shapeToString( end ) );
+    if( tqshapes( KDGanttViewItem::Event, start, middle, end ) ) {
+        KDGanttXML::createStringNode( doc, tqshapesEventElement, "Start",
+                                 KDGanttViewItem::tqshapeToString( start ) );
+        KDGanttXML::createStringNode( doc, tqshapesEventElement, "Middle",
+                                 KDGanttViewItem::tqshapeToString( middle ) );
+        KDGanttXML::createStringNode( doc, tqshapesEventElement, "End",
+                                 KDGanttViewItem::tqshapeToString( end ) );
     } else {
-        KDGanttXML::createStringNode( doc, shapesEventElement, "Start",
+        KDGanttXML::createStringNode( doc, tqshapesEventElement, "Start",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, shapesEventElement, "Middle",
+        KDGanttXML::createStringNode( doc, tqshapesEventElement, "Middle",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, shapesEventElement, "End",
+        KDGanttXML::createStringNode( doc, tqshapesEventElement, "End",
                                  "Undefined" );
     }
-    TQDomElement shapesTaskElement = doc.createElement( "Task" );
-    shapesElement.appendChild( shapesTaskElement );
-    if( shapes( KDGanttViewItem::Task, start, middle, end ) ) {
-        KDGanttXML::createStringNode( doc, shapesTaskElement, "Start",
-                                 KDGanttViewItem::shapeToString( start ) );
-        KDGanttXML::createStringNode( doc, shapesTaskElement, "Middle",
-                                 KDGanttViewItem::shapeToString( middle ) );
-        KDGanttXML::createStringNode( doc, shapesTaskElement, "End",
-                                 KDGanttViewItem::shapeToString( end ) );
+    TQDomElement tqshapesTaskElement = doc.createElement( "Task" );
+    tqshapesElement.appendChild( tqshapesTaskElement );
+    if( tqshapes( KDGanttViewItem::Task, start, middle, end ) ) {
+        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Start",
+                                 KDGanttViewItem::tqshapeToString( start ) );
+        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Middle",
+                                 KDGanttViewItem::tqshapeToString( middle ) );
+        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "End",
+                                 KDGanttViewItem::tqshapeToString( end ) );
     } else {
-        KDGanttXML::createStringNode( doc, shapesTaskElement, "Start",
+        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Start",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, shapesTaskElement, "Middle",
+        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Middle",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, shapesTaskElement, "End",
+        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "End",
                                  "Undefined" );
     }
-    TQDomElement shapesSummaryElement = doc.createElement( "Summary" );
-    shapesElement.appendChild( shapesSummaryElement );
-    if( shapes( KDGanttViewItem::Event, start, middle, end ) ) {
-        KDGanttXML::createStringNode( doc, shapesSummaryElement, "Start",
-                                 KDGanttViewItem::shapeToString( start ) );
-        KDGanttXML::createStringNode( doc, shapesSummaryElement, "Middle",
-                                 KDGanttViewItem::shapeToString( middle ) );
-        KDGanttXML::createStringNode( doc, shapesSummaryElement, "End",
-                                 KDGanttViewItem::shapeToString( end ) );
+    TQDomElement tqshapesSummaryElement = doc.createElement( "Summary" );
+    tqshapesElement.appendChild( tqshapesSummaryElement );
+    if( tqshapes( KDGanttViewItem::Event, start, middle, end ) ) {
+        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Start",
+                                 KDGanttViewItem::tqshapeToString( start ) );
+        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Middle",
+                                 KDGanttViewItem::tqshapeToString( middle ) );
+        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "End",
+                                 KDGanttViewItem::tqshapeToString( end ) );
     } else {
-        KDGanttXML::createStringNode( doc, shapesSummaryElement, "Start",
+        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Start",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, shapesSummaryElement, "Middle",
+        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Middle",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, shapesSummaryElement, "End",
+        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "End",
                                  "Undefined" );
     }
 
@@ -3604,7 +3604,7 @@ TQDomDocument KDGanttView::saveXML( bool withPI ) const
         TQDomElement legendItemElement = doc.createElement( "LegendItem" );
         legendItemsElement.appendChild( legendItemElement );
         KDGanttXML::createStringNode( doc, legendItemElement, "Shape",
-                                 KDGanttViewItem::shapeToString( current->shape ) );
+                                 KDGanttViewItem::tqshapeToString( current->tqshape ) );
         KDGanttXML::createColorNode( doc, legendItemElement, "Color",
                                 current->color );
         KDGanttXML::createStringNode( doc, legendItemElement, "Text",
@@ -3757,17 +3757,17 @@ void KDGanttView::editItem( KDGanttViewItem*  item)
 
 
 /*!
-  This method returns the pixmap used for a certain shape, in the
+  This method returns the pixmap used for a certain tqshape, in the
   selected color and size.
 
-  \param shape the shape to generate
-  \param shapeColor the foreground color of the shape
-  \param backgroundColor the background color of the shape
-  \param itemSize the size of the shape
-  \return the generated shape pixmap
+  \param tqshape the tqshape to generate
+  \param tqshapeColor the foreground color of the tqshape
+  \param backgroundColor the background color of the tqshape
+  \param itemSize the size of the tqshape
+  \return the generated tqshape pixmap
 */
-TQPixmap KDGanttView::getPixmap( KDGanttViewItem::Shape shape,
-                                const TQColor& shapeColor,
+TQPixmap KDGanttView::getPixmap( KDGanttViewItem::Shape tqshape,
+                                const TQColor& tqshapeColor,
                                 const TQColor& backgroundColor, int itemSize)
 {
   // 10 is a good value as size
@@ -3777,11 +3777,11 @@ TQPixmap KDGanttView::getPixmap( KDGanttViewItem::Shape shape,
   p.fill( backgroundColor );
   TQPainter paint (&p);
   TQBrush b = TQBrush ( Qt::SolidPattern );
-  b.setColor( shapeColor );
+  b.setColor( tqshapeColor );
   paint.setBrush( b );
   TQPen pen( Qt::black, 1 ) ;
   paint.setPen( pen );
-  switch (shape) {
+  switch (tqshape) {
   case KDGanttViewItem::TriangleDown:{
     TQPointArray arr = TQPointArray(3);
     arr.setPoint(0,-size/2,-hei);
@@ -3864,8 +3864,8 @@ void KDGanttView::initDefaults()
     myDefaultColor [ getIndex( KDGanttViewItem::Summary ) ] =  Qt::cyan;//summary
     myDefaultColorHL [ getIndex( KDGanttViewItem::Summary ) ] =  Qt::red;
 
-    // setting the default shape types
-    // currently, we take for each item for all three shapes (start, middle, end) the same default shape
+    // setting the default tqshape types
+    // currently, we take for each item for all three tqshapes (start, middle, end) the same default tqshape
     for (i = 0;i<3;++i) {
       myDefaultShape [3*getIndex( KDGanttViewItem::Event )+ i] =  KDGanttViewItem::Diamond; //event
       myDefaultShape [3*getIndex( KDGanttViewItem::Task ) +i] =  KDGanttViewItem::Square; //task
@@ -4239,7 +4239,7 @@ TQColor KDGanttView::legendHeaderBackgroundColor () const
   may add as many widgets as you want. They are ordered horizontally
   from left to right.  To remove a widget from the spacer widget, call
   widget->reparent(newParent,...) or delete the widget.  Since the spacer
-  is a TQHBox, the layout of the added widgets is managed by this
+  is a TQHBox, the tqlayout of the added widgets is managed by this
   TQHBox.
 
   \param w A pointer to the widget to be added.
@@ -4800,7 +4800,7 @@ bool KDGanttView::isLinkItemsEnabled() const
   const TQString& text )
 
   This signal is emitted whenever the user changes the name of an item
-  in the list view using in-place editing. \a text contains the new
+  in the list view using in-place editing. \a text tqcontains the new
   text in the list view.
 */
 
diff --git a/kdgantt/KDGanttView.h b/kdgantt/KDGanttView.h
index 4e6b338a..0f135e5a 100644
--- a/kdgantt/KDGanttView.h
+++ b/kdgantt/KDGanttView.h
@@ -192,7 +192,7 @@ public:
                     KDGanttViewItem::Shape middle,
                     KDGanttViewItem::Shape end,
 		    bool overwriteExisting = true  );
-    bool shapes( KDGanttViewItem::Type type,
+    bool tqshapes( KDGanttViewItem::Type type,
                  KDGanttViewItem::Shape& start,
                  KDGanttViewItem::Shape& middle,
                  KDGanttViewItem::Shape& end ) const;
@@ -227,7 +227,7 @@ public:
     TQPtrList<KDGanttViewTaskLinkGroup> taskLinkGroups() const;
 
     // Legend-related stuff
-    void addLegendItem( KDGanttViewItem::Shape shape, const TQColor& shapeColor, const TQString& text );
+    void addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text );
     void clearLegend();
     // Header-related stuff
     void setHorizonStart( const TQDateTime& start );
@@ -261,7 +261,7 @@ public:
 				   Scale mini =  KDGanttView::Minute ,
 				   Scale maxi =  KDGanttView::Month);
 #if 0
-   // This API has been replaced with KDIntervalColorRectangle and addIntervalBackgroundColor
+   // This API has been tqreplaced with KDIntervalColorRectangle and addIntervalBackgroundColor
     void setIntervalBackgroundColor( const TQDateTime& start,
 				     const TQDateTime& end,
 				     const TQColor& color,
@@ -297,7 +297,7 @@ public:
     void setWeekendDays( int start, int end );
     void weekendDays( int& start, int& end ) const;
 
-    static TQPixmap getPixmap( KDGanttViewItem::Shape shape, const TQColor& shapeColor,const TQColor& backgroundColor, int itemSize);
+    static TQPixmap getPixmap( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor,const TQColor& backgroundColor, int itemSize);
 
     void setHeaderVisible( bool );
     bool headerVisible() const;
@@ -329,7 +329,7 @@ public:
     virtual void lvStartDrag (KDGanttViewItem*);
     virtual bool lvDragMoveEvent (TQDragMoveEvent * e,KDGanttViewItem*, KDGanttViewItem*);
     virtual void lvDragEnterEvent (TQDragEnterEvent * e );
-    virtual TQSize sizeHint() const;
+    virtual TQSize tqsizeHint() const;
     KDGanttViewItem* getItemByName( const TQString& name ) const;
     TQDateTime getDateTimeForCoordX(int coordX, bool global = true ) const;
     KDGanttViewItem* getItemByListViewPos( const TQPoint& pos ) const;
@@ -421,7 +421,7 @@ private slots:
     void slot_lvDropped(TQDropEvent* e, KDGanttViewItem* droppedItem, KDGanttViewItem* itemBelowMouse );
 private:
     struct legendItem {
-      KDGanttViewItem::Shape shape;
+      KDGanttViewItem::Shape tqshape;
       TQColor color;
       TQString text;
     };
diff --git a/kdgantt/KDGanttViewEventItem.cpp b/kdgantt/KDGanttViewEventItem.cpp
index 19bfaeb9..eadef6a1 100644
--- a/kdgantt/KDGanttViewEventItem.cpp
+++ b/kdgantt/KDGanttViewEventItem.cpp
@@ -209,7 +209,7 @@ void KDGanttViewEventItem::hideMe()
 void KDGanttViewEventItem::showItem(bool show, int coordY)
 {
   isVisibleInGanttView = show;
-  invalidateHeight () ;
+  tqinvalidateHeight () ;
   if (!show) {
     hideMe();
     return;
diff --git a/kdgantt/KDGanttViewItem.cpp b/kdgantt/KDGanttViewItem.cpp
index 3d36683b..c250d22f 100644
--- a/kdgantt/KDGanttViewItem.cpp
+++ b/kdgantt/KDGanttViewItem.cpp
@@ -52,20 +52,20 @@
   directly. Instead, you should create items of one of the
   subclasses. This class provides methods common to all Gantt items.
 
-  The initialization of the shapes/colors of the item works as follows:
+  The initialization of the tqshapes/colors of the item works as follows:
 
   Shapes:
-  When a new item is created, the shapes are set to the default values
+  When a new item is created, the tqshapes are set to the default values
   for items of the type of this item, defined in the KDGanttView class with
   void setShapes( KDGanttViewItem::Type type,
   KDGanttViewItem::Shape start,
   KDGanttViewItem::Shape middle,
   KDGanttViewItem::Shape end );
   If there is no default value defined for this type,
-  the shapes are set as follows:
-  For TaskViewItems all three shapes are set to Square.
-  For SummaryViewItems all three shapes are set to TriangleDown.
-  For EventViewItems all three shapes are set to Diamond.
+  the tqshapes are set as follows:
+  For TaskViewItems all three tqshapes are set to Square.
+  For SummaryViewItems all three tqshapes are set to TriangleDown.
+  For EventViewItems all three tqshapes are set to Diamond.
 
   Colors:
   When a new item is created, the colors are set to the default values
@@ -75,7 +75,7 @@
   const TQColor& middle,
   const TQColor& end );
   If there is no default value defined for this type,
-  the colors of the shapes are set to the default color for items of this type,
+  the colors of the tqshapes are set to the default color for items of this type,
   defined in the KDGanttView class with:
   void setDefaultColor( KDGanttViewItem::Type type, const TQColor& );
   The initial default color in the KDGanttView class is set to
@@ -92,7 +92,7 @@
   const TQColor& middle,
   const TQColor& end );
   If there is no default value defined for this type,
-  the highlight colors of the shapes are set to the default color for
+  the highlight colors of the tqshapes are set to the default color for
   items of this type, defined in the KDGanttView class with:
   void setDefaultHighlightColor( KDGanttViewItem::Type type, const TQColor& );
   The initial default highlight color in the KDGanttView class is set to red
@@ -138,7 +138,7 @@
 
   Example 1, Color:
   If you create an instance of a KDGanttView class and add a SummaryViewItem
-  without setting any color/shape values, you get an item with three shapes
+  without setting any color/tqshape values, you get an item with three tqshapes
   of the form TriangleDown in the color magenta. If the item is highlighted,
   the color will change to the highlight color red.
 
@@ -773,16 +773,16 @@ bool KDGanttViewItem::highlight() const
 
 
 /*!
-  Specifies the shapes to be used for this item.
+  Specifies the tqshapes to be used for this item.
 
-  It is advisable not to use this method, but rather set the shapes
+  It is advisable not to use this method, but rather set the tqshapes
   for all items of a type with KDGanttView::setShapes() in order to
   get a uniform Gantt view.
 
-  \param start the start shape
-  \param middle the middle shape
-  \param end the end shape
-  \sa shapes(), setColors(), colors()
+  \param start the start tqshape
+  \param middle the middle tqshape
+  \param end the end tqshape
+  \sa tqshapes(), setColors(), colors()
 */
 void KDGanttViewItem::setShapes( Shape start, Shape middle, Shape end )
 {
@@ -799,20 +799,20 @@ void KDGanttViewItem::setShapes( Shape start, Shape middle, Shape end )
 
 
 /*!
-  Creates shapes of the specified type \a shape.
-  The background shape color is set to black and the background shape
-  is slightly bit bigger than the foreground shape to have a black border
-  around the foreground shape.
+  Creates tqshapes of the specified type \a tqshape.
+  The background tqshape color is set to black and the background tqshape
+  is slightly bit bigger than the foreground tqshape to have a black border
+  around the foreground tqshape.
 
-  \param itemShape the foreground shape
-  \param middle itemShapeBack  the background shape
-  \param shape the type of the shape
+  \param itemShape the foreground tqshape
+  \param middle itemShapeBack  the background tqshape
+  \param tqshape the type of the tqshape
    (may be TriangleDown, TriangleUp, Diamond, Square, Circle)
-  \sa shapes(), setColors(), colors()
+  \sa tqshapes(), setColors(), colors()
 */
 void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape,
                                    KDCanvasPolygonItem* &itemShapeBack,
-                                   Shape shape )
+                                   Shape tqshape )
 {
   if ( itemShape && type() ==  Task )
     return;
@@ -823,7 +823,7 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape,
     TQCanvasPolygonalItem * itemBack;
     int size = myItemSize+2;
     int hei = (myItemSize/3)/2;
-    switch (shape) {
+    switch (tqshape) {
     case TriangleDown:
         {
             item = new KDCanvasPolygon(myGanttView->myTimeTable, this,Type_is_KDGanttViewItem);
@@ -912,8 +912,8 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape,
             break;
         }
     default:
-        // Uninitialized shape, can e.g. be the case with free-busy
-        // items which don't have any shapes
+        // Uninitialized tqshape, can e.g. be the case with free-busy
+        // items which don't have any tqshapes
         return;
     }
     item->setBrush(Qt::SolidPattern);
@@ -927,14 +927,14 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape,
 
 
 /*!
-  Returns the shapes used for this item
+  Returns the tqshapes used for this item
 
-  \param start returns the start shape
-  \param middle returns the middle shape
-  \param end returns the end shape
+  \param start returns the start tqshape
+  \param middle returns the middle tqshape
+  \param end returns the end tqshape
   \sa setShapes(), setColors(), colors()
 */
-void KDGanttViewItem::shapes( Shape& start, Shape& middle, Shape& end ) const
+void KDGanttViewItem::tqshapes( Shape& start, Shape& middle, Shape& end ) const
 {
     start = myStartShape;
     middle = myMiddleShape;
@@ -943,16 +943,16 @@ void KDGanttViewItem::shapes( Shape& start, Shape& middle, Shape& end ) const
 
 
 /*!
-  Specifies the colors in which to draw the shapes of this item.
+  Specifies the colors in which to draw the tqshapes of this item.
 
   It is advisable not to use this method, but rather set the colors
   for all items of a type with KDGanttView::setColors() in order to
   get a uniform Gantt view.
 
-  \param start the color for the start shape
-  \param middle the color for the middle shape
-  \param end the color for the end shape
-  \sa colors(), setShapes(), shapes(), setDefaultColor(), defaultColor()
+  \param start the color for the start tqshape
+  \param middle the color for the middle tqshape
+  \param end the color for the end tqshape
+  \sa colors(), setShapes(), tqshapes(), setDefaultColor(), defaultColor()
 */
 void KDGanttViewItem::setColors( const TQColor& start, const TQColor& middle,
                                  const TQColor& end )
@@ -980,7 +980,7 @@ void KDGanttViewItem::setColors( const TQColor& start, const TQColor& middle,
   \param start returns the start color
   \param middle returns the middle color
   \param end returns the end color
-  \sa setColors(), setShapes(), shapes(), setDefaultColor(), defaultColor()
+  \sa setColors(), setShapes(), tqshapes(), setDefaultColor(), defaultColor()
 */
 void KDGanttViewItem::colors( TQColor& start, TQColor& middle, TQColor& end ) const
 {
@@ -992,7 +992,7 @@ void KDGanttViewItem::colors( TQColor& start, TQColor& middle, TQColor& end ) co
 
 
 /*!
-  Specifies the highlight colors in which to draw the shapes of this item.
+  Specifies the highlight colors in which to draw the tqshapes of this item.
 
   It is advisable not to use this method, but rather set the highlight
   colors for all items of a type with
@@ -1003,10 +1003,10 @@ void KDGanttViewItem::colors( TQColor& start, TQColor& middle, TQColor& end ) co
   (displaySubitemsAsGroup() == true)
   all changes apply to all subitems as well.
 
-  \param start the highlight color for the start shape
-  \param middle the highlight color for the middle shape
-  \param end the highlight color for the end shape
-  \sa highlightColors(), setShapes(), shapes()
+  \param start the highlight color for the start tqshape
+  \param middle the highlight color for the middle tqshape
+  \param end the highlight color for the end tqshape
+  \sa highlightColors(), setShapes(), tqshapes()
 */
 void KDGanttViewItem::setHighlightColors( const TQColor& start, const TQColor& middle, const TQColor& end )
 {
@@ -1032,7 +1032,7 @@ void KDGanttViewItem::setHighlightColors( const TQColor& start, const TQColor& m
   \param start returns the start highlight color
   \param middle returns the middle highlight color
   \param end returns the end highlight color
-  \sa setHighlightColors(), setShapes(), shapes()
+  \sa setHighlightColors(), setShapes(), tqshapes()
 */
 void KDGanttViewItem::highlightColors( TQColor& start, TQColor& middle, TQColor& end ) const
 {
@@ -1086,7 +1086,7 @@ TQColor KDGanttViewItem::textColor() const
 /*!
   \enum KDGanttViewItem::Shape
 
-  This enum is used in order to specify the shapes of a Gantt chart
+  This enum is used in order to specify the tqshapes of a Gantt chart
   item.
 */
 
@@ -1469,10 +1469,10 @@ void KDGanttViewItem::initColorAndShapes(Type t)
     setDefaultColor( myGanttView->defaultColor(myType));
     // set default highlight color
     setDefaultHighlightColor(myGanttView->defaultHighlightColor(myType));
-    // set shapes
-    if (!( shapeDefined = (myGanttView->shapes(myType,myStartShape,myMiddleShape,myEndShape)))) {
+    // set tqshapes
+    if (!( tqshapeDefined = (myGanttView->tqshapes(myType,myStartShape,myMiddleShape,myEndShape)))) {
 
-        //qDebug("KDGantt::KDGanttViewItem created with not user defined shapes");
+        //qDebug("KDGantt::KDGanttViewItem created with not user defined tqshapes");
     };
 
     setShapes(myStartShape,myMiddleShape,myEndShape);
@@ -1486,12 +1486,12 @@ void KDGanttViewItem::initColorAndShapes(Type t)
     floatStartShape = (KDCanvasPolygonItem*)new  KDCanvasRectangle(myGanttView->myTimeTable,this,Type_is_KDGanttViewItem);
     floatEndShape = (KDCanvasPolygonItem*)new  KDCanvasRectangle(myGanttView->myTimeTable,this,Type_is_KDGanttViewItem);
 
-    // set color of shapes
+    // set color of tqshapes
     if (!( colorDefined = (myGanttView->colors(myType,myStartColor,myMiddleColor,myEndColor)))) {
 
     };
     setColors(defaultColor(),defaultColor(), defaultColor());
-    // set highlight color of shapes
+    // set highlight color of tqshapes
     if (!( colorHLDefined = (myGanttView->highlightColors(myType,myStartColorHL,myMiddleColorHL,myEndColorHL)))) {
 
     };
@@ -1508,9 +1508,9 @@ void KDGanttViewItem::initColorAndShapes(Type t)
 }
 
 
-TQString KDGanttViewItem::shapeToString( Shape shape )
+TQString KDGanttViewItem::tqshapeToString( Shape tqshape )
 {
-    switch( shape ) {
+    switch( tqshape ) {
     case TriangleDown:
         return "TriangleDown";
     case TriangleUp:
@@ -1571,13 +1571,13 @@ void KDGanttViewItem::createNode( TQDomDocument& doc,
     KDGanttXML::createBoolNode( doc, itemElement, "Open", isOpen() );
     KDGanttXML::createBoolNode( doc, itemElement, "Highlight", highlight() );
     Shape startShape, middleShape, endShape;
-    shapes( startShape, middleShape, endShape );
+    tqshapes( startShape, middleShape, endShape );
     KDGanttXML::createStringNode( doc, itemElement, "StartShape",
-                             shapeToString( startShape ) );
+                             tqshapeToString( startShape ) );
     KDGanttXML::createStringNode( doc, itemElement, "MiddleShape",
-                             shapeToString( middleShape ) );
+                             tqshapeToString( middleShape ) );
     KDGanttXML::createStringNode( doc, itemElement, "EndShape",
-                             shapeToString( endShape ) );
+                             tqshapeToString( endShape ) );
     KDGanttXML::createColorNode( doc, itemElement, "DefaultColor", defaultColor() );
     TQColor startColor, middleColor, endColor;
     colors( startColor, middleColor, endColor );
@@ -2294,7 +2294,7 @@ void  KDGanttViewItem::resetSubitemVisibility()
   In calendar mode, only those items can be opened
   which have subitems which have subitems.
   An item which has subitems which have no subitems is called a calendar.
-  I.e., an item that contains
+  I.e., an item that tqcontains
   multiple calendars can be opened, while a calendar item itself cannot.
   But if all calendars of an item do not have any subitem (e.g at startup),
   the program cannot detect automatically that it should be possible to open
@@ -2365,37 +2365,37 @@ bool KDGanttViewItem::isCalendar( ) const
 /*!
   \var KDGanttViewItem::startShape
 
-  the shape at the beginning of the item
+  the tqshape at the beginning of the item
 */
 
 /*!
   \var KDGanttViewItem::midShape
 
-  the shape in the middle of the item
+  the tqshape in the middle of the item
 */
 
 /*!
   \var KDGanttViewItem::endShape
 
-  the shape at the end of the item
+  the tqshape at the end of the item
 */
 
 /*!
   \var KDGanttViewItem::startShapeBack
 
-  the background shape at the beginning of the item
+  the background tqshape at the beginning of the item
 */
 
 /*!
   \var KDGanttViewItem::midShapeBack
 
-  the background shape in the middle of the item
+  the background tqshape in the middle of the item
 */
 
 /*!
   \var KDGanttViewItem::endShapeBack
 
-  the background shape at the end of the item
+  the background tqshape at the end of the item
 */
 
 
diff --git a/kdgantt/KDGanttViewItem.h b/kdgantt/KDGanttViewItem.h
index cebced30..80cc258d 100644
--- a/kdgantt/KDGanttViewItem.h
+++ b/kdgantt/KDGanttViewItem.h
@@ -146,7 +146,7 @@ public:
   //bool isCalendar( ) const;
 
     void setShapes( Shape start, Shape middle, Shape end );
-    void shapes( Shape& start, Shape& middle, Shape& end ) const;
+    void tqshapes( Shape& start, Shape& middle, Shape& end ) const;
     void setDefaultColor( const TQColor& );
     TQColor defaultColor() const;
     void setColors( const TQColor& start, const TQColor& middle,
@@ -202,7 +202,7 @@ private:
     friend class KDGanttViewItemDrag;
     friend class itemAttributeDialog;
 
-    static TQString shapeToString( Shape shape );
+    static TQString tqshapeToString( Shape tqshape );
     static Shape stringToShape( const TQString& string );
     static TQString typeToString( Type type );
 
@@ -242,7 +242,7 @@ private:
     bool isMyTextCanvas(TQCanvasItem *tc);
     TQPoint myTextOffset;
     TQString _name;
-    bool shapeDefined;
+    bool tqshapeDefined;
     int _priority;
     static TQDict<KDGanttViewItem> sItemDict;
 
diff --git a/kdgantt/KDGanttViewItemDrag.cpp b/kdgantt/KDGanttViewItemDrag.cpp
index 23bf90ac..5ced61b3 100644
--- a/kdgantt/KDGanttViewItemDrag.cpp
+++ b/kdgantt/KDGanttViewItemDrag.cpp
@@ -63,7 +63,7 @@ KDGanttViewItemDrag::KDGanttViewItemDrag( KDGanttViewItem* item , TQWidget *sour
         pix = *(item->pixmap()) ;
     else {
         KDGanttViewItem::Shape start,  middle, end;
-        item->shapes( start, middle, end );
+        item->tqshapes( start, middle, end );
         TQColor st, mi, en;
         item->colors( st, mi, en );
         pix =item->myGanttView->getPixmap( start, st, item->myGanttView->lvBackgroundColor(), 11 );
@@ -86,7 +86,7 @@ KDGanttViewItemDrag::KDGanttViewItemDrag( KDGanttViewItem* item , TQWidget *sour
   \param c the format of the data
   \return the encoded data of the drag object
 */
-TQByteArray KDGanttViewItemDrag::encodedData( const char * c) const
+TQByteArray KDGanttViewItemDrag::tqencodedData( const char * c) const
 {
     TQString s ( c );
     if ( s == "x-application/x-KDGanttViewItemDrag" ) {
@@ -132,7 +132,7 @@ bool KDGanttViewItemDrag::canDecode (  const TQMimeSource * e )
 bool KDGanttViewItemDrag::decode (  const TQMimeSource * e , TQString &  string)
 {
     TQByteArray arr;
-    arr = e->encodedData( "x-application/x-KDGanttViewItemDrag");
+    arr = e->tqencodedData( "x-application/x-KDGanttViewItemDrag");
     TQDataStream s( arr, IO_ReadOnly );
     s >> string;
     return true;
diff --git a/kdgantt/KDGanttViewItemDrag.h b/kdgantt/KDGanttViewItemDrag.h
index 2512711e..d29ec214 100644
--- a/kdgantt/KDGanttViewItemDrag.h
+++ b/kdgantt/KDGanttViewItemDrag.h
@@ -44,7 +44,7 @@ class KDGanttViewItemDrag :public QStoredDrag
 public:
   KDGanttViewItemDrag(KDGanttViewItem* item, TQWidget *source,  const char * name  ) ;
 
-  TQByteArray encodedData( const char * c) const;
+  TQByteArray tqencodedData( const char * c) const;
   KDGanttViewItem* getItem();
   static bool canDecode ( const TQMimeSource * e );
   static bool decode ( const TQMimeSource * e, TQString & );
diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp
index ffec6528..daabcb59 100644
--- a/kdgantt/KDGanttViewSubwidgets.cpp
+++ b/kdgantt/KDGanttViewSubwidgets.cpp
@@ -140,14 +140,14 @@ void KDTimeTableWidget::removeItemFromTasklinks( KDGanttViewItem* item)
 
 void KDTimeTableWidget::expandItem( TQListViewItem * item)
 {
-    item->invalidateHeight () ;
-    //qApp->processEvents();
+    item->tqinvalidateHeight () ;
+    //tqApp->processEvents();
     updateMyContent();
 }
 void KDTimeTableWidget::collapseItem( TQListViewItem * item)
 {
-    item->invalidateHeight () ;
-    //qApp->processEvents();
+    item->tqinvalidateHeight () ;
+    //tqApp->processEvents();
     updateMyContent();
 }
 
@@ -160,7 +160,7 @@ void KDTimeTableWidget::highlightItem( TQListViewItem * item )
     highlightedItem = ( KDGanttViewItem*)item;
     itemwashighlighted = highlightedItem->highlight();
     highlightedItem->setHighlight(true);
-    item->invalidateHeight () ;
+    item->tqinvalidateHeight () ;
     myGanttView->myListView->contentsY();
     updateMyContent();
 }
@@ -702,12 +702,12 @@ KDTimeHeaderWidget:: KDTimeHeaderWidget( TQWidget* parent,KDGanttView* gant )
     mySizeHint = 0;
     myGanttView = gant;
     flagDoNotRecomputeAfterChange = true;
-    TQDateTime start = (TQDateTime::currentDateTime ()).addSecs(-3600);
+    TQDateTime start = (TQDateTime::tqcurrentDateTime ()).addSecs(-3600);
     setHorizonStart(start);
     setHorizonEnd( start.addSecs(3600*2));
     flagStartTimeSet = false;
     flagEndTimeSet = false;
-    myCenterDateTime = TQDateTime::currentDateTime ();
+    myCenterDateTime = TQDateTime::tqcurrentDateTime ();
     setScale(KDGanttView::Auto);
     //setScale(KDGanttView::Hour);
     myMaxScale = KDGanttView::Month;
@@ -830,14 +830,14 @@ void KDTimeHeaderWidget::addTickRight( int num )
 {
     int secs = ((num*getTickTime())-30);
     setHorizonEnd(getDateTimeForIndex(width()).addSecs(secs));
-    //qApp->processEvents();
+    //tqApp->processEvents();
 }
 
 void KDTimeHeaderWidget::addTickLeft( int num )
 {
     int secs = ((num*getTickTime())-30);
     setHorizonStart(getDateTimeForIndex(0).addSecs(-secs));
-    //qApp->processEvents();
+    //tqApp->processEvents();
 }
 // the time in secs of one minor grid tick
 int KDTimeHeaderWidget::getTickTime()
@@ -1140,7 +1140,7 @@ void KDTimeHeaderWidget::zoomToSelection( TQDateTime start, TQDateTime end)
     }
     flagDoNotRepaintAfterChange = false;
     updateTimeTable();
-    repaint();
+    tqrepaint();
     moveTimeLineTo((getCoordX(start)-(viewWid-timeWid)/2));
     // Since we have disconnected autoupdate of scrollbars, we must do it ourselves
     if (myGanttView && myGanttView->myCanvasView)
@@ -1436,7 +1436,7 @@ void KDTimeHeaderWidget::setShowMinorTicks( bool show )
     flagShowMinorTicks = show;
     if (show)
         setShowMajorTicks(false );
-    //repaintMe();
+    //tqrepaintMe();
     updateTimeTable();
 }
 
@@ -1487,7 +1487,7 @@ void KDTimeHeaderWidget::computeIntervals( int height )
 {
     IntervalColorList::const_iterator it;
     for ( it = icList.begin(); it != icList.end(); ++it ) {
-      (*it)->layout( this, height );
+      (*it)->tqlayout( this, height );
     }
 }
 
@@ -1861,7 +1861,7 @@ int KDTimeHeaderWidget::autoScaleMinorTickCount()
 }
 
 
-void KDTimeHeaderWidget::repaintMe(int left,int paintwid, TQPainter* painter)
+void KDTimeHeaderWidget::tqrepaintMe(int left,int paintwid, TQPainter* painter)
 {
     if (flagDoNotRecomputeAfterChange) return;
     TQColorGroup qcg =TQColorGroup( white, black,white, darkGray,black,gray,gray) ;
@@ -2086,7 +2086,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
     TQPainter p(this);
     int Width, Height;
     TQString testTextMinor,testTextMajor, tempStr;
-    TQRect itemRectMinor, itemRectMajor;
+    TQRect tqitemRectMinor, tqitemRectMajor;
     TQDate tempDate = myRealStart.date();
     myRealEnd = myRealStart;
     // preparing the testtext for the differennt scales
@@ -2109,25 +2109,25 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
                 testTextMinor = "12 AM";
             testTextMajor = "Mon Aug 30, x";
             if ( yearFormat() != KDGanttView::NoDate )
-                testTextMajor += getYear(TQDate::currentDate());
+                testTextMajor += getYear(TQDate::tqcurrentDate());
             minorPerMajor = 2400;
             break;
         case KDGanttView::Day:
             minorItems = minorItems/(60*24);
             testTextMinor = "88";
-            testTextMajor = "Aug 30, x"+getYear(TQDate::currentDate());
+            testTextMajor = "Aug 30, x"+getYear(TQDate::tqcurrentDate());
             minorPerMajor = 700;
             break;
         case KDGanttView::Week:
             minorItems = minorItems/(60*24*7);
             testTextMinor = "88";
-            testTextMajor = "Aug x"+getYear(TQDate::currentDate());
+            testTextMajor = "Aug x"+getYear(TQDate::tqcurrentDate());
             minorPerMajor = 435; // 435 = 365days/12months/7days * 100
             break;
         case KDGanttView::Month:
             minorItems = (minorItems*12)/(60*24*365);
             testTextMinor = "M";
-            testTextMajor = "x"+getYear(TQDate::currentDate());
+            testTextMajor = "x"+getYear(TQDate::tqcurrentDate());
             minorPerMajor = 1200;
             break;
         case KDGanttView::Auto:
@@ -2135,12 +2135,12 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
             qDebug("             RealScale == Auto : This may not be! ");
             break;
         }
-    itemRectMinor = p.boundingRect ( 10, 10, 2, 2, Qt::AlignLeft,testTextMinor);
-    itemRectMajor = p.boundingRect ( 10, 10, 2, 2, Qt::AlignLeft,testTextMajor);
+    tqitemRectMinor = p.boundingRect ( 10, 10, 2, 2, Qt::AlignLeft,testTextMinor);
+    tqitemRectMajor = p.boundingRect ( 10, 10, 2, 2, Qt::AlignLeft,testTextMajor);
     p.end();
     //qDebug("     tempMinorScaleCount %d ", tempMinorScaleCount);
-    Height = itemRectMinor.height()+itemRectMajor.height()+11;
-    Width = (itemRectMinor.width()+5);
+    Height = tqitemRectMinor.height()+tqitemRectMajor.height()+11;
+    Width = (tqitemRectMinor.width()+5);
     if (Width < minimumColumnWidth()) Width = minimumColumnWidth();
     // if the desired width is greater than the maximum width of this widget
     // increase the minorscalecount
@@ -2197,7 +2197,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
     // checking, if enough space for majorscale
     // if not, increasing MajorScaleCount
 
-    while ((minorPerMajor*Width)/100 < itemRectMajor.width()) {
+    while ((minorPerMajor*Width)/100 < tqitemRectMajor.width()) {
         minorPerMajor = minorPerMajor/tempMajorScaleCount;
         ++tempMajorScaleCount;
         minorPerMajor = minorPerMajor*tempMajorScaleCount;
@@ -2207,13 +2207,13 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
     myGridMinorWidth = Width;
     // the width of this widget is the gridwidth * the amount of items
     Width *= minorItems;
-    // if size changed, reset geometry
+    // if size changed, reset tqgeometry
     if (width() != Width   || height() != Height  )
         {
             resize( Width, Height );
             emit  sizeChanged( Width );
         }
-    myMajorGridHeight = itemRectMajor.height()+5;
+    myMajorGridHeight = tqitemRectMajor.height()+5;
     TQTime tempTime = myRealStart.time();
     TQDateTime tempDateTime;
     int i;
@@ -2343,7 +2343,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
     myGanttView->myTimeTable->setBlockUpdating( block );
     updateTimeTable();
     centerDateTime(myCenterDateTime);
-    repaint();
+    tqrepaint();
 }
 
 
@@ -2371,7 +2371,7 @@ void KDTimeHeaderWidget::centerDateTime( const TQDateTime& center )
 
 void KDTimeHeaderWidget::paintEvent(TQPaintEvent *p)
 {
-    repaintMe(p->rect().x(),p->rect().width());
+    tqrepaintMe(p->rect().x(),p->rect().width());
 }
 
 
@@ -2489,7 +2489,7 @@ void KDTimeHeaderWidget::mouseReleaseEvent ( TQMouseEvent *  )
         //zoomToSelection( getDateTimeForIndex(start),getDateTimeForIndex(end) );
     }
     mouseDown = false;
-    repaint();
+    tqrepaint();
 }
 
 
@@ -2504,11 +2504,11 @@ void KDTimeHeaderWidget::mouseMoveEvent ( TQMouseEvent * e )
     if ( mouseDown ) {
         if ( e->pos().y() < -height() || e->pos().y() > 2* height() ) {
             mouseDown = false;
-            repaint();
+            tqrepaint();
             return;
         }
         endMouseDown = e->pos().x();
-        //repaint;
+        //tqrepaint;
         int val = -1;
         if (endMouseDown <  -x() ) {
             val = myGanttView->myCanvasView->horizontalScrollBar()->value() -
@@ -2517,19 +2517,19 @@ void KDTimeHeaderWidget::mouseMoveEvent ( TQMouseEvent * e )
                 val = 0;
             }
         }
-        if (endMouseDown >  -x() +parentWidget()->width() ) {
+        if (endMouseDown >  -x() +tqparentWidget()->width() ) {
             val = myGanttView->myCanvasView->horizontalScrollBar()->value() +
                 myGanttView->myCanvasView->horizontalScrollBar()->lineStep();
 
         }
-        repaintMe(-x(),parentWidget()->width());
+        tqrepaintMe(-x(),tqparentWidget()->width());
         if ( val > -1 ) {
             if ( val > myGanttView->myCanvasView->horizontalScrollBar()->maxValue() ) {
                 val = myGanttView->myCanvasView->horizontalScrollBar()->maxValue();
             }
             myGanttView->myCanvasView->horizontalScrollBar()->setValue( val );
         }
-        //qDebug("mousemove %d %d %d %d",endMouseDown, -x(),parentWidget()->width() , e->pos().y());
+        //qDebug("mousemove %d %d %d %d",endMouseDown, -x(),tqparentWidget()->width() , e->pos().y());
     }
 }
 
@@ -2631,7 +2631,7 @@ TQSize KDLegendWidget::legendSize()
 TQSize KDLegendWidget::legendSizeHint()
 {
     TQApplication::sendPostedEvents( 0, TQEvent::LayoutHint );
-    return TQSize( myLegend->sizeHint().width(), myLegend->sizeHint().height()+scroll->horizontalScrollBar()->height());
+    return TQSize( myLegend->tqsizeHint().width(), myLegend->tqsizeHint().height()+scroll->horizontalScrollBar()->height());
 }
 
 
@@ -2652,7 +2652,7 @@ void KDLegendWidget::clearLegend ( )
     myLegend->setFont( font() );
     scroll->addChild(  myLegend );
     scroll->setResizePolicy( TQScrollView::AutoOneFit );
-    myLegend->layout()->setMargin( 11 );
+    myLegend->tqlayout()->setMargin( 11 );
     myLegend->setFrameStyle( TQFrame::NoFrame );
     if ( dock )
         scroll->setMaximumHeight( 32000 );
@@ -2661,10 +2661,10 @@ void KDLegendWidget::clearLegend ( )
 }
 
 
-void KDLegendWidget::addLegendItem( KDGanttViewItem::Shape shape, const TQColor& shapeColor, const TQString& text )
+void KDLegendWidget::addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text )
 {
     TQLabel * temp;
-    TQPixmap p = KDGanttView::getPixmap( shape,  shapeColor, Qt::white, 10);
+    TQPixmap p = KDGanttView::getPixmap( tqshape,  tqshapeColor, Qt::white, 10);
     TQWidget *w = new TQWidget( myLegend );
     w->setBackgroundColor( Qt::white );
     TQHBoxLayout *lay = new TQHBoxLayout( w ,0, 6);
@@ -2949,7 +2949,7 @@ void KDListView::drawAllContents(TQPainter * p, int cx, int cy, int cw, int ch)
                 p->translate( rleft, crtop );
                 //kdDebug()<<k_funcinfo<<"paintBranches: "<<current->i->text(0)<<endl;
 
-                current->i->paintBranches( p, colorGroup(), treeStepSize(),
+                current->i->paintBranches( p, tqcolorGroup(), treeStepSize(),
                                         rtop - crtop, r.height() );
                 p->restore();
             }
@@ -3510,7 +3510,7 @@ KDGanttCanvasView::MovingOperation KDGanttCanvasView::gvItemHitTest( KDGanttView
 void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e )
 {
     //qDebug("mousepress! %d ", this);
-    //qDebug("focus %d ",qApp->focusWidget());
+    //qDebug("focus %d ",tqApp->tqfocusWidget());
     setFocus();
     currentLink = 0;
     currentItem = 0;
@@ -3819,14 +3819,14 @@ void KDGanttCanvasView::contentsMouseMoveEvent ( TQMouseEvent *e )
 
     const TQPoint p = e->pos();
     if ( movingItem ) {
-      int x = qRound( movingItem->x() );
+      int x = tqRound( movingItem->x() );
       int width = movingItem->width();
       switch( movingOperation ) {
       case Moving:
         x += p.x() - movingStart.x();
         break;
       case ResizingLeft: {
-        width = qRound( movingItem->x() + movingItem->width() - p.x() );
+        width = tqRound( movingItem->x() + movingItem->width() - p.x() );
         x = p.x();
         break;
       }
@@ -4003,7 +4003,7 @@ void KDIntervalColorRectangle::setDateTimes( const TQDateTime& start,
   mStart = start;
   mEnd = end;
   if ( mEnd < mStart )
-    qSwap( mStart, mEnd );
+    tqSwap( mStart, mEnd );
 }
 
 /*!
@@ -4018,7 +4018,7 @@ void KDIntervalColorRectangle::setColor( const TQColor& color )
 /*!
   \internal
 */
-void KDIntervalColorRectangle::layout( KDTimeHeaderWidget* timeHeader, int height )
+void KDIntervalColorRectangle::tqlayout( KDTimeHeaderWidget* timeHeader, int height )
 {
   int left = timeHeader->getCoordX(mStart);
   int right = timeHeader->getCoordX(mEnd);
diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h
index 1a88411a..de771800 100644
--- a/kdgantt/KDGanttViewSubwidgets.h
+++ b/kdgantt/KDGanttViewSubwidgets.h
@@ -138,7 +138,7 @@ public:
 				  Scale mini =  KDGanttView::Minute ,
 				  Scale maxi =  KDGanttView::Month);
 #if 0
-   // This API has been replaced with KDIntervalColorRectangle and addIntervalBackgroundColor
+   // This API has been tqreplaced with KDIntervalColorRectangle and addIntervalBackgroundColor
    void setIntervalBackgroundColor( const TQDateTime& start,
 				    const TQDateTime& end,
 				  const TQColor& color,
@@ -174,7 +174,7 @@ public:
       return ccList;
     }
    TQColor weekdayColor[8];
-   void repaintMe(int left, int wid, TQPainter *p = 0);
+   void tqrepaintMe(int left, int wid, TQPainter *p = 0);
 
    void centerDateTime( const TQDateTime& center );
 
@@ -334,7 +334,7 @@ public:
   KDLegendWidget ( TQWidget* parent, KDGanttMinimizeSplitter* legendParent );
   void showMe(bool);
   bool isShown();
-  void addLegendItem( KDGanttViewItem::Shape shape, const TQColor& shapeColor, const TQString& text );
+  void addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text );
   void clearLegend();
   void setFont( TQFont );
   void drawToPainter( TQPainter *p );
@@ -467,7 +467,7 @@ public:
   enum HitTest { Start, Middle, End };
   HitTest hitTest( KDTimeHeaderWidget* timeHeader, const TQPoint& pos ) const;
 
-  void layout( KDTimeHeaderWidget* timeHeader, int height );
+  void tqlayout( KDTimeHeaderWidget* timeHeader, int height );
 
   static const int RTTI = 0x0c58;
   /*reimp*/ int rtti() const { return RTTI; }
diff --git a/kdgantt/KDGanttViewSummaryItem.cpp b/kdgantt/KDGanttViewSummaryItem.cpp
index cb7e2893..95ca682d 100644
--- a/kdgantt/KDGanttViewSummaryItem.cpp
+++ b/kdgantt/KDGanttViewSummaryItem.cpp
@@ -267,7 +267,7 @@ void KDGanttViewSummaryItem::hideMe()
 void KDGanttViewSummaryItem::showItem( bool show, int coordY )
 {
   isVisibleInGanttView = show;
-  invalidateHeight () ;
+  tqinvalidateHeight () ;
   if (!show) {
     hideMe();
     return;
diff --git a/kdgantt/KDGanttViewTaskItem.cpp b/kdgantt/KDGanttViewTaskItem.cpp
index 1bcb96a6..f2ba122c 100644
--- a/kdgantt/KDGanttViewTaskItem.cpp
+++ b/kdgantt/KDGanttViewTaskItem.cpp
@@ -43,7 +43,7 @@
 
   This class represents calendar items in Gantt charts.
 
-  A calendar item in a Gantt chart has no start/end shape,
+  A calendar item in a Gantt chart has no start/end tqshape,
   it is displayed as a rectangle.
   You can set the colors as usual, where only the first argument of
   setColors( col, col, col )
@@ -201,7 +201,7 @@ void KDGanttViewTaskItem::showItem(bool show, int coordY)
 
   //qDebug("KDGanttViewTaskItem::showItem() %d %s ", (int) show, listViewText().latin1());
   isVisibleInGanttView = show;
-  invalidateHeight () ;
+  tqinvalidateHeight () ;
   if (!show) {
     hideMe();
     return;
diff --git a/kdgantt/itemAttributeDialog.ui b/kdgantt/itemAttributeDialog.ui
index 8b8d5518..10fac5d6 100644
--- a/kdgantt/itemAttributeDialog.ui
+++ b/kdgantt/itemAttributeDialog.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>itemAttributeDialog</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -64,7 +64,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>0</width>
                     <height>16</height>
@@ -383,7 +383,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>0</width>
                     <height>16</height>
@@ -462,7 +462,7 @@
                             <property name="text">
                                 <string>Text color:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -733,5 +733,5 @@
     <slot>PrioSlider_valueChanged( int val )</slot>
     <slot returnType="KDGanttViewItem *">getItem()</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdgantt/itemAttributeDialog.ui.h b/kdgantt/itemAttributeDialog.ui.h
index 2ca8b671..348b3e97 100644
--- a/kdgantt/itemAttributeDialog.ui.h
+++ b/kdgantt/itemAttributeDialog.ui.h
@@ -54,7 +54,7 @@ void itemAttributeDialog::ChangeText_clicked()
       myItem->setTextColor( c );
     TQPixmap *  pix  = (TQPixmap *)ChangeText->pixmap();
     pix->fill( myItem->textColor() );
-    ChangeText->repaint();
+    ChangeText->tqrepaint();
 }
 
 
@@ -62,7 +62,7 @@ void itemAttributeDialog::ChangeStart_clicked()
 {
     if ( !myItem) return;
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->shapes( start, middle, end );
+    myItem->tqshapes( start, middle, end );
     TQColor st, mi, en;
     myItem->colors( st, mi, en );
     TQColor c = QColorDialog::getColor( st, this );
@@ -79,7 +79,7 @@ void itemAttributeDialog::ChangeMiddle_clicked()
 {
     if ( !myItem) return;
      KDGanttViewItem::Shape start,  middle, end;
-    myItem->shapes( start, middle, end );
+    myItem->tqshapes( start, middle, end );
     TQColor st, mi, en;
     myItem->colors( st, mi, en );
     TQColor c = QColorDialog::getColor( mi, this );
@@ -95,7 +95,7 @@ void itemAttributeDialog::ChangeEnd_clicked()
 {
     if ( !myItem) return;
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->shapes( start, middle, end );
+    myItem->tqshapes( start, middle, end );
     TQColor st, mi, en;
     myItem->colors( st, mi, en );
      TQColor c = QColorDialog::getColor( en, this );
@@ -244,7 +244,7 @@ void itemAttributeDialog::reset( KDGanttViewItem * item )
   //  DateEdit3->setRange(item->startTime().date(), item->endTime().date().addYears(10));
     LineEdit1->setText( item->text() );
     KDGanttViewItem::Shape start,  middle, end;
-    item->shapes( start, middle, end );
+    item->tqshapes( start, middle, end );
     TQColor st, mi, en;
     item->colors( st, mi, en );
     ChangeStart->setPixmap(  KDGanttView::getPixmap( start, st, backgroundColor(), 10 )  );
@@ -272,7 +272,7 @@ void itemAttributeDialog::HighStart_clicked()
 {
     if ( !myItem) return;
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->shapes( start, middle, end );
+    myItem->tqshapes( start, middle, end );
     TQColor st, mi, en;
     myItem->highlightColors( st, mi, en );
     TQColor c = QColorDialog::getColor( st, this );
@@ -289,7 +289,7 @@ void itemAttributeDialog::HighMiddle_clicked()
 {
     if ( !myItem) return;
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->shapes( start, middle, end );
+    myItem->tqshapes( start, middle, end );
     TQColor st, mi, en;
     myItem->highlightColors( st, mi, en );
     TQColor c = QColorDialog::getColor( mi, this );
@@ -306,7 +306,7 @@ void itemAttributeDialog::HighEnd_clicked()
 {
     if ( !myItem) return;
    KDGanttViewItem::Shape start,  middle, end;
-    myItem->shapes( start, middle, end );
+    myItem->tqshapes( start, middle, end );
     TQColor st, mi, en;
     myItem->highlightColors( st, mi, en );
     TQColor c = QColorDialog::getColor( en, this );
@@ -409,7 +409,7 @@ void itemAttributeDialog::LineEdit1_textChanged( const TQString & )
 void itemAttributeDialog::StartBox_activated( const TQString & s )
 {
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->shapes( start, middle, end );
+    myItem->tqshapes( start, middle, end );
     start = KDGanttViewItem::stringToShape( s );
     myItem->setShapes( start, middle, end );
     reset( myItem );
@@ -419,7 +419,7 @@ void itemAttributeDialog::StartBox_activated( const TQString & s )
 void itemAttributeDialog::MiddleBox_activated( const TQString & s )
 {
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->shapes( start, middle, end );
+    myItem->tqshapes( start, middle, end );
     middle = KDGanttViewItem::stringToShape( s );
     myItem->setShapes( start, middle, end );
     reset( myItem );
@@ -430,7 +430,7 @@ void itemAttributeDialog::MiddleBox_activated( const TQString & s )
 void itemAttributeDialog::EndBox_activated( const TQString & s )
 {
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->shapes( start, middle, end );
+    myItem->tqshapes( start, middle, end );
     end = KDGanttViewItem::stringToShape( s );
     myItem->setShapes( start, middle, end );
     reset( myItem );
diff --git a/kdgantt/qlayoutengine_p.h b/kdgantt/qlayoutengine_p.h
index fed046ae..2681ff73 100644
--- a/kdgantt/qlayoutengine_p.h
+++ b/kdgantt/qlayoutengine_p.h
@@ -46,7 +46,7 @@
 //  -------------
 //
 // This file is not part of the Qt API.  It exists for the convenience
-// of qlayout.cpp, qlayoutengine.cpp, qmainwindow.cpp and qsplitter.cpp.
+// of qtqlayout.cpp, qtqlayoutengine.cpp, qmainwindow.cpp and qsplitter.cpp.
 // This header file may change from version to version without notice,
 // or even be removed.
 //
@@ -56,21 +56,21 @@
 
 
 #ifndef QT_H
-#include "tqabstractlayout.h"
+#include "tqabstractqlayout.h"
 #endif // QT_H
 
 #ifndef QT_NO_LAYOUT
 struct QLayoutStruct
 {
-    void initParameters() { minimumSize = sizeHint = 0;
-    maximumSize = QWIDGETSIZE_MAX; expansive = FALSE; empty = TRUE; }
+    void initParameters() { tqminimumSize = tqsizeHint = 0;
+    tqmaximumSize = QWIDGETSIZE_MAX; expansive = FALSE; empty = TRUE; }
     void init() { stretch = 0; initParameters(); }
     //permanent storage:
     int stretch;
     //parameters:
-    QCOORD sizeHint;
-    QCOORD maximumSize;
-    QCOORD minimumSize;
+    QCOORD tqsizeHint;
+    QCOORD tqmaximumSize;
+    QCOORD tqminimumSize;
     bool expansive;
     bool empty;
     //temporary storage:
diff --git a/kfile-plugins/ics/kfile_ics.cpp b/kfile-plugins/ics/kfile_ics.cpp
index 0d85344e..b8346f4f 100644
--- a/kfile-plugins/ics/kfile_ics.cpp
+++ b/kfile-plugins/ics/kfile_ics.cpp
@@ -59,7 +59,7 @@ bool ICSPlugin::readInfo( KFileMetaInfo& info, uint /*what*/ )
 {
   KFileMetaInfoGroup group = appendGroup( info, "ICSInfo");
 
-  CalendarLocal cal ( TQString::fromLatin1( "UTC" ) );
+  CalendarLocal cal ( TQString::tqfromLatin1( "UTC" ) );
   if( !cal.load( info.path() ) ) {
     kdDebug() << "Could not load calendar" << endl;
     return false;
@@ -80,7 +80,7 @@ bool ICSPlugin::readInfo( KFileMetaInfo& info, uint /*what*/ )
     Todo *todo = *it;
     if ( todo->isCompleted() )
       ++completed;
-    else if ( todo->hasDueDate() && todo->dtDue().date() < TQDate::currentDate() )
+    else if ( todo->hasDueDate() && todo->dtDue().date() < TQDate::tqcurrentDate() )
       ++overdue;
   }
 
diff --git a/kfile-plugins/vcf/kfile_vcf.cpp b/kfile-plugins/vcf/kfile_vcf.cpp
index 5dcfc2c1..6c083895 100644
--- a/kfile-plugins/vcf/kfile_vcf.cpp
+++ b/kfile-plugins/vcf/kfile_vcf.cpp
@@ -91,7 +91,7 @@ bool KVcfPlugin::readInfo( KFileMetaInfo& info, uint /*what*/ )
     TQStringList phoneNumbers;
     for (unsigned int no=0; no<pnList.count(); ++no) {
       TQString pn = pnList[no].number().simplifyWhiteSpace();
-      if (!pn.isEmpty() && !phoneNumbers.contains(pn))
+      if (!pn.isEmpty() && !phoneNumbers.tqcontains(pn))
         phoneNumbers.append(pn);
     }
     if ( !phoneNumbers.isEmpty() )
diff --git a/kgantt/kgantt/KGantt.cpp b/kgantt/kgantt/KGantt.cpp
index f16d4776..249f11ad 100644
--- a/kgantt/kgantt/KGantt.cpp
+++ b/kgantt/kgantt/KGantt.cpp
@@ -24,8 +24,8 @@ KGantt::KGantt(KGanttItem* toplevelitem,
 
   if(toplevelitem == 0) {
     _toplevelitem = new KGanttItem(0, "toplevelitem",
-			   TQDateTime::currentDateTime(),
-			   TQDateTime::currentDateTime() );
+			   TQDateTime::tqcurrentDateTime(),
+			   TQDateTime::tqcurrentDateTime() );
     _toplevelitem->setMode(KGanttItem::Rubberband);
     _deleteItem = true;
   }
diff --git a/kgantt/kgantt/KGantt.h b/kgantt/kgantt/KGantt.h
index fbde52d7..5cfe559c 100644
--- a/kgantt/kgantt/KGantt.h
+++ b/kgantt/kgantt/KGantt.h
@@ -49,7 +49,7 @@
 /**
  *  \mainpage KGantt Module <br> <IMG SRC="gantt.png">
  *
- *  The kgantt module contains several classes (KGanttItem, KGantt)
+ *  The kgantt module tqcontains several classes (KGanttItem, KGantt)
  *  for drawing and editing gantt-diagramms.
  *
  *  This example shows how to use the gantt module:
@@ -66,8 +66,8 @@
 
        KGanttItem* t1 = new KGanttItem(toplevel, 
                                        "task 1, no subtasks", 
-                	               TQDateTime::currentDateTime().addDays(10),
-                                       TQDateTime::currentDateTime().addDays(20) );
+                	               TQDateTime::tqcurrentDateTime().addDays(10),
+                                       TQDateTime::tqcurrentDateTime().addDays(20) );
 
        ...
 
@@ -83,7 +83,7 @@
 
 ///  Gantt Widget.
 /*!
- *   A gantt widget contains two parts, a list view and a
+ *   A gantt widget tqcontains two parts, a list view and a
  *   bar view.
  */
 ////////////////////////////////
diff --git a/kgantt/kgantt/KGanttItem.cpp b/kgantt/kgantt/KGanttItem.cpp
index 4ddddf01..3632e170 100644
--- a/kgantt/kgantt/KGanttItem.cpp
+++ b/kgantt/kgantt/KGanttItem.cpp
@@ -90,7 +90,7 @@ KGanttRelation*
 KGanttItem::addRelation(KGanttItem* from, KGanttItem* to,
 			const TQString& text)
 {
-  if(_subitems.containsRef(from) > 0 && _subitems.containsRef(to) >0) {
+  if(_subitems.tqcontainsRef(from) > 0 && _subitems.tqcontainsRef(to) >0) {
     KGanttRelation* rel = new KGanttRelation(from,to,text);
     _relations.append(rel);
 
diff --git a/kgantt/kgantt/KGanttItem.h b/kgantt/kgantt/KGanttItem.h
index 9971508c..fb7feb04 100644
--- a/kgantt/kgantt/KGanttItem.h
+++ b/kgantt/kgantt/KGanttItem.h
@@ -46,8 +46,8 @@
 
 ///  KGanttItem.
 /*!
- *   This class describes a item. It contains dates on which the item starts and
- *   ends. It also contains attributes that gouverns the graphical representation
+ *   This class describes a item. It tqcontains dates on which the item starts and
+ *   ends. It also tqcontains attributes that gouverns the graphical representation
  *   in a gantt diagramm.
  */
 //////////////////////////////////
@@ -121,7 +121,7 @@ public:
     //  Draw handlke for opening/closing item.
     DrawHandle      = 16,
     
-    /// Draw handle only if item contains subitems
+    /// Draw handle only if item tqcontains subitems
     DrawHandleWSubitems = 32,
     
     DrawAll         = 255 
@@ -342,7 +342,7 @@ public:
 
   ///  Get date of starting.
   /*!
-   *   If mode == ´Rubberband´ and this item contains
+   *   If mode == ´Rubberband´ and this item tqcontains
    *   subitems, start of the item is determined by the start of the
    *   earliest subitem. <br>
    */
diff --git a/kgantt/kgantt/KGanttRelation.h b/kgantt/kgantt/KGanttRelation.h
index 54878950..8ab96c5d 100644
--- a/kgantt/kgantt/KGanttRelation.h
+++ b/kgantt/kgantt/KGanttRelation.h
@@ -40,8 +40,8 @@ class KGanttItem;
 
 ///  KGanttRelation.
 /*!
- *   This class describes a item. It contains dates on which the item starts and
- *   ends. It also contains attributes that gouverns the graphical representation
+ *   This class describes a item. It tqcontains dates on which the item starts and
+ *   ends. It also tqcontains attributes that gouverns the graphical representation
  *   in a gantt diagramm.
  */
 //////////////////////////////////
@@ -175,7 +175,7 @@ public:
 
   ///  Get date of starting.
   /*!
-   *   If mode == ´Rubberband´ and this item contains
+   *   If mode == ´Rubberband´ and this item tqcontains
    *   subitems, start of the item is determined by the start of the
    *   earliest subitem. <br>
    */
diff --git a/kgantt/kgantt/itemedit.ui b/kgantt/kgantt/itemedit.ui
index e50689e6..3be22f9e 100644
--- a/kgantt/kgantt/itemedit.ui
+++ b/kgantt/kgantt/itemedit.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>Form1</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -12,9 +12,9 @@
             <height>431</height>
         </rect>
     </property>
-    <property name="layoutMargin" stdset="0">
+    <property name="tqlayoutMargin" stdset="0">
     </property>
-    <property name="layoutSpacing" stdset="0">
+    <property name="tqlayoutSpacing" stdset="0">
     </property>
     <grid>
         <property name="name">
@@ -38,7 +38,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>32767</width>
                     <height>30</height>
@@ -47,7 +47,7 @@
             <property name="text">
                 <string>Item text:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignBottom|AlignLeft</set>
             </property>
             <property name="vAlign" stdset="0">
@@ -74,7 +74,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>50</width>
                             <height>20</height>
@@ -85,7 +85,7 @@
                     <property name="name">
                         <cstring>_minStartMinuetEdit</cstring>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>20</width>
                             <height>30</height>
@@ -99,7 +99,7 @@
                     <property name="name">
                         <cstring>_minStartHourEdit</cstring>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>20</width>
                             <height>30</height>
@@ -177,7 +177,7 @@
                     <property name="name">
                         <cstring>_maxStartHourEdit</cstring>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>20</width>
                             <height>30</height>
@@ -210,7 +210,7 @@
                     <property name="name">
                         <cstring>_maxStartMinuetEdit</cstring>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>20</width>
                             <height>30</height>
@@ -230,7 +230,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>50</width>
                             <height>20</height>
@@ -308,7 +308,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>356</width>
                             <height>20</height>
@@ -354,7 +354,7 @@
                     <property name="name">
                         <cstring>_startHourEdit</cstring>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>20</width>
                             <height>30</height>
@@ -368,7 +368,7 @@
                     <property name="name">
                         <cstring>_startMinuetEdit</cstring>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>20</width>
                             <height>30</height>
@@ -395,7 +395,7 @@
                     <property name="name">
                         <cstring>_endMinuetEdit</cstring>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>20</width>
                             <height>30</height>
@@ -415,7 +415,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>356</width>
                             <height>20</height>
@@ -477,7 +477,7 @@
                     <property name="name">
                         <cstring>_endHourEdit</cstring>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>20</width>
                             <height>30</height>
@@ -605,7 +605,7 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
 </includehints>
diff --git a/kgantt/kgantt/itemedit2.ui b/kgantt/kgantt/itemedit2.ui
index 7ef1fa00..bdcc0eb7 100644
--- a/kgantt/kgantt/itemedit2.ui
+++ b/kgantt/kgantt/itemedit2.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>Form1</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -12,9 +12,9 @@
             <height>345</height>
         </rect>
     </property>
-    <property name="layoutMargin" stdset="0">
+    <property name="tqlayoutMargin" stdset="0">
     </property>
-    <property name="layoutSpacing" stdset="0">
+    <property name="tqlayoutSpacing" stdset="0">
     </property>
     <grid>
         <property name="name">
@@ -217,7 +217,7 @@
                     <property name="name">
                         <cstring>_dateTimeHourEdit</cstring>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>20</width>
                             <height>30</height>
@@ -245,7 +245,7 @@
                     <property name="name">
                         <cstring>_dateTimeMinuetEdit</cstring>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>20</width>
                             <height>30</height>
@@ -265,7 +265,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>194</width>
                             <height>20</height>
@@ -302,7 +302,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>32767</width>
                     <height>30</height>
@@ -314,7 +314,7 @@
             <property name="textFormat">
                 <enum>PlainText</enum>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignBottom|AlignLeft</set>
             </property>
             <property name="vAlign" stdset="0">
@@ -322,7 +322,7 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
 </includehints>
diff --git a/kgantt/kgantt/xQGanttBarViewPort.cpp b/kgantt/kgantt/xQGanttBarViewPort.cpp
index b0985dd7..2ee7ad02 100644
--- a/kgantt/kgantt/xQGanttBarViewPort.cpp
+++ b/kgantt/kgantt/xQGanttBarViewPort.cpp
@@ -424,7 +424,7 @@ xQGanttBarViewPort::recalc(KGanttItem* item, int xPos, int yPos,
     new xQTaskPosition(nr, xPos, yPos, _screenW, _screenH, _screenHS,
 		       _textPosX, _textPosY, depth);
   
-  _gItemList.replace(item, tpos );
+  _gItemList.tqreplace(item, tpos );
 
   tpos->_screenHandleX = xPos + dd;
   tpos->_screenHandleW = 2 * dd;
diff --git a/kioslaves/imap4/imap4.cc b/kioslaves/imap4/imap4.cc
index 2290c678..b5d1071f 100644
--- a/kioslaves/imap4/imap4.cc
+++ b/kioslaves/imap4/imap4.cc
@@ -251,7 +251,7 @@ IMAP4Protocol::get (const KURL & _url)
       if (aUpper.find ("BODY.PEEK[]") != -1)
       {
         if (!hasCapability("IMAP4rev1")) // imap4 does not know BODY.PEEK[]
-          aSection.replace("BODY.PEEK[]", "RFC822.PEEK");
+          aSection.tqreplace("BODY.PEEK[]", "RFC822.PEEK");
       }
       aSection.prepend("UID RFC822.SIZE FLAGS ");
     }
@@ -309,7 +309,7 @@ IMAP4Protocol::get (const KURL & _url)
       {
         // get the MIME header and fill getLastHandled()
         TQString mySection = aSection;
-        mySection.replace("]", ".MIME]");
+        mySection.tqreplace("]", ".MIME]");
         cmd = sendCommand (imapCommand::clientFetch (aSequence, mySection));
         do
         {
@@ -1816,7 +1816,7 @@ IMAP4Protocol::slave_status ()
 {
   bool connected = (getState() != ISTATE_NO) && isConnectionValid();
   kdDebug(7116) << "IMAP4::slave_status " << connected << endl;
-  slaveStatus ( connected ? myHost : TQString::null, connected );
+  slavetqStatus ( connected ? myHost : TQString::null, connected );
 }
 
 void
@@ -1863,7 +1863,7 @@ IMAP4Protocol::stat (const KURL & _url)
       ok = true;
     else
     {
-      imapCommand *cmd = doCommand(imapCommand::clientStatus(aBox, aSection));
+      imapCommand *cmd = doCommand(imapCommand::clienStatus(aBox, aSection));
       ok = cmd->result() == "OK";
       cmdInfo = cmd->resultInfo();
       completeQueue.removeRef(cmd);
@@ -1887,13 +1887,13 @@ IMAP4Protocol::stat (const KURL & _url)
         error(KIO::ERR_DOES_NOT_EXIST, aBox);
       return;
     }
-    if ((aSection == "UIDNEXT" && getStatus().uidNextAvailable())
-      || (aSection == "UNSEEN" && getStatus().unseenAvailable()))
+    if ((aSection == "UIDNEXT" && geStatus().uidNextAvailable())
+      || (aSection == "UNSEEN" && geStatus().unseenAvailable()))
     {
       atom.m_uds = UDS_SIZE;
       atom.m_str = TQString::null;
-      atom.m_long = (aSection == "UIDNEXT") ? getStatus().uidNext()
-        : getStatus().unseen();
+      atom.m_long = (aSection == "UIDNEXT") ? geStatus().uidNext()
+        : geStatus().unseen();
       entry.append(atom);
     }
   } else
@@ -1910,9 +1910,9 @@ IMAP4Protocol::stat (const KURL & _url)
       // only do this if the box is not selected
       // the server might change the validity for new select/examine
       imapCommand *cmd =
-        doCommand (imapCommand::clientStatus (aBox, "UIDVALIDITY"));
+        doCommand (imapCommand::clienStatus (aBox, "UIDVALIDITY"));
       completeQueue.removeRef (cmd);
-      validity = getStatus ().uidValidity ();
+      validity = geStatus ().uidValidity ();
     }
     validity = 0;               // temporary
 
@@ -2108,7 +2108,7 @@ bool IMAP4Protocol::makeLogin ()
       }
     }
 
-    if ( greeting.contains(  TQRegExp(  "Cyrus IMAP4 v2.1" ) ) ) {
+    if ( greeting.tqcontains(  TQRegExp(  "Cyrus IMAP4 v2.1" ) ) ) {
       removeCapability( "ANNOTATEMORE" );
     }
 
@@ -2473,7 +2473,7 @@ IMAP4Protocol::parseURL (const KURL & _url, TQString & _box,
   // get the delimiter
   TQString myNamespace = namespaceForBox( _box );
   kdDebug(7116) << "IMAP4::parseURL - namespace=" << myNamespace << endl;
-  if ( namespaceToDelimiter.contains(myNamespace) )
+  if ( namespaceToDelimiter.tqcontains(myNamespace) )
   {
     _hierarchyDelimiter = namespaceToDelimiter[myNamespace];
     kdDebug(7116) << "IMAP4::parseURL - delimiter=" << _hierarchyDelimiter << endl;
@@ -2524,7 +2524,7 @@ IMAP4Protocol::parseURL (const KURL & _url, TQString & _box,
             }
             // if we got no list response for the box see if it's a prefix
             if ( retVal == ITYPE_UNKNOWN &&
-                 namespaceToDelimiter.contains(_box) ) {
+                 namespaceToDelimiter.tqcontains(_box) ) {
               retVal = ITYPE_DIR;
             }
           } else {
@@ -2636,7 +2636,7 @@ void IMAP4Protocol::flushOutput(TQString contentEncoding)
     else
       decoded = outputCache;
 
-    TQString mimetype = KMimeType::findByContent( decoded )->name();
+    TQString mimetype = KMimeType::tqfindByContent( decoded )->name();
     kdDebug(7116) << "IMAP4::flushOutput - mimeType " << mimetype << endl;
     mimeType(mimetype);
     decodeContent = false;
@@ -2715,10 +2715,10 @@ IMAP4Protocol::assureBox (const TQString & aBox, bool readonly)
     // Doing this means a server roundtrip and since assureBox is called
     // after every mail, we do it with a timeout.
     kdDebug(7116) << "IMAP4Protocol::assureBox - reusing box" << endl;
-    if ( mTimeOfLastNoop.secsTo( TQDateTime::currentDateTime() ) > 10 ) {
+    if ( mTimeOfLastNoop.secsTo( TQDateTime::tqcurrentDateTime() ) > 10 ) {
       cmd = doCommand (imapCommand::clientNoop ());
       completeQueue.removeRef (cmd);
-      mTimeOfLastNoop = TQDateTime::currentDateTime();
+      mTimeOfLastNoop = TQDateTime::tqcurrentDateTime();
       kdDebug(7116) << "IMAP4Protocol::assureBox - noop timer fired" << endl;
     }
   }
diff --git a/kioslaves/imap4/imap4.h b/kioslaves/imap4/imap4.h
index 9920ecac..a44b4eb7 100644
--- a/kioslaves/imap4/imap4.h
+++ b/kioslaves/imap4/imap4.h
@@ -37,8 +37,8 @@ enum IMAP_TYPE
 {
   ITYPE_UNKNOWN, /*< unknown type */
   ITYPE_DIR,     /*< Object is a directory. i.e. does not contain message, just mailboxes */
-  ITYPE_BOX,     /*< Object is a mailbox. i.e. contains mails */
-  ITYPE_DIR_AND_BOX, /*< Object contains both mails and mailboxes */
+  ITYPE_BOX,     /*< Object is a mailbox. i.e. tqcontains mails */
+  ITYPE_DIR_AND_BOX, /*< Object tqcontains both mails and mailboxes */
   ITYPE_MSG,   /*< Object is a mail */
   ITYPE_ATTACH   /*< Object is an attachment */
 };
@@ -193,7 +193,7 @@ private:
   bool relayEnabled, cacheOutput, decodeContent;
   TQByteArray outputCache;
   TQBuffer outputBuffer;
-  Q_ULONG outputBufferIndex;
+  TQ_ULONG outputBufferIndex;
   KIO::filesize_t mProcessedSize;
 
   char readBuffer[IMAP_BUFFER];
diff --git a/kioslaves/imap4/imapcommand.cc b/kioslaves/imap4/imapcommand.cc
index ae26f0ab..97956200 100644
--- a/kioslaves/imap4/imapcommand.cc
+++ b/kioslaves/imap4/imapcommand.cc
@@ -236,7 +236,7 @@ imapCommand::clientAppend (const TQString & box, const TQString & flags,
 }
 
 imapCommand *
-imapCommand::clientStatus (const TQString & path, const TQString & parameters)
+imapCommand::clienStatus (const TQString & path, const TQString & parameters)
 {
   return new imapCommand ("STATUS",
                           TQString ("\"") + rfcDecoder::toIMAP (path) +
diff --git a/kioslaves/imap4/imapcommand.h b/kioslaves/imap4/imapcommand.h
index f91b9329..4c955202 100644
--- a/kioslaves/imap4/imapcommand.h
+++ b/kioslaves/imap4/imapcommand.h
@@ -212,7 +212,7 @@ public:
    * @param parameters
    * @return a STATUS imapCommand
    */
-  static imapCommand *clientStatus (const TQString & path,
+  static imapCommand *clienStatus (const TQString & path,
                                     const TQString & parameters);
   /**
    * @brief Create a COPY command
diff --git a/kioslaves/imap4/imapinfo.cc b/kioslaves/imap4/imapinfo.cc
index 4d1fc805..c65eca0c 100644
--- a/kioslaves/imap4/imapinfo.cc
+++ b/kioslaves/imap4/imapinfo.cc
@@ -206,29 +206,29 @@ ulong imapInfo::_flags (const TQCString & inFlags)
 
     if (entry.isEmpty ())
       flagsString.clear();
-    else if (0 != entry.contains ("\\SEEN"))
+    else if (0 != entry.tqcontains ("\\SEEN"))
       flags ^= Seen;
-    else if (0 != entry.contains ("\\ANSWERED"))
+    else if (0 != entry.tqcontains ("\\ANSWERED"))
       flags ^= Answered;
-    else if (0 != entry.contains ("\\FLAGGED"))
+    else if (0 != entry.tqcontains ("\\FLAGGED"))
       flags ^= Flagged;
-    else if (0 != entry.contains ("\\DELETED"))
+    else if (0 != entry.tqcontains ("\\DELETED"))
       flags ^= Deleted;
-    else if (0 != entry.contains ("\\DRAFT"))
+    else if (0 != entry.tqcontains ("\\DRAFT"))
       flags ^= Draft;
-    else if (0 != entry.contains ("\\RECENT"))
+    else if (0 != entry.tqcontains ("\\RECENT"))
       flags ^= Recent;
-    else if (0 != entry.contains ("\\*"))
+    else if (0 != entry.tqcontains ("\\*"))
       flags ^= User;
 
     // non standard kmail falgs
-    else if ( entry.contains( "KMAILFORWARDED" ) || entry.contains( "$FORWARDED" ) )
+    else if ( entry.tqcontains( "KMAILFORWARDED" ) || entry.tqcontains( "$FORWARDED" ) )
       flags = flags | Forwarded;
-    else if ( entry.contains( "KMAILTODO" ) || entry.contains( "$TODO" ) )
+    else if ( entry.tqcontains( "KMAILTODO" ) || entry.tqcontains( "$TODO" ) )
       flags = flags | Todo;
-    else if ( entry.contains( "KMAILWATCHED" ) || entry.contains( "$WATCHED" ) )
+    else if ( entry.tqcontains( "KMAILWATCHED" ) || entry.tqcontains( "$WATCHED" ) )
       flags = flags | Watched;
-    else if ( entry.contains( "KMAILIGNORED" ) || entry.contains( "$IGNORED" ) )
+    else if ( entry.tqcontains( "KMAILIGNORED" ) || entry.tqcontains( "$IGNORED" ) )
       flags = flags | Ignored;
   }
 
diff --git a/kioslaves/imap4/imapparser.cc b/kioslaves/imap4/imapparser.cc
index e4294bd0..0cd8938e 100644
--- a/kioslaves/imap4/imapparser.cc
+++ b/kioslaves/imap4/imapparser.cc
@@ -273,7 +273,7 @@ imapParser::clientAuthenticate ( KIO::SlaveBase *slave, KIO::AuthInfo &ai,
   TQString firstCommand = aAuth;
   if ( !challenge.isEmpty() ) {
     firstCommand += " ";
-    firstCommand += TQString::fromLatin1( challenge.data(), challenge.size() );
+    firstCommand += TQString::tqfromLatin1( challenge.data(), challenge.size() );
   }
   cmd = sendCommand (new imapCommand ("AUTHENTICATE", firstCommand.latin1()));
 
@@ -349,11 +349,11 @@ imapParser::parseUntagged (parseString & result)
   {
     //the status responses
   case 'B':                    // BAD or BYE
-    if (qstrncmp(what, "BAD", what.size()) == 0)
+    if (tqstrncmp(what, "BAD", what.size()) == 0)
     {
       parseResult (what, result);
     }
-    else if (qstrncmp(what, "BYE", what.size()) == 0)
+    else if (tqstrncmp(what, "BYE", what.size()) == 0)
     {
       parseResult (what, result);
       if ( sentQueue.count() ) {
@@ -370,7 +370,7 @@ imapParser::parseUntagged (parseString & result)
     {
       parseResult (what, result);
     }
-    else if (qstrncmp(what, "NAMESPACE", what.size()) == 0)
+    else if (tqstrncmp(what, "NAMESPACE", what.size()) == 0)
     {
       parseNamespace (result);
     }
@@ -380,20 +380,20 @@ imapParser::parseUntagged (parseString & result)
     if (what[1] == 'K' && what.size() == 2)
     {
       parseResult (what, result);
-    } else if (qstrncmp(what, "OTHER-USER", 10) == 0) { // X-GET-OTHER-USER
+    } else if (tqstrncmp(what, "OTHER-USER", 10) == 0) { // X-GET-OTHER-USER
       parseOtherUser (result);
-    } else if (qstrncmp(what, "OUT-OF-OFFICE", 13) == 0) { // X-GET-OUT-OF-OFFICE
+    } else if (tqstrncmp(what, "OUT-OF-OFFICE", 13) == 0) { // X-GET-OUT-OF-OFFICE
       parseOutOfOffice (result);
     }
     break;
   case 'D':
-    if (qstrncmp(what, "DELEGATE", 8) == 0) { // X-GET-DELEGATES
+    if (tqstrncmp(what, "DELEGATE", 8) == 0) { // X-GET-DELEGATES
       parseDelegate (result);
     }
     break;
 
   case 'P':                    // PREAUTH
-    if (qstrncmp(what, "PREAUTH", what.size()) == 0)
+    if (tqstrncmp(what, "PREAUTH", what.size()) == 0)
     {
       parseResult (what, result);
       currentState = ISTATE_LOGIN;
@@ -402,67 +402,67 @@ imapParser::parseUntagged (parseString & result)
 
     // parse the other responses
   case 'C':                    // CAPABILITY
-    if (qstrncmp(what, "CAPABILITY", what.size()) == 0)
+    if (tqstrncmp(what, "CAPABILITY", what.size()) == 0)
     {
       parseCapability (result);
     }
     break;
 
   case 'F':                    // FLAGS
-    if (qstrncmp(what, "FLAGS", what.size()) == 0)
+    if (tqstrncmp(what, "FLAGS", what.size()) == 0)
     {
       parseFlags (result);
     }
     break;
 
   case 'L':                    // LIST or LSUB or LISTRIGHTS
-    if (qstrncmp(what, "LIST", what.size()) == 0)
+    if (tqstrncmp(what, "LIST", what.size()) == 0)
     {
       parseList (result);
     }
-    else if (qstrncmp(what, "LSUB", what.size()) == 0)
+    else if (tqstrncmp(what, "LSUB", what.size()) == 0)
     {
       parseLsub (result);
     }
-    else if (qstrncmp(what, "LISTRIGHTS", what.size()) == 0)
+    else if (tqstrncmp(what, "LISTRIGHTS", what.size()) == 0)
     {
       parseListRights (result);
     }
     break;
 
   case 'M': // MYRIGHTS
-    if (qstrncmp(what, "MYRIGHTS", what.size()) == 0)
+    if (tqstrncmp(what, "MYRIGHTS", what.size()) == 0)
     {
       parseMyRights (result);
     }
     break;
   case 'S':                    // SEARCH or STATUS
-    if (qstrncmp(what, "SEARCH", what.size()) == 0)
+    if (tqstrncmp(what, "SEARCH", what.size()) == 0)
     {
       parseSearch (result);
     }
-    else if (qstrncmp(what, "STATUS", what.size()) == 0)
+    else if (tqstrncmp(what, "STATUS", what.size()) == 0)
     {
       parseStatus (result);
     }
     break;
 
   case 'A': // ACL or ANNOTATION
-    if (qstrncmp(what, "ACL", what.size()) == 0)
+    if (tqstrncmp(what, "ACL", what.size()) == 0)
     {
       parseAcl (result);
     }
-    else if (qstrncmp(what, "ANNOTATION", what.size()) == 0)
+    else if (tqstrncmp(what, "ANNOTATION", what.size()) == 0)
     {
       parseAnnotation (result);
     }
     break;
   case 'Q': // QUOTA or QUOTAROOT
-    if ( what.size() > 5 && qstrncmp(what, "QUOTAROOT", what.size()) == 0)
+    if ( what.size() > 5 && tqstrncmp(what, "QUOTAROOT", what.size()) == 0)
     {
       parseQuotaRoot( result );
     }
-    else if (qstrncmp(what, "QUOTA", what.size()) == 0)
+    else if (tqstrncmp(what, "QUOTA", what.size()) == 0)
     {
       parseQuota( result );
     }
@@ -485,18 +485,18 @@ imapParser::parseUntagged (parseString & result)
         switch (what[0])
         {
         case 'E':
-          if (qstrncmp(what, "EXISTS", what.size()) == 0)
+          if (tqstrncmp(what, "EXISTS", what.size()) == 0)
           {
             parseExists (number, result);
           }
-          else if (qstrncmp(what, "EXPUNGE", what.size()) == 0)
+          else if (tqstrncmp(what, "EXPUNGE", what.size()) == 0)
           {
             parseExpunge (number, result);
           }
           break;
 
         case 'F':
-          if (qstrncmp(what, "FETCH", what.size()) == 0)
+          if (tqstrncmp(what, "FETCH", what.size()) == 0)
           {
             seenUid = TQString::null;
             parseFetch (number, result);
@@ -504,7 +504,7 @@ imapParser::parseUntagged (parseString & result)
           break;
 
         case 'S':
-          if (qstrncmp(what, "STORE", what.size()) == 0)  // deprecated store
+          if (tqstrncmp(what, "STORE", what.size()) == 0)  // deprecated store
           {
             seenUid = TQString::null;
             parseFetch (number, result);
@@ -512,7 +512,7 @@ imapParser::parseUntagged (parseString & result)
           break;
 
         case 'R':
-          if (qstrncmp(what, "RECENT", what.size()) == 0)
+          if (tqstrncmp(what, "RECENT", what.size()) == 0)
           {
             parseRecent (number, result);
           }
@@ -626,20 +626,20 @@ imapParser::parseResult (TQByteArray & result, parseString & rest,
   {
   case 'A':
     if (command == "AUTHENTICATE")
-      if (qstrncmp(result, "OK", result.size()) == 0)
+      if (tqstrncmp(result, "OK", result.size()) == 0)
         currentState = ISTATE_LOGIN;
     break;
 
   case 'L':
     if (command == "LOGIN")
-      if (qstrncmp(result, "OK", result.size()) == 0)
+      if (tqstrncmp(result, "OK", result.size()) == 0)
         currentState = ISTATE_LOGIN;
     break;
 
   case 'E':
     if (command == "EXAMINE")
     {
-      if (qstrncmp(result, "OK", result.size()) == 0)
+      if (tqstrncmp(result, "OK", result.size()) == 0)
         currentState = ISTATE_SELECT;
       else
       {
@@ -654,7 +654,7 @@ imapParser::parseResult (TQByteArray & result, parseString & rest,
   case 'S':
     if (command == "SELECT")
     {
-      if (qstrncmp(result, "OK", result.size()) == 0)
+      if (tqstrncmp(result, "OK", result.size()) == 0)
         currentState = ISTATE_SELECT;
       else
       {
@@ -847,7 +847,7 @@ void imapParser::parseSearch (parseString & result)
 
 void imapParser::parseStatus (parseString & inWords)
 {
-  lastStatus = imapInfo ();
+  lasStatus = imapInfo ();
 
   parseLiteralC(inWords);       // swallow the box
   if (inWords.isEmpty() || inWords[0] != '(')
@@ -864,15 +864,15 @@ void imapParser::parseStatus (parseString & inWords)
     if (parseOneNumber (inWords, value))
     {
       if (label == "MESSAGES")
-        lastStatus.setCount (value);
+        lasStatus.setCount (value);
       else if (label == "RECENT")
-        lastStatus.setRecent (value);
+        lasStatus.setRecent (value);
       else if (label == "UIDVALIDITY")
-        lastStatus.setUidValidity (value);
+        lasStatus.setUidValidity (value);
       else if (label == "UNSEEN")
-        lastStatus.setUnseen (value);
+        lasStatus.setUnseen (value);
       else if (label == "UIDNEXT")
-        lastStatus.setUidNext (value);
+        lasStatus.setUidNext (value);
     }
   }
 
@@ -1675,7 +1675,7 @@ void imapParser::parseNamespace (parseString & result)
     return;
 
   TQString delimEmpty;
-  if ( namespaceToDelimiter.contains( TQString::null ) )
+  if ( namespaceToDelimiter.tqcontains( TQString::null ) )
     delimEmpty = namespaceToDelimiter[TQString::null];
 
   namespaceToDelimiter.clear();
diff --git a/kioslaves/imap4/imapparser.h b/kioslaves/imap4/imapparser.h
index 2595d094..d40524d1 100644
--- a/kioslaves/imap4/imapparser.h
+++ b/kioslaves/imap4/imapparser.h
@@ -404,9 +404,9 @@ public:
   };
 
   /** @brief return the last status code */
-  const imapInfo & getStatus ()
+  const imapInfo & geStatus ()
   {
-    return lastStatus;
+    return lasStatus;
   };
   /** return the select info */
   const imapInfo & getSelected ()
@@ -450,7 +450,7 @@ protected:
   imapInfo selectInfo;
 
   /** @brief the results from the last status command */
-  imapInfo lastStatus;
+  imapInfo lasStatus;
 
   /** @brief the results from the capabilities, split at ' ' */
   TQStringList imapCapabilities;
diff --git a/kioslaves/imap4/mailheader.h b/kioslaves/imap4/mailheader.h
index 633d61b7..72ac6e48 100644
--- a/kioslaves/imap4/mailheader.h
+++ b/kioslaves/imap4/mailheader.h
@@ -94,7 +94,7 @@ public:
   }
 
   /**
-   * set a unicode subject
+   * set a tqunicode subject
    */
   void setSubject (const TQString & _str)
   {
@@ -109,7 +109,7 @@ public:
   }
 
   /** 
-   * get the unicode subject
+   * get the tqunicode subject
    */
   const TQString getSubject ()
   {
diff --git a/kioslaves/imap4/mimehdrline.h b/kioslaves/imap4/mimehdrline.h
index e31c1864..210f5a7c 100644
--- a/kioslaves/imap4/mimehdrline.h
+++ b/kioslaves/imap4/mimehdrline.h
@@ -52,10 +52,10 @@ and report characters slurped */
   static int parseAlphaNum (const char *);
 
 protected:                     // Protected attributes
-  /** contains the Value 
+  /** tqcontains the Value 
  */
     TQCString mimeValue;
-  /** contains the Label of the line
+  /** tqcontains the Label of the line
  */
   TQCString mimeLabel;
 protected:                     // Protected methods
diff --git a/kioslaves/imap4/mimeheader.cc b/kioslaves/imap4/mimeheader.cc
index 676e0d72..1d0b7ab9 100644
--- a/kioslaves/imap4/mimeheader.cc
+++ b/kioslaves/imap4/mimeheader.cc
@@ -650,7 +650,7 @@ mimeHeader::bodyDecoded ()
   TQByteArray temp;
 
   temp = bodyDecodedBinary ();
-  return TQString::fromLatin1 (temp.data (), temp.count ());
+  return TQString::tqfromLatin1 (temp.data (), temp.count ());
 }
 
 QByteArray
diff --git a/kioslaves/imap4/rfcdecoder.cc b/kioslaves/imap4/rfcdecoder.cc
index 0aa237d6..5470901e 100644
--- a/kioslaves/imap4/rfcdecoder.cc
+++ b/kioslaves/imap4/rfcdecoder.cc
@@ -154,7 +154,7 @@ TQString rfcDecoder::fromIMAP (const TQString & inSrc)
   return TQString::fromUtf8 (dst.data ());
 }
 
-/* replace " with \" and \ with \\ " and \ characters */
+/* tqreplace " with \" and \ with \\ " and \ characters */
 TQString rfcDecoder::quoteIMAP(const TQString &src)
 {
   uint len = src.length();
@@ -311,7 +311,7 @@ rfcDecoder::codecForName (const TQString & _str)
   if (_str.isEmpty ())
     return NULL;
   return TQTextCodec::codecForName (_str.lower ().
-                                   replace ("windows", "cp").latin1 ());
+                                   tqreplace ("windows", "cp").latin1 ());
 }
 
 //-----------------------------------------------------------------------------
diff --git a/kioslaves/imap4/rfcdecoder.h b/kioslaves/imap4/rfcdecoder.h
index 2095b2ed..50ab948e 100644
--- a/kioslaves/imap4/rfcdecoder.h
+++ b/kioslaves/imap4/rfcdecoder.h
@@ -44,7 +44,7 @@ public:
 /** Convert Unicode path to modified UTF-7 IMAP mailbox
  */
   static TQString toIMAP (const TQString & inSrc);
-/** replace " with \" and \ with \\ " and \ characters */
+/** tqreplace " with \" and \ with \\ " and \ characters */
   static TQString quoteIMAP (const TQString & src);
 
   /** remove \ from a string 
diff --git a/kioslaves/mbox/Makefile.am b/kioslaves/mbox/Makefile.am
index b4840ee7..13e370f4 100644
--- a/kioslaves/mbox/Makefile.am
+++ b/kioslaves/mbox/Makefile.am
@@ -12,7 +12,7 @@ kio_mbox_la_SOURCES = \
 	readmbox.cc \
 	stat.cc \
 	urlinfo.cc
-kio_mbox_la_LIBADD  = $(LIB_KIO)
+kio_mbox_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
 kio_mbox_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
 
 noinst_HEADERS = \
diff --git a/kioslaves/mbox/readmbox.cc b/kioslaves/mbox/readmbox.cc
index 35b24db4..7cf67e32 100644
--- a/kioslaves/mbox/readmbox.cc
+++ b/kioslaves/mbox/readmbox.cc
@@ -104,7 +104,7 @@ bool ReadMBox::nextLine()
 	} else if( m_only_new )
 	{
 		if( m_header && m_current_line->left( 7 ) == "Status:" &&
-		    ! m_current_line->contains( "U" ) && ! m_current_line->contains( "N" ) )
+		    ! m_current_line->tqcontains( "U" ) && ! m_current_line->tqcontains( "N" ) )
 		{
 			m_status = false;
 		}
diff --git a/kioslaves/opengroupware/opengroupware.cpp b/kioslaves/opengroupware/opengroupware.cpp
index 55525aff..ad15b155 100644
--- a/kioslaves/opengroupware/opengroupware.cpp
+++ b/kioslaves/opengroupware/opengroupware.cpp
@@ -146,8 +146,8 @@ void OpenGroupware::getFreeBusy( const KURL &url )
       // FIXME get from server
 
       // FIXME: Read range from configuration or URL parameters.
-      TQDate start = TQDate::currentDate().addDays( -3 );
-      TQDate end = TQDate::currentDate().addDays( 60 );
+      TQDate start = TQDate::tqcurrentDate().addDays( -3 );
+      TQDate end = TQDate::tqcurrentDate().addDays( 60 );
 
       fb->setDtStart( start );
       fb->setDtEnd( end );
diff --git a/kioslaves/sieve/Makefile.am b/kioslaves/sieve/Makefile.am
index 830c8258..844d3f5c 100644
--- a/kioslaves/sieve/Makefile.am
+++ b/kioslaves/sieve/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(all_includes)
 kde_module_LTLIBRARIES = kio_sieve.la
 
 kio_sieve_la_SOURCES = sieve.cpp
-kio_sieve_la_LIBADD  = $(LIB_KIO) $(SASL2_LIBS)
+kio_sieve_la_LIBADD  = $(LIB_KIO) $(SASL2_LIBS) $(LIB_QT) $(LIB_KDECORE)
 kio_sieve_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 noinst_HEADERS = sieve.h
diff --git a/kioslaves/sieve/sieve.cpp b/kioslaves/sieve/sieve.cpp
index bc781166..6d2f90b8 100644
--- a/kioslaves/sieve/sieve.cpp
+++ b/kioslaves/sieve/sieve.cpp
@@ -245,14 +245,14 @@ bool kio_sieveProtocol::parseCapabilities(bool requestCapabilities/* = false*/)
 		ksDebug() << "Looping receive" << endl;
 
 		if (r.getType() == kio_sieveResponse::ACTION) {
-			if ( r.getAction().contains("ok", false) != -1 ) {
+			if ( r.getAction().tqcontains("ok", false) != -1 ) {
 				ksDebug() << "Sieve server ready & awaiting authentication." << endl;
 				break;
 			} else
 				ksDebug() << "Unknown action " << r.getAction() << "." << endl;
 
 		} else if (r.getKey() == "IMPLEMENTATION") {
-			if (r.getVal().contains("sieve", false) != -1) {
+			if (r.getVal().tqcontains("sieve", false) != -1) {
 				ksDebug() << "Connected to Sieve server: " << r.getVal() << endl;
 				ret = true;
 				setMetaData("implementation", r.getVal());
@@ -876,7 +876,7 @@ void kio_sieveProtocol::stat(const KURL& url)
 
 		while(receiveData()) {
 			if (r.getType() == kio_sieveResponse::ACTION) {
-				if (r.getAction().contains("OK", false) == 1)
+				if (r.getAction().tqcontains("OK", false) == 1)
 					// Script list completed
 					break;
 
@@ -929,7 +929,7 @@ void kio_sieveProtocol::listDir(const KURL& url)
 
 	while(receiveData()) {
 		if (r.getType() == kio_sieveResponse::ACTION) {
-			if (r.getAction().contains("OK", false) == 1)
+			if (r.getAction().tqcontains("OK", false) == 1)
 				// Script list completed.
 				break;
 
@@ -1082,13 +1082,13 @@ bool kio_sieveProtocol::authenticate()
 
 	ksDebug() << "Preferred authentication method is " << mechusing << "." << endl;
 
-  TQString firstCommand = "AUTHENTICATE \"" + TQString::fromLatin1( mechusing ) + "\"";
+  TQString firstCommand = "AUTHENTICATE \"" + TQString::tqfromLatin1( mechusing ) + "\"";
   tmp.setRawData( out, outlen );
   KCodecs::base64Encode( tmp, challenge );
   tmp.resetRawData( out, outlen );
   if ( !challenge.isEmpty() ) {
     firstCommand += " \"";
-    firstCommand += TQString::fromLatin1( challenge.data(), challenge.size() );
+    firstCommand += TQString::tqfromLatin1( challenge.data(), challenge.size() );
     firstCommand += "\"";
   }
 
@@ -1222,7 +1222,7 @@ bool kio_sieveProtocol::receiveData(bool waitForData, TQCString *reparse)
 		buffer[SIEVE_DEFAULT_RECIEVE_BUFFER-1] = '\0';
 
 		// strip LF/CR
-		interpret = TQCString(buffer).left(qstrlen(buffer) - 2);
+		interpret = TQCString(buffer).left(tqstrlen(buffer) - 2);
 
 	} else {
 		interpret = reparse->copy();
diff --git a/kitchensync/libqopensync/group.cpp b/kitchensync/libqopensync/group.cpp
index bc94e220..a3fd4f2a 100644
--- a/kitchensync/libqopensync/group.cpp
+++ b/kitchensync/libqopensync/group.cpp
@@ -146,7 +146,7 @@ TQString Group::name() const
 {
   Q_ASSERT( mGroup );
 
-  return TQString::fromLatin1( osync_group_get_name( mGroup ) );
+  return TQString::tqfromLatin1( osync_group_get_name( mGroup ) );
 }
 
 void Group::setLastSynchronization( const TQDateTime &dateTime )
diff --git a/kitchensync/libqopensync/member.cpp b/kitchensync/libqopensync/member.cpp
index 35cb0463..5ed40986 100644
--- a/kitchensync/libqopensync/member.cpp
+++ b/kitchensync/libqopensync/member.cpp
@@ -55,14 +55,14 @@ TQString Member::configurationDirectory() const
 {
   Q_ASSERT( mMember );
 
-  return TQString::fromLatin1( osync_member_get_configdir( mMember ) );
+  return TQString::tqfromLatin1( osync_member_get_configdir( mMember ) );
 }
 
 TQString Member::pluginName() const
 {
   Q_ASSERT( mMember );
 
-  return TQString::fromLatin1( osync_member_get_pluginname( mMember ) );
+  return TQString::tqfromLatin1( osync_member_get_pluginname( mMember ) );
 }
 
 Plugin Member::plugin() const
diff --git a/kitchensync/libqopensync/plugin.cpp b/kitchensync/libqopensync/plugin.cpp
index acd54447..fd760049 100644
--- a/kitchensync/libqopensync/plugin.cpp
+++ b/kitchensync/libqopensync/plugin.cpp
@@ -43,20 +43,20 @@ TQString Plugin::name() const
 {
   Q_ASSERT( mPlugin );
 
-  return TQString::fromLatin1( osync_plugin_get_name( mPlugin ) );
+  return TQString::tqfromLatin1( osync_plugin_get_name( mPlugin ) );
 }
 
 TQString Plugin::longName() const
 {
   Q_ASSERT( mPlugin );
 
-  return TQString::fromLatin1( osync_plugin_get_longname( mPlugin ) );
+  return TQString::tqfromLatin1( osync_plugin_get_longname( mPlugin ) );
 }
 
 TQString Plugin::description() const
 {
   Q_ASSERT( mPlugin );
 
-  return TQString::fromLatin1( osync_plugin_get_description( mPlugin ) );
+  return TQString::tqfromLatin1( osync_plugin_get_description( mPlugin ) );
 }
 
diff --git a/kitchensync/libqopensync/syncchange.h b/kitchensync/libqopensync/syncchange.h
index 53d9c440..27ff6b22 100644
--- a/kitchensync/libqopensync/syncchange.h
+++ b/kitchensync/libqopensync/syncchange.h
@@ -82,7 +82,7 @@ class SyncChange
     TQString data() const;
 
     /**
-      Returns whether the change contains data.
+      Returns whether the change tqcontains data.
      */
     bool hasData() const;
 
diff --git a/kitchensync/src/Makefile.am b/kitchensync/src/Makefile.am
index 7f94fc17..429e5425 100644
--- a/kitchensync/src/Makefile.am
+++ b/kitchensync/src/Makefile.am
@@ -33,14 +33,15 @@ libkitchensync_la_SOURCES = aboutpage.cpp mainwidget.cpp groupconfigdialog.cpp \
                             configguisunbird.cpp
 libkitchensync_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
 libkitchensync_la_LIBADD = $(LIB_KIO) $(LIB_KHTML) $(top_builddir)/kitchensync/libqopensync/libqopensync.la \
-                           $(LIB_KABC) $(top_builddir)/libkdepim/libkdepim.la $(top_builddir)/libkcal/libkcal.la
+                           $(LIB_KABC) $(top_builddir)/libkdepim/libkdepim.la $(top_builddir)/libkcal/libkcal.la \
+                           $(LIB_QT)
 
 # KPart
 kde_module_LTLIBRARIES = libkitchensyncpart.la
 
 libkitchensyncpart_la_SOURCES = part.cpp
 libkitchensyncpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkitchensyncpart_la_LIBADD = $(LIB_KPARTS) libkitchensync.la
+libkitchensyncpart_la_LIBADD = $(LIB_KPARTS) libkitchensync.la $(LIB_QT) $(LIB_KIO) $(LIB_KHTML) $(LIB_KABC) $(LIB_KDECORE) $(LIB_KDEUI)
 
 # Resources
 kitchensyncdatadir = $(kde_datadir)/kitchensync
diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp
index 0909fa0f..3d5b1f04 100644
--- a/kitchensync/src/aboutpage.cpp
+++ b/kitchensync/src/aboutpage.cpp
@@ -51,7 +51,7 @@ static TQString readFile( const TQString &fileName )
 AboutPage::AboutPage( TQWidget *parent )
   : TQWidget( parent, "AboutPage" )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
 
   TQString location = locate( "data", "kitchensync/about/main.html" );
   TQString content = readFile( location );
@@ -62,7 +62,7 @@ AboutPage::AboutPage( TQWidget *parent )
     content = content.arg( "" );
 
   KHTMLPart *part = new KHTMLPart( this );
-  layout->addWidget( part->view() );
+  tqlayout->addWidget( part->view() );
 
   part->begin( KURL( location ) );
 
diff --git a/kitchensync/src/configguievo2.cpp b/kitchensync/src/configguievo2.cpp
index c313ce3a..716bce78 100644
--- a/kitchensync/src/configguievo2.cpp
+++ b/kitchensync/src/configguievo2.cpp
@@ -71,21 +71,21 @@ TQString ConfigGuiEvo2::save() const
 
 void ConfigGuiEvo2::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
-  layout->setMargin( KDialog::marginHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
+  tqlayout->setMargin( KDialog::marginHint() );
 
-  layout->addWidget( new TQLabel( i18n( "Address Book location:" ), this ), 0, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Address Book location:" ), this ), 0, 0 );
   mAddressPath = new KURLRequester( this );
   mAddressPath->setMode( KFile::Directory );
-  layout->addMultiCellWidget( mAddressPath, 0, 0, 1, 2 );
+  tqlayout->addMultiCellWidget( mAddressPath, 0, 0, 1, 2 );
 
-  layout->addWidget( new TQLabel( i18n( "Calendar location:" ), this ), 1, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Calendar location:" ), this ), 1, 0 );
   mCalendarPath = new KURLRequester( this );
   mCalendarPath->setMode( KFile::Directory );
-  layout->addMultiCellWidget( mCalendarPath, 1, 1, 1, 2 );
+  tqlayout->addMultiCellWidget( mCalendarPath, 1, 1, 1, 2 );
 
-  layout->addWidget( new TQLabel( i18n( "Task list location:" ), this ), 2, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Task list location:" ), this ), 2, 0 );
   mTasksPath = new KURLRequester( this );
   mTasksPath->setMode( KFile::Directory );
-  layout->addMultiCellWidget( mTasksPath, 2, 2, 1, 2 );
+  tqlayout->addMultiCellWidget( mTasksPath, 2, 2, 1, 2 );
 }
diff --git a/kitchensync/src/configguignokii.cpp b/kitchensync/src/configguignokii.cpp
index 38f2fbf3..84db0275 100644
--- a/kitchensync/src/configguignokii.cpp
+++ b/kitchensync/src/configguignokii.cpp
@@ -37,14 +37,14 @@
 ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent )
   : ConfigGui( member, parent )
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout() );
 
   // Model
   TQLabel *label = new TQLabel( i18n("Model:"), this );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mModel = new KComboBox( true, this );
-  layout->addWidget( mModel, 0, 1 );
+  tqlayout->addWidget( mModel, 0, 1 );
   mModel->insertItem( "2110" ); 
   mModel->insertItem( "3110" ); 
   mModel->insertItem( "6110" ); 
@@ -67,10 +67,10 @@ ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent
 
   // Connection
   label = new TQLabel( i18n("Connection:"), this );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
 
   mConnection = new TQComboBox( this );
-  layout->addWidget( mConnection, 1, 1 );
+  tqlayout->addWidget( mConnection, 1, 1 );
 
   connect( mConnection, TQT_SIGNAL (activated( int ) ),
       	    this, TQT_SLOT( slotConnectionChanged ( int ) ) );
@@ -100,15 +100,15 @@ ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent
   mBluetooth = new BluetoothWidget( connectionWidget ); 
   mBluetooth->hide();
 
-  layout->addMultiCellWidget( connectionWidget, 2, 2, 0, 1 );
+  tqlayout->addMultiCellWidget( connectionWidget, 2, 2, 0, 1 );
 
   // Port
   mPortLabel = new TQLabel( i18n("Port:"), this );
-  layout->addWidget( mPortLabel, 2, 0 );
+  tqlayout->addWidget( mPortLabel, 2, 0 );
   mPortLabel->hide();
 
   mPort = new KComboBox( true, this );
-  layout->addWidget( mPort, 2, 1 );
+  tqlayout->addWidget( mPort, 2, 1 );
   mPort->hide();
 
   mPort->insertItem( "/dev/ircomm0" );
@@ -118,7 +118,7 @@ ConfigGuiGnokii::ConfigGuiGnokii( const QSync::Member &member, TQWidget *parent
   mPort->insertItem( "/dev/ttyUSB0" );
   mPort->insertItem( "/dev/ttyUSB1" );
 
-  layout->setColStretch( 1, 1 );
+  tqlayout->setColStretch( 1, 1 );
 
   topLayout()->addStretch( 1 );
 }
diff --git a/kitchensync/src/configguigpe.cpp b/kitchensync/src/configguigpe.cpp
index b3bff63a..94108d30 100644
--- a/kitchensync/src/configguigpe.cpp
+++ b/kitchensync/src/configguigpe.cpp
@@ -81,23 +81,23 @@ TQString ConfigGuiGpe::save() const
 
 void ConfigGuiGpe::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
-  layout->setMargin( KDialog::marginHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
+  tqlayout->setMargin( KDialog::marginHint() );
 
-  layout->addWidget( new TQLabel( i18n( "Connection Mode:" ), this ), 0, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Connection Mode:" ), this ), 0, 0 );
   mConnectionMode = new KComboBox( this );
-  layout->addMultiCellWidget( mConnectionMode, 0, 0, 0, 3 );
+  tqlayout->addMultiCellWidget( mConnectionMode, 0, 0, 0, 3 );
 
-  layout->addWidget( new TQLabel( i18n( "IP Address:" ), this ), 1, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "IP Address:" ), this ), 1, 0 );
   mIP = new KLineEdit( this );
   mIP->setInputMask( "000.000.000.000" );
-  layout->addWidget( mIP, 1, 1 );
+  tqlayout->addWidget( mIP, 1, 1 );
 
-  layout->addWidget( new TQLabel( i18n( "Port:" ), this ), 1, 2, Qt::AlignRight );
+  tqlayout->addWidget( new TQLabel( i18n( "Port:" ), this ), 1, 2, Qt::AlignRight );
   mPort = new TQSpinBox( 1, 65536, 1, this );
-  layout->addWidget( mPort, 1, 3 );
+  tqlayout->addWidget( mPort, 1, 3 );
 
-  layout->addWidget( new TQLabel( i18n( "User:" ), this ), 2, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "User:" ), this ), 2, 0 );
   mUser = new KLineEdit( this );
-  layout->addMultiCellWidget( mUser, 2, 2, 1, 3 );
+  tqlayout->addMultiCellWidget( mUser, 2, 2, 1, 3 );
 }
diff --git a/kitchensync/src/configguijescs.cpp b/kitchensync/src/configguijescs.cpp
index 2b37ad42..158eb225 100644
--- a/kitchensync/src/configguijescs.cpp
+++ b/kitchensync/src/configguijescs.cpp
@@ -76,23 +76,23 @@ TQString ConfigGuiJescs::save() const
 
 void ConfigGuiJescs::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
-  layout->setMargin( KDialog::marginHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
+  tqlayout->setMargin( KDialog::marginHint() );
 
-  layout->addWidget( new TQLabel( i18n( "URL:" ), this ), 0, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "URL:" ), this ), 0, 0 );
   mUrl = new KLineEdit( this );
-  layout->addMultiCellWidget( mUrl, 0, 0, 1, 2 );
+  tqlayout->addMultiCellWidget( mUrl, 0, 0, 1, 2 );
 
-  layout->addWidget( new TQLabel( i18n( "Username:" ), this ), 1, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Username:" ), this ), 1, 0 );
   mUsername = new KLineEdit( this );
-  layout->addMultiCellWidget( mUsername, 1, 1, 1, 2 );
+  tqlayout->addMultiCellWidget( mUsername, 1, 1, 1, 2 );
 
-  layout->addWidget( new TQLabel( i18n( "Password:" ), this ), 2, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Password:" ), this ), 2, 0 );
   mPassword = new KLineEdit( this );
   mPassword->setEchoMode( KLineEdit::Password );
-  layout->addMultiCellWidget( mPassword, 2, 2, 1, 2 );
+  tqlayout->addMultiCellWidget( mPassword, 2, 2, 1, 2 );
 
   mDelNotify = new TQCheckBox( this );
   mDelNotify->setText( "Notify attendees about event/task deletion" );
-  layout->addMultiCellWidget( mDelNotify, 3, 3, 0, 2 );
+  tqlayout->addMultiCellWidget( mDelNotify, 3, 3, 0, 2 );
 }
diff --git a/kitchensync/src/configguildap.cpp b/kitchensync/src/configguildap.cpp
index 3ef451c3..417e58d0 100644
--- a/kitchensync/src/configguildap.cpp
+++ b/kitchensync/src/configguildap.cpp
@@ -121,8 +121,8 @@ TQString ConfigGuiLdap::save() const
 
 void ConfigGuiLdap::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
-  layout->setMargin( KDialog::marginHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
+  tqlayout->setMargin( KDialog::marginHint() );
 
   mLdapWidget = new KABC::LdapConfigWidget( KABC::LdapConfigWidget::W_HOST |
                                             KABC::LdapConfigWidget::W_PORT |
@@ -139,14 +139,14 @@ void ConfigGuiLdap::initGUI()
   mReadLdap = new TQCheckBox( i18n( "Load data from LDAP" ), this );
   mWriteLdap = new TQCheckBox( i18n( "Save data to LDAP" ), this );
 
-  layout->addMultiCellWidget( mLdapWidget, 0, 9, 0, 3 );
-  layout->addWidget( new TQLabel( i18n( "Key Attribute:" ), this ), 10, 0 );
-  layout->addMultiCellWidget( mKeyAttribute, 10, 10, 1, 2 );
-  layout->addWidget( new TQLabel( i18n( "Search Scope:" ), this ), 11, 0 );
-  layout->addMultiCellWidget( mSearchScope, 11, 11, 1, 2 );
-  layout->addWidget( mEncryption, 12, 0 );
-  layout->addWidget( mReadLdap, 13, 0 );
-  layout->addWidget( mWriteLdap, 13, 3 );
+  tqlayout->addMultiCellWidget( mLdapWidget, 0, 9, 0, 3 );
+  tqlayout->addWidget( new TQLabel( i18n( "Key Attribute:" ), this ), 10, 0 );
+  tqlayout->addMultiCellWidget( mKeyAttribute, 10, 10, 1, 2 );
+  tqlayout->addWidget( new TQLabel( i18n( "Search Scope:" ), this ), 11, 0 );
+  tqlayout->addMultiCellWidget( mSearchScope, 11, 11, 1, 2 );
+  tqlayout->addWidget( mEncryption, 12, 0 );
+  tqlayout->addWidget( mReadLdap, 13, 0 );
+  tqlayout->addWidget( mWriteLdap, 13, 3 );
 
 }
 
diff --git a/kitchensync/src/configguimoto.cpp b/kitchensync/src/configguimoto.cpp
index a310692f..c44a2b40 100644
--- a/kitchensync/src/configguimoto.cpp
+++ b/kitchensync/src/configguimoto.cpp
@@ -62,10 +62,10 @@ TQString ConfigGuiMoto::save() const
 
 void ConfigGuiMoto::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
-  layout->setMargin( KDialog::marginHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 3, KDialog::spacingHint() );
+  tqlayout->setMargin( KDialog::marginHint() );
 
-  layout->addWidget( new TQLabel( i18n( "Device String:" ), this ), 0, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Device String:" ), this ), 0, 0 );
   mDeviceString = new KLineEdit( this );
-  layout->addMultiCellWidget( mDeviceString, 0, 0, 1, 2 );
+  tqlayout->addMultiCellWidget( mDeviceString, 0, 0, 1, 2 );
 }
diff --git a/kitchensync/src/configguiopie.cpp b/kitchensync/src/configguiopie.cpp
index e823ffe3..ed8aa15f 100644
--- a/kitchensync/src/configguiopie.cpp
+++ b/kitchensync/src/configguiopie.cpp
@@ -33,52 +33,52 @@
 ConfigGuiOpie::ConfigGuiOpie( const QSync::Member &member, TQWidget *parent )
   : ConfigGui( member, parent )
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout() );
 
   TQLabel *label = new TQLabel( i18n("Device IP:"), this );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mDeviceIP = new TQLineEdit( this );
   mDeviceIP->setInputMask( "000.000.000.000" );
   label->setBuddy( mDeviceIP );
-  layout->addWidget( mDeviceIP, 0, 1 );
+  tqlayout->addWidget( mDeviceIP, 0, 1 );
 
   label = new TQLabel( i18n("Device Type:"), this );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
 
   mDeviceType = new TQComboBox( this );
   label->setBuddy( mDeviceType );
-  layout->addWidget( mDeviceType, 1, 1 );
+  tqlayout->addWidget( mDeviceType, 1, 1 );
 
   label = new TQLabel( i18n("Username:"), this );
-  layout->addWidget( label, 2, 0 );
+  tqlayout->addWidget( label, 2, 0 );
 
   mUserName = new TQLineEdit( this );
   label->setBuddy( mUserName );
-  layout->addWidget( mUserName, 2, 1 );
+  tqlayout->addWidget( mUserName, 2, 1 );
 
   label = new TQLabel( i18n("Password:"), this );
-  layout->addWidget( label, 3, 0 );
+  tqlayout->addWidget( label, 3, 0 );
 
   mPassword = new TQLineEdit( this );
   mPassword->setEchoMode( TQLineEdit::Password );
   label->setBuddy( mPassword );
-  layout->addWidget( mPassword, 3, 1 );
+  tqlayout->addWidget( mPassword, 3, 1 );
 
   label = new TQLabel( i18n("Protocol:"), this );
-  layout->addWidget( label, 4, 0 );
+  tqlayout->addWidget( label, 4, 0 );
 
   mConnectionType = new TQComboBox( this );
   label->setBuddy( mConnectionType );
-  layout->addWidget( mConnectionType, 4, 1 );
+  tqlayout->addWidget( mConnectionType, 4, 1 );
 
   label = new TQLabel( i18n("Port:"), this );
-  layout->addWidget( label, 5, 0 );
+  tqlayout->addWidget( label, 5, 0 );
 
   mPort = new TQSpinBox( this );
   mPort->setRange( 0, 65335 );
   label->setBuddy( mPort );
-  layout->addWidget( mPort, 5, 1 );
+  tqlayout->addWidget( mPort, 5, 1 );
 
   mDeviceType->insertItem( i18n("Opie/OpenZaurus") );
   mDeviceType->insertItem( i18n("Qtopia2") );
diff --git a/kitchensync/src/configguisunbird.cpp b/kitchensync/src/configguisunbird.cpp
index 99e86f3c..b0da28ca 100644
--- a/kitchensync/src/configguisunbird.cpp
+++ b/kitchensync/src/configguisunbird.cpp
@@ -57,14 +57,14 @@ ConfigGuiSunbird::ConfigGuiSunbird( const QSync::Member &member, TQWidget *paren
 
   KPushButton *mLocalAddButton = new KPushButton( mLocalWidget );
   mLocalAddButton->setText( i18n( "Add new calendar" ) );
-  mLocalAddButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mLocalAddButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
   mLocalLayout->addWidget( mLocalAddButton );
   connect( mLocalAddButton, TQT_SIGNAL( clicked() ),
            this, TQT_SLOT( addLocalCalendar() ) );
 
   KPushButton *mWebdavAddButton = new KPushButton( mWebdavWidget );
   mWebdavAddButton->setText( i18n( "Add new calendar" ) );
-  mWebdavAddButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mWebdavAddButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
   mWebdavLayout->addWidget( mWebdavAddButton );
   connect( mWebdavAddButton, TQT_SIGNAL( clicked() ),
            this, TQT_SLOT( addWebdavCalendar() ) );
@@ -100,7 +100,7 @@ void ConfigGuiSunbird::load( const TQString &xml )
 
       LocalCalendar *cal = new LocalCalendar( path, defaultcal, days, mLocalWidget );
       mLocalLayout->removeItem( mLocalSpacer );
-      cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+      cal->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
       mLocalLayout->addWidget( cal );
       mLocalLayout->addItem( mLocalSpacer );
       mLocalList.append( cal );
@@ -122,7 +122,7 @@ void ConfigGuiSunbird::load( const TQString &xml )
       WebdavCalendar *cal = new WebdavCalendar( username, password,
                                                 url, defaultcal, days, mWebdavWidget );
       mWebdavLayout->removeItem( mWebdavSpacer );
-      cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+      cal->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
       mWebdavLayout->addWidget( cal );
       mWebdavLayout->addItem( mWebdavSpacer );
       mWebdavList.append( cal );
@@ -175,7 +175,7 @@ void ConfigGuiSunbird::addLocalCalendar()
 {
   LocalCalendar *cal = new LocalCalendar( mLocalWidget );
   mLocalLayout->removeItem( mLocalSpacer );
-  cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+  cal->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
   mLocalLayout->addWidget( cal );
   mLocalLayout->addItem( mLocalSpacer );
   mLocalList.append( cal );
@@ -194,7 +194,7 @@ void ConfigGuiSunbird::addWebdavCalendar()
 {
   WebdavCalendar *cal = new WebdavCalendar( mWebdavWidget );
   mWebdavLayout->removeItem( mWebdavSpacer );
-  cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+  cal->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
   mWebdavLayout->addWidget( cal );
   mWebdavLayout->addItem( mWebdavSpacer );
   mWebdavList.append( cal );
@@ -239,7 +239,7 @@ void LocalCalendar::initGui()
 
   mDaysSpinBox = new TQSpinBox( this );
   mDaysSpinBox->setDisabled( true );
-  mDaysSpinBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mDaysSpinBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
 
   connect( mDaysCheckBox, TQT_SIGNAL( toggled( bool ) ),
            this, TQT_SLOT( toggleDays( bool ) ) );
@@ -253,7 +253,7 @@ void LocalCalendar::initGui()
   mPathRequester = new KURLRequester( this );
 
   KPushButton *removeButton = new KPushButton( this );
-  removeButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  removeButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
   removeButton->setText( i18n( "Remove" ) );
   connect( removeButton, TQT_SIGNAL( clicked() ),
            this, TQT_SLOT( deleteWidget() ) );
@@ -308,7 +308,7 @@ void WebdavCalendar::initGui()
 
   mDaysSpinBox = new TQSpinBox( this );
   mDaysSpinBox->setDisabled( true );
-  mDaysSpinBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mDaysSpinBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
 
   connect( mDaysCheckBox, TQT_SIGNAL( toggled( bool ) ),
            this, TQT_SLOT( toggleDays( bool ) ) );
diff --git a/kitchensync/src/configguisynce.cpp b/kitchensync/src/configguisynce.cpp
index 6e521bee..b83e8568 100644
--- a/kitchensync/src/configguisynce.cpp
+++ b/kitchensync/src/configguisynce.cpp
@@ -72,22 +72,22 @@ TQString ConfigGuiSynce::save() const
 
 void ConfigGuiSynce::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 2, KDialog::spacingHint() );
-  layout->setMargin( KDialog::marginHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 2, KDialog::spacingHint() );
+  tqlayout->setMargin( KDialog::marginHint() );
 
   mContacts = new TQCheckBox( this );
   mContacts->setText( "Sync Contacts" );
-  layout->addMultiCellWidget( mContacts, 0, 0, 0, 1 );
+  tqlayout->addMultiCellWidget( mContacts, 0, 0, 0, 1 );
 
   mTodos = new TQCheckBox( this );
   mTodos->setText( "Sync \'Todo\' items" );
-  layout->addMultiCellWidget( mTodos, 1, 1, 0, 1 );
+  tqlayout->addMultiCellWidget( mTodos, 1, 1, 0, 1 );
 
   mCalendar = new TQCheckBox( this );
   mCalendar->setText( "Sync Calendar" );
-  layout->addMultiCellWidget( mCalendar, 2, 2, 0, 1 );
+  tqlayout->addMultiCellWidget( mCalendar, 2, 2, 0, 1 );
 
-  layout->addWidget( new TQLabel( i18n( "File:" ), this ), 3, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "File:" ), this ), 3, 0 );
   mFile = new KLineEdit( this );
-  layout->addWidget( mFile, 3, 1 );
+  tqlayout->addWidget( mFile, 3, 1 );
 }
diff --git a/kitchensync/src/configguisyncmlhttp.cpp b/kitchensync/src/configguisyncmlhttp.cpp
index 26a8c224..08c596bc 100644
--- a/kitchensync/src/configguisyncmlhttp.cpp
+++ b/kitchensync/src/configguisyncmlhttp.cpp
@@ -174,7 +174,7 @@ void ConfigGuiSyncmlHttp::load( const TQString &xml )
         mMaxObjSize->setValue( element.text().toInt() );
     } else if ( element.tagName() == "usestringtable" ) {
       mUseStringTable->setChecked( element.text() == "1" );
-    } else if ( element.tagName() == "onlyreplace" ) {
+    } else if ( element.tagName() == "onlytqreplace" ) {
       mOnlyReplace->setChecked( element.text() == "1" );
     } else if ( element.tagName() == "contact_db" ) {
       mContactDb->setCurrentText( element.text() );
@@ -208,12 +208,12 @@ TQString ConfigGuiSyncmlHttp::save() const
     xml += "0";
   xml += "</usestringtable>\n";
 
-  xml += "<onlyreplace>";
+  xml += "<onlytqreplace>";
   if ( mOnlyReplace->isChecked() )
     xml += "1";
   else
     xml += "0";
-  xml += "</onlyreplace>\n";
+  xml += "</onlytqreplace>\n";
 
   xml += "<contact_db>" + mContactDb->currentText() + "</contact_db>\n";
   xml += "<calendar_db>" + mCalendarDb->currentText() + "</calendar_db>\n";
diff --git a/kitchensync/src/configguisyncmlobex.cpp b/kitchensync/src/configguisyncmlobex.cpp
index 372cf926..fe7354ed 100644
--- a/kitchensync/src/configguisyncmlobex.cpp
+++ b/kitchensync/src/configguisyncmlobex.cpp
@@ -225,7 +225,7 @@ void ConfigGuiSyncmlObex::load( const TQString &xml )
       if ( mMaxObjSize ) mMaxObjSize->setValue( element.text().toInt() );
     } else if ( element.tagName() == "usestringtable" ) {
       mUseStringTable->setChecked( element.text() == "1" );
-    } else if ( element.tagName() == "onlyreplace" ) {
+    } else if ( element.tagName() == "onlytqreplace" ) {
       mOnlyReplace->setChecked( element.text() == "1" );
     } else if ( element.tagName() == "contact_db" ) {
       mContactDb->setCurrentText( element.text() );
@@ -293,12 +293,12 @@ TQString ConfigGuiSyncmlObex::save() const
     xml += "0";
   xml += "</usestringtable>\n";
 
-  xml += "<onlyreplace>";
+  xml += "<onlytqreplace>";
   if ( mOnlyReplace->isChecked() )
     xml += "1";
   else
     xml += "0";
-  xml += "</onlyreplace>\n";
+  xml += "</onlytqreplace>\n";
 
   xml += "<contact_db>" + mContactDb->currentText() + "</contact_db>\n";
   xml += "<calendar_db>" + mCalendarDb->currentText() + "</calendar_db>\n";
diff --git a/kitchensync/src/connectionwidgets.cpp b/kitchensync/src/connectionwidgets.cpp
index ac5277fb..bb25c271 100644
--- a/kitchensync/src/connectionwidgets.cpp
+++ b/kitchensync/src/connectionwidgets.cpp
@@ -43,24 +43,24 @@
 BluetoothWidget::BluetoothWidget( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this );
+  TQGridLayout *tqlayout = new TQGridLayout( this );
 
   mAddress = new KLineEdit( this );
   mAddress->setInputMask( ">NN:NN:NN:NN:NN:NN;" );
-  layout->addWidget( mAddress, 1, 0 );
+  tqlayout->addWidget( mAddress, 1, 0 );
 
   TQLabel *label = new TQLabel( i18n( "Bluetooth address:" ), this );
   label->setBuddy( mAddress );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mChannel = new KLineEdit( this );
-  layout->addWidget( mChannel, 1, 1 );
+  tqlayout->addWidget( mChannel, 1, 1 );
 
   mChannelLabel = new TQLabel( i18n( "Channel:" ), this );
   mChannelLabel->setBuddy( mChannel );
-  layout->addWidget( mChannelLabel, 0, 1 );
+  tqlayout->addWidget( mChannelLabel, 0, 1 );
 
-  layout->setRowStretch( 2, 1 );
+  tqlayout->setRowStretch( 2, 1 );
 }
 
 void BluetoothWidget::hideChannel()
@@ -103,23 +103,23 @@ TQString BluetoothWidget::channel() const
 IRWidget::IRWidget( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 3, 3, 11, 3 );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 3, 11, 3 );
 
   mDevice = new KLineEdit( this );
   mSerialNumber = new KLineEdit( this );
 
-  layout->addWidget( mDevice, 1, 0 );
-  layout->addWidget( mSerialNumber, 1, 1 );
+  tqlayout->addWidget( mDevice, 1, 0 );
+  tqlayout->addWidget( mSerialNumber, 1, 1 );
 
   TQLabel *label = new TQLabel( i18n( "Device Name:" ), this );
   label->setBuddy( mDevice );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   label = new TQLabel( i18n( "Serial Number:" ), this );
   label->setBuddy( mSerialNumber );
-  layout->addWidget( label, 0, 1 );
+  tqlayout->addWidget( label, 0, 1 );
 
-  layout->setRowStretch( 2, 1 );
+  tqlayout->setRowStretch( 2, 1 );
 }
 
 void IRWidget::load( const TQDomElement &parent )
@@ -149,23 +149,23 @@ void IRWidget::save( TQDomDocument &doc, TQDomElement &parent )
 CableWidget::CableWidget( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 3, 2, 11, 3 );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 11, 3 );
 
   mManufacturer = new KComboBox( this );
   mDevice = new KComboBox( true, this );
 
-  layout->addWidget( mManufacturer, 0, 1 );
-  layout->addWidget( mDevice, 1, 1 );
+  tqlayout->addWidget( mManufacturer, 0, 1 );
+  tqlayout->addWidget( mDevice, 1, 1 );
 
   TQLabel *label = new TQLabel( i18n( "Device Manufacturer:" ), this );
   label->setBuddy( mManufacturer );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   label = new TQLabel( i18n( "Device:" ), this );
   label->setBuddy( mDevice );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
 
-  layout->setRowStretch( 2, 1 );
+  tqlayout->setRowStretch( 2, 1 );
 
   mManufacturer->insertItem( i18n( "SonyEricsson/Ericsson" ) );
   mManufacturer->insertItem( i18n( "Siemens" ) );
@@ -202,16 +202,16 @@ void CableWidget::save( TQDomDocument &doc, TQDomElement &parent )
 UsbWidget::UsbWidget( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 3, 2, 11, 3);
+  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 11, 3);
 
   mInterface = new TQSpinBox( this );
-  layout->addWidget( mInterface, 0, 1 );
+  tqlayout->addWidget( mInterface, 0, 1 );
 
   TQLabel *label = new TQLabel( i18n( "USB Interface:" ), this );
   label->setBuddy( mInterface );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
-  layout->setRowStretch( 2, 1 );
+  tqlayout->setRowStretch( 2, 1 );
 }
 
 void UsbWidget::setInterface( int interface )
diff --git a/kitchensync/src/groupconfig.cpp b/kitchensync/src/groupconfig.cpp
index cfedcbfa..2d1ccbc5 100644
--- a/kitchensync/src/groupconfig.cpp
+++ b/kitchensync/src/groupconfig.cpp
@@ -50,8 +50,8 @@ GroupConfig::GroupConfig( TQWidget *parent )
   TQFrame *titleFrame = new TQFrame( this );
   topLayout->addWidget( titleFrame );
 
-  titleFrame->setPaletteForegroundColor( colorGroup().light() );
-  titleFrame->setPaletteBackgroundColor( colorGroup().mid() );
+  titleFrame->setPaletteForegroundColor( tqcolorGroup().light() );
+  titleFrame->setPaletteBackgroundColor( tqcolorGroup().mid() );
 
   TQBoxLayout *nameLayout = new TQHBoxLayout( titleFrame );
   nameLayout->setMargin( 4 );
diff --git a/kitchensync/src/groupconfigcommon.cpp b/kitchensync/src/groupconfigcommon.cpp
index 9f629c4d..d5c89bc8 100644
--- a/kitchensync/src/groupconfigcommon.cpp
+++ b/kitchensync/src/groupconfigcommon.cpp
@@ -41,8 +41,8 @@
 ObjectTypeSelector::ObjectTypeSelector( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this );
-  layout->setMargin( 0 );
+  TQGridLayout *tqlayout = new TQGridLayout( this );
+  tqlayout->setMargin( 0 );
 
   const QSync::Conversion conversion = SyncProcessManager::self()->environment()->conversion();
 
@@ -78,7 +78,7 @@ ObjectTypeSelector::ObjectTypeSelector( TQWidget *parent )
       continue;
 
     TQCheckBox *objectCheckBox = new TQCheckBox( objectTypeMap[ objectType ], this );
-    layout->addWidget( objectCheckBox, row, col );
+    tqlayout->addWidget( objectCheckBox, row, col );
     mObjectTypeChecks.insert( objectType, objectCheckBox );
 
     col++;
@@ -103,7 +103,7 @@ void ObjectTypeSelector::load( const QSync::Group &group )
   TQMap<TQString, TQCheckBox*>::ConstIterator it;
   for( it = mObjectTypeChecks.begin(); it != mObjectTypeChecks.end(); ++it ) {
     TQCheckBox *check = it.data();
-    check->setChecked( objectTypes.contains( it.key() ) || initialLoad );
+    check->setChecked( objectTypes.tqcontains( it.key() ) || initialLoad );
   }
 }
 
@@ -128,19 +128,19 @@ void ObjectTypeSelector::save( QSync::Group group )
 GroupConfigCommon::GroupConfigCommon( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
 
-  layout->addWidget( new TQLabel( i18n( "Name:" ), this ), 0, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Name:" ), this ), 0, 0 );
 
   mGroupName = new KLineEdit( this );
-  layout->addWidget( mGroupName, 0, 1 );
+  tqlayout->addWidget( mGroupName, 0, 1 );
 
-  layout->addWidget( new TQLabel( i18n( "Object Types to be Synchronized:"), this ), 1, 0, Qt::AlignTop );
+  tqlayout->addWidget( new TQLabel( i18n( "Object Types to be Synchronized:"), this ), 1, 0, Qt::AlignTop );
 
   mObjectTypeSelector = new ObjectTypeSelector( this );
-  layout->addWidget( mObjectTypeSelector, 1, 1 );
+  tqlayout->addWidget( mObjectTypeSelector, 1, 1 );
 
-  layout->setRowStretch( 2, 1 );
+  tqlayout->setRowStretch( 2, 1 );
 }
 
 void GroupConfigCommon::setSyncProcess( SyncProcess *syncProcess )
diff --git a/kitchensync/src/groupitem.cpp b/kitchensync/src/groupitem.cpp
index 784991c6..0a27fb9e 100644
--- a/kitchensync/src/groupitem.cpp
+++ b/kitchensync/src/groupitem.cpp
@@ -50,7 +50,7 @@ GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process )
   boldFont.setBold( true );
   boldFont.setPointSize( boldFont.pointSize() + 2 );
 
-  TQGridLayout *layout = new TQGridLayout( this, 4, 4, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 4, 4, KDialog::marginHint(), KDialog::spacingHint() );
 
   mBox = new TQVBox( this );
   mBox->setMargin( 5 );
@@ -71,36 +71,36 @@ GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process )
 
   mIcon = new TQLabel( hbox );
   mIcon->setPixmap( icon );
-  mIcon->setFixedSize( mIcon->sizeHint() );
-  mIcon->setPaletteBackgroundColor( colorGroup().mid() );
+  mIcon->setFixedSize( mIcon->tqsizeHint() );
+  mIcon->setPaletteBackgroundColor( tqcolorGroup().mid() );
 
   mGroupName = new TQLabel( hbox );
-  mGroupName->setAlignment( AlignLeft | AlignVCenter );
+  mGroupName->tqsetAlignment( AlignLeft | AlignVCenter );
   mGroupName->setIndent( KDialog::spacingHint() );
   mGroupName->setFont( boldFont );
-  mGroupName->setPaletteForegroundColor( colorGroup().light() );
-  mGroupName->setPaletteBackgroundColor( colorGroup().mid() );
+  mGroupName->setPaletteForegroundColor( tqcolorGroup().light() );
+  mGroupName->setPaletteBackgroundColor( tqcolorGroup().mid() );
 
   mStatus = new TQLabel( hbox );
-  mStatus->setAlignment( Qt::AlignRight );
-  mStatus->setAlignment( AlignRight | AlignVCenter );
+  mStatus->tqsetAlignment( Qt::AlignRight );
+  mStatus->tqsetAlignment( AlignRight | AlignVCenter );
   mStatus->setIndent( KDialog::spacingHint() );
   mStatus->setFont( boldFont );
-  mStatus->setPaletteForegroundColor( colorGroup().light() );
-  mStatus->setPaletteBackgroundColor( colorGroup().mid() );
+  mStatus->setPaletteForegroundColor( tqcolorGroup().light() );
+  mStatus->setPaletteBackgroundColor( tqcolorGroup().mid() );
   mStatus->setText( i18n( "Ready" ) );
 
-  hbox->setPaletteBackgroundColor( colorGroup().mid() );
-  hbox->setMaximumHeight( hbox->minimumSizeHint().height() );
+  hbox->setPaletteBackgroundColor( tqcolorGroup().mid() );
+  hbox->setMaximumHeight( hbox->tqminimumSizeHint().height() );
 
-  layout->addMultiCellWidget( hbox, 0, 0, 0, 3 );
-  layout->addMultiCellWidget( mBox, 1, 1, 0, 3 );
-  layout->addWidget( mTime, 2, 0 );
-  layout->addWidget( mSyncAction, 2, 1 );
-  layout->addWidget( mConfigureAction, 2, 2 );
-  layout->addWidget( mProgressBar, 2, 3 );
-  layout->setColStretch( 0, 1 );
-  layout->setRowStretch( 3, 1 );
+  tqlayout->addMultiCellWidget( hbox, 0, 0, 0, 3 );
+  tqlayout->addMultiCellWidget( mBox, 1, 1, 0, 3 );
+  tqlayout->addWidget( mTime, 2, 0 );
+  tqlayout->addWidget( mSyncAction, 2, 1 );
+  tqlayout->addWidget( mConfigureAction, 2, 2 );
+  tqlayout->addWidget( mProgressBar, 2, 3 );
+  tqlayout->setColStretch( 0, 1 );
+  tqlayout->setRowStretch( 3, 1 );
 
   setPaletteBackgroundColor( kapp->palette().active().base() );
 
@@ -157,7 +157,7 @@ void GroupItem::update()
   for ( ; memberIt != memberEndIt; ++memberIt ) {
     MemberItem *item = new MemberItem( mBox, mSyncProcess, *memberIt );
     item->show();
-    item->setStatusMessage( i18n( "Ready" ) );
+    item->seStatusMessage( i18n( "Ready" ) );
     mMemberItems.append( item );
   }
 }
@@ -259,7 +259,7 @@ void GroupItem::engine( const QSync::SyncEngineUpdate &update )
       break;
     case QSync::SyncEngineUpdate::SyncSuccessfull:
       mStatus->setText( i18n( "Successfully synchronized" ) );
-      mSyncProcess->group().setLastSynchronization( TQDateTime::currentDateTime() );
+      mSyncProcess->group().setLastSynchronization( TQDateTime::tqcurrentDateTime() );
       mSyncProcess->group().save();
       this->update();
 
@@ -286,31 +286,31 @@ void GroupItem::member( const QSync::SyncMemberUpdate &update )
     if ( (*it)->member() == update.member() ) {
       switch ( update.type() ) {
         case QSync::SyncMemberUpdate::Connected:
-          (*it)->setStatusMessage( i18n( "Connected" ) );
+          (*it)->seStatusMessage( i18n( "Connected" ) );
           break;
         case QSync::SyncMemberUpdate::SentChanges:
-          (*it)->setStatusMessage( i18n( "Changes read" ) );
+          (*it)->seStatusMessage( i18n( "Changes read" ) );
           break;
         case QSync::SyncMemberUpdate::CommittedAll:
-          (*it)->setStatusMessage( i18n( "Changes written" ) );
+          (*it)->seStatusMessage( i18n( "Changes written" ) );
           break;
         case QSync::SyncMemberUpdate::Disconnected:
-          (*it)->setStatusMessage( i18n( "Disconnected" ) );
+          (*it)->seStatusMessage( i18n( "Disconnected" ) );
           break;
         case QSync::SyncMemberUpdate::ConnectError:
-          (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
+          (*it)->seStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
           break;
         case QSync::SyncMemberUpdate::GetChangesError:
-          (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
+          (*it)->seStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
           break;
         case QSync::SyncMemberUpdate::CommittedAllError:
-          (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
+          (*it)->seStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
           break;
         case QSync::SyncMemberUpdate::SyncDoneError:
-          (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
+          (*it)->seStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
           break;
         case QSync::SyncMemberUpdate::DisconnectedError:
-          (*it)->setStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
+          (*it)->seStatusMessage( i18n( "Error: %1" ).arg( update.result().message() ) );
           break;
         default:
           break;
@@ -358,17 +358,17 @@ MemberItem::MemberItem( TQWidget *parent, SyncProcess *process,
 
   QSync::Plugin plugin = member.plugin();
 
-  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
 
   TQHBox* box = new TQHBox( this );
   box->setMargin( 5 );
   box->setSpacing( 6 );
-  layout->addWidget( box );
+  tqlayout->addWidget( box );
 
   mIcon = new TQLabel( box );
   mIcon->setPixmap( icon );
-  mIcon->setAlignment( Qt::AlignTop );
-  mIcon->setFixedWidth( mIcon->sizeHint().width() );
+  mIcon->tqsetAlignment( Qt::AlignTop );
+  mIcon->setFixedWidth( mIcon->tqsizeHint().width() );
 
   TQVBox *nameBox = new TQVBox( box );
   mMemberName = new TQLabel( nameBox );
@@ -381,7 +381,7 @@ MemberItem::MemberItem( TQWidget *parent, SyncProcess *process,
   mDescription->setText( plugin.longName() );
 }
 
-void MemberItem::setStatusMessage( const TQString &msg )
+void MemberItem::seStatusMessage( const TQString &msg )
 {
   mStatus->setText( msg );
 }
diff --git a/kitchensync/src/groupitem.h b/kitchensync/src/groupitem.h
index 5f2543a7..dc724890 100644
--- a/kitchensync/src/groupitem.h
+++ b/kitchensync/src/groupitem.h
@@ -96,7 +96,7 @@ class MemberItem : public QWidget
     SyncProcess* syncProcess() const { return mSyncProcess; }
     QSync::Member member() const { return mMember; }
 
-    void setStatusMessage( const TQString &msg );
+    void seStatusMessage( const TQString &msg );
 
   private:
     SyncProcess *mSyncProcess;
diff --git a/kitchensync/src/kwidgetlist.cpp b/kitchensync/src/kwidgetlist.cpp
index d34fcb2b..e8c1b791 100644
--- a/kitchensync/src/kwidgetlist.cpp
+++ b/kitchensync/src/kwidgetlist.cpp
@@ -69,7 +69,7 @@ void KWidgetList::appendItem( KWidgetListItem *item )
   if ( !item )
     return;
 
-  if ( !d->mItems.contains( item ) ) {
+  if ( !d->mItems.tqcontains( item ) ) {
     d->mItems.append( item );
     item->reparent( d->mBox, 0, TQPoint( 0, 0 ), true );
     item->setSelected( false );
@@ -129,7 +129,7 @@ void KWidgetList::setSelected( KWidgetListItem *item )
   if ( !item )
     return;
 
-  if ( d->mItems.contains( item ) == 0 )
+  if ( d->mItems.tqcontains( item ) == 0 )
     return;
 
   if ( d->mSelectedItem )
diff --git a/kitchensync/src/multiconflictdialog.cpp b/kitchensync/src/multiconflictdialog.cpp
index 7d7805c4..e7c03761 100644
--- a/kitchensync/src/multiconflictdialog.cpp
+++ b/kitchensync/src/multiconflictdialog.cpp
@@ -37,10 +37,10 @@ class ChangeItem : public KWidgetListItem
       : KWidgetListItem( parent ),
         mChange( change )
     {
-      TQGridLayout *layout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() );
+      TQGridLayout *tqlayout = new TQGridLayout( this, 2, 1, KDialog::marginHint(), KDialog::spacingHint() );
 
       MemberInfo mi( change.member() );
-      layout->addWidget( new TQLabel( mi.name(), this ), 0, 0 );
+      tqlayout->addWidget( new TQLabel( mi.name(), this ), 0, 0 );
 
       TQString type;
       switch ( change.changeType() ) {
@@ -62,7 +62,7 @@ class ChangeItem : public KWidgetListItem
           break;
       }
 
-      layout->addWidget( new TQLabel( type, this ), 1, 0 );
+      tqlayout->addWidget( new TQLabel( type, this ), 1, 0 );
     }
 
     QSync::SyncChange change() const { return mChange; }
@@ -118,24 +118,24 @@ void MultiConflictDialog::ignoreChange()
 
 void MultiConflictDialog::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( this, 3, 3, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 3, KDialog::marginHint(), KDialog::spacingHint() );
 
-  layout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 2 );
+  tqlayout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 2 );
 
   mWidgetList = new KWidgetList( this );
-  layout->addMultiCellWidget( mWidgetList, 1, 1, 0, 2 );
+  tqlayout->addMultiCellWidget( mWidgetList, 1, 1, 0, 2 );
 
   TQPushButton *button = new TQPushButton( i18n( "Use Selected Item" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useSelectedChange() ) );
-  layout->addWidget( button, 2, 0 );
+  tqlayout->addWidget( button, 2, 0 );
 
   button = new TQPushButton( i18n( "Duplicate Items" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( duplicateChange() ) );
-  layout->addWidget( button, 2, 1 );
+  tqlayout->addWidget( button, 2, 1 );
 
   button = new TQPushButton( i18n( "Ignore Conflict" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( ignoreChange() ) );
-  layout->addWidget( button, 2, 2 );
+  tqlayout->addWidget( button, 2, 2 );
 }
 
 #include "multiconflictdialog.moc"
diff --git a/kitchensync/src/part.cpp b/kitchensync/src/part.cpp
index f66eece6..0e5c5c0c 100644
--- a/kitchensync/src/part.cpp
+++ b/kitchensync/src/part.cpp
@@ -36,14 +36,14 @@
 typedef KParts::GenericFactory< KitchenSyncPart > KitchenSyncFactory;
 K_EXPORT_COMPONENT_FACTORY( libkitchensyncpart, KitchenSyncFactory )
 
-KitchenSyncPart::KitchenSyncPart( TQWidget *parentWidget, const char *widgetName,
+KitchenSyncPart::KitchenSyncPart( TQWidget *tqparentWidget, const char *widgetName,
                                   TQObject *parent, const char *name,
                                   const TQStringList& )
   : KParts::ReadOnlyPart( parent, name )
 {
   setInstance( KitchenSyncFactory::instance() );
 
-  TQVBox *canvas = new TQVBox( parentWidget, widgetName );
+  TQVBox *canvas = new TQVBox( tqparentWidget, widgetName );
   setWidget( canvas );
 
   new MainWidget( this, canvas );
diff --git a/kitchensync/src/part.h b/kitchensync/src/part.h
index 3e053bbd..d9e03a3f 100644
--- a/kitchensync/src/part.h
+++ b/kitchensync/src/part.h
@@ -32,7 +32,7 @@ class KitchenSyncPart: public KParts::ReadOnlyPart
   Q_OBJECT
 
   public:
-    KitchenSyncPart( TQWidget *parentWidget, const char *widgetName,
+    KitchenSyncPart( TQWidget *tqparentWidget, const char *widgetName,
                      TQObject *parent, const char *name, const TQStringList& );
     virtual ~KitchenSyncPart();
 
diff --git a/kitchensync/src/pluginpicker.cpp b/kitchensync/src/pluginpicker.cpp
index d981599b..d8d6c46d 100644
--- a/kitchensync/src/pluginpicker.cpp
+++ b/kitchensync/src/pluginpicker.cpp
@@ -38,11 +38,11 @@ PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin )
   : KWidgetListItem( list ), mPlugin( plugin )
 {
   TQString iconName = MemberInfo::pluginIconName( mPlugin.name() );
-  TQGridLayout *layout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() );
 
   TQLabel *icon = new TQLabel( this );
   icon->setPixmap( KGlobal::iconLoader()->loadIcon( iconName, KIcon::Desktop ) );
-  icon->setFixedSize( icon->sizeHint() );
+  icon->setFixedSize( icon->tqsizeHint() );
 
   TQLabel *name = new TQLabel( plugin.longName(), this );
   TQLabel *description = new TQLabel( plugin.description(), this );
@@ -51,19 +51,19 @@ PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin )
   font.setBold( true );
   name->setFont( font );
 
-  layout->addWidget( icon, 0, 0 );
-  layout->addWidget( name, 0, 1 );
-  layout->addWidget( description, 1, 1 );
+  tqlayout->addWidget( icon, 0, 0 );
+  tqlayout->addWidget( name, 0, 1 );
+  tqlayout->addWidget( description, 1, 1 );
 }
 
 
 PluginPicker::PluginPicker( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQBoxLayout *layout = new TQVBoxLayout( this );
+  TQBoxLayout *tqlayout = new TQVBoxLayout( this );
 
   mPluginList = new KWidgetList( this );
-  layout->addWidget( mPluginList );
+  tqlayout->addWidget( mPluginList );
 
   connect( mPluginList, TQT_SIGNAL( doubleClicked( KWidgetListItem* ) ),
            TQT_SIGNAL( selected() ) );
diff --git a/kitchensync/src/singleconflictdialog.cpp b/kitchensync/src/singleconflictdialog.cpp
index 8975b6f9..f9228e17 100644
--- a/kitchensync/src/singleconflictdialog.cpp
+++ b/kitchensync/src/singleconflictdialog.cpp
@@ -96,28 +96,28 @@ void SingleConflictDialog::ignoreChange()
 
 void SingleConflictDialog::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( this, 3, 4, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 4, KDialog::marginHint(), KDialog::spacingHint() );
 
-  layout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 3 );
+  tqlayout->addMultiCellWidget( new TQLabel( i18n( "A conflict has appeared, please solve it manually." ), this ), 0, 0, 0, 3 );
   mDiffAlgoDisplay = new KSync::HTMLDiffAlgoDisplay( this );
 
-  layout->addMultiCellWidget( mDiffAlgoDisplay, 1, 1, 0, 3 );
+  tqlayout->addMultiCellWidget( mDiffAlgoDisplay, 1, 1, 0, 3 );
 
   TQPushButton *button = new TQPushButton( i18n( "Use Item" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useFirstChange() ) );
-  layout->addWidget( button, 2, 0 );
+  tqlayout->addWidget( button, 2, 0 );
 
   button = new TQPushButton( i18n( "Duplicate Items" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( duplicateChange() ) );
-  layout->addWidget( button, 2, 1 );
+  tqlayout->addWidget( button, 2, 1 );
 
   button = new TQPushButton( i18n( "Ignore Conflict" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( ignoreChange() ) );
-  layout->addWidget( button, 2, 2 );
+  tqlayout->addWidget( button, 2, 2 );
 
   button = new TQPushButton( i18n( "Use Item" ), this );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( useSecondChange() ) );
-  layout->addWidget( button, 2, 3 );
+  tqlayout->addWidget( button, 2, 3 );
 }
 
 #include "singleconflictdialog.moc"
diff --git a/kitchensync/src/syncprocess.cpp b/kitchensync/src/syncprocess.cpp
index 60310b80..924151bd 100644
--- a/kitchensync/src/syncprocess.cpp
+++ b/kitchensync/src/syncprocess.cpp
@@ -90,7 +90,7 @@ void SyncProcess::applyObjectTypeFilter()
   const TQStringList activeObjectTypes = mGroup.config().activeObjectTypes();
 
   for ( uint i = 0; i < objectTypes.count(); ++i ) {
-    if ( activeObjectTypes.contains( objectTypes[ i ] ) ) {
+    if ( activeObjectTypes.tqcontains( objectTypes[ i ] ) ) {
       kdDebug() << "Enabled object type: " <<  objectTypes[ i ] << endl;
       /*
        * This is not required. Also this lead to filtering problems when sync with "file-sync".
diff --git a/kmail/Makefile.am b/kmail/Makefile.am
index 62939092..7d0ed238 100644
--- a/kmail/Makefile.am
+++ b/kmail/Makefile.am
@@ -25,8 +25,8 @@ INDEXLIB=../indexlib/libindex.la
 endif
 
 lib_LTLIBRARIES = libkmailprivate.la
-libkmailprivate_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined
-libkmailprivate_la_LIBADD  = \
+libkmailprivate_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined -L$(top_builddir)/libkdepim
+libkmailprivate_la_LIBADD = \
         ../libkmime/libkmime.la ../libkpgp/libkpgp.la ../libkdepim/libkdepim.la \
         ../libkpimidentities/libkpimidentities.la ../mimelib/libmimelib.la \
         ../libksieve/libksieve.la ../libemailfunctions/libemailfunctions.la \
@@ -49,7 +49,7 @@ linkdir = $(kde_datadir)/kmail/plugins/bodypartformatter
 link_DATA = application_octetstream.desktop
 
 bin_PROGRAMS = kmail
-kmail_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) -L$(top_builddir)/libkdepim -lkdepim
 kmail_LDADD   = libkmailprivate.la
 
 libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \
diff --git a/kmail/aboutdata.cpp b/kmail/aboutdata.cpp
index e525fae4..19d25574 100644
--- a/kmail/aboutdata.cpp
+++ b/kmail/aboutdata.cpp
@@ -156,7 +156,7 @@ namespace KMail {
   };
 
   static const about_data credits[] = {
-    { "Sam Abed", 0, 0, 0 }, // KConfigXT porting, smileys->emoticons replacement
+    { "Sam Abed", 0, 0, 0 }, // KConfigXT porting, smileys->emoticons tqreplacement
     { "Joern Ahrens", 0, 0, 0 }, // implement wish 77182 (Add some separators to "Mark Message as" popup menu)
     { "Tom Albers", 0, 0, 0 }, // small fixes, bugzilla maintenance
     { "Albert Cervera Areny", 0, 0, 0 }, // implemented wish 88309 (optional compression of attachments)
@@ -196,7 +196,7 @@ namespace KMail {
       "jan@simonson.pp.se", 0 },
     { "Paul Sprakes", 0, 0, 0 }, // fix for bug:63619 (filter button in toolbar doesn't work), context menu clean up
     { "Will Stephenson", 0, 0, 0 }, // added IM status indicator
-    { "Hasso Tepper", 0, 0, 0 }, // improve layout of recipients editor
+    { "Hasso Tepper", 0, 0, 0 }, // improve tqlayout of recipients editor
     { "Patrick S. Vogt", I18N_NOOP("timestamp for 'Transmission completed' status messages"),
       "patrick.vogt@unibas.ch", 0 },
     { "Jan-Oliver Wagner", I18N_NOOP("\xC3\x84gypten and Kroupware project management"),
diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp
index 8254bac9..51c72977 100644
--- a/kmail/accountdialog.cpp
+++ b/kmail/accountdialog.cpp
@@ -156,11 +156,11 @@ ProcmailRCParser::ProcmailRCParser(TQString fname)
     default_Location += '/';
     default_Location += getenv("USER");
   }
-  if ( !mSpoolFiles.contains(default_Location) )
+  if ( !mSpoolFiles.tqcontains(default_Location) )
     mSpoolFiles << default_Location;
 
   default_Location = default_Location + ".lock";
-  if ( !mLockFiles.contains(default_Location) )
+  if ( !mLockFiles.tqcontains(default_Location) )
     mLockFiles << default_Location;
 }
 
@@ -173,7 +173,7 @@ void
 ProcmailRCParser::processGlobalLock(const TQString &s)
 {
   TQString val = expandVars(s.mid(s.find('=') + 1).stripWhiteSpace());
-  if ( !mLockFiles.contains(val) )
+  if ( !mLockFiles.tqcontains(val) )
     mLockFiles << val;
 }
 
@@ -215,7 +215,7 @@ ProcmailRCParser::processLocalLock(const TQString &s)
       line.insert(0, *(mVars["MAILDIR"]) + '/');
 
     // now we have the spoolfile name
-    if ( !mSpoolFiles.contains(line) )
+    if ( !mSpoolFiles.tqcontains(line) )
       mSpoolFiles << line;
 
     if( colonPos > 0 && (!val || val.isEmpty()) ) {
@@ -230,7 +230,7 @@ ProcmailRCParser::processLocalLock(const TQString &s)
         val += ".lock";
     }
 
-    if ( !val.isNull() && !mLockFiles.contains(val) ) {
+    if ( !val.isNull() && !mLockFiles.tqcontains(val) ) {
       mLockFiles << val;
     }
   }
@@ -258,7 +258,7 @@ ProcmailRCParser::expandVars(const TQString &s)
   TQAsciiDictIterator<TQString> it( mVars ); // iterator for dict
 
   while ( it.current() ) {
-    expS.replace(TQString::fromLatin1("$") + it.currentKey(), *it.current());
+    expS.tqreplace(TQString::tqfromLatin1("$") + it.currentKey(), *it.current());
     ++it;
   }
 
@@ -306,7 +306,7 @@ AccountDialog::AccountDialog( const TQString & caption, KMAccount *account,
   else
   {
     TQString msg = i18n( "Account type is not supported." );
-    KMessageBox::information( topLevelWidget(),msg,i18n("Configure Account") );
+    KMessageBox::information( tqtopLevelWidget(),msg,i18n("Configure Account") );
     return;
   }
 
@@ -358,10 +358,10 @@ void AccountDialog::makeLocalAccountPage()
 
   TQButtonGroup *group = new TQButtonGroup(i18n("Locking Method"), page );
   group->setColumnLayout(0, Qt::Horizontal);
-  group->layout()->setSpacing( 0 );
-  group->layout()->setMargin( 0 );
-  TQGridLayout *groupLayout = new TQGridLayout( group->layout() );
-  groupLayout->setAlignment( Qt::AlignTop );
+  group->tqlayout()->setSpacing( 0 );
+  group->tqlayout()->setMargin( 0 );
+  TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout() );
+  groupLayout->tqsetAlignment( Qt::AlignTop );
   groupLayout->setSpacing( 6 );
   groupLayout->setMargin( 11 );
 
@@ -806,7 +806,7 @@ void AccountDialog::makePopAccountPage()
   mPop.authDigestMd5 = new TQRadioButton( i18n("&DIGEST-MD5"), mPop.authGroup, "auth digest-md5" );
   mPop.authNTLM = new TQRadioButton( i18n("&NTLM"), mPop.authGroup, "auth ntlm" );
   mPop.authGSSAPI = new TQRadioButton( i18n("&GSSAPI"), mPop.authGroup, "auth gssapi" );
-  if ( KProtocolInfo::capabilities("pop3").contains("SASL") == 0 )
+  if ( KProtocolInfo::capabilities("pop3").tqcontains("SASL") == 0 )
   {
     mPop.authNTLM->hide();
     mPop.authGSSAPI->hide();
@@ -905,7 +905,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
   // button to reload
   TQToolButton* button = new TQToolButton( box );
   button->setAutoRaise(true);
-  button->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
   button->setFixedSize( 22, 22 );
   button->setIconSet(
       KGlobal::iconLoader()->loadIconSet( "reload", KIcon::Small, 0 ) );
@@ -924,7 +924,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
   mImap.editPNS->setIconSet(
       KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) );
   mImap.editPNS->setAutoRaise( true );
-  mImap.editPNS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mImap.editPNS->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
   mImap.editPNS->setFixedSize( 22, 22 );
   connect( mImap.editPNS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditPersonalNamespace()) );
 
@@ -936,7 +936,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
   mImap.editONS->setIconSet(
       KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) );
   mImap.editONS->setAutoRaise( true );
-  mImap.editONS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mImap.editONS->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
   mImap.editONS->setFixedSize( 22, 22 );
   connect( mImap.editONS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditOtherUsersNamespace()) );
 
@@ -948,7 +948,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
   mImap.editSNS->setIconSet(
       KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) );
   mImap.editSNS->setAutoRaise( true );
-  mImap.editSNS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mImap.editSNS->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
   mImap.editSNS->setFixedSize( 22, 22 );
   connect( mImap.editSNS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditSharedNamespace()) );
 
@@ -1127,7 +1127,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
 
   // TODO (marc/bo): Test this
   mSieveConfigEditor = new SieveConfigEditor( tabWidget );
-  mSieveConfigEditor->layout()->setMargin( KDialog::marginHint() );
+  mSieveConfigEditor->tqlayout()->setMargin( KDialog::marginHint() );
   tabWidget->addTab( mSieveConfigEditor, i18n("&Filtering") );
 
   connect(kapp,TQT_SIGNAL(kdisplayFontChanged()),TQT_SLOT(slotFontChanged()));
@@ -1451,7 +1451,7 @@ void AccountDialog::slotLeaveOnServerClicked()
     slotEnableLeaveOnServerSize( state );
   }
   if ( !( mCurCapa & UIDL ) && mPop.leaveOnServerCheck->isChecked() ) {
-    KMessageBox::information( topLevelWidget(),
+    KMessageBox::information( tqtopLevelWidget(),
                               i18n("The server does not seem to support unique "
                                    "message numbers, but this is a "
                                    "requirement for leaving messages on the "
@@ -1466,7 +1466,7 @@ void AccountDialog::slotLeaveOnServerClicked()
 void AccountDialog::slotFilterOnServerClicked()
 {
   if ( !( mCurCapa & TOP ) && mPop.filterOnServerCheck->isChecked() ) {
-    KMessageBox::information( topLevelWidget(),
+    KMessageBox::information( tqtopLevelWidget(),
                               i18n("The server does not seem to support "
                                    "fetching message headers, but this is a "
                                    "requirement for filtering messages on the "
@@ -1481,7 +1481,7 @@ void AccountDialog::slotFilterOnServerClicked()
 void AccountDialog::slotPipeliningClicked()
 {
   if (mPop.usePipeliningCheck->isChecked())
-    KMessageBox::information( topLevelWidget(),
+    KMessageBox::information( tqtopLevelWidget(),
       i18n("Please note that this feature can cause some POP3 servers "
       "that do not support pipelining to send corrupted mail;\n"
       "this is configurable, though, because some servers support pipelining "
@@ -1636,7 +1636,7 @@ void AccountDialog::enablePopFeatures( unsigned int capa )
   mPop.authAPOP->setEnabled( capa & APOP );
   if ( !( capa & Pipelining ) && mPop.usePipeliningCheck->isChecked() ) {
     mPop.usePipeliningCheck->setChecked( false );
-    KMessageBox::information( topLevelWidget(),
+    KMessageBox::information( tqtopLevelWidget(),
                               i18n("The server does not seem to support "
                                    "pipelining; therefore, this option has "
                                    "been disabled.\n"
@@ -1655,7 +1655,7 @@ void AccountDialog::enablePopFeatures( unsigned int capa )
   }
   if ( !( capa & UIDL ) && mPop.leaveOnServerCheck->isChecked() ) {
     mPop.leaveOnServerCheck->setChecked( false );
-    KMessageBox::information( topLevelWidget(),
+    KMessageBox::information( tqtopLevelWidget(),
                               i18n("The server does not seem to support unique "
                                    "message numbers, but this is a "
                                    "requirement for leaving messages on the "
@@ -1668,7 +1668,7 @@ void AccountDialog::enablePopFeatures( unsigned int capa )
   }
   if ( !( capa & TOP ) && mPop.filterOnServerCheck->isChecked() ) {
     mPop.filterOnServerCheck->setChecked( false );
-    KMessageBox::information( topLevelWidget(),
+    KMessageBox::information( tqtopLevelWidget(),
                               i18n("The server does not seem to support "
                                    "fetching message headers, but this is a "
                                    "requirement for filtering messages on the "
@@ -2307,7 +2307,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent,
     button->setIconSet(
       KGlobal::iconLoader()->loadIconSet( "editdelete", KIcon::Small, 0 ) );
     button->setAutoRaise( true );
-    button->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+    button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
     button->setFixedSize( 22, 22 );
     mLineEditMap[ mBg->insert( button ) ] = edit;
   }
@@ -2315,7 +2315,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent,
 
 void NamespaceEditDialog::slotRemoveEntry( int id )
 {
-  if ( mLineEditMap.contains( id ) ) {
+  if ( mLineEditMap.tqcontains( id ) ) {
     // delete the lineedit and remove namespace from map
     NamespaceLineEdit* edit = mLineEditMap[id];
     mDelimMap.remove( edit->text() );
@@ -2343,7 +2343,7 @@ void NamespaceEditDialog::slotOk()
       mDelimMap.remove( edit->lastText() );
     }
   }
-  mNamespaceMap->replace( mType, mDelimMap );
+  mNamespaceMap->tqreplace( mType, mDelimMap );
   KDialogBase::slotOk();
 }
 
diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp
index 0610622f..5484c66d 100644
--- a/kmail/accountmanager.cpp
+++ b/kmail/accountmanager.cpp
@@ -155,7 +155,7 @@ void AccountManager::processNextCheck( bool _newMail )
   if ( mAcctChecking.isEmpty() ) {
     // all checks finished, display summary
     if ( mDisplaySummary )
-      KPIM::BroadcastStatus::instance()->setStatusMsgTransmissionCompleted(
+      KPIM::BroadcasStatus::instance()->seStatusMsgTransmissionCompleted(
           mTotalNewMailsArrived );
     emit checkedMail( mNewMailArrived, mInteractive, mTotalNewInFolder );
     mTotalNewMailsArrived = 0;
@@ -222,7 +222,7 @@ void AccountManager::processNextCheck( bool _newMail )
   connect( curAccount, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
                 this, TQT_SLOT( processNextCheck( bool ) ) );
 
-  KPIM::BroadcastStatus::instance()->setStatusMsg(
+  KPIM::BroadcasStatus::instance()->seStatusMsg(
       i18n("Checking account %1 for new mail").arg(curAccount->name()));
 
   kdDebug(5006) << "processing next mail check for " << curAccount->name() << endl;
@@ -358,11 +358,11 @@ void AccountManager::checkMail( bool _interactive )
 
 //-----------------------------------------------------------------------------
 void AccountManager::singleInvalidateIMAPFolders(KMAccount *account) {
-  account->invalidateIMAPFolders();
+  account->tqinvalidateIMAPFolders();
 }
 
 
-void AccountManager::invalidateIMAPFolders()
+void AccountManager::tqinvalidateIMAPFolders()
 {
   for ( AccountList::ConstIterator it( mAcctList.begin() ), end( mAcctList.end() ); it != end; ++it )
     singleInvalidateIMAPFolders( *it );
diff --git a/kmail/accountmanager.h b/kmail/accountmanager.h
index 94bf470a..f693180f 100644
--- a/kmail/accountmanager.h
+++ b/kmail/accountmanager.h
@@ -82,7 +82,7 @@ public:
   void checkMail( bool interactive = true );
 
   /** Delete all IMAP folders and resync them */
-  void invalidateIMAPFolders();
+  void tqinvalidateIMAPFolders();
 
   TQStringList getAccounts() const;
 
diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp
index 589ef5d6..0dfb503d 100644
--- a/kmail/accountwizard.cpp
+++ b/kmail/accountwizard.cpp
@@ -215,29 +215,29 @@ void AccountWizard::setupAccountTypePage()
 void AccountWizard::setupAccountInformationPage()
 {
   mAccountInformationPage = new TQWidget( this );
-  TQGridLayout *layout = new TQGridLayout( mAccountInformationPage, 3, 2,
+  TQGridLayout *tqlayout = new TQGridLayout( mAccountInformationPage, 3, 2,
                                          KDialog::marginHint(), KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Real name:" ), mAccountInformationPage );
   mRealName = new KLineEdit( mAccountInformationPage );
   label->setBuddy( mRealName );
 
-  layout->addWidget( label, 0, 0 );
-  layout->addWidget( mRealName, 0, 1 );
+  tqlayout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( mRealName, 0, 1 );
 
   label = new TQLabel( i18n( "E-mail address:" ), mAccountInformationPage );
   mEMailAddress = new KLineEdit( mAccountInformationPage );
   label->setBuddy( mEMailAddress );
 
-  layout->addWidget( label, 1, 0 );
-  layout->addWidget( mEMailAddress, 1, 1 );
+  tqlayout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( mEMailAddress, 1, 1 );
 
   label = new TQLabel( i18n( "Organization:" ), mAccountInformationPage );
   mOrganization = new KLineEdit( mAccountInformationPage );
   label->setBuddy( mOrganization );
 
-  layout->addWidget( label, 2, 0 );
-  layout->addWidget( mOrganization, 2, 1 );
+  tqlayout->addWidget( label, 2, 0 );
+  tqlayout->addWidget( mOrganization, 2, 1 );
 
   addPage( mAccountInformationPage, i18n( "Account Information" ) );
 }
@@ -245,23 +245,23 @@ void AccountWizard::setupAccountInformationPage()
 void AccountWizard::setupLoginInformationPage()
 {
   mLoginInformationPage = new TQWidget( this );
-  TQGridLayout *layout = new TQGridLayout( mLoginInformationPage, 2, 2,
+  TQGridLayout *tqlayout = new TQGridLayout( mLoginInformationPage, 2, 2,
                                          KDialog::marginHint(), KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Login name:" ), mLoginInformationPage );
   mLoginName = new KLineEdit( mLoginInformationPage );
   label->setBuddy( mLoginName );
 
-  layout->addWidget( label, 0, 0 );
-  layout->addWidget( mLoginName, 0, 1 );
+  tqlayout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( mLoginName, 0, 1 );
 
   label = new TQLabel( i18n( "Password:" ), mLoginInformationPage );
   mPassword = new KLineEdit( mLoginInformationPage );
   mPassword->setEchoMode( TQLineEdit::Password );
   label->setBuddy( mPassword );
 
-  layout->addWidget( label, 1, 0 );
-  layout->addWidget( mPassword, 1, 1 );
+  tqlayout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( mPassword, 1, 1 );
 
   addPage( mLoginInformationPage, i18n( "Login Information" ) );
 }
@@ -269,7 +269,7 @@ void AccountWizard::setupLoginInformationPage()
 void AccountWizard::setupServerInformationPage()
 {
   mServerInformationPage = new TQWidget( this );
-  TQGridLayout *layout = new TQGridLayout( mServerInformationPage, 3, 2,
+  TQGridLayout *tqlayout = new TQGridLayout( mServerInformationPage, 3, 2,
                                          KDialog::marginHint(), KDialog::spacingHint() );
 
   mIncomingLabel = new TQLabel( mServerInformationPage );
@@ -285,23 +285,23 @@ void AccountWizard::setupServerInformationPage()
   connect( mChooseLocation, TQT_SIGNAL( clicked() ),
            this, TQT_SLOT( chooseLocation() ) );
 
-  layout->addWidget( mIncomingLabel, 0, 0, AlignTop );
-  layout->addWidget( mIncomingLocationWdg, 0, 1 );
-  layout->addWidget( mIncomingServerWdg, 0, 1 );
+  tqlayout->addWidget( mIncomingLabel, 0, 0, AlignTop );
+  tqlayout->addWidget( mIncomingLocationWdg, 0, 1 );
+  tqlayout->addWidget( mIncomingServerWdg, 0, 1 );
 
   TQLabel *label = new TQLabel( i18n( "Outgoing server:" ), mServerInformationPage );
   mOutgoingServer = new KLineEdit( mServerInformationPage );
   label->setBuddy( mOutgoingServer );
 
-  layout->addWidget( label, 1, 0 );
-  layout->addWidget( mOutgoingServer, 1, 1 );
+  tqlayout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( mOutgoingServer, 1, 1 );
 
   mOutgoingUseSSL = new TQCheckBox( i18n( "Use secure connection (SSL)" ), mServerInformationPage );
-  layout->addWidget( mOutgoingUseSSL, 2, 1 );
+  tqlayout->addWidget( mOutgoingUseSSL, 2, 1 );
 
   mLocalDelivery = new TQCheckBox( i18n( "Use local delivery" ),
                                   mServerInformationPage );
-  layout->addWidget( mLocalDelivery, 3, 0 );
+  tqlayout->addWidget( mLocalDelivery, 3, 0 );
 
   connect( mLocalDelivery, TQT_SIGNAL( toggled( bool ) ),
            mOutgoingServer, TQT_SLOT( setDisabled( bool ) ) );
diff --git a/kmail/acljobs.cpp b/kmail/acljobs.cpp
index 1f9b6bb5..9926cc46 100644
--- a/kmail/acljobs.cpp
+++ b/kmail/acljobs.cpp
@@ -122,7 +122,7 @@ TQString ACLJobs::permissionsToString( unsigned int permissions )
 
 KIO::SimpleJob* ACLJobs::setACL( KIO::Slave* slave, const KURL& url, const TQString& user, unsigned int permissions )
 {
-  TQString perm = TQString::fromLatin1( permissionsToIMAPRights( permissions ) );
+  TQString perm = TQString::tqfromLatin1( permissionsToIMAPRights( permissions ) );
 
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
diff --git a/kmail/acljobs.h b/kmail/acljobs.h
index 2a868540..d6a9b245 100644
--- a/kmail/acljobs.h
+++ b/kmail/acljobs.h
@@ -51,7 +51,7 @@ namespace KMail {
   typedef TQValueVector<ACLListEntry> ACLList;
 
 /**
- * This namespace contains functions that return jobs for ACL operations.
+ * This namespace tqcontains functions that return jobs for ACL operations.
  *
  * The current implementation is tied to IMAP.
  * If someone wants to extend this to other protocols, turn the class into a namespace
diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp
index 0af6cdd4..6975b3fc 100644
--- a/kmail/actionscheduler.cpp
+++ b/kmail/actionscheduler.cpp
@@ -157,8 +157,8 @@ void ActionScheduler::setSourceFolder( KMFolder *srcFolder )
 {
   srcFolder->open("actionschedsrc");
   if (mSrcFolder) {
-    disconnect( mSrcFolder, TQT_SIGNAL(msgAdded(KMFolder*, Q_UINT32)),
-		this, TQT_SLOT(msgAdded(KMFolder*, Q_UINT32)) );
+    disconnect( mSrcFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+		this, TQT_SLOT(msgAdded(KMFolder*, TQ_UINT32)) );
     disconnect( mSrcFolder, TQT_SIGNAL(closed()),
                 this, TQT_SLOT(folderClosedOrExpunged()) );
     disconnect( mSrcFolder, TQT_SIGNAL(expunged(KMFolder*)),
@@ -170,8 +170,8 @@ void ActionScheduler::setSourceFolder( KMFolder *srcFolder )
   for (i = 0; i < mSrcFolder->count(); ++i)
     enqueue( mSrcFolder->getMsgBase( i )->getMsgSerNum() );
   if (mSrcFolder) {
-    connect( mSrcFolder, TQT_SIGNAL(msgAdded(KMFolder*, Q_UINT32)),
-	     this, TQT_SLOT(msgAdded(KMFolder*, Q_UINT32)) );
+    connect( mSrcFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+	     this, TQT_SLOT(msgAdded(KMFolder*, TQ_UINT32)) );
     connect( mSrcFolder, TQT_SIGNAL(closed()),
              this, TQT_SLOT(folderClosedOrExpunged()) );
     connect( mSrcFolder, TQT_SIGNAL(expunged(KMFolder*)),
@@ -230,9 +230,9 @@ void ActionScheduler::tempCloseFolders()
   mOpenFolders.clear();
 }
 
-void ActionScheduler::execFilters(const TQValueList<Q_UINT32> serNums)
+void ActionScheduler::execFilters(const TQValueList<TQ_UINT32> serNums)
 {
-  TQValueListConstIterator<Q_UINT32> it;
+  TQValueListConstIterator<TQ_UINT32> it;
   for (it = serNums.begin(); it != serNums.end(); ++it)
     execFilters( *it );
 }
@@ -250,7 +250,7 @@ void ActionScheduler::execFilters(KMMsgBase* msgBase)
   execFilters( msgBase->getMsgSerNum() );
 }
 
-void ActionScheduler::execFilters(Q_UINT32 serNum)
+void ActionScheduler::execFilters(TQ_UINT32 serNum)
 {
   if (mResult != ResultOk) {
       if ((mResult != ResultCriticalError) &&
@@ -279,7 +279,7 @@ void ActionScheduler::execFilters(Q_UINT32 serNum)
   }
 }
 
-KMMsgBase *ActionScheduler::messageBase(Q_UINT32 serNum)
+KMMsgBase *ActionScheduler::messageBase(TQ_UINT32 serNum)
 {
   int idx = -1;
   KMFolder *folder = 0;
@@ -299,7 +299,7 @@ KMMsgBase *ActionScheduler::messageBase(Q_UINT32 serNum)
   return msg;
 }
 
-KMMessage *ActionScheduler::message(Q_UINT32 serNum)
+KMMessage *ActionScheduler::message(TQ_UINT32 serNum)
 {
   int idx = -1;
   KMFolder *folder = 0;
@@ -380,7 +380,7 @@ void ActionScheduler::finish()
 
 void ActionScheduler::fetchMessage()
 {
-  TQValueListIterator<Q_UINT32> mFetchMessageIt = mFetchSerNums.begin();
+  TQValueListIterator<TQ_UINT32> mFetchMessageIt = mFetchSerNums.begin();
   while (mFetchMessageIt != mFetchSerNums.end()) {
     if (!MessageProperty::transferInProgress(*mFetchMessageIt))
       break;
@@ -454,7 +454,7 @@ void ActionScheduler::messageFetched( KMMessage *msg )
     serNumS.setNum( msg->getMsgSerNum() );
     KMMessage *newMsg = new KMMessage;
     newMsg->fromString(msg->asString());
-    newMsg->setStatus(msg->status());
+    newMsg->seStatus(msg->status());
     newMsg->setComplete(msg->isComplete());
     newMsg->setHeaderField( "X-KMail-Filtered", serNumS );
     mSrcFolder->addMsg( newMsg );
@@ -466,13 +466,13 @@ void ActionScheduler::messageFetched( KMMessage *msg )
   return;
 }
 
-void ActionScheduler::msgAdded( KMFolder*, Q_UINT32 serNum )
+void ActionScheduler::msgAdded( KMFolder*, TQ_UINT32 serNum )
 {
   if (!mIgnore)
     enqueue( serNum );
 }
 
-void ActionScheduler::enqueue(Q_UINT32 serNum)
+void ActionScheduler::enqueue(TQ_UINT32 serNum)
 {
   if (mResult != ResultOk)
     return; // An error has already occurred don't even try to process this msg
diff --git a/kmail/actionscheduler.h b/kmail/actionscheduler.h
index e785210b..3c989450 100644
--- a/kmail/actionscheduler.h
+++ b/kmail/actionscheduler.h
@@ -84,10 +84,10 @@ public:
   void clearAccountId() { mAccountId = 0; mAccount = false; }
 
   /** Queue a message for filtering */
-  void execFilters(const TQValueList<Q_UINT32> serNums);
+  void execFilters(const TQValueList<TQ_UINT32> serNums);
   void execFilters(const TQPtrList<KMMsgBase> msgList);
   void execFilters(KMMsgBase* msgBase);
-  void execFilters(Q_UINT32 serNum);
+  void execFilters(TQ_UINT32 serNum);
 
   static TQString debug();
   static bool isEnabled();
@@ -101,7 +101,7 @@ public:
 signals:
   /** Emitted when filtering is completed */
   void result(ReturnCode);
-  void filtered(Q_UINT32);
+  void filtered(TQ_UINT32);
 
 public slots:
   /** Called back by asynchronous actions when they have completed */
@@ -111,8 +111,8 @@ public slots:
   void copyMessageFinished( KMCommand *command );
 
 private slots:
-  KMMsgBase* messageBase(Q_UINT32 serNum);
-  KMMessage* message(Q_UINT32 serNum);
+  KMMsgBase* messageBase(TQ_UINT32 serNum);
+  KMMessage* message(TQ_UINT32 serNum);
   void finish();
 
   void folderClosedOrExpunged();
@@ -123,8 +123,8 @@ private slots:
   //Fetching slots
   void fetchMessage();
   void messageFetched( KMMessage *msg );
-  void msgAdded( KMFolder*, Q_UINT32 );
-  void enqueue(Q_UINT32 serNum);
+  void msgAdded( KMFolder*, TQ_UINT32 );
+  void enqueue(TQ_UINT32 serNum);
 
   //Filtering slots
   void processMessage();
@@ -140,9 +140,9 @@ private:
   static KMFolderMgr *tempFolderMgr;
   static int refCount, count;
   static bool sEnabled, sEnabledChecked;
-  TQValueListIterator<Q_UINT32> mMessageIt;
+  TQValueListIterator<TQ_UINT32> mMessageIt;
   TQValueListIterator<KMFilter> mFilterIt;
-  TQValueList<Q_UINT32> mSerNums, mFetchSerNums;
+  TQValueList<TQ_UINT32> mSerNums, mFetchSerNums;
   TQValueList<TQGuardedPtr<KMFolder> > mOpenFolders;
   TQValueList<KMFilter> mFilters, mQueuedFilters;
   KMFilterAction* mFilterAction;
@@ -157,7 +157,7 @@ private:
   bool mAlwaysMatch;
   bool mAccount;
   uint mAccountId;
-  Q_UINT32 mOriginalSerNum;
+  TQ_UINT32 mOriginalSerNum;
   bool mDeleteSrcFolder;
   ReturnCode mResult;
   TQTimer *finishTimer, *fetchMessageTimer, *tempCloseFoldersTimer;
diff --git a/kmail/annotationjobs.h b/kmail/annotationjobs.h
index 2c6ca984..df3da1ad 100644
--- a/kmail/annotationjobs.h
+++ b/kmail/annotationjobs.h
@@ -50,7 +50,7 @@ struct AnnotationAttribute {
 typedef TQValueVector<AnnotationAttribute> AnnotationList;
 
 /**
- * This namespace contains functions that return jobs for annotation operations.
+ * This namespace tqcontains functions that return jobs for annotation operations.
  *
  * The current implementation is tied to IMAP.
  * If someone wants to extend this to other protocols, turn the namespace into a class
diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp
index 17d7ed1e..15b3e7f7 100644
--- a/kmail/antispamwizard.cpp
+++ b/kmail/antispamwizard.cpp
@@ -150,7 +150,7 @@ void AntiSpamWizard::accept()
 
   KMFilterActionDict dict;
   TQValueList<KMFilter*> filterList;
-  bool replaceExistingFilters = false;
+  bool tqreplaceExistingFilters = false;
 
   // Let's start with virus detection and handling,
   // so we can avoid spam checks for viral messages
@@ -227,10 +227,10 @@ void AntiSpamWizard::accept()
     }
   }
   else { // AntiSpam mode
-    // TODO Existing filters with same name are replaced. This is hardcoded
-    // ATM and needs to be replaced with a value from a (still missing)
-    // checkbox in the GUI. At least, the replacement is announced in the GUI.
-    replaceExistingFilters = true;
+    // TODO Existing filters with same name are tqreplaced. This is hardcoded
+    // ATM and needs to be tqreplaced with a value from a (still missing)
+    // checkbox in the GUI. At least, the tqreplacement is announced in the GUI.
+    tqreplaceExistingFilters = true;
     for ( TQValueListIterator<SpamToolConfig> it = mToolList.begin();
           it != mToolList.end(); ++it ) {
       if ( mInfoPage->isProgramSelected( (*it).getVisibleName() ) &&
@@ -245,7 +245,7 @@ void AntiSpamWizard::accept()
         pipeFilterAction->argsFromString( (*it).getDetectCmd() );
         pipeFilterActions->append( pipeFilterAction );
         KMSearchPattern* pipeFilterPattern = pipeFilter->pattern();
-        if ( replaceExistingFilters )
+        if ( tqreplaceExistingFilters )
           pipeFilterPattern->setName( (*it).getFilterName() );
         else
           pipeFilterPattern->setName( uniqueNameFor( (*it).getFilterName() ) );
@@ -279,7 +279,7 @@ void AntiSpamWizard::accept()
       spamFilterActions->append( spamFilterAction3 );
     }
     KMSearchPattern* spamFilterPattern = spamFilter->pattern();
-    if ( replaceExistingFilters )
+    if ( tqreplaceExistingFilters )
       spamFilterPattern->setName( i18n( "Spam handling" ) );
     else
       spamFilterPattern->setName( uniqueNameFor( i18n( "Spam handling" ) ) );
@@ -320,7 +320,7 @@ void AntiSpamWizard::accept()
       unsureFilterAction1->argsFromString( mSpamRulesPage->selectedUnsureFolderName() );
       unsureFilterActions->append( unsureFilterAction1 );
       KMSearchPattern* unsureFilterPattern = unsureFilter->pattern();
-      if ( replaceExistingFilters )
+      if ( tqreplaceExistingFilters )
         unsureFilterPattern->setName( i18n( "Semi spam (unsure) handling" ) );
       else
         unsureFilterPattern->setName( uniqueNameFor( i18n( "Semi spam (unsure) handling" ) ) );
@@ -382,7 +382,7 @@ void AntiSpamWizard::accept()
     }
 
     KMSearchPattern* classSpamFilterPattern = classSpamFilter->pattern();
-    if ( replaceExistingFilters )
+    if ( tqreplaceExistingFilters )
       classSpamFilterPattern->setName( i18n( "Classify as spam" ) );
     else
       classSpamFilterPattern->setName( uniqueNameFor( i18n( "Classify as spam" ) ) );
@@ -414,7 +414,7 @@ void AntiSpamWizard::accept()
       }
     }
     KMSearchPattern* classHamFilterPattern = classHamFilter->pattern();
-    if ( replaceExistingFilters )
+    if ( tqreplaceExistingFilters )
       classHamFilterPattern->setName( i18n( "Classify as NOT spam" ) );
     else
       classHamFilterPattern->setName( uniqueNameFor( i18n( "Classify as NOT spam" ) ) );
@@ -441,7 +441,7 @@ void AntiSpamWizard::accept()
    * initialized. This should happend only once. */
   if ( !filterList.isEmpty() )
     KMKernel::self()->filterMgr()->appendFilters(
-          filterList, replaceExistingFilters );
+          filterList, tqreplaceExistingFilters );
 
   TQDialog::accept();
 }
@@ -505,9 +505,9 @@ void AntiSpamWizard::checkToolAvailability()
       AccountManager* mgr = kmkernel->acctMgr();
       KMAccount* account = mgr->first();
       while ( account ) {
-        if ( account->type() == "pop" || account->type().contains( "imap" ) ) {
+        if ( account->type() == "pop" || account->type().tqcontains( "imap" ) ) {
           const NetworkAccount * n = dynamic_cast<const NetworkAccount*>( account );
-          if ( n && n->host().lower().contains( pattern.lower() ) ) {
+          if ( n && n->host().lower().tqcontains( pattern.lower() ) ) {
             mInfoPage->addAvailableTool( (*it).getVisibleName() );
             found = true;
           }
@@ -550,7 +550,7 @@ void AntiSpamWizard::slotBuildSummary()
 {
   TQString text;
   TQString newFilters;
-  TQString replaceFilters;
+  TQString tqreplaceFilters;
 
   if ( mMode == AntiVirus ) {
     text = ""; // TODO add summary for the virus part
@@ -571,10 +571,10 @@ void AntiSpamWizard::slotBuildSummary()
           it != mToolList.end(); ++it ) {
       if ( mInfoPage->isProgramSelected( (*it).getVisibleName() ) &&
          (*it).isSpamTool() && !(*it).isDetectionOnly() ) {
-        sortFilterOnExistance( (*it).getFilterName(), newFilters, replaceFilters );
+        sortFilterOnExistance( (*it).getFilterName(), newFilters, tqreplaceFilters );
       }
     }
-    sortFilterOnExistance( i18n( "Spam handling" ), newFilters, replaceFilters );
+    sortFilterOnExistance( i18n( "Spam handling" ), newFilters, tqreplaceFilters );
 
     // The need for a andling of status "probably spam" depends on the tools chosen
     if ( mSpamRulesPage->moveUnsureSelected() ) {
@@ -588,7 +588,7 @@ void AntiSpamWizard::slotBuildSummary()
       }
       if ( atLeastOneUnsurePattern ) {
         sortFilterOnExistance( i18n( "Semi spam (unsure) handling" ),
-                               newFilters, replaceFilters );
+                               newFilters, tqreplaceFilters );
         text += i18n( "<p>The folder for messages classified as unsure (probably spam) is <i>" )
               + mSpamRulesPage->selectedUnsureFolderName() + "</i>.</p>";
       }
@@ -596,17 +596,17 @@ void AntiSpamWizard::slotBuildSummary()
 
     // Manual classification via toolbar icon / manually applied filter action
     sortFilterOnExistance( i18n( "Classify as spam" ),
-                            newFilters, replaceFilters );
+                            newFilters, tqreplaceFilters );
     sortFilterOnExistance( i18n( "Classify as NOT spam" ),
-                            newFilters, replaceFilters );
+                            newFilters, tqreplaceFilters );
 
     // Show the filters in the summary
     if ( !newFilters.isEmpty() )
       text += i18n( "<p>The wizard will create the following filters:<ul>" )
             + newFilters + "</ul></p>";
-    if ( !replaceFilters.isEmpty() )
-      text += i18n( "<p>The wizard will replace the following filters:<ul>" )
-            + replaceFilters + "</ul></p>";
+    if ( !tqreplaceFilters.isEmpty() )
+      text += i18n( "<p>The wizard will tqreplace the following filters:<ul>" )
+            + tqreplaceFilters + "</ul></p>";
   }
 
   mSummaryPage->setSummaryText( text );
@@ -639,12 +639,12 @@ const TQString AntiSpamWizard::uniqueNameFor( const TQString & name )
 
 void AntiSpamWizard::sortFilterOnExistance(
         const TQString & intendedFilterName,
-        TQString & newFilters, TQString & replaceFilters )
+        TQString & newFilters, TQString & tqreplaceFilters )
 {
   if ( uniqueNameFor( intendedFilterName ) == intendedFilterName )
     newFilters += "<li>" + intendedFilterName + "</li>";
   else
-    replaceFilters += "<li>" + intendedFilterName + "</li>";
+    tqreplaceFilters += "<li>" + intendedFilterName + "</li>";
 }
 
 
@@ -855,7 +855,7 @@ ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode,
                               TQWidget * parent, const char * name )
   : ASWizPage( parent, name )
 {
-  TQBoxLayout * layout = new TQVBoxLayout( mLayout );
+  TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout );
 
   mIntroText = new TQLabel( this );
   mIntroText->setText(
@@ -879,26 +879,26 @@ ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode,
       "deleting the filter rules created by the wizard to get "
       "back to the former behavior."
       ) );
-  layout->addWidget( mIntroText );
+  tqlayout->addWidget( mIntroText );
 
   mScanProgressText = new TQLabel( this );
   mScanProgressText->setText( "" ) ;
-  layout->addWidget( mScanProgressText );
+  tqlayout->addWidget( mScanProgressText );
 
   mToolsList = new KListBox( this );
   mToolsList->hide();
   mToolsList->setSelectionMode( TQListBox::Multi );
   mToolsList->setRowMode( TQListBox::FixedNumber );
   mToolsList->setRowMode( 10 );
-  layout->addWidget( mToolsList );
+  tqlayout->addWidget( mToolsList );
   connect( mToolsList, TQT_SIGNAL(selectionChanged()),
            this, TQT_SLOT(processSelectionChange(void)) );
 
   mSelectionHint = new TQLabel( this );
   mSelectionHint->setText( "" );
-  layout->addWidget( mSelectionHint );
+  tqlayout->addWidget( mSelectionHint );
 
-  layout->addStretch();
+  tqlayout->addStretch();
 }
 
 
@@ -940,18 +940,18 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name,
                                         KMFolderTree * mainFolderTree )
   : ASWizPage( parent, name )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( mLayout );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( mLayout );
 
   mMarkRules = new TQCheckBox( i18n("&Mark detected spam messages as read"), this );
   TQWhatsThis::add( mMarkRules,
       i18n( "Mark messages which have been classified as spam as read.") );
-  layout->addWidget( mMarkRules);
+  tqlayout->addWidget( mMarkRules);
 
   mMoveSpamRules = new TQCheckBox( i18n("Move &known spam to:"), this );
   TQWhatsThis::add( mMoveSpamRules,
       i18n( "The default folder for spam messages is the trash folder, "
             "but you may change that in the folder view below.") );
-  layout->addWidget( mMoveSpamRules );
+  tqlayout->addWidget( mMoveSpamRules );
 
   mFolderReqForSpamFolder = new FolderRequester( this, mainFolderTree );
   mFolderReqForSpamFolder->setFolder( "trash" );
@@ -959,7 +959,7 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name,
   mFolderReqForSpamFolder->setShowOutbox( false );
   mFolderReqForSpamFolder->setShowImapFolders( false );
 
-  TQHBoxLayout *hLayout1 = new TQHBoxLayout( layout );
+  TQHBoxLayout *hLayout1 = new TQHBoxLayout( tqlayout );
   hLayout1->addSpacing( KDialog::spacingHint() * 3 );
   hLayout1->addWidget( mFolderReqForSpamFolder );
 
@@ -969,7 +969,7 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name,
             "in the folder view below.<p>"
             "Not all tools support a classification as unsure. If you haven't "
             "selected a capable tool, you can't select a folder as well.") );
-  layout->addWidget( mMoveUnsureRules );
+  tqlayout->addWidget( mMoveUnsureRules );
 
   mFolderReqForUnsureFolder = new FolderRequester( this, mainFolderTree );
   mFolderReqForUnsureFolder->setFolder( "inbox" );
@@ -977,11 +977,11 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name,
   mFolderReqForUnsureFolder->setShowOutbox( false );
   mFolderReqForUnsureFolder->setShowImapFolders( false );
 
-  TQHBoxLayout *hLayout2 = new TQHBoxLayout( layout );
+  TQHBoxLayout *hLayout2 = new TQHBoxLayout( tqlayout );
   hLayout2->addSpacing( KDialog::spacingHint() * 3 );
   hLayout2->addWidget( mFolderReqForUnsureFolder );
 
-  layout->addStretch();
+  tqlayout->addStretch();
 
   connect( mMarkRules, TQT_SIGNAL(clicked()),
             this, TQT_SLOT(processSelectionChange(void)) );
@@ -1138,11 +1138,11 @@ void ASWizVirusRulesPage::processSelectionChange()
 ASWizSummaryPage::ASWizSummaryPage( TQWidget * parent, const char * name )
   : ASWizPage( parent, name )
 {
-  TQBoxLayout * layout = new TQVBoxLayout( mLayout );
+  TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout );
 
   mSummaryText = new TQLabel( this );
-  layout->addWidget( mSummaryText );
-  layout->addStretch();
+  tqlayout->addWidget( mSummaryText );
+  tqlayout->addStretch();
 }
 
 
diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h
index 738d8516..e8023426 100644
--- a/kmail/antispamwizard.h
+++ b/kmail/antispamwizard.h
@@ -259,7 +259,7 @@ namespace KMail {
       /* convenience method to sort out new and existing filters */
       void sortFilterOnExistance( const TQString & intendedFilterName,
                                   TQString & newFilters, 
-                                  TQString & replaceFilters );
+                                  TQString & tqreplaceFilters );
 
       /* The pages in the wizard */
       ASWizInfoPage * mInfoPage;
diff --git a/kmail/archivefolderdialog.cpp b/kmail/archivefolderdialog.cpp
index 5bf2cf93..979065e4 100644
--- a/kmail/archivefolderdialog.cpp
+++ b/kmail/archivefolderdialog.cpp
@@ -46,7 +46,7 @@ static TQString standardArchivePath( const TQString &folderName )
   }
   return currentPath +
     i18n( "Start of the filename for a mail archive file" , "Archive" ) + "_" + folderName +
-    "_" + TQDate::currentDate().toString( TQt::ISODate ) + ".tar.bz2";
+    "_" + TQDate::tqcurrentDate().toString( TQt::ISODate ) + ".tar.bz2";
 }
 
 ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent )
@@ -120,7 +120,7 @@ ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent )
   mainLayout->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Expanding, TQSizePolicy::Expanding ), row, 0 );
 
   // Make it a bit bigger, else the folder requester cuts off the text too early
-  resize( 500, minimumSize().height() );
+  resize( 500, tqminimumSize().height() );
 }
 
 void ArchiveFolderDialog::slotUrlChanged( const TQString &text )
diff --git a/kmail/attachmentlistview.cpp b/kmail/attachmentlistview.cpp
index 11c53f12..49fc3935 100644
--- a/kmail/attachmentlistview.cpp
+++ b/kmail/attachmentlistview.cpp
@@ -93,7 +93,7 @@ void AttachmentListView::contentsDropEvent( TQDropEvent* e )
     TQBuffer serNumBuffer( serNums );
     serNumBuffer.open( IO_ReadOnly );
     TQDataStream serNumStream( &serNumBuffer );
-    Q_UINT32 serNum;
+    TQ_UINT32 serNum;
     KMFolder *folder = 0;
     int idx;
     TQPtrList<KMMsgBase> messageList;
diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp
index fd53997b..a20e4118 100644
--- a/kmail/backupjob.cpp
+++ b/kmail/backupjob.cpp
@@ -165,7 +165,7 @@ void BackupJob::finish()
     }
   }
 
-  mProgressItem->setStatus( i18n( "Archiving finished" ) );
+  mProgressItem->seStatus( i18n( "Archiving finished" ) );
   mProgressItem->setComplete();
   mProgressItem = 0;
 
@@ -388,7 +388,7 @@ void BackupJob::archiveNextFolder()
 
   mCurrentFolder = mPendingFolders.take( 0 );
   kdDebug(5006) << "===> Archiving next folder: " << mCurrentFolder->name() << endl;
-  mProgressItem->setStatus( i18n( "Archiving folder %1" ).arg( mCurrentFolder->name() ) );
+  mProgressItem->seStatus( i18n( "Archiving folder %1" ).arg( mCurrentFolder->name() ) );
   if ( mCurrentFolder->open( "BackupJob" ) != 0 ) {
     abort( i18n( "Unable to open folder '%1'.").arg( mCurrentFolder->name() ) );
     return;
diff --git a/kmail/bodypartformatter.cpp b/kmail/bodypartformatter.cpp
index 6b61b9bc..a69c01bf 100644
--- a/kmail/bodypartformatter.cpp
+++ b/kmail/bodypartformatter.cpp
@@ -302,7 +302,7 @@ static const KMail::BodyPartFormatter * createForApplication( const char * subty
   return AnyTypeBodyPartFormatter::create();
 }
 
-// OK, replace this with a factory with plugin support later on...
+// OK, tqreplace this with a factory with plugin support later on...
 const KMail::BodyPartFormatter * KMail::BodyPartFormatter::createFor( const char * type, const char * subtype ) {
   if ( type && *type )
     switch ( type[0] ) {
diff --git a/kmail/bodyvisitor.cpp b/kmail/bodyvisitor.cpp
index 04b7a98b..5c920584 100644
--- a/kmail/bodyvisitor.cpp
+++ b/kmail/bodyvisitor.cpp
@@ -78,11 +78,11 @@ namespace KMail {
       ++it;
       // skip this part if the parent part is already loading
       if ( part->parent() &&
-           selected.contains( part->parent() ) &&
+           selected.tqcontains( part->parent() ) &&
            part->loadPart() )
         continue;
 
-      if ( part->originalContentTypeStr().contains("SIGNED") )
+      if ( part->originalContentTypeStr().tqcontains("SIGNED") )
       {
         // signed messages have to be loaded completely
         // so construct a new dummy part that loads the body
@@ -115,7 +115,7 @@ namespace KMail {
 
       // check whether to load this part or not:
       // look at the basic list, ask the subclass and check the parent
-      if ( mBasicList.contains( part->originalContentTypeStr() ) ||
+      if ( mBasicList.tqcontains( part->originalContentTypeStr() ) ||
            parentNeedsLoading( part ) ||
            addPartToList( part ) )
       {
diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp
index 2393b257..f80f5674 100644
--- a/kmail/cachedimapjob.cpp
+++ b/kmail/cachedimapjob.cpp
@@ -234,7 +234,7 @@ void CachedImapJob::slotDeleteNextMessages( KIO::Job* job )
 
   KURL url = mAccount->getUrl();
   url.setPath( mFolder->imapPath() +
-               TQString::fromLatin1(";UID=%1").arg(uids) );
+               TQString::tqfromLatin1(";UID=%1").arg(uids) );
 
   KIO::SimpleJob *simpleJob = KIO::file_delete( url, false );
   KIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob );
@@ -248,7 +248,7 @@ void CachedImapJob::expungeFolder()
 {
   KURL url = mAccount->getUrl();
   // Special URL that means EXPUNGE
-  url.setPath( mFolder->imapPath() + TQString::fromLatin1(";UID=*") );
+  url.setPath( mFolder->imapPath() + TQString::tqfromLatin1(";UID=*") );
 
   KIO::SimpleJob *job = KIO::file_delete( url, false );
   KIO::Scheduler::assignJobToSlave( mAccount->slave(), job );
@@ -311,7 +311,7 @@ void CachedImapJob::slotGetNextMessage(KIO::Job * job)
       mFolder->addMsgInternal( mMsg, true, &index );
 
       if ( kmkernel->iCalIface().isResourceFolder( mFolder->folder() ) ) {
-        mFolder->setStatus( index, KMMsgStatusRead, false );
+        mFolder->seStatus( index, KMMsgStatusRead, false );
       }
 
       emit messageRetrieved( mMsg );
@@ -404,7 +404,7 @@ void CachedImapJob::slotPutNextMessage()
   int a = cstr.find("\nX-UID: ");
   int b = cstr.find('\n', a);
   if (a != -1 && b != -1 && cstr.find("\n\n") > a) cstr.remove(a, b-a);
-  TQCString mData(cstr.length() + cstr.contains('\n'));
+  TQCString mData(cstr.length() + cstr.tqcontains('\n'));
   unsigned int i = 0;
   for( char *ch = cstr.data(); *ch; ch++ ) {
     if ( *ch == '\n' ) {
diff --git a/kmail/callback.cpp b/kmail/callback.cpp
index be787ff8..6f563699 100644
--- a/kmail/callback.cpp
+++ b/kmail/callback.cpp
@@ -94,13 +94,13 @@ bool Callback::mailICal( const TQString& to, const TQString &iCal,
   msg->setSubject( subject );
   if ( GlobalSettings::self()->exchangeCompatibleInvitations() ) {
     if ( status == TQString("cancel") )
-      msg->setSubject( i18n( "Declined: %1" ).arg(subject).replace("Answer: ","") );
+      msg->setSubject( i18n( "Declined: %1" ).arg(subject).tqreplace("Answer: ","") );
     else if ( status == TQString("tentative") )
-      msg->setSubject( i18n( "Tentative: %1" ).arg(subject).replace("Answer: ","") );
+      msg->setSubject( i18n( "Tentative: %1" ).arg(subject).tqreplace("Answer: ","") );
     else if ( status == TQString("accepted") )
-      msg->setSubject( i18n( "Accepted: %1" ).arg(subject).replace("Answer: ","") );
+      msg->setSubject( i18n( "Accepted: %1" ).arg(subject).tqreplace("Answer: ","") );
     else if ( status == TQString("delegated") )
-      msg->setSubject( i18n( "Delegated: %1" ).arg(subject).replace("Answer: ","") );
+      msg->setSubject( i18n( "Delegated: %1" ).arg(subject).tqreplace("Answer: ","") );
   }
   msg->setTo( to );
   msg->setFrom( receiver() );
diff --git a/kmail/chiasmuskeyselector.cpp b/kmail/chiasmuskeyselector.cpp
index 6c82c379..ac4d3278 100644
--- a/kmail/chiasmuskeyselector.cpp
+++ b/kmail/chiasmuskeyselector.cpp
@@ -14,26 +14,26 @@ ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* parent, const TQString& capt
 {
   TQWidget *page = makeMainWidget();
 
-  TQVBoxLayout *layout = new TQVBoxLayout(page, KDialog::spacingHint());
+  TQVBoxLayout *tqlayout = new TQVBoxLayout(page, KDialog::spacingHint());
 
   mLabel = new TQLabel( i18n( "Please select the Chiasmus key file to use:" ), page );
-  layout->addWidget( mLabel );
+  tqlayout->addWidget( mLabel );
 
   mListBox = new KListBox( page );
   mListBox->insertStringList( keys );
   const int current = keys.findIndex( currentKey );
   mListBox->setSelected( QMAX( 0, current ), true );
   mListBox->ensureCurrentVisible();
-  layout->addWidget( mListBox, 1 );
+  tqlayout->addWidget( mListBox, 1 );
 
   TQLabel* optionLabel = new TQLabel( i18n( "Additional arguments for chiasmus:" ), page );
-  layout->addWidget( optionLabel );
+  tqlayout->addWidget( optionLabel );
 
   mOptions = new KLineEdit( lastOptions, page );
   optionLabel->setBuddy( mOptions );
-  layout->addWidget( mOptions );
+  tqlayout->addWidget( mOptions );
 
-  layout->addStretch();
+  tqlayout->addStretch();
 
   connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQT_SLOT( slotOk() ) );
   connect( mListBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), this, TQT_SLOT( slotOk() ) );
diff --git a/kmail/compactionjob.cpp b/kmail/compactionjob.cpp
index 243a1753..183b7216 100644
--- a/kmail/compactionjob.cpp
+++ b/kmail/compactionjob.cpp
@@ -28,7 +28,7 @@
 #include "compactionjob.h"
 #include "kmfolder.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "kmfoldermbox.h"
 #include "kmfoldermaildir.h"
 
@@ -97,7 +97,7 @@ int MboxCompactionJob::executeNow( bool silent )
     kdDebug(5006) << storage->location() << " compaction skipped." << endl;
     if ( !mSilent ) {
       TQString str = i18n( "For safety reasons, compaction has been disabled for %1" ).arg( mbox->label() );
-      BroadcastStatus::instance()->setStatusMsg( str );
+      BroadcasStatus::instance()->seStatusMsg( str );
     }
     return 0;
   }
@@ -185,7 +185,7 @@ void MboxCompactionJob::done( int rc )
   mErrorCode = rc;
 
   if ( !mSilent )
-    BroadcastStatus::instance()->setStatusMsg( str );
+    BroadcasStatus::instance()->seStatusMsg( str );
 
   mFolderOpen = false;
   deleteLater(); // later, because of the "return mErrorCode"
@@ -266,7 +266,7 @@ void MaildirCompactionJob::done( int rc )
   if ( storage->isOpened() )
     storage->updateIndex();
   if ( !mSilent )
-    BroadcastStatus::instance()->setStatusMsg( str );
+    BroadcasStatus::instance()->seStatusMsg( str );
 
   mFolderOpen = false;
   deleteLater(); // later, because of the "return mErrorCode"
diff --git a/kmail/composercryptoconfiguration.ui b/kmail/composercryptoconfiguration.ui
index c59c7af0..696334e1 100644
--- a/kmail/composercryptoconfiguration.ui
+++ b/kmail/composercryptoconfiguration.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>ComposerCryptoConfiguration</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -137,7 +137,7 @@ However, there may be local rules that require you to turn this option on. When
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -154,5 +154,5 @@ However, there may be local rules that require you to turn this option on. When
     <tabstop>mAutoEncrypt</tabstop>
     <tabstop>mNeverEncryptWhenSavingInDrafts</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index 4378c325..c5824ead 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -167,7 +167,7 @@ namespace {
 
   void populateButtonGroup( TQButtonGroup * g, const EnumConfigEntry & e ) {
     g->setTitle( i18n( e.desc ) );
-    g->layout()->setSpacing( KDialog::spacingHint() );
+    g->tqlayout()->setSpacing( KDialog::spacingHint() );
     for ( int i = 0 ; i < e.numItems ; ++i )
       g->insert( new TQRadioButton( i18n( e.items[i].desc ), g ), i );
   }
@@ -233,9 +233,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
   // the KCMultiDialog starts with the size of the first kcm, not
   // the largest one. This way at least after the first showing of
   // the largest kcm the size is kept.
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
-  int width = geometry.readNumEntry( "ConfigureDialogWidth" );
-  int height = geometry.readNumEntry( "ConfigureDialogHeight" );
+  KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+  int width = tqgeometry.readNumEntry( "ConfigureDialogWidth" );
+  int height = tqgeometry.readNumEntry( "ConfigureDialogHeight" );
   if ( width != 0 && height != 0 ) {
      setMinimumSize( width, height );
   }
@@ -243,9 +243,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
 }
 
 void ConfigureDialog::hideEvent( TQHideEvent *ev ) {
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
-  geometry.writeEntry( "ConfigureDialogWidth", width() );
-  geometry.writeEntry( "ConfigureDialogHeight",height() );
+  KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+  tqgeometry.writeEntry( "ConfigureDialogWidth", width() );
+  tqgeometry.writeEntry( "ConfigureDialogHeight",height() );
   KDialogBase::hideEvent( ev );
 }
 
@@ -281,7 +281,7 @@ void ConfigureDialog::slotUser2() {
 // *                                                           *
 // *************************************************************
 TQString IdentityPage::helpAnchor() const {
-  return TQString::fromLatin1("configure-identity");
+  return TQString::tqfromLatin1("configure-identity");
 }
 
 IdentityPage::IdentityPage( TQWidget * parent, const char * name )
@@ -480,7 +480,7 @@ void IdentityPage::slotRenameIdentity( TQListViewItem * i,
 
   TQString newName = s.stripWhiteSpace();
   if ( !newName.isEmpty() &&
-       !kmkernel->identityManager()->shadowIdentities().contains( newName ) ) {
+       !kmkernel->identityManager()->shadowIdentities().tqcontains( newName ) ) {
     KPIM::Identity & ident = item->identity();
     ident.setIdentityName( newName );
     emit changed(true);
@@ -552,7 +552,7 @@ void IdentityPage::slotUpdateTransportCombo( const TQStringList & sl )
 // *                                                           *
 // *************************************************************
 TQString AccountsPage::helpAnchor() const {
-  return TQString::fromLatin1("configure-accounts");
+  return TQString::tqfromLatin1("configure-accounts");
 }
 
 AccountsPage::AccountsPage( TQWidget * parent, const char * name )
@@ -578,7 +578,7 @@ AccountsPage::AccountsPage( TQWidget * parent, const char * name )
 }
 
 TQString AccountsPage::SendingTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-accounts-sending");
+  return TQString::tqfromLatin1("configure-accounts-sending");
 }
 
 AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * name )
@@ -597,9 +597,9 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char *
   // label: zero stretch ### FIXME more
   vlay->addWidget( new TQLabel( i18n("Outgoing accounts (add at least one):"), this ) );
 
-  // hbox layout: stretch 10, spacing inherited from vlay
+  // hbox tqlayout: stretch 10, spacing inherited from vlay
   hlay = new TQHBoxLayout();
-  vlay->addLayout( hlay, 10 ); // high stretch b/c of the groupbox's sizeHint
+  vlay->addLayout( hlay, 10 ); // high stretch b/c of the groupbox's tqsizeHint
 
   // transport list: left widget in hlay; stretch 1
   // ### FIXME: allow inline renaming of the account:
@@ -614,7 +614,7 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char *
            this, TQT_SLOT(slotModifySelectedTransport()) );
   hlay->addWidget( mTransportList, 1 );
 
-  // a vbox layout for the buttons: zero stretch, spacing inherited from hlay
+  // a vbox tqlayout for the buttons: zero stretch, spacing inherited from hlay
   btn_vlay = new TQVBoxLayout( hlay );
 
   // "add..." button: stretch 0
@@ -653,8 +653,8 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char *
                          i18n("Common Options"), this );
   vlay->addWidget(group);
 
-  // a grid layout for the contents of the "common options" group box
-  glay = new TQGridLayout( group->layout(), 5, 3, KDialog::spacingHint() );
+  // a grid tqlayout for the contents of the "common options" group box
+  glay = new TQGridLayout( group->tqlayout(), 5, 3, KDialog::spacingHint() );
   glay->setColStretch( 2, 10 );
 
   // "confirm before send" check box:
@@ -787,10 +787,10 @@ void AccountsPage::SendingTab::slotAddTransport()
   KMTransportInfo *transportInfo = new KMTransportInfo();
   switch ( transportType ) {
   case 0: // smtp
-    transportInfo->type = TQString::fromLatin1("smtp");
+    transportInfo->type = TQString::tqfromLatin1("smtp");
     break;
   case 1: // sendmail
-    transportInfo->type = TQString::fromLatin1("sendmail");
+    transportInfo->type = TQString::tqfromLatin1("sendmail");
     transportInfo->name = i18n("Sendmail");
     transportInfo->host = _PATH_SENDMAIL; // ### FIXME: use const, not #define
     break;
@@ -1026,7 +1026,7 @@ void AccountsPage::SendingTab::doLoadOther() {
       buffer[255] = 0;
     else
       buffer[0] = 0;
-    str = TQString::fromLatin1( *buffer ? buffer : "localhost" );
+    str = TQString::tqfromLatin1( *buffer ? buffer : "localhost" );
   }
   mDefaultDomainEdit->setText( str );
 }
@@ -1053,7 +1053,7 @@ void AccountsPage::SendingTab::save() {
 }
 
 TQString AccountsPage::ReceivingTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-accounts-receiving");
+  return TQString::tqfromLatin1("configure-accounts-receiving");
 }
 
 AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const char * name )
@@ -1071,7 +1071,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha
   // label: zero stretch
   vlay->addWidget( new TQLabel( i18n("Incoming accounts (add at least one):"), this ) );
 
-  // hbox layout: stretch 10, spacing inherited from vlay
+  // hbox tqlayout: stretch 10, spacing inherited from vlay
   hlay = new TQHBoxLayout();
   vlay->addLayout( hlay, 10 ); // high stretch to suppress groupbox's growing
 
@@ -1088,7 +1088,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha
            this, TQT_SLOT(slotModifySelectedAccount()) );
   hlay->addWidget( mAccountList, 1 );
 
-  // a vbox layout for the buttons: zero stretch, spacing inherited from hlay
+  // a vbox tqlayout for the buttons: zero stretch, spacing inherited from hlay
   btn_vlay = new TQVBoxLayout( hlay );
 
   // "add..." button: stretch 0
@@ -1123,11 +1123,11 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha
   // "New Mail Notification" group box: stretch 0
   group = new TQVGroupBox( i18n("New Mail Notification"), this );
   vlay->addWidget( group );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
 
   // "beep on new mail" check box:
   mBeepNewMailCheck = new TQCheckBox(i18n("&Beep"), group );
-  mBeepNewMailCheck->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+  mBeepNewMailCheck->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
                                                  TQSizePolicy::Fixed ) );
   connect( mBeepNewMailCheck, TQT_SIGNAL( stateChanged( int ) ),
            this, TQT_SLOT( slotEmitChanged( void ) ) );
@@ -1135,7 +1135,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha
   // "Detailed new mail notification" check box
   mVerboseNotificationCheck =
     new TQCheckBox( i18n( "Deta&iled new mail notification" ), group );
-  mVerboseNotificationCheck->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+  mVerboseNotificationCheck->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
                                                          TQSizePolicy::Fixed ) );
   TQToolTip::add( mVerboseNotificationCheck,
                  i18n( "Show for each folder the number of newly arrived "
@@ -1147,7 +1147,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha
 
   // "Other Actions" button:
   mOtherNewMailActionsButton = new TQPushButton( i18n("Other Actio&ns"), group );
-  mOtherNewMailActionsButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed,
+  mOtherNewMailActionsButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed,
                                                           TQSizePolicy::Fixed ) );
   connect( mOtherNewMailActionsButton, TQT_SIGNAL(clicked()),
            this, TQT_SLOT(slotEditNotifications()) );
@@ -1223,13 +1223,13 @@ void AccountsPage::ReceivingTab::slotAddAccount() {
 
     default:
       // ### FIXME: How should this happen???
-      // replace with assert.
+      // tqreplace with assert.
       KMessageBox::sorry( this, i18n("Unknown account type selected") );
       return;
   }
 
   KMAccount *account
-    = kmkernel->acctMgr()->create( TQString::fromLatin1( accountType ) );
+    = kmkernel->acctMgr()->create( TQString::tqfromLatin1( accountType ) );
   if ( !account ) {
     // ### FIXME: Give the user more information. Is this error
     // recoverable?
@@ -1478,7 +1478,7 @@ void AccountsPage::ReceivingTab::save() {
 // *                                                           *
 // *************************************************************
 TQString AppearancePage::helpAnchor() const {
-  return TQString::fromLatin1("configure-appearance");
+  return TQString::tqfromLatin1("configure-appearance");
 }
 
 AppearancePage::AppearancePage( TQWidget * parent, const char * name )
@@ -1525,7 +1525,7 @@ AppearancePage::AppearancePage( TQWidget * parent, const char * name )
 
 
 TQString AppearancePage::FontsTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-appearance-fonts");
+  return TQString::tqfromLatin1("configure-appearance-fonts");
 }
 
 static const struct {
@@ -1694,7 +1694,7 @@ void AppearancePage::FontsTab::save() {
 }
 
 TQString AppearancePage::ColorsTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-appearance-colors");
+  return TQString::tqfromLatin1("configure-appearance-colors");
 }
 
 
@@ -1857,7 +1857,7 @@ void AppearancePage::ColorsTab::save() {
 }
 
 TQString AppearancePage::LayoutTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-appearance-layout");
+  return TQString::tqfromLatin1("configure-appearance-tqlayout");
 }
 
 static const EnumConfigEntryItem folderListModes[] = {
@@ -1941,33 +1941,33 @@ AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * parent, const char
 
 void AppearancePage::LayoutTab::doLoadOther() {
   const KConfigGroup reader( KMKernel::config(), "Reader" );
-  const KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  const KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
 
-  loadWidget( mFolderListGroup, geometry, folderListMode );
+  loadWidget( mFolderListGroup, tqgeometry, folderListMode );
   loadWidget( mMIMETreeLocationGroup, reader, mimeTreeLocation );
   loadWidget( mMIMETreeModeGroup, reader, mimeTreeMode );
-  loadWidget( mReaderWindowModeGroup, geometry, readerWindowMode );
+  loadWidget( mReaderWindowModeGroup, tqgeometry, readerWindowMode );
   mFavoriteFolderViewCB->setChecked( GlobalSettings::self()->enableFavoriteFolderView() );
 }
 
 void AppearancePage::LayoutTab::installProfile( KConfig * profile ) {
   const KConfigGroup reader( profile, "Reader" );
-  const KConfigGroup geometry( profile, "Geometry" );
+  const KConfigGroup tqgeometry( profile, "Geometry" );
 
-  loadProfile( mFolderListGroup, geometry, folderListMode );
+  loadProfile( mFolderListGroup, tqgeometry, folderListMode );
   loadProfile( mMIMETreeLocationGroup, reader, mimeTreeLocation );
   loadProfile( mMIMETreeModeGroup, reader, mimeTreeMode );
-  loadProfile( mReaderWindowModeGroup, geometry, readerWindowMode );
+  loadProfile( mReaderWindowModeGroup, tqgeometry, readerWindowMode );
 }
 
 void AppearancePage::LayoutTab::save() {
   KConfigGroup reader( KMKernel::config(), "Reader" );
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
 
-  saveButtonGroup( mFolderListGroup, geometry, folderListMode );
+  saveButtonGroup( mFolderListGroup, tqgeometry, folderListMode );
   saveButtonGroup( mMIMETreeLocationGroup, reader, mimeTreeLocation );
   saveButtonGroup( mMIMETreeModeGroup, reader, mimeTreeMode );
-  saveButtonGroup( mReaderWindowModeGroup, geometry, readerWindowMode );
+  saveButtonGroup( mReaderWindowModeGroup, tqgeometry, readerWindowMode );
   GlobalSettings::self()->setEnableFavoriteFolderView( mFavoriteFolderViewCB->isChecked() );
 }
 
@@ -1976,7 +1976,7 @@ void AppearancePage::LayoutTab::save() {
 //
 
 TQString AppearancePage::HeadersTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-appearance-headers");
+  return TQString::tqfromLatin1("configure-appearance-headers");
 }
 
 static const struct {
@@ -2004,7 +2004,7 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
 
   // "General Options" group:
   group = new TQVButtonGroup( i18n( "General Options" ), this );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
 
   mMessageSizeCheck = new TQCheckBox( i18n("Display messa&ge sizes"), group );
 
@@ -2030,7 +2030,7 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
   // "Message Header Threading Options" group:
   mNestingPolicy =
     new TQVButtonGroup( i18n("Threaded Message List Options"), this );
-  mNestingPolicy->layout()->setSpacing( KDialog::spacingHint() );
+  mNestingPolicy->tqlayout()->setSpacing( KDialog::spacingHint() );
 
   mNestingPolicy->insert(
     new TQRadioButton( i18n("Always &keep threads open"),
@@ -2053,11 +2053,11 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
 
   // "Date Display" group:
   mDateDisplay = new TQVButtonGroup( i18n("Date Display"), this );
-  mDateDisplay->layout()->setSpacing( KDialog::spacingHint() );
+  mDateDisplay->tqlayout()->setSpacing( KDialog::spacingHint() );
 
   for ( int i = 0 ; i < numDateDisplayConfig ; i++ ) {
     TQString buttonLabel = i18n(dateDisplayConfig[i].displayName);
-    if ( buttonLabel.contains("%1") )
+    if ( buttonLabel.tqcontains("%1") )
       buttonLabel = buttonLabel.arg( DateFormatter::formatCurrentDate( dateDisplayConfig[i].dateDisplay ) );
     radio = new TQRadioButton( buttonLabel, mDateDisplay );
     mDateDisplay->insert( radio, i );
@@ -2094,8 +2094,8 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
              "<li>ss - the seconds with a leading zero (00-59)</li>"
              "<li>z - the milliseconds without leading zeroes (0-999)</li>"
              "<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-             "<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or \"PM\".</li>"
-             "<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li>"
+             "<li>AP - switch to AM/PM display. AP will be tqreplaced by either \"AM\" or \"PM\".</li>"
+             "<li>ap - switch to AM/PM display. ap will be tqreplaced by either \"am\" or \"pm\".</li>"
              "<li>Z - time zone in numeric form (-0500)</li>"
              "</ul>"
              "<p><strong>All other input characters will be ignored."
@@ -2115,16 +2115,16 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
 
 void AppearancePage::HeadersTab::doLoadOther() {
   KConfigGroup general( KMKernel::config(), "General" );
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
 
   // "General Options":
-  mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages", false ) );
+  mNestedMessagesCheck->setChecked( tqgeometry.readBoolEntry( "nestedMessages", false ) );
   mMessageSizeCheck->setChecked( general.readBoolEntry( "showMessageSize", false ) );
   mCryptoIconsCheck->setChecked( general.readBoolEntry( "showCryptoIcons", false ) );
   mAttachmentCheck->setChecked( general.readBoolEntry( "showAttachmentIcon", true ) );
 
   // "Message Header Threading Options":
-  int num = geometry.readNumEntry( "nestingPolicy", 3 );
+  int num = tqgeometry.readNumEntry( "nestingPolicy", 3 );
   if ( num < 0 || num > 3 ) num = 3;
   mNestingPolicy->setButton( num );
 
@@ -2152,10 +2152,10 @@ void AppearancePage::HeadersTab::setDateDisplay( int num, const TQString & forma
 
 void AppearancePage::HeadersTab::installProfile( KConfig * profile ) {
   KConfigGroup general( profile, "General" );
-  KConfigGroup geometry( profile, "Geometry" );
+  KConfigGroup tqgeometry( profile, "Geometry" );
 
-  if ( geometry.hasKey( "nestedMessages" ) )
-    mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages" ) );
+  if ( tqgeometry.hasKey( "nestedMessages" ) )
+    mNestedMessagesCheck->setChecked( tqgeometry.readBoolEntry( "nestedMessages" ) );
   if ( general.hasKey( "showMessageSize" ) )
     mMessageSizeCheck->setChecked( general.readBoolEntry( "showMessageSize" ) );
 
@@ -2164,8 +2164,8 @@ void AppearancePage::HeadersTab::installProfile( KConfig * profile ) {
   if ( general.hasKey( "showAttachmentIcon" ) )
     mAttachmentCheck->setChecked( general.readBoolEntry( "showAttachmentIcon" ) );
 
-  if ( geometry.hasKey( "nestingPolicy" ) ) {
-    int num = geometry.readNumEntry( "nestingPolicy" );
+  if ( tqgeometry.hasKey( "nestingPolicy" ) ) {
+    int num = tqgeometry.readNumEntry( "nestingPolicy" );
     if ( num < 0 || num > 3 ) num = 3;
     mNestingPolicy->setButton( num );
   }
@@ -2177,16 +2177,16 @@ void AppearancePage::HeadersTab::installProfile( KConfig * profile ) {
 
 void AppearancePage::HeadersTab::save() {
   KConfigGroup general( KMKernel::config(), "General" );
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
 
-  if ( geometry.readBoolEntry( "nestedMessages", false )
+  if ( tqgeometry.readBoolEntry( "nestedMessages", false )
        != mNestedMessagesCheck->isChecked() ) {
     int result = KMessageBox::warningContinueCancel( this,
                    i18n("Changing the global threading setting will override "
                         "all folder specific values."),
                    TQString::null, KStdGuiItem::cont(), "threadOverride" );
     if ( result == KMessageBox::Continue ) {
-      geometry.writeEntry( "nestedMessages", mNestedMessagesCheck->isChecked() );
+      tqgeometry.writeEntry( "nestedMessages", mNestedMessagesCheck->isChecked() );
       // remove all threadMessagesOverride keys from all [Folder-*] groups:
       TQStringList groups = KMKernel::config()->groupList().grep( TQRegExp("^Folder-") );
       kdDebug(5006) << "groups.count() == " << groups.count() << endl;
@@ -2197,7 +2197,7 @@ void AppearancePage::HeadersTab::save() {
     }
   }
 
-  geometry.writeEntry( "nestingPolicy",
+  tqgeometry.writeEntry( "nestingPolicy",
                        mNestingPolicy->id( mNestingPolicy->selected() ) );
   general.writeEntry( "showMessageSize", mMessageSizeCheck->isChecked() );
   general.writeEntry( "showCryptoIcons", mCryptoIconsCheck->isChecked() );
@@ -2246,7 +2246,7 @@ static const BoolConfigEntry showCurrentTime = {
 };
 
 TQString AppearancePage::ReaderTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-appearance-reader");
+  return TQString::tqfromLatin1("configure-appearance-reader");
 }
 
 AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent,
@@ -2276,7 +2276,7 @@ AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent,
   connect( mShowSpamStatusCheck, TQT_SIGNAL ( stateChanged( int ) ),
            this, TQT_SLOT( slotEmitChanged() ) );
 
-  // "replace smileys by emoticons" check box;
+  // "tqreplace smileys by emoticons" check box;
   populateCheckBox( mShowEmoticonsCheck = new TQCheckBox( this ), showEmoticons );
   vlay->addWidget( mShowEmoticonsCheck );
   connect( mShowEmoticonsCheck, TQT_SIGNAL ( stateChanged( int ) ),
@@ -2367,7 +2367,7 @@ void AppearancePage::ReaderTab::readCurrentFallbackCodec()
   TQStringList::ConstIterator it( encodings.begin() );
   TQStringList::ConstIterator end( encodings.end() );
   TQString currentEncoding = GlobalSettings::self()->fallbackCharacterEncoding();
-  currentEncoding = currentEncoding.replace( "iso ", "iso-", false );
+  currentEncoding = currentEncoding.tqreplace( "iso ", "iso-", false );
   ///kdDebug(5006) << "Looking for encoding: " << currentEncoding << endl;
   int i = 0;
   int indexOfLatin9 = 0;
@@ -2472,7 +2472,7 @@ void AppearancePage::ReaderTab::installProfile( KConfig * /* profile */ ) {
 
 
 TQString AppearancePage::SystemTrayTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-appearance-systemtray");
+  return TQString::tqfromLatin1("configure-appearance-systemtray");
 }
 
 AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * parent,
@@ -2490,7 +2490,7 @@ AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * parent,
 
   // System tray modes
   mSystemTrayGroup = new TQVButtonGroup( i18n("System Tray Mode"), this );
-  mSystemTrayGroup->layout()->setSpacing( KDialog::spacingHint() );
+  mSystemTrayGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
   vlay->addWidget( mSystemTrayGroup );
   connect( mSystemTrayGroup, TQT_SIGNAL( clicked( int ) ),
            this, TQT_SLOT( slotEmitChanged( void ) ) );
@@ -2537,7 +2537,7 @@ void AppearancePage::SystemTrayTab::save() {
 // *************************************************************
 
 TQString ComposerPage::helpAnchor() const {
-  return TQString::fromLatin1("configure-composer");
+  return TQString::tqfromLatin1("configure-composer");
 }
 
 ComposerPage::ComposerPage( TQWidget * parent, const char * name )
@@ -2596,7 +2596,7 @@ ComposerPage::ComposerPage( TQWidget * parent, const char * name )
 }
 
 TQString ComposerPage::GeneralTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-composer-general");
+  return TQString::tqfromLatin1("configure-composer-general");
 }
 
 ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * name )
@@ -2766,7 +2766,7 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char *
 
   // The "external editor" group:
   group = new TQVGroupBox( i18n("External Editor"), this );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
 
   mExternalEditorCheck = new TQCheckBox(
            GlobalSettings::self()->useExternalEditorItem()->label(),
@@ -2796,7 +2796,7 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char *
   connect( mExternalEditorCheck, TQT_SIGNAL(toggled(bool)),
            mEditorRequester, TQT_SLOT(setEnabled(bool)) );
 
-  label = new TQLabel( i18n("<b>%f</b> will be replaced with the "
+  label = new TQLabel( i18n("<b>%f</b> will be tqreplaced with the "
                            "filename to edit."), group );
   label->setEnabled( false ); // see above
   connect( mExternalEditorCheck, TQT_SIGNAL(toggled(bool)),
@@ -2910,7 +2910,7 @@ void ComposerPage::GeneralTab::slotConfigureCompletionOrder( )
 }
 
 TQString ComposerPage::PhrasesTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-composer-phrases");
+  return TQString::tqfromLatin1("configure-composer-phrases");
 }
 
 ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * parent, const char * name )
@@ -3020,7 +3020,7 @@ void ComposerPage::PhrasesTab::saveActiveLanguageItem() {
 
 void ComposerPage::PhrasesTab::slotNewLanguage()
 {
-  NewLanguageDialog dialog( mLanguageList, parentWidget(), "New", true );
+  NewLanguageDialog dialog( mLanguageList, tqparentWidget(), "New", true );
   if ( dialog.exec() == TQDialog::Accepted ) slotAddNewLanguage( dialog.language() );
 }
 
@@ -3122,7 +3122,7 @@ void ComposerPage::PhrasesTab::save() {
 }
 
 TQString ComposerPage::TemplatesTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-composer-templates");
+  return TQString::tqfromLatin1("configure-composer-templates");
 }
 
 ComposerPageTemplatesTab::ComposerPageTemplatesTab( TQWidget * parent, const char * name )
@@ -3146,7 +3146,7 @@ void ComposerPage::TemplatesTab::save() {
 }
 
 TQString ComposerPage::CustomTemplatesTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-composer-custom-templates");
+  return TQString::tqfromLatin1("configure-composer-custom-templates");
 }
 
 ComposerPageCustomTemplatesTab::ComposerPageCustomTemplatesTab( TQWidget * parent, const char * name )
@@ -3170,7 +3170,7 @@ void ComposerPage::CustomTemplatesTab::save() {
 }
 
 TQString ComposerPage::SubjectTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-composer-subject");
+  return TQString::tqfromLatin1("configure-composer-subject");
 }
 
 ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * name )
@@ -3185,12 +3185,12 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char *
   vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
 
   group = new TQVGroupBox( i18n("Repl&y Subject Prefixes"), this );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
 
   // row 0: help text:
   label = new TQLabel( i18n("Recognize any sequence of the following prefixes\n"
                            "(entries are case-insensitive regular expressions):"), group );
-  label->setAlignment( AlignLeft|WordBreak );
+  label->tqsetAlignment( AlignLeft|WordBreak );
 
   // row 1, string list editor:
   SimpleStringListEditor::ButtonCode buttonCode =
@@ -3203,7 +3203,7 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char *
   connect( mReplyListEditor, TQT_SIGNAL( changed( void ) ),
            this, TQT_SLOT( slotEmitChanged( void ) ) );
 
-  // row 2: "replace [...]" check box:
+  // row 2: "tqreplace [...]" check box:
   mReplaceReplyPrefixCheck = new TQCheckBox(
      GlobalSettings::self()->replaceReplyPrefixItem()->label(),
      group, "kcfg_ReplaceReplyPrefix" );
@@ -3214,12 +3214,12 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char *
 
 
   group = new TQVGroupBox( i18n("For&ward Subject Prefixes"), this );
-  group->layout()->setSpacing( KDialog::marginHint() );
+  group->tqlayout()->setSpacing( KDialog::marginHint() );
 
   // row 0: help text:
   label= new TQLabel( i18n("Recognize any sequence of the following prefixes\n"
                           "(entries are case-insensitive regular expressions):"), group );
-  label->setAlignment( AlignLeft|WordBreak );
+  label->tqsetAlignment( AlignLeft|WordBreak );
 
   // row 1: string list editor
   mForwardListEditor =
@@ -3231,7 +3231,7 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char *
   connect( mForwardListEditor, TQT_SIGNAL( changed( void ) ),
            this, TQT_SLOT( slotEmitChanged( void ) ) );
 
-  // row 3: "replace [...]" check box:
+  // row 3: "tqreplace [...]" check box:
   mReplaceForwardPrefixCheck = new TQCheckBox(
        GlobalSettings::self()->replaceForwardPrefixItem()->label(),
        group, "kcfg_ReplaceForwardPrefix" );
@@ -3254,7 +3254,7 @@ void ComposerPage::SubjectTab::save() {
 }
 
 TQString ComposerPage::CharsetTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-composer-charset");
+  return TQString::tqfromLatin1("configure-composer-charset");
 }
 
 ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * parent, const char * name )
@@ -3268,8 +3268,8 @@ ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * parent, const char *
 
   label = new TQLabel( i18n("This list is checked for every outgoing message "
                            "from the top to the bottom for a charset that "
-                           "contains all required characters."), this );
-  label->setAlignment( WordBreak);
+                           "tqcontains all required characters."), this );
+  label->tqsetAlignment( WordBreak);
   vlay->addWidget( label );
 
   mCharsetListEditor =
@@ -3297,13 +3297,13 @@ void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) {
 
   // KCharsets::codecForName("us-ascii") returns "iso-8859-1" (cf. Bug #49812)
   // therefore we have to treat this case specially
-  if ( charset.lower() == TQString::fromLatin1("us-ascii") ) {
-    charset = TQString::fromLatin1("us-ascii");
+  if ( charset.lower() == TQString::tqfromLatin1("us-ascii") ) {
+    charset = TQString::tqfromLatin1("us-ascii");
     return;
   }
 
-  if ( charset.lower() == TQString::fromLatin1("locale") ) {
-    charset =  TQString::fromLatin1("%1 (locale)")
+  if ( charset.lower() == TQString::tqfromLatin1("locale") ) {
+    charset =  TQString::tqfromLatin1("%1 (locale)")
       .arg( TQCString( kmkernel->networkCodec()->mimeName() ).lower() );
     return;
   }
@@ -3311,7 +3311,7 @@ void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) {
   bool ok = false;
   TQTextCodec *codec = KGlobal::charsets()->codecForName( charset, ok );
   if ( ok && codec ) {
-    charset = TQString::fromLatin1( codec->mimeName() ).lower();
+    charset = TQString::tqfromLatin1( codec->mimeName() ).lower();
     return;
   }
 
@@ -3325,7 +3325,7 @@ void ComposerPage::CharsetTab::doLoadOther() {
   TQStringList charsets = composer.readListEntry( "pref-charsets" );
   for ( TQStringList::Iterator it = charsets.begin() ;
         it != charsets.end() ; ++it )
-    if ( (*it) == TQString::fromLatin1("locale") ) {
+    if ( (*it) == TQString::tqfromLatin1("locale") ) {
       TQCString cset = kmkernel->networkCodec()->mimeName();
       KPIM::kAsciiToLower( cset.data() );
       (*it) = TQString("%1 (locale)").arg( cset );
@@ -3349,7 +3349,7 @@ void ComposerPage::CharsetTab::save() {
 }
 
 TQString ComposerPage::HeadersTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-composer-headers");
+  return TQString::tqfromLatin1("configure-composer-headers");
 }
 
 ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * name )
@@ -3564,7 +3564,7 @@ void ComposerPage::HeadersTab::save() {
 }
 
 TQString ComposerPage::AttachmentsTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-composer-attachments");
+  return TQString::tqfromLatin1("configure-composer-attachments");
 }
 
 ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent,
@@ -3601,7 +3601,7 @@ ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent,
   // "Attachment key words" label and string list editor
   label = new TQLabel( i18n("Recognize any of the following key words as "
                            "intention to attach a file:"), this );
-  label->setAlignment( AlignLeft|WordBreak );
+  label->tqsetAlignment( AlignLeft|WordBreak );
   vlay->addWidget( label );
 
   SimpleStringListEditor::ButtonCode buttonCode =
@@ -3629,11 +3629,11 @@ void ComposerPage::AttachmentsTab::doLoadFromGlobalSettings() {
   TQStringList attachWordsList = GlobalSettings::self()->attachmentKeywords();
   if ( attachWordsList.isEmpty() ) {
     // default value
-    attachWordsList << TQString::fromLatin1("attachment")
-                    << TQString::fromLatin1("attached");
-    if ( TQString::fromLatin1("attachment") != i18n("attachment") )
+    attachWordsList << TQString::tqfromLatin1("attachment")
+                    << TQString::tqfromLatin1("attached");
+    if ( TQString::tqfromLatin1("attachment") != i18n("attachment") )
       attachWordsList << i18n("attachment");
-    if ( TQString::fromLatin1("attached") != i18n("attached") )
+    if ( TQString::tqfromLatin1("attached") != i18n("attached") )
       attachWordsList << i18n("attached");
   }
 
@@ -3669,7 +3669,7 @@ void ComposerPageAttachmentsTab::slotOutlookCompatibleClicked()
 // *                                                           *
 // *************************************************************
 TQString SecurityPage::helpAnchor() const {
-  return TQString::fromLatin1("configure-security");
+  return TQString::tqfromLatin1("configure-security");
 }
 
 SecurityPage::SecurityPage( TQWidget * parent, const char * name )
@@ -3716,7 +3716,7 @@ void SecurityPage::installProfile( KConfig * profile ) {
 }
 
 TQString SecurityPage::GeneralTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-security-reading");
+  return TQString::tqfromLatin1("configure-security-reading");
 }
 
 SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * name )
@@ -3798,7 +3798,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
 
   // "HTML Messages" group box:
   group = new TQVGroupBox( i18n( "HTML Messages" ), this );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
 
   mHtmlMailCheck = new TQCheckBox( i18n("Prefer H&TML to plain text"), group );
   TQWhatsThis::add( mHtmlMailCheck, htmlWhatsThis );
@@ -3822,14 +3822,14 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
 
   // encrypted messages group
   group = new TQVGroupBox( i18n("Encrypted Messages"), this );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
   mAlwaysDecrypt = new TQCheckBox( i18n( "Attempt decryption of encrypted messages when viewing" ), group );
   connect( mAlwaysDecrypt, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotEmitChanged()) );
   vlay->addWidget( group );
 
   // "Message Disposition Notification" groupbox:
   group = new TQVGroupBox( i18n("Message Disposition Notifications"), this );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
 
 
   // "ignore", "ask", "deny", "always send" radiobutton line:
@@ -3897,7 +3897,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
 
   // "Attached keys" group box:
   group = new TQVGroupBox( i18n( "Certificate && Key Bundle Attachments" ), this );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
 
   mAutomaticallyImportAttachedKeysCheck = new TQCheckBox( i18n("Automatically import keys and certificates"), group );
   connect( mAutomaticallyImportAttachedKeysCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) );
@@ -3993,7 +3993,7 @@ void SecurityPage::GeneralTab::save() {
 
 
 TQString SecurityPage::ComposerCryptoTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-security-composing");
+  return TQString::tqfromLatin1("configure-security-composing");
 }
 
 SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( TQWidget * parent, const char * name )
@@ -4068,7 +4068,7 @@ void SecurityPage::ComposerCryptoTab::save() {
 }
 
 TQString SecurityPage::WarningTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-security-warnings");
+  return TQString::tqfromLatin1("configure-security-warnings");
 }
 
 SecurityPageWarningTab::SecurityPageWarningTab( TQWidget * parent, const char * name )
@@ -4177,7 +4177,7 @@ void SecurityPage::WarningTab::slotReenableAllWarningsClicked() {
 ////
 
 TQString SecurityPage::SMimeTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-security-smime-validation");
+  return TQString::tqfromLatin1("configure-security-smime-validation");
 }
 
 SecurityPageSMimeTab::SecurityPageSMimeTab( TQWidget * parent, const char * name )
@@ -4495,7 +4495,7 @@ Kleo::CryptoConfigEntry* SMIMECryptoConfigEntries::configEntry( const char* comp
 ////
 
 TQString SecurityPage::CryptPlugTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-security-crypto-backends");
+  return TQString::tqfromLatin1("configure-security-crypto-backends");
 }
 
 SecurityPageCryptPlugTab::SecurityPageCryptPlugTab( TQWidget * parent, const char * name )
@@ -4528,7 +4528,7 @@ void SecurityPage::CryptPlugTab::save() {
 // *                                                           *
 // *************************************************************
 TQString MiscPage::helpAnchor() const {
-  return TQString::fromLatin1("configure-misc");
+  return TQString::tqfromLatin1("configure-misc");
 }
 
 MiscPage::MiscPage( TQWidget * parent, const char * name )
@@ -4543,7 +4543,7 @@ MiscPage::MiscPage( TQWidget * parent, const char * name )
 }
 
 TQString MiscPage::FolderTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-misc-folders");
+  return TQString::tqfromLatin1("configure-misc-folders");
 }
 
 MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name )
@@ -4797,7 +4797,7 @@ void MiscPage::FolderTab::save() {
 }
 
 TQString MiscPage::GroupwareTab::helpAnchor() const {
-  return TQString::fromLatin1("configure-misc-groupware");
+  return TQString::tqfromLatin1("configure-misc-groupware");
 }
 
 MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name )
diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp
index 5cc86ccc..e17e800e 100644
--- a/kmail/configuredialog_p.cpp
+++ b/kmail/configuredialog_p.cpp
@@ -43,7 +43,7 @@ NewIdentityDialog::NewIdentityDialog( const TQStringList & identities,
   : KDialogBase( parent, name, modal, i18n("New Identity"),
 		 Ok|Cancel|Help, Ok, true )
 {
-  setHelp( TQString::fromLatin1("configure-identity-newidentitydialog") );
+  setHelp( TQString::tqfromLatin1("configure-identity-newidentitydialog") );
   TQWidget * page = makeMainWidget();
   TQVBoxLayout * vlay = new TQVBoxLayout( page, 0, spacingHint() );
 
@@ -169,33 +169,33 @@ void ListView::setVisibleItem( int visibleItem, bool updateSize )
   mVisibleItem = QMAX( 1, visibleItem );
   if( updateSize == true )
   {
-    TQSize s = sizeHint();
-    setMinimumSize( s.width() + verticalScrollBar()->sizeHint().width() +
+    TQSize s = tqsizeHint();
+    setMinimumSize( s.width() + verticalScrollBar()->tqsizeHint().width() +
 		    lineWidth() * 2, s.height() );
   }
 }
 
 
-TQSize ListView::sizeHint() const
+TQSize ListView::tqsizeHint() const
 {
-  TQSize s = TQListView::sizeHint();
+  TQSize s = TQListView::tqsizeHint();
 
   int h = fontMetrics().height() + 2*itemMargin();
   if( h % 2 > 0 ) { h++; }
 
-  s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->sizeHint().height());
+  s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->tqsizeHint().height());
   return s;
 }
 
 
-static TQString flagPng = TQString::fromLatin1("/flag.png");
+static TQString flagPng = TQString::tqfromLatin1("/flag.png");
 
 NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs,
 				      TQWidget *parent, const char *name,
 				      bool modal )
   : KDialogBase( parent, name, modal, i18n("New Language"), Ok|Cancel, Ok, true )
 {
-  // layout the page (a combobox with label):
+  // tqlayout the page (a combobox with label):
   TQWidget *page = makeMainWidget();
   TQHBoxLayout *hlay = new TQHBoxLayout( page, 0, spacingHint() );
   mComboBox = new TQComboBox( false, page );
@@ -203,7 +203,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs,
   hlay->addWidget( mComboBox, 1 );
 
   TQStringList pathList = KGlobal::dirs()->findAllResources( "locale",
-                               TQString::fromLatin1("*/entry.desktop") );
+                               TQString::tqfromLatin1("*/entry.desktop") );
   // extract a list of language tags that should not be included:
   TQStringList suppressedAcronyms;
   for ( LanguageItemList::Iterator lit = suppressedLangs.begin();
@@ -224,7 +224,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs,
 
     if ( suppressedAcronyms.find( acronym ) == suppressedAcronyms.end() ) {
       // not found:
-      TQString displayname = TQString::fromLatin1("%1 (%2)")
+      TQString displayname = TQString::tqfromLatin1("%1 (%2)")
 	.arg( name ).arg( acronym );
       TQPixmap flag( locate("locale", acronym + flagPng ) );
       mComboBox->insertItem( flag, displayname );
@@ -251,11 +251,11 @@ LanguageComboBox::LanguageComboBox( bool rw, TQWidget *parent, const char *name
 
 int LanguageComboBox::insertLanguage( const TQString & language )
 {
-  static TQString entryDesktop = TQString::fromLatin1("/entry.desktop");
+  static TQString entryDesktop = TQString::tqfromLatin1("/entry.desktop");
   KSimpleConfig entry( locate("locale", language + entryDesktop) );
   entry.setGroup( "KCM Locale" );
   TQString name = entry.readEntry( "Name" );
-  TQString output = TQString::fromLatin1("%1 (%2)").arg( name ).arg( language );
+  TQString output = TQString::tqfromLatin1("%1 (%2)").arg( name ).arg( language );
   insertItem( TQPixmap( locate("locale", language + flagPng ) ), output );
   return listBox()->index( listBox()->findItem(output) );
 }
@@ -269,7 +269,7 @@ TQString LanguageComboBox::language() const
 
 void LanguageComboBox::setLanguage( const TQString & language )
 {
-  TQString parenthizedLanguage = TQString::fromLatin1("(%1)").arg( language );
+  TQString parenthizedLanguage = TQString::tqfromLatin1("(%1)").arg( language );
   for (int i = 0; i < count(); i++)
     // ### FIXME: use .endWith():
     if ( text(i).find( parenthizedLanguage ) >= 0 ) {
@@ -323,7 +323,7 @@ void ProfileDialog::slotSelectionChanged()
 void ProfileDialog::setup() {
   mListView->clear();
   // find all profiles (config files named "profile-xyz-rc"):
-  const TQString profileFilenameFilter = TQString::fromLatin1("kmail/profile-*-rc");
+  const TQString profileFilenameFilter = TQString::tqfromLatin1("kmail/profile-*-rc");
   mProfileList = KGlobal::dirs()->findAllResources( "data", profileFilenameFilter );
 
   kdDebug(5006) << "Profile manager: found " << mProfileList.count()
diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h
index 096ba45a..f12c39ba 100644
--- a/kmail/configuredialog_p.h
+++ b/kmail/configuredialog_p.h
@@ -398,7 +398,7 @@ public:
   TQString helpAnchor() const;
 
 
-  // hrmpf. moc doesn't like nested classes with slots/signals...:
+  // hrmpf. tqmoc doesn't like nested classes with slots/signals...:
   typedef AccountsPageSendingTab SendingTab;
   typedef AccountsPageReceivingTab ReceivingTab;
 
@@ -570,7 +570,7 @@ public:
 
   TQString helpAnchor() const;
 
-  // hrmpf. moc doesn't like nested classes with slots/signals...:
+  // hrmpf. tqmoc doesn't like nested classes with slots/signals...:
   typedef AppearancePageFontsTab FontsTab;
   typedef AppearancePageColorsTab ColorsTab;
   typedef AppearancePageLayoutTab LayoutTab;
@@ -790,7 +790,7 @@ public:
 
   TQString helpAnchor() const;
 
-  // hrmpf. moc doesn't like nested classes with slots/signals...:
+  // hrmpf. tqmoc doesn't like nested classes with slots/signals...:
   typedef ComposerPageGeneralTab GeneralTab;
   typedef ComposerPagePhrasesTab PhrasesTab;
   typedef ComposerPageTemplatesTab TemplatesTab;
@@ -1057,7 +1057,7 @@ public:
   void resizeColums();
 
   void setVisibleItem( int visibleItem, bool updateSize=true );
-  virtual TQSize sizeHint() const;
+  virtual TQSize tqsizeHint() const;
 
 protected:
   virtual void resizeEvent( TQResizeEvent *e );
diff --git a/kmail/customtemplates_base.ui b/kmail/customtemplates_base.ui
index 6a578030..ab8ecb84 100644
--- a/kmail/customtemplates_base.ui
+++ b/kmail/customtemplates_base.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>CustomTemplatesBase</class>
 <widget class="QWidget">
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -15,7 +15,7 @@
         </property>
         <widget class="QLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout9</cstring>
+                <cstring>tqlayout9</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -26,7 +26,7 @@
                 </property>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -47,7 +47,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>100</width>
                                     <height>0</height>
@@ -147,7 +147,7 @@
                 </property>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -155,7 +155,7 @@
                         </property>
                         <widget class="QLayoutWidget">
                             <property name="name">
-                                <cstring>layout6</cstring>
+                                <cstring>tqlayout6</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -181,7 +181,7 @@
                         </widget>
                         <widget class="QLayoutWidget">
                             <property name="name">
-                                <cstring>layout7</cstring>
+                                <cstring>tqlayout7</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -222,7 +222,7 @@
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -260,7 +260,7 @@
                             <property name="text">
                                 <string>Shortc&amp;ut:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -282,7 +282,7 @@
                             <property name="text">
                                 <string>&amp;Template type:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -355,7 +355,7 @@
     <slot>mAdd_clicked()</slot>
     <slot>mRemove_clicked()</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kmail/distributionlistdialog.cpp b/kmail/distributionlistdialog.cpp
index 47051866..5f590b3b 100644
--- a/kmail/distributionlistdialog.cpp
+++ b/kmail/distributionlistdialog.cpp
@@ -131,7 +131,7 @@ void DistributionListDialog::setRecipients( const Recipient::List &recipients )
       if ( !email.isEmpty() ) {
         DistributionListItem *item = new DistributionListItem( mRecipientsList );
         KABC::Addressee::List addressees =
-          KABC::StdAddressBook::self( true )->findByEmail( email );
+          KABC::StdAddressBook::self( true )->tqfindByEmail( email );
         if ( addressees.isEmpty() ) {
           KABC::Addressee a;
           a.setNameFromString( name );
diff --git a/kmail/editorwatcher.cpp b/kmail/editorwatcher.cpp
index dbf5f3f9..bca75762 100644
--- a/kmail/editorwatcher.cpp
+++ b/kmail/editorwatcher.cpp
@@ -49,13 +49,13 @@
 using namespace KMail;
 
 EditorWatcher::EditorWatcher(const KURL & url, const TQString &mimeType, bool openWith,
-                             TQObject * parent, TQWidget *parentWidget) :
+                             TQObject * parent, TQWidget *tqparentWidget) :
     TQObject( parent ),
     mUrl( url ),
     mMimeType( mimeType ),
     mOpenWith( openWith ),
     mEditor( 0 ),
-    mParentWidget( parentWidget ),
+    mParentWidget( tqparentWidget ),
     mHaveInotify( false ),
     mFileOpen( false ),
     mEditorRunning( false ),
@@ -127,11 +127,11 @@ void EditorWatcher::inotifyEvent()
       struct inotify_event *event = (struct inotify_event *) &buffer[offset];
       size -= sizeof( struct inotify_event ) + event->len;
       offset += sizeof( struct inotify_event ) + event->len;
-      if ( event->mask & IN_OPEN )
+      if ( event->tqmask & IN_OPEN )
         mFileOpen = true;
-      if ( event->mask & IN_CLOSE )
+      if ( event->tqmask & IN_CLOSE )
         mFileOpen = false;
-      if ( event->mask & IN_MODIFY )
+      if ( event->tqmask & IN_MODIFY )
         mFileModified = true;
     }
   }
diff --git a/kmail/editorwatcher.h b/kmail/editorwatcher.h
index 839386f8..35504d85 100644
--- a/kmail/editorwatcher.h
+++ b/kmail/editorwatcher.h
@@ -43,11 +43,11 @@ class EditorWatcher : public QObject
      * Constructs an EditorWatcher.
      * @param parent the parent object of this EditorWatcher, which will take care of deleting
      *               this EditorWatcher if the parent is deleted.
-     * @param parentWidget the parent widget of this EditorWatcher, which will be used as the parent
+     * @param tqparentWidget the parent widget of this EditorWatcher, which will be used as the parent
      *                     widget for message dialogs.
      */
     EditorWatcher( const KURL &url, const TQString &mimeType, bool openWith,
-                   TQObject *parent, TQWidget *parentWidget );
+                   TQObject *parent, TQWidget *tqparentWidget );
     bool start();
     bool fileChanged() const { return mFileModified; }
   signals:
diff --git a/kmail/encodingdetector.cpp b/kmail/encodingdetector.cpp
index f036a193..df595b36 100644
--- a/kmail/encodingdetector.cpp
+++ b/kmail/encodingdetector.cpp
@@ -824,7 +824,7 @@ EncodingDetector::EncodingChoiceSource EncodingDetector::encodingChoiceSource()
 const char* EncodingDetector::encoding() const
 {
     d->m_storeDecoderName = d->m_codec->name();
-    d->m_storeDecoderName = d->m_storeDecoderName.lower().replace( "iso ", "iso-" );
+    d->m_storeDecoderName = d->m_storeDecoderName.lower().tqreplace( "iso ", "iso-" );
     return d->m_storeDecoderName.data();
 }
 
diff --git a/kmail/encodingdetector.h b/kmail/encodingdetector.h
index 378a1e07..b2dd9766 100644
--- a/kmail/encodingdetector.h
+++ b/kmail/encodingdetector.h
@@ -35,7 +35,7 @@ class EncodingDetectorPrivate;
  * Searches for encoding declaration inside raw data -- meta and xml tags. 
  * In the case it can't find it, uses heuristics for specified language.
  *
- * If it finds unicode BOM marks, it changes encoding regardless of what the user has told
+ * If it finds tqunicode BOM marks, it changes encoding regardless of what the user has told
  *
  * Intended lifetime of the object: one instance per document.
  *
diff --git a/kmail/expirejob.cpp b/kmail/expirejob.cpp
index a97c0842..010a9d00 100644
--- a/kmail/expirejob.cpp
+++ b/kmail/expirejob.cpp
@@ -31,7 +31,7 @@
 #include "globalsettings.h"
 #include "folderstorage.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "kmcommands.h"
 
 #include <kdebug.h>
@@ -190,7 +190,7 @@ void ExpireJob::done()
     }
   }
   if ( !str.isEmpty() )
-    BroadcastStatus::instance()->setStatusMsg( str );
+    BroadcasStatus::instance()->seStatusMsg( str );
 
   KConfigGroup group( KMKernel::config(), "Folder-" + mSrcFolder->idString() );
   group.writeEntry( "Current", -1 ); // i.e. make it invalid, the serial number will be used
@@ -244,7 +244,7 @@ void ExpireJob::slotMessagesMoved( KMCommand *command )
     }
   default: ;
   }
-  BroadcastStatus::instance()->setStatusMsg( msg );
+  BroadcasStatus::instance()->seStatusMsg( msg );
 
   deleteLater();
 }
diff --git a/kmail/expirypropertiesdialog.cpp b/kmail/expirypropertiesdialog.cpp
index c524f8b3..4913d1c6 100644
--- a/kmail/expirypropertiesdialog.cpp
+++ b/kmail/expirypropertiesdialog.cpp
@@ -73,7 +73,7 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo
 
   labelDays2 = new TQLabel( privateLayoutWidget, "labelDays2" );
   labelDays2->setText( i18n( "days" ) );
-  labelDays2->setAlignment( int( TQLabel::AlignTop ) );
+  labelDays2->tqsetAlignment( int( TQLabel::AlignTop ) );
   unreadHBox->addWidget( labelDays2 );
   globalVBox->addLayout( unreadHBox );
 
@@ -81,7 +81,7 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo
 
   expiryActionLabel = new TQLabel( privateLayoutWidget, "expiryActionLabel" );
   expiryActionLabel->setText( i18n( "Expiry action:" ) );
-  expiryActionLabel->setAlignment( int( TQLabel::AlignVCenter ) );
+  expiryActionLabel->tqsetAlignment( int( TQLabel::AlignVCenter ) );
   expiryActionHBox->addWidget( expiryActionLabel );
 
   actionsHBox = new TQVBoxLayout( 0, 0, 6, "actionsHBox");
@@ -111,7 +111,7 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo
 
   note = new TQLabel( privateLayoutWidget, "note" );
   note->setText( i18n( "Note: Expiry action will be applied immediately after confirming settings." ) );
-  note->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+  note->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
   globalVBox->addWidget( note );
 
   // Load the values from the folder
@@ -144,7 +144,7 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo
       folderSelector->setFolder( destFolder );
   }
   slotUpdateControls();
-  resize( TQSize(295, 204).expandedTo(minimumSizeHint()) );
+  resize( TQSize(295, 204).expandedTo(tqminimumSizeHint()) );
   clearWState( WState_Polished );
 }
 
diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp
index 5d8e3d13..d7098687 100644
--- a/kmail/favoritefolderview.cpp
+++ b/kmail/favoritefolderview.cpp
@@ -58,7 +58,7 @@ FavoriteFolderViewItem::FavoriteFolderViewItem(FavoriteFolderView * parent, cons
   connect( folder, TQT_SIGNAL(nameChanged()), TQT_SLOT(nameChanged()) );
   connect( folder, TQT_SIGNAL(iconsChanged()), TQT_SLOT(slotIconsChanged()) );
 
-  connect( folder, TQT_SIGNAL(msgAdded(KMFolder*,Q_UINT32)), TQT_SLOT(updateCount()) );
+  connect( folder, TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), TQT_SLOT(updateCount()) );
   connect( folder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), TQT_SLOT(updateCount()) );
   connect( folder, TQT_SIGNAL(msgRemoved(KMFolder*)), TQT_SLOT(updateCount()) );
   connect( folder, TQT_SIGNAL(folderSizeChanged( KMFolder* )), TQT_SLOT(updateCount()) );
@@ -74,7 +74,7 @@ FavoriteFolderViewItem::FavoriteFolderViewItem(FavoriteFolderView * parent, cons
 void FavoriteFolderViewItem::nameChanged()
 {
   TQString txt = text( 0 );
-  txt.replace( mOldName, folder()->label() );
+  txt.tqreplace( mOldName, folder()->label() );
   setText( 0, txt );
   mOldName = folder()->label();
 }
@@ -253,7 +253,7 @@ void FavoriteFolderView::itemClicked(TQListViewItem * item)
   if ( !item ) return;
   if ( !item->isSelected() )
     item->setSelected( true );
-  item->repaint();
+  item->tqrepaint();
   handleGroupwareFolder( static_cast<KMFolderTreeItem*>( item ) );
 }
 
@@ -267,11 +267,11 @@ void FavoriteFolderView::folderTreeSelectionChanged(KMFolder * folder)
       fti->setSelected( true );
       setCurrentItem( fti );
       ensureItemVisible( fti );
-      fti->repaint();
+      fti->tqrepaint();
       found = true;
     } else if ( fti->folder() != folder && fti->isSelected() ) {
       fti->setSelected( false );
-      fti->repaint();
+      fti->tqrepaint();
     }
   }
   blockSignals( false );
@@ -309,7 +309,7 @@ void FavoriteFolderView::dropped(TQDropEvent * e, TQListViewItem * after)
       KMFolderTreeItem *fti = static_cast<KMFolderTreeItem*>( it.current() );
       if ( !fti->folder() )
         continue;
-      if( !mFolderToItem.contains( fti->folder() ) )
+      if( !mFolderToItem.tqcontains( fti->folder() ) )
          afterItem = addFolder( fti->folder(), prettyName( fti ), afterItem );
     }
     e->accept();
@@ -369,7 +369,7 @@ void FavoriteFolderView::initializeFavorites()
   assert( ft );
   for ( TQListViewItemIterator it( ft ); it.current(); ++it ) {
     KMFolderTreeItem *fti = static_cast<KMFolderTreeItem*>( it.current() );
-    if ( fti->type() == KFolderTreeItem::Inbox && fti->folder() && !seenInboxes.contains( fti->folder()->id() ) ) {
+    if ( fti->type() == KFolderTreeItem::Inbox && fti->folder() && !seenInboxes.tqcontains( fti->folder()->id() ) ) {
       seenInboxes.append( fti->folder()->id() );
       if ( fti->folder() == kmkernel->inboxFolder() && hideLocalInbox() )
         continue;
@@ -457,7 +457,7 @@ void FavoriteFolderView::addFolder()
   KMFolder *folder = dlg.folder();
   if ( !folder )
     return;
-  if ( mFolderToItem.contains( folder ) )
+  if ( mFolderToItem.tqcontains( folder ) )
     return;
 
   KMFolderTreeItem *fti = findFolderTreeItem( folder );
@@ -468,7 +468,7 @@ void KMail::FavoriteFolderView::addFolder(KMFolderTreeItem * fti)
 {
   if ( !fti || !fti->folder() )
     return;
-  if ( !mFolderToItem.contains( fti->folder()  ) )
+  if ( !mFolderToItem.tqcontains( fti->folder()  ) )
     addFolder( fti->folder(), prettyName( fti ) );
 }
 
@@ -524,7 +524,7 @@ void FavoriteFolderView::refresh()
     KMFolderTreeItem* fti = static_cast<KMFolderTreeItem*>(it.current());
     if (!fti || !fti->folder())
       continue;
-    fti->repaint();
+    fti->tqrepaint();
   }
   update();
 }
diff --git a/kmail/filterlog.h b/kmail/filterlog.h
index d49efb22..f336621a 100644
--- a/kmail/filterlog.h
+++ b/kmail/filterlog.h
@@ -135,7 +135,7 @@ namespace KMail {
       /** Non-public constructor needed by the singleton implementation */
       FilterLog();
       
-      /** The list contains the single log pieces */
+      /** The list tqcontains the single log pieces */
       TQStringList mLogEntries;
       
       /** the log status */
diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp
index bebd9c31..58130a05 100644
--- a/kmail/folderdiaacltab.cpp
+++ b/kmail/folderdiaacltab.cpp
@@ -259,8 +259,8 @@ void KMail::FolderDiaACLTab::ListViewItem::load( const ACLListEntry& entry )
   // since it uses space as a separator (imap4.cc, look for GETACL)
   // It's ok in distribution list names though, that's why this check is only done here
   // and also why there's no validator on the lineedit.
-  if ( entry.userId.contains( ' ' ) )
-    kdWarning(5006) << "Userid contains a space!!!  '" << entry.userId << "'" << endl;
+  if ( entry.userId.tqcontains( ' ' ) )
+    kdWarning(5006) << "Userid tqcontains a space!!!  '" << entry.userId << "'" << endl;
 
   setUserId( entry.userId );
   mPermissions = entry.permissions;
@@ -328,7 +328,7 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent,
   topLayout->addWidget( mStack );
 
   mLabel = new TQLabel( mStack );
-  mLabel->setAlignment( AlignHCenter | AlignVCenter | WordBreak );
+  mLabel->tqsetAlignment( AlignHCenter | AlignVCenter | WordBreak );
   mStack->addWidget( mLabel );
 
   mACLWidget = new TQHBox( mStack );
@@ -352,7 +352,7 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent,
   mEditACL = new KPushButton( i18n( "Modify Entry..." ), buttonBox );
   mRemoveACL = new KPushButton( i18n( "Remove Entry" ), buttonBox );
   TQWidget *spacer = new TQWidget( buttonBox );
-  spacer->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding );
+  spacer->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding );
 
   connect( mAddACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAddACL() ) );
   connect( mEditACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditACL() ) );
@@ -632,7 +632,7 @@ void KMail::FolderDiaACLTab::slotRemoveACL()
     return;
   if ( !ACLitem->isNew() ) {
     if ( mImapAccount && mImapAccount->login() == ACLitem->userId() ) {
-      if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel( topLevelWidget(),
+      if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel( tqtopLevelWidget(),
          i18n( "Do you really want to remove your own permissions for this folder? You will not be able to access it afterwards." ), i18n( "Remove" ) ) )
         return;
     }
@@ -642,7 +642,7 @@ void KMail::FolderDiaACLTab::slotRemoveACL()
   emit changed(true);
 }
 
-KMail::FolderDiaTab::AcceptStatus KMail::FolderDiaACLTab::accept()
+KMail::FolderDiaTab::AccepStatus KMail::FolderDiaACLTab::accept()
 {
   if ( !mChanged || !mImapAccount )
     return Accepted; // (no change made), ok for accepting the dialog immediately
@@ -699,7 +699,7 @@ bool KMail::FolderDiaACLTab::save()
     TQString uid = (*init).userId;
     for( ACLList::ConstIterator it = aclList.begin(); it != aclList.end() && !isInNewList; ++it )
       isInNewList = uid == (*it).userId;
-    if ( !isInNewList && !mRemovedACLs.contains(uid) )
+    if ( !isInNewList && !mRemovedACLs.tqcontains(uid) )
       mRemovedACLs.append( uid );
   }
 
diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h
index 6576d13e..d9116a6b 100644
--- a/kmail/folderdiaacltab.h
+++ b/kmail/folderdiaacltab.h
@@ -92,7 +92,7 @@ public:
 
   virtual void load();
   virtual bool save();
-  virtual AcceptStatus accept();
+  virtual AccepStatus accept();
 
   static bool supports( KMFolder* refFolder );
 
diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp
index 01cb8dbb..99954cc2 100644
--- a/kmail/folderdiaquotatab.cpp
+++ b/kmail/folderdiaquotatab.cpp
@@ -62,7 +62,7 @@ KMail::FolderDiaQuotaTab::FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* pare
   topLayout->addWidget( mStack );
 
   mLabel = new TQLabel( mStack );
-  mLabel->setAlignment( AlignHCenter | AlignVCenter | WordBreak );
+  mLabel->tqsetAlignment( AlignHCenter | AlignVCenter | WordBreak );
   mStack->addWidget( mLabel );
 
   mQuotaWidget = new KMail::QuotaWidget( mStack );
@@ -187,7 +187,7 @@ void KMail::FolderDiaQuotaTab::showQuotaWidget()
 }
 
 
-KMail::FolderDiaTab::AcceptStatus KMail::FolderDiaQuotaTab::accept()
+KMail::FolderDiaTab::AccepStatus KMail::FolderDiaQuotaTab::accept()
 {
   if ( mFolderType == KMFolderTypeCachedImap || mFolderType == KMFolderTypeImap )
     return Accepted;
diff --git a/kmail/folderdiaquotatab.h b/kmail/folderdiaquotatab.h
index e0b570ee..2fc956e9 100644
--- a/kmail/folderdiaquotatab.h
+++ b/kmail/folderdiaquotatab.h
@@ -59,7 +59,7 @@ public:
 
   virtual void load();
   virtual bool save();
-  virtual AcceptStatus accept();
+  virtual AccepStatus accept();
 
   static bool supports( KMFolder* refFolder );
 
diff --git a/kmail/folderdiaquotatab_p.cpp b/kmail/folderdiaquotatab_p.cpp
index be623fe3..86d399d8 100644
--- a/kmail/folderdiaquotatab_p.cpp
+++ b/kmail/folderdiaquotatab_p.cpp
@@ -56,19 +56,19 @@ QuotaWidget::QuotaWidget( TQWidget* parent, const char* name )
 {
       TQVBoxLayout *box = new TQVBoxLayout(this);
       TQWidget *stuff = new TQWidget( this );
-      TQGridLayout* layout =
+      TQGridLayout* tqlayout =
           new TQGridLayout( stuff, 3, 3,
                            KDialog::marginHint(),
                            KDialog::spacingHint() );
       mInfoLabel = new TQLabel("", stuff );
       mRootLabel = new TQLabel("", stuff );
       mProgressBar = new TQProgressBar( stuff );
-      layout->addWidget( new TQLabel( i18n("Root:" ), stuff ), 0, 0 );
-      layout->addWidget( mRootLabel, 0, 1 );
-      layout->addWidget( new TQLabel( i18n("Usage:"), stuff ), 1, 0 );
-      //layout->addWidget( new TQLabel( i18n("Status:"), stuff ), 2, 0 );
-      layout->addWidget( mInfoLabel, 1, 1 );
-      layout->addWidget( mProgressBar, 2, 1 );
+      tqlayout->addWidget( new TQLabel( i18n("Root:" ), stuff ), 0, 0 );
+      tqlayout->addWidget( mRootLabel, 0, 1 );
+      tqlayout->addWidget( new TQLabel( i18n("Usage:"), stuff ), 1, 0 );
+      //tqlayout->addWidget( new TQLabel( i18n("Status:"), stuff ), 2, 0 );
+      tqlayout->addWidget( mInfoLabel, 1, 1 );
+      tqlayout->addWidget( mProgressBar, 2, 1 );
       box->addWidget( stuff );
       box->addStretch( 2 );
 }
diff --git a/kmail/folderjob.h b/kmail/folderjob.h
index b1f71251..2988c925 100644
--- a/kmail/folderjob.h
+++ b/kmail/folderjob.h
@@ -127,7 +127,7 @@ signals:
 
   /**
    * Emitted when a list of messages has been
-   * copied to the specified location. TQPtrList contains
+   * copied to the specified location. TQPtrList tqcontains
    * the list of the copied messages.
    */
   void messageCopied( TQPtrList<KMMessage> );
@@ -153,7 +153,7 @@ signals:
   void result( KMail::FolderJob* job );
 
   /**
-   * This progress signal contains the "done" and the "total" numbers so
+   * This progress signal tqcontains the "done" and the "total" numbers so
    * that the caller can either make a % out of it, or combine it into
    * a higher-level progress info.
    */
diff --git a/kmail/folderpropertiesdialog.ui b/kmail/folderpropertiesdialog.ui
index 417e8df4..45fa7015 100644
--- a/kmail/folderpropertiesdialog.ui
+++ b/kmail/folderpropertiesdialog.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KMFolderDialogUI</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -73,7 +73,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -104,7 +104,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -140,13 +140,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>28</width>
                             <height>28</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>28</width>
                             <height>28</height>
@@ -166,7 +166,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -188,13 +188,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>28</width>
                             <height>28</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>28</width>
                             <height>28</height>
@@ -228,7 +228,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>101</width>
                             <height>20</height>
@@ -296,7 +296,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -321,7 +321,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -434,7 +434,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -507,7 +507,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>120</width>
                             <height>80</height>
@@ -633,6 +633,6 @@
 <slots>
     <slot access="protected">slotChangeIcon( QString )</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kmail/folderrequester.cpp b/kmail/folderrequester.cpp
index 553fc5a0..2be44c5a 100644
--- a/kmail/folderrequester.cpp
+++ b/kmail/folderrequester.cpp
@@ -55,7 +55,7 @@ FolderRequester::FolderRequester( TQWidget *parent, KMFolderTree *tree )
   button->setIconSet( KGlobal::iconLoader()->loadIconSet( "folder", KIcon::Small, 0 ) );
   connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpenDialog()) );
 
-  setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+  tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
         TQSizePolicy::Fixed ) );
   setFocusPolicy( TQWidget::StrongFocus );
 }
diff --git a/kmail/folderrequester.h b/kmail/folderrequester.h
index 30e39c63..9d7493c8 100644
--- a/kmail/folderrequester.h
+++ b/kmail/folderrequester.h
@@ -38,7 +38,7 @@ class KMFolderTree;
 namespace KMail {
 
   /**
-   * A widget that contains a KLineEdit which shows the current folder
+   * A widget that tqcontains a KLineEdit which shows the current folder
    * and a button that fires a KMFolderSelDlg
    * The dialog is set to disable readonly folders by default
    * Search folders are excluded
diff --git a/kmail/foldersetselector.cpp b/kmail/foldersetselector.cpp
index c35fd0c1..147d98a0 100644
--- a/kmail/foldersetselector.cpp
+++ b/kmail/foldersetselector.cpp
@@ -76,7 +76,7 @@ void FolderSetSelector::setSelectedFolders(const TQValueList< int > & folderIds)
   while ( it.current() ) {
     SimpleFolderTreeItem<TQCheckListItem> *item = dynamic_cast<SimpleFolderTreeItem<TQCheckListItem>*>( it.current() );
     if ( item && item->folder() ) {
-      if ( folderIds.contains( item->folder()->id() ) )
+      if ( folderIds.tqcontains( item->folder()->id() ) )
         item->setOn( true );
       else
         item->setOn( false );
diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp
index 78724d50..6744e136 100644
--- a/kmail/folderstorage.cpp
+++ b/kmail/folderstorage.cpp
@@ -174,7 +174,7 @@ void FolderStorage::markNewAsUnread()
     if (!(msgBase = getMsgBase(i))) continue;
     if (msgBase->isNew())
     {
-      msgBase->setStatus(KMMsgStatusUnread);
+      msgBase->seStatus(KMMsgStatusUnread);
       msgBase->setDirty(true);
     }
   }
@@ -197,7 +197,7 @@ void FolderStorage::markUnreadAsRead()
   if (serNums.empty())
     return;
 
-  KMCommand *command = new KMSetStatusCommand( KMMsgStatusRead, serNums );
+  KMCommand *command = new KMSeStatusCommand( KMMsgStatusRead, serNums );
   command->start();
 }
 
@@ -283,7 +283,7 @@ void FolderStorage::slotEmitChangedTimer()
 //-----------------------------------------------------------------------------
 void FolderStorage::emitMsgAddedSignals(int idx)
 {
-  Q_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder() , idx );
+  TQ_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder() , idx );
   if (!mQuiet) {
     emit msgAdded(idx);
   } else {
@@ -388,7 +388,7 @@ void FolderStorage::removeMsg(int idx, bool)
 
   KMMsgBase* mb = getMsgBase(idx);
 
-  Q_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), idx );
+  TQ_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), idx );
   if (serNum != 0)
     emit msgRemoved( folder(), serNum );
   mb = takeIndexEntry( idx );
@@ -430,7 +430,7 @@ KMMessage* FolderStorage::take(int idx)
   mb = getMsgBase(idx);
   if (!mb) return 0;
   if (!mb->isMessage()) readMsg(idx);
-  Q_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), idx );
+  TQ_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), idx );
   emit msgRemoved( folder(), serNum );
 
   msg = (KMMessage*)takeIndexEntry(idx);
@@ -503,7 +503,7 @@ KMMessage* FolderStorage::getMsg(int idx)
         kdDebug(5006) << "Error: " << location() <<
           " Index file is inconsistent with folder file. This should never happen." << endl;
 
-        // We can't recreate the index at this point, since that would invalidate the current
+        // We can't recreate the index at this point, since that would tqinvalidate the current
         // message list and delete KMMsgBase or KMMessage objects that are in use.
         // Do it later in KMFolderIndex::readIndexHeader() instead.
         mCompactable = false; // Don't compact
@@ -844,7 +844,7 @@ int FolderStorage::countUnread()
   return (unread > 0) ? unread : 0;
 }
 
-Q_INT64 FolderStorage::folderSize() const
+TQ_INT64 FolderStorage::folderSize() const
 {
     if ( mSize != -1 ) {
         return mSize;
@@ -889,7 +889,7 @@ void FolderStorage::msgStatusChanged(const KMMsgStatus oldStatus,
       }
       mChanged = true;
     }
-    Q_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum(folder(), idx);
+    TQ_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum(folder(), idx);
     emit msgChanged( folder(), serNum, deltaUnread );
   }
 }
@@ -977,21 +977,21 @@ void FolderStorage::readFolderIdsFile()
 {
   if ( !mExportsSernums ) return;
   if ( KMMsgDict::mutableInstance()->readFolderIds( *this ) == -1 ) {
-    invalidateFolder();
+    tqinvalidateFolder();
   }
   if ( !KMMsgDict::mutableInstance()->hasFolderIds( *this ) ) {
-    invalidateFolder();
+    tqinvalidateFolder();
   }
 }
 
-void FolderStorage::invalidateFolder()
+void FolderStorage::tqinvalidateFolder()
 {
   if ( !mExportsSernums ) return;
   unlink(TQFile::encodeName( indexLocation()) + ".sorted");
   unlink(TQFile::encodeName( indexLocation()) + ".ids");
   fillMessageDict();
   KMMsgDict::mutableInstance()->writeFolderIds( *this );
-  emit invalidated( folder() );
+  emit tqinvalidated( folder() );
 }
 
 
@@ -1022,10 +1022,10 @@ int FolderStorage::appendToFolderIdsFile( int idx )
   return ret;
 }
 
-void FolderStorage::replaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx )
+void FolderStorage::tqreplaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx )
 {
   if ( !mExportsSernums ) return;
-  KMMsgDict::mutableInstance()->replace( sernum, msg, idx );
+  KMMsgDict::mutableInstance()->tqreplace( sernum, msg, idx );
 }
 
 void FolderStorage::setRDict( KMMsgDictREntry *rentry ) const
@@ -1040,24 +1040,24 @@ void FolderStorage::setRDict( KMMsgDictREntry *rentry ) const
 }
 
 //-----------------------------------------------------------------------------
-void FolderStorage::setStatus(int idx, KMMsgStatus status, bool toggle)
+void FolderStorage::seStatus(int idx, KMMsgStatus status, bool toggle)
 {
   KMMsgBase *msg = getMsgBase(idx);
   if ( msg ) {
     if (toggle)
       msg->toggleStatus(status, idx);
     else
-      msg->setStatus(status, idx);
+      msg->seStatus(status, idx);
   }
 }
 
 
 //-----------------------------------------------------------------------------
-void FolderStorage::setStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle)
+void FolderStorage::seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle)
 {
   for ( TQValueList<int>::Iterator it = ids.begin(); it != ids.end(); ++it )
   {
-    FolderStorage::setStatus(*it, status, toggle);
+    FolderStorage::seStatus(*it, status, toggle);
   }
 }
 
@@ -1135,11 +1135,11 @@ void FolderStorage::slotProcessNextSearchBatch()
 {
   if ( !mSearchPattern )
     return;
-  TQValueList<Q_UINT32> matchingSerNums;
+  TQValueList<TQ_UINT32> matchingSerNums;
   const int end = QMIN( mCurrentSearchedMsg + 15, count() );
   for ( int i = mCurrentSearchedMsg; i < end; ++i )
   {
-    Q_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), i );
+    TQ_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), i );
     if ( mSearchPattern->matches( serNum ) )
       matchingSerNums.append( serNum );
   }
@@ -1151,7 +1151,7 @@ void FolderStorage::slotProcessNextSearchBatch()
 }
 
 //-----------------------------------------------------------------------------
-void FolderStorage::search( const KMSearchPattern* pattern, Q_UINT32 serNum )
+void FolderStorage::search( const KMSearchPattern* pattern, TQ_UINT32 serNum )
 {
   bool matches = pattern && pattern->matches( serNum );
 
diff --git a/kmail/folderstorage.h b/kmail/folderstorage.h
index 7d716543..b7effe08 100644
--- a/kmail/folderstorage.h
+++ b/kmail/folderstorage.h
@@ -63,7 +63,7 @@ namespace KMail {
 }
 using KMail::AttachmentStrategy;
 
-typedef TQValueList<Q_UINT32> SerNumList;
+typedef TQValueList<TQ_UINT32> SerNumList;
 
 /**
  * @short The FolderStorage class is the bass class for the storage related
@@ -238,13 +238,13 @@ public:
   virtual int countUnread();
 
   /** Total size of the contents of this folder. */
-  Q_INT64 folderSize() const;
+  TQ_INT64 folderSize() const;
 
   /** Return whether the folder is close to its quota limit, which can
    * be reflected in the UI.  */
   virtual bool isCloseToQuota() const;
 
-  /** Called by KMMsgBase::setStatus when status of a message has changed
+  /** Called by KMMsgBase::seStatus when status of a message has changed
       required to keep the number unread messages variable current. */
   virtual void msgStatusChanged( const KMMsgStatus oldStatus,
                                  const KMMsgStatus newStatus,
@@ -324,7 +324,7 @@ public:
   /** Change the dirty flag. */
   void setDirty(bool f);
 
-  /** Returns TRUE if the folder contains deleted messages */
+  /** Returns TRUE if the folder tqcontains deleted messages */
   bool needsCompacting() const { return needsCompact; }
   virtual void setNeedsCompacting(bool f) { needsCompact = f; }
 
@@ -363,10 +363,10 @@ public:
   void deregisterFromMessageDict();
 
   /** Set the status of the message at index @p idx to @p status. */
-  virtual void setStatus(int idx, KMMsgStatus status, bool toggle=false);
+  virtual void seStatus(int idx, KMMsgStatus status, bool toggle=false);
 
   /** Set the status of the message(s) in the TQValueList @p ids to @p status. */
-  virtual void setStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle=false);
+  virtual void seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle=false);
 
   void removeJobs();
 
@@ -412,7 +412,7 @@ public:
    * Check if the message matches the search criteria
    * The end is signaled with searchDone()
    */
-  virtual void search( const KMSearchPattern*, Q_UINT32 serNum );
+  virtual void search( const KMSearchPattern*, TQ_UINT32 serNum );
 
   /** Returns true if this folder can be moved */
   virtual bool isMoveable() const;
@@ -437,8 +437,8 @@ signals:
   /** Emitted when the folder was closed and ticket owners have to reopen */
   void closed( KMFolder* );
 
-  /** Emitted when the serial numbers of this folder were invalidated. */
-  void invalidated( KMFolder * );
+  /** Emitted when the serial numbers of this folder were tqinvalidated. */
+  void tqinvalidated( KMFolder * );
 
   /** Emitted when the name of the folder changes. */
   void nameChanged();
@@ -459,7 +459,7 @@ signals:
   void noContentChanged();
 
   /** Emitted before a message is removed from the folder. */
-  void msgRemoved(KMFolder*, Q_UINT32 sernum);
+  void msgRemoved(KMFolder*, TQ_UINT32 sernum);
 
   /** Emitted after a message is removed from the folder. */
   void msgRemoved( int idx, TQString msgIdMD5 );
@@ -467,10 +467,10 @@ signals:
 
   /** Emitted when a message is added from the folder. */
   void msgAdded(int idx);
-  void msgAdded(KMFolder*, Q_UINT32 sernum);
+  void msgAdded(KMFolder*, TQ_UINT32 sernum);
 
   /** Emitted, when the status of a message is changed */
-  void msgChanged(KMFolder*, Q_UINT32 sernum, int delta);
+  void msgChanged(KMFolder*, TQ_UINT32 sernum, int delta);
 
   /** Emitted when a field of the header of a specific message changed. */
   void msgHeaderChanged(KMFolder*, int);
@@ -489,14 +489,14 @@ signals:
    * The matching serial numbers are included
    * If @p complete is true the search is done
    */
-  void searchResult( KMFolder*, TQValueList<Q_UINT32>,
+  void searchResult( KMFolder*, TQValueList<TQ_UINT32>,
                      const KMSearchPattern*, bool complete );
 
   /**
    * Emitted when a search for a single message is completed
    * The serial number and a bool matching yes/no is included
    */
-  void searchDone( KMFolder*, Q_UINT32, const KMSearchPattern*, bool );
+  void searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool );
 
   /** Emitted when the folder's size changes. */
   void folderSizeChanged();
@@ -553,7 +553,7 @@ protected:
 friend class KMMsgDict;
   /** Inserts messages into the message dictionary. The messages will get
    * new serial numbers. This is only used on newly appeared folders, where
-   * there is no .ids file yet, or when that has been invalidated. */
+   * there is no .ids file yet, or when that has been tqinvalidated. */
   virtual void fillMessageDict() {}
 
   /** Read the on-disk cache of serial numbers  of messages in this store
@@ -581,12 +581,12 @@ friend class KMMsgDict;
 
   /** Replaces the serial number for the message @p msg at index @p idx with
    * @p sernum */
-  void replaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx );
+  void tqreplaceMsgSerNum( unsigned long sernum, KMMsgBase* msg, int idx );
 
-   /** Called when serial numbers for a folder are invalidated,
-  invalidates/recreates data structures dependent on the
+   /** Called when serial numbers for a folder are tqinvalidated,
+  tqinvalidates/recreates data structures dependent on the
   serial numbers for this folder */
-  void invalidateFolder();
+  void tqinvalidateFolder();
 
   /** Called by KMFolder::remove() to delete the actual contents.
     At the time of the call the folder has already been closed, and
@@ -605,7 +605,7 @@ friend class KMMsgDict;
   virtual void clearIndex(bool autoDelete=true, bool syncDict = false) = 0;
   virtual void truncateIndex() = 0;
 
-  virtual Q_INT64 doFolderSize() const { return 0; };
+  virtual TQ_INT64 doFolderSize() const { return 0; };
 
   int mOpenCount;
   int mQuiet;
@@ -623,7 +623,7 @@ friend class KMMsgDict;
   /** number of unread messages, -1 if not yet set */
   int mUnreadMsgs, mGuessedUnreadMsgs;
   int mTotalMsgs;
-  Q_INT64 mSize;
+  TQ_INT64 mSize;
   bool mWriteConfigEnabled :1;
   /** sven: true if on destruct folder needs to be compacted. */
   bool needsCompact :1;
diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp
index c35c8807..e126263f 100644
--- a/kmail/foldertreebase.cpp
+++ b/kmail/foldertreebase.cpp
@@ -179,10 +179,10 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/
   }
 
   // set it
-  bool repaint = false;
+  bool tqrepaint = false;
   if (fti->unreadCount() != count) {
      fti->adjustUnreadCount( count );
-     repaint = true;
+     tqrepaint = true;
   }
   if (isTotalActive() || force)
   {
@@ -196,15 +196,15 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/
     // set it
     if ( count != fti->totalCount() ) {
       fti->setTotalCount(count);
-      repaint = true;
+      tqrepaint = true;
     }
   }
   if ( isSizeActive() || force ) {
     if ( !fti->folder()->noContent()) {
-      Q_INT64 size = folder->storage()->folderSize();
+      TQ_INT64 size = folder->storage()->folderSize();
       if ( size != fti->folderSize() ) {
         fti->setFolderSize( size );
-        repaint = true;
+        tqrepaint = true;
       }
     }
   }
@@ -213,8 +213,8 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/
   }
 
   if (fti->parent() && !fti->parent()->isOpen())
-    repaint = false; // we're not visible
-  if (repaint) {
+    tqrepaint = false; // we're not visible
+  if (tqrepaint) {
     fti->setNeedsRepaint( true );
     emit triggerRefresh();
   }
@@ -228,7 +228,7 @@ void FolderTreeBase::handleMailListDrop(TQDropEvent * event, KMFolder *destinati
   if ( !MailListDrag::decode( event, list ) ) {
     kdWarning() << k_funcinfo << "Could not decode drag data!" << endl;
   } else {
-    TQValueList<Q_UINT32> serNums = MessageCopyHelper::serNumListFromMailList( list );
+    TQValueList<TQ_UINT32> serNums = MessageCopyHelper::serNumListFromMailList( list );
     int action;
     if ( MessageCopyHelper::inReadOnlyFolder( serNums ) )
       action = DRAG_COPY;
diff --git a/kmail/foldertreebase.h b/kmail/foldertreebase.h
index bc2ad0cc..0c8f9720 100644
--- a/kmail/foldertreebase.h
+++ b/kmail/foldertreebase.h
@@ -38,7 +38,7 @@ class FolderTreeBase : public KFolderTree
     /** Find index of given folder. Returns 0 if not found */
     virtual TQListViewItem* indexOfFolder( const KMFolder* folder ) const
     {
-       if ( mFolderToItem.contains( folder ) )
+       if ( mFolderToItem.tqcontains( folder ) )
          return mFolderToItem[ folder ];
        else
          return 0;
diff --git a/kmail/folderviewtooltip.h b/kmail/folderviewtooltip.h
index 24f9fbbe..ee813bf4 100644
--- a/kmail/folderviewtooltip.h
+++ b/kmail/folderviewtooltip.h
@@ -20,8 +20,8 @@ class FolderViewToolTip : public QToolTip
       KMFolderTreeItem *item = dynamic_cast<KMFolderTreeItem*>( mListView->itemAt( point ) );
       if  ( !item )
         return;
-      const TQRect itemRect = mListView->itemRect( item );
-      if ( !itemRect.isValid() )
+      const TQRect tqitemRect = mListView->tqitemRect( item );
+      if ( !tqitemRect.isValid() )
         return;
       const TQRect headerRect = mListView->header()->sectionRect( 0 );
       if ( !headerRect.isValid() )
@@ -32,7 +32,7 @@ class FolderViewToolTip : public QToolTip
       
       item->updateCount();
       TQString tipText = i18n("<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4" )
-          .arg( item->folder()->prettyURL().replace( " ", "&nbsp;" ) )
+          .arg( item->folder()->prettyURL().tqreplace( " ", "&nbsp;" ) )
           .arg( item->totalCount() < 0 ? "-" : TQString::number( item->totalCount() ) )
           .arg( item->unreadCount() < 0 ? "-" : TQString::number( item->unreadCount() ) )
           .arg( KIO::convertSize( item->folderSize() ) );
@@ -43,7 +43,7 @@ class FolderViewToolTip : public QToolTip
               tipText += i18n("<br>Quota: %1").arg( info.toString() );
       }
       
-      tip( TQRect( headerRect.left(), itemRect.top(), headerRect.width(), itemRect.height() ), tipText );
+      tip( TQRect( headerRect.left(), tqitemRect.top(), headerRect.width(), tqitemRect.height() ), tipText );
     }
 
   private:
diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp
index 188e0532..684dd590 100644
--- a/kmail/headeritem.cpp
+++ b/kmail/headeritem.cpp
@@ -138,7 +138,7 @@ TQString HeaderItem::from() const
 }
 
 // Return the serial number
-Q_UINT32 HeaderItem::msgSerNum() const
+TQ_UINT32 HeaderItem::msgSerNum() const
 {
   return mSerNum;
 }
@@ -232,17 +232,17 @@ TQPixmap HeaderItem::pixmapMerge( PixmapList pixmaps ) const
   }
 
   TQPixmap res( width, height );
-  TQBitmap mask( width, height, true );
+  TQBitmap tqmask( width, height, true );
 
   int x = 0;
   for ( PixmapList::ConstIterator it = pixmaps.begin();
       it != pixmaps.end(); ++it ) {
     bitBlt( &res, x, (height - (*it).height()) / 2, &(*it) );
-    bitBlt( &mask, x, (height - (*it).height()) / 2, (*it).mask() );
+    bitBlt( &tqmask, x, (height - (*it).height()) / 2, (*it).tqmask() );
     x += (*it).width();
   }
 
-  res.setMask( mask );
+  res.setMask( tqmask );
   return res;
 }
 
diff --git a/kmail/headeritem.h b/kmail/headeritem.h
index ac46cb95..4ada5112 100644
--- a/kmail/headeritem.h
+++ b/kmail/headeritem.h
@@ -183,7 +183,7 @@ public:
   TQString from() const;
 
   // Return the serial number of the message associated with this item;
-  Q_UINT32 msgSerNum() const;
+  TQ_UINT32 msgSerNum() const;
 
   /** Expands all children of the list view item. */
   void setOpenRecursive( bool open );
@@ -232,7 +232,7 @@ public:
 
 private:
   int mMsgId;
-  Q_UINT32 mSerNum;
+  TQ_UINT32 mSerNum;
   TQString mKey;
   bool mAboutToBeDeleted;
   SortCacheItem *mSortCacheItem;
diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp
index 69ac5b1f..a2262744 100644
--- a/kmail/headerlistquicksearch.cpp
+++ b/kmail/headerlistquicksearch.cpp
@@ -72,20 +72,20 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent,
   mStatusCombo->setSizeLimit( 12 );
   mStatusCombo->insertItem( SmallIcon( "run" ), i18n("Any Status") );
 
-  insertStatus( StatusUnread );
-  insertStatus( StatusNew );
-  insertStatus( StatusImportant );
-  insertStatus( StatusReplied );
-  insertStatus( StatusForwarded );
-  insertStatus( StatusToDo );
-  insertStatus( StatusHasAttachment );
-  insertStatus( StatusInvitation );
-  insertStatus( StatusWatched );
-  insertStatus( StatusIgnored );
+  inserStatus( StatusUnread );
+  inserStatus( StatusNew );
+  inserStatus( StatusImportant );
+  inserStatus( StatusReplied );
+  inserStatus( StatusForwarded );
+  inserStatus( StatusToDo );
+  inserStatus( StatusHasAttachment );
+  inserStatus( StatusInvitation );
+  inserStatus( StatusWatched );
+  inserStatus( StatusIgnored );
   mStatusCombo->setCurrentItem( 0 );
   mStatusCombo->installEventFilter( this );
   connect( mStatusCombo, TQT_SIGNAL ( activated( int ) ),
-           this, TQT_SLOT( slotStatusChanged( int ) ) );
+           this, TQT_SLOT( sloStatusChanged( int ) ) );
 
   label->setBuddy( mStatusCombo );
 
@@ -116,7 +116,7 @@ bool HeaderListQuickSearch::eventFilter( TQObject *watched, TQEvent *event )
     KMMainWidget *mainWidget = 0;
 
     // Travel up the parents list until we find the main widget
-    for ( TQWidget *curWidget = parentWidget(); curWidget; curWidget = curWidget->parentWidget() ) {
+    for ( TQWidget *curWidget = tqparentWidget(); curWidget; curWidget = curWidget->tqparentWidget() ) {
       mainWidget = ::qt_cast<KMMainWidget *>( curWidget );
       if ( mainWidget )
         break;
@@ -155,10 +155,10 @@ bool HeaderListQuickSearch::itemMatches(const TQListViewItem *item, const TQStri
   // The full email address is not visible, but we still want it to be searchable.
   // KListViewSearchLine::itemMatches() only searches in visible columns.
   const HeaderItem *headerItem = static_cast<const HeaderItem*>( item );
-  if ( headerItem->from().lower().contains( s.lower() ) ) {
+  if ( headerItem->from().lower().tqcontains( s.lower() ) ) {
     return true;
   }
-  if ( headerItem->to().lower().contains( s.lower() ) ) {
+  if ( headerItem->to().lower().tqcontains( s.lower() ) ) {
     return true;
   }
 
@@ -170,10 +170,10 @@ void HeaderListQuickSearch::reset()
 {
   clear();
   mStatusCombo->setCurrentItem( 0 );
-  slotStatusChanged( 0 );
+  sloStatusChanged( 0 );
 }
 
-void HeaderListQuickSearch::slotStatusChanged( int index )
+void HeaderListQuickSearch::sloStatusChanged( int index )
 {
   if ( index == 0 )
     mStatus = 0;
@@ -182,7 +182,7 @@ void HeaderListQuickSearch::slotStatusChanged( int index )
   updateSearch();
 }
 
-void HeaderListQuickSearch::insertStatus(KMail::StatusValueTypes which)
+void HeaderListQuickSearch::inserStatus(KMail::StatusValueTypes which)
 {
   mStatusCombo->insertItem( SmallIcon( KMail::StatusValues[which].icon ),
     i18n( KMail::StatusValues[ which ].text ) );
@@ -196,7 +196,7 @@ TQString HeaderListQuickSearch::currentSearchTerm() const
 }
 
 
-int HeaderListQuickSearch::currentStatus() const
+int HeaderListQuickSearch::currenStatus() const
 {
     return mStatus;
 }
diff --git a/kmail/headerlistquicksearch.h b/kmail/headerlistquicksearch.h
index 09898f95..ddef0b40 100644
--- a/kmail/headerlistquicksearch.h
+++ b/kmail/headerlistquicksearch.h
@@ -66,7 +66,7 @@ public:
     /**
      * Returns the currently selected status filter.
      */
-    int currentStatus() const;
+    int currenStatus() const;
 
 public slots:
    void reset();
@@ -76,7 +76,7 @@ signals:
 
 protected:
     /**
-     * checks whether @param item contains the search string and has the status
+     * checks whether @param item tqcontains the search string and has the status
      * currently in mStatus
      */
     virtual bool itemMatches(const TQListViewItem *item, const TQString &s) const;
@@ -86,11 +86,11 @@ private slots:
    * cache the status in mStatus so as to avoid having to do the comparatively
    * expensive string comparison for each item in itemMatches
    */
-  void slotStatusChanged( int index );
+  void sloStatusChanged( int index );
 
 private:
     /** Helper method for the filling of the status combo. */
-    void insertStatus(KMail::StatusValueTypes which);
+    void inserStatus(KMail::StatusValueTypes which);
     TQComboBox *mStatusCombo;
     KMMsgStatus mStatus;
     TQValueVector<TQString> statusList;
diff --git a/kmail/headerstrategy.cpp b/kmail/headerstrategy.cpp
index bfe9845b..3fed82ab 100644
--- a/kmail/headerstrategy.cpp
+++ b/kmail/headerstrategy.cpp
@@ -243,8 +243,8 @@ namespace KMail {
   }
 
   bool HeaderStrategy::showHeader( const TQString & header ) const {
-    if ( headersToDisplay().contains( header.lower() ) ) return true;
-    if ( headersToHide().contains( header.lower() ) ) return false;
+    if ( headersToDisplay().tqcontains( header.lower() ) ) return true;
+    if ( headersToHide().tqcontains( header.lower() ) ) return false;
     return defaultPolicy() == Display;
   }
 
diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp
index f099d982..3f3073ef 100644
--- a/kmail/headerstyle.cpp
+++ b/kmail/headerstyle.cpp
@@ -124,7 +124,7 @@ namespace KMail {
       strategy = HeaderStrategy::brief();
 
     // The direction of the header is determined according to the direction
-    // of the application layout.
+    // of the application tqlayout.
 
     TQString dir = TQApplication::reverseLayout() ? "rtl" : "ltr" ;
 
@@ -223,7 +223,7 @@ namespace KMail {
       strategy = HeaderStrategy::rich();
 
     // The direction of the header is determined according to the direction
-    // of the application layout.
+    // of the application tqlayout.
 
     TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" );
 
@@ -394,15 +394,15 @@ namespace KMail {
       { 255,  25,   0 },
       { 255,   0,   0 }
     };
-    meterBar.setColor( 21, qRgb( 255, 255, 255 ) );
-    meterBar.setColor( 22, qRgb( 170, 170, 170 ) );
+    meterBar.setColor( 21, tqRgb( 255, 255, 255 ) );
+    meterBar.setColor( 22, tqRgb( 170, 170, 170 ) );
     if ( percent < 0 ) // grey is for errors
       meterBar.fill( 22 );
     else {
       meterBar.fill( 21 );
       int max = QMIN( 20, static_cast<int>( percent ) / 5 );
       for ( int i = 0; i < max; ++i ) {
-        meterBar.setColor( i+1, qRgb( gradient[i][0], gradient[i][1],
+        meterBar.setColor( i+1, tqRgb( gradient[i][0], gradient[i][1],
                                       gradient[i][2] ) );
         meterBar.setPixel( i, 0, i+1 );
       }
@@ -427,7 +427,7 @@ namespace KMail {
 
     // ### from kmreaderwin begin
     // The direction of the header is determined according to the direction
-    // of the application layout.
+    // of the application tqlayout.
 
     TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" );
     TQString headerStr = TQString("<div class=\"fancy header\" dir=\"%1\">\n").arg(dir);
@@ -478,7 +478,7 @@ namespace KMail {
     ::KIMProxy *imProxy = KMKernel::self()->imProxy();
     TQString kabcUid;
     KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
-    KABC::AddresseeList addresses = addressBook->findByEmail( KPIM::getFirstEmailAddress( message->from() ) );
+    KABC::AddresseeList addresses = addressBook->tqfindByEmail( KPIM::getFirstEmailAddress( message->from() ) );
 
     TQString photoURL;
     int photoWidth = 60;
@@ -493,7 +493,7 @@ namespace KMail {
           presence = imProxy->presenceString( kabcUid );
           if ( !presence.isEmpty() )
           {
-            TQString presenceIcon = TQString::fromLatin1( " <img src=\"%1\"/>" )
+            TQString presenceIcon = TQString::tqfromLatin1( " <img src=\"%1\"/>" )
                 .arg( imgToDataUrl( imProxy->presenceIcon( kabcUid ).convertToImage() ) );
             presence += presenceIcon;
           }
@@ -853,7 +853,7 @@ namespace KMail {
     TQBuffer buffer( ba );
     buffer.open( IO_WriteOnly );
     image.save( &buffer, fmt );
-    return TQString::fromLatin1("data:image/%1;base64,%2")
+    return TQString::tqfromLatin1("data:image/%1;base64,%2")
            .arg( fmt, KCodecs::base64Encode( ba ) );
   }
 
@@ -882,7 +882,7 @@ namespace KMail {
 	    strategy = HeaderStrategy::brief();
 
 	// The direction of the header is determined according to the direction
-	// of the application layout.
+	// of the application tqlayout.
 
 	TQString dir = TQApplication::reverseLayout() ? "rtl" : "ltr" ;
 
@@ -901,7 +901,7 @@ namespace KMail {
 	// colors depend on if its encapsulated or not
         TQColor fontColor(Qt::white);
 	TQString linkColor = "class =\"white\"";
-	const TQColor activeColor = qApp->palette().active().highlight();
+	const TQColor activeColor = tqApp->palette().active().highlight();
 	TQColor activeColorDark = activeColor.dark(130);
         // reverse colors for encapsulated
         if( !topLevel ){
diff --git a/kmail/htmlstatusbar.cpp b/kmail/htmlstatusbar.cpp
index 2c6e6faf..111ce6cd 100644
--- a/kmail/htmlstatusbar.cpp
+++ b/kmail/htmlstatusbar.cpp
@@ -52,9 +52,9 @@ KMail::HtmlStatusBar::HtmlStatusBar( TQWidget * parent, const char * name, WFlag
   : TQLabel( parent, name, f ),
     mMode( Normal )
 {
-  setAlignment( AlignHCenter|AlignTop );
+  tqsetAlignment( AlignHCenter|AlignTop );
   // Don't force a minimum height to the reader widget
-  setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) );
+  tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) );
   upd();
 }
 
diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp
index 22b5a4c8..5c3f7df6 100644
--- a/kmail/identitydialog.cpp
+++ b/kmail/identitydialog.cpp
@@ -165,7 +165,7 @@ namespace KMail {
     label = new TQLabel( mAliasEdit, i18n("Email a&liases:"), tab );
     glay->addWidget( label, row, 0, TQt::AlignTop );
     msg = i18n("<qt><h3>Email aliases</h3>"
-               "<p>This field contains alias addresses that should also "
+               "<p>This field tqcontains alias addresses that should also "
                "be considered as belonging to this identity (as opposed "
                "to representing a different identity).</p>"
                "<p>Example:</p>"
@@ -427,16 +427,16 @@ namespace KMail {
     // Tab Widget: Signature
     //
     mSignatureConfigurator = new SignatureConfigurator( tabWidget );
-    mSignatureConfigurator->layout()->setMargin( KDialog::marginHint() );
+    mSignatureConfigurator->tqlayout()->setMargin( KDialog::marginHint() );
     tabWidget->addTab( mSignatureConfigurator, i18n("&Signature") );
 
     mXFaceConfigurator = new XFaceConfigurator( tabWidget );
-    mXFaceConfigurator->layout()->setMargin( KDialog::marginHint() );
+    mXFaceConfigurator->tqlayout()->setMargin( KDialog::marginHint() );
     tabWidget->addTab( mXFaceConfigurator, i18n("&Picture") );
 
-    KConfigGroup geometry( KMKernel::config(), "Geometry" );
-    if ( geometry.hasKey( "Identity Dialog size" ) )
-      resize( geometry.readSizeEntry( "Identity Dialog size" ) );
+    KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+    if ( tqgeometry.hasKey( "Identity Dialog size" ) )
+      resize( tqgeometry.readSizeEntry( "Identity Dialog size" ) );
     mNameEdit->setFocus();
 
     connect( tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)),
@@ -444,8 +444,8 @@ namespace KMail {
   }
 
   IdentityDialog::~IdentityDialog() {
-    KConfigGroup geometry( KMKernel::config(), "Geometry" );
-    geometry.writeEntry( "Identity Dialog size", size() );
+    KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+    tqgeometry.writeEntry( "Identity Dialog size", size() );
   }
 
   void IdentityDialog::slotAboutToShow( TQWidget * w ) {
diff --git a/kmail/identitydrag.cpp b/kmail/identitydrag.cpp
index e8ba4a07..85520637 100644
--- a/kmail/identitydrag.cpp
+++ b/kmail/identitydrag.cpp
@@ -54,7 +54,7 @@ namespace KMail {
       return 0;
   }
 
-  TQByteArray IdentityDrag::encodedData( const char * mimetype ) const {
+  TQByteArray IdentityDrag::tqencodedData( const char * mimetype ) const {
     TQByteArray a;
 
     if ( !qstrcmp( mimetype, kmailIdentityMimeType ) ) {
@@ -73,7 +73,7 @@ namespace KMail {
   bool IdentityDrag::decode( const TQMimeSource * e, KPIM::Identity & i ) {
 
     if ( e->provides( kmailIdentityMimeType ) ) {
-      TQDataStream s( e->encodedData( kmailIdentityMimeType ), IO_ReadOnly );
+      TQDataStream s( e->tqencodedData( kmailIdentityMimeType ), IO_ReadOnly );
       s >> i;
       return true;
     }
diff --git a/kmail/identitydrag.h b/kmail/identitydrag.h
index 82d6d026..f48e1a3c 100644
--- a/kmail/identitydrag.h
+++ b/kmail/identitydrag.h
@@ -51,7 +51,7 @@ namespace KMail {
     virtual ~IdentityDrag() {}
 
     const char * format( int i ) const; // reimp. QMimeSource
-    TQByteArray encodedData( const char * mimetype ) const; // dto.
+    TQByteArray tqencodedData( const char * mimetype ) const; // dto.
 
     static bool canDecode( const TQMimeSource * e );
     static bool decode( const TQMimeSource * e, KPIM::Identity & ident );
diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index b0f78c5a..01e1324c 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -32,7 +32,7 @@ using KMail::SieveConfig;
 using KMail::AccountManager;
 #include "kmfolder.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "kmmainwin.h"
 #include "kmfolderimap.h"
 #include "kmmainwidget.h"
@@ -354,7 +354,7 @@ namespace KMail {
       checkDone( false, CheckOK );
     }
     if ( showStatusMsg )
-      BroadcastStatus::instance()->setStatusMsgTransmissionCompleted(
+      BroadcasStatus::instance()->seStatusMsgTransmissionCompleted(
           name(), newMails);
   }
 
@@ -669,7 +669,7 @@ namespace KMail {
       // split, allow empty parts as we can get empty namespaces
       TQStringList parts = TQStringList::split( "=", *it, true );
       imapNamespace section = imapNamespace( parts[0].toInt() );
-      if ( map.contains( section ) ) {
+      if ( map.tqcontains( section ) ) {
         nsDelim = map[section];
       } else {
         nsDelim.clear();
@@ -736,31 +736,31 @@ namespace KMail {
         TQString msg = i18n("KMail has detected a prefix entry in the "
             "configuration of the account \"%1\" which is obsolete with the "
             "support of IMAP namespaces.").arg( name() );
-        if ( list.contains( "" ) ) {
-          // replace empty entry with the old prefix
+        if ( list.tqcontains( "" ) ) {
+          // tqreplace empty entry with the old prefix
           list.remove( "" );
           list += mOldPrefix;
           mNamespaces[PersonalNS] = list;
-          if ( mNamespaceToDelimiter.contains( "" ) ) {
+          if ( mNamespaceToDelimiter.tqcontains( "" ) ) {
             TQString delim = mNamespaceToDelimiter[""];
             mNamespaceToDelimiter.remove( "" );
             mNamespaceToDelimiter[mOldPrefix] = delim;
           }
-          kdDebug(5006) << "migratePrefix - replaced empty with " << mOldPrefix << endl;
+          kdDebug(5006) << "migratePrefix - tqreplaced empty with " << mOldPrefix << endl;
           msg += i18n("The configuration was automatically migrated but you should check "
               "your account configuration.");
         } else if ( list.count() == 1 ) {
-          // only one entry in the personal namespace so replace it
+          // only one entry in the personal namespace so tqreplace it
           TQString old = list.first();
           list.clear();
           list += mOldPrefix;
           mNamespaces[PersonalNS] = list;
-          if ( mNamespaceToDelimiter.contains( old ) ) {
+          if ( mNamespaceToDelimiter.tqcontains( old ) ) {
             TQString delim = mNamespaceToDelimiter[old];
             mNamespaceToDelimiter.remove( old );
             mNamespaceToDelimiter[mOldPrefix] = delim;
           }
-          kdDebug(5006) << "migratePrefix - replaced single with " << mOldPrefix << endl;
+          kdDebug(5006) << "migratePrefix - tqreplaced single with " << mOldPrefix << endl;
           msg += i18n("The configuration was automatically migrated but you should check "
               "your account configuration.");
         } else {
@@ -812,7 +812,7 @@ namespace KMail {
   {
     //kdDebug(5006) << "delimiterForNamespace " << prefix << endl;
     // try to match exactly
-    if ( mNamespaceToDelimiter.contains(prefix) ) {
+    if ( mNamespaceToDelimiter.tqcontains(prefix) ) {
       return mNamespaceToDelimiter[prefix];
     }
 
@@ -820,17 +820,17 @@ namespace KMail {
     // exclude empty namespace
     for ( namespaceDelim::ConstIterator it = mNamespaceToDelimiter.begin();
           it != mNamespaceToDelimiter.end(); ++it ) {
-      // the namespace definition sometimes contains the delimiter
+      // the namespace definition sometimes tqcontains the delimiter
       // make sure we also match this version
       TQString stripped = it.key().left( it.key().length() - 1 );
       if ( !it.key().isEmpty() &&
-          ( prefix.contains( it.key() ) || prefix.contains( stripped ) ) ) {
+          ( prefix.tqcontains( it.key() ) || prefix.tqcontains( stripped ) ) ) {
         return it.data();
       }
     }
     // see if we have an empty namespace
     // this should always be the case
-    if ( mNamespaceToDelimiter.contains( "" ) ) {
+    if ( mNamespaceToDelimiter.tqcontains( "" ) ) {
       return mNamespaceToDelimiter[""];
     }
     // well, we tried
@@ -961,10 +961,10 @@ namespace KMail {
           KMessageBox::information( kapp->activeWindow(), msg, caption, "kmailConnectionBrokenErrorDialog" );
           // Show it in the status bar, in case the user has ticked "don't show again"
           if ( errorCode == KIO::ERR_CONNECTION_BROKEN )
-            KPIM::BroadcastStatus::instance()->setStatusMsg(
+            KPIM::BroadcasStatus::instance()->seStatusMsg(
                 i18n(  "The connection to account %1 was broken." ).arg( name() ) );
           else if ( errorCode == KIO::ERR_SERVER_TIMEOUT )
-            KPIM::BroadcastStatus::instance()->setStatusMsg(
+            KPIM::BroadcasStatus::instance()->seStatusMsg(
                 i18n(  "The connection to account %1 timed out." ).arg( name() ) );
         } else {
           if ( !errors.isEmpty() )
@@ -1025,7 +1025,7 @@ namespace KMail {
   //-----------------------------------------------------------------------------
   void ImapAccountBase::processNewMailInFolder( KMFolder* folder, FolderListType type /*= Single*/ )
   {
-    if ( mFoldersQueuedForChecking.contains( folder ) )
+    if ( mFoldersQueuedForChecking.tqcontains( folder ) )
       return;
     mFoldersQueuedForChecking.append( folder );
     mCheckingSingleFolder = ( type == Single );
@@ -1057,7 +1057,7 @@ namespace KMail {
   //-----------------------------------------------------------------------------
   bool ImapAccountBase::checkingMail( KMFolder *folder )
   {
-    if (checkingMail() && mFoldersQueuedForChecking.contains(folder))
+    if (checkingMail() && mFoldersQueuedForChecking.tqcontains(folder))
       return true;
     return false;
   }
@@ -1215,7 +1215,7 @@ namespace KMail {
      jd.path = path;
      insertJob(job, jd);
      connect(job, TQT_SIGNAL(result(KIO::Job *)),
-           TQT_SLOT(slotSetStatusResult(KIO::Job *)));
+           TQT_SLOT(slotSeStatusResult(KIO::Job *)));
   }
 
   void ImapAccountBase::setImapSeenStatus(KMFolder * folder, const TQString & path, bool seen)
@@ -1237,11 +1237,11 @@ namespace KMail {
      jd.path = path;
      insertJob(job, jd);
      connect(job, TQT_SIGNAL(result(KIO::Job *)),
-           TQT_SLOT(slotSetStatusResult(KIO::Job *)));
+           TQT_SLOT(slotSeStatusResult(KIO::Job *)));
   }
 
   //-----------------------------------------------------------------------------
-  void ImapAccountBase::slotSetStatusResult(KIO::Job * job)
+  void ImapAccountBase::slotSeStatusResult(KIO::Job * job)
   {
      ImapAccountBase::JobIterator it = findJob(job);
      if ( it == jobsEnd() ) return;
diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h
index 39fb33b6..0795eb2a 100644
--- a/kmail/imapaccountbase.h
+++ b/kmail/imapaccountbase.h
@@ -266,9 +266,9 @@ namespace KMail {
 
     /**
      * Called when we're completely done checking mail for this account
-     * When @p setStatusMsg is true a status msg is shown
+     * When @p seStatusMsg is true a status msg is shown
      */
-    void postProcessNewMail( bool setStatusMsg = true );
+    void postProcessNewMail( bool seStatusMsg = true );
 
     /**
      * Check whether we're checking for new mail
@@ -397,7 +397,7 @@ namespace KMail {
       * Returns true if the account has the given capability
       */
      bool hasCapability( const TQString& capa ) {
-      return mCapabilities.contains( capa ); }
+      return mCapabilities.tqcontains( capa ); }
 
      /**
       * Create an IMAP path for a parent folder and a foldername
@@ -437,7 +437,7 @@ namespace KMail {
     /**
      * Only delete information about the job and ignore write errors
      */
-    void slotSetStatusResult(KIO::Job * job);
+    void slotSeStatusResult(KIO::Job * job);
 
     /// Result of getUserRights() job
     void slotGetUserRightsResult( KIO::Job* _job );
@@ -590,7 +590,7 @@ namespace KMail {
 
     /**
      * Emitted when changeSubscription() failed.
-     * @param errorMessage the error message that contains the reason for the failure
+     * @param errorMessage the error message that tqcontains the reason for the failure
      */
     void subscriptionChangeFailed( const TQString &errorMessage );
 
diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp
index 56034368..b76c6d2c 100644
--- a/kmail/imapjob.cpp
+++ b/kmail/imapjob.cpp
@@ -133,7 +133,7 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
       int a = cstr.find("\nX-UID: ");
       int b = cstr.find('\n', a);
       if (a != -1 && b != -1 && cstr.find("\n\n") > a) cstr.remove(a, b-a);
-      jd.data.resize( cstr.length() + cstr.contains( "\n" ) - cstr.contains( "\r\n" ) );
+      jd.data.resize( cstr.length() + cstr.tqcontains( "\n" ) - cstr.tqcontains( "\r\n" ) );
       unsigned int i = 0;
       char prevChar = '\0';
       // according to RFC 2060 we need CRLF
@@ -369,7 +369,7 @@ void ImapJob::slotGetMessageResult( KIO::Job * job )
   {
     TQString errorStr = i18n( "Error while retrieving messages from the server." );
     if ( (*it).progressItem )
-      (*it).progressItem->setStatus( errorStr );
+      (*it).progressItem->seStatus( errorStr );
     account->handleJobError( job, errorStr );
     return;
   } else {
@@ -540,12 +540,12 @@ void ImapJob::slotPutMessageResult( KIO::Job *job )
   if (job->error())
   {
     if ( (*it).progressItem )
-      (*it).progressItem->setStatus( i18n("Uploading message data failed.") );
+      (*it).progressItem->seStatus( i18n("Uploading message data failed.") );
     account->handlePutError( job, *it, mDestFolder );
     return;
   } else {
     if ( (*it).progressItem )
-      (*it).progressItem->setStatus( i18n("Uploading message data completed.") );
+      (*it).progressItem->seStatus( i18n("Uploading message data completed.") );
     if ( mParentProgressItem )
     {
       mParentProgressItem->incCompletedItems();
@@ -651,7 +651,7 @@ void ImapJob::slotCopyMessageResult( KIO::Job *job )
     mErrorCode = job->error();
     TQString errStr = i18n("Error while copying messages.");
     if ( (*it).progressItem )
-      (*it).progressItem->setStatus( errStr );
+      (*it).progressItem->seStatus( errStr );
     if ( account->handleJobError( job, errStr  ) )
       deleteLater();
     return;
diff --git a/kmail/importarchivedialog.cpp b/kmail/importarchivedialog.cpp
index bdae8054..b446ba0b 100644
--- a/kmail/importarchivedialog.cpp
+++ b/kmail/importarchivedialog.cpp
@@ -73,7 +73,7 @@ ImportArchiveDialog::ImportArchiveDialog( TQWidget *parent, TQt::WidgetFlags fla
   mainLayout->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Expanding, TQSizePolicy::Expanding ), row, 0 );
 
   // Make it a bit bigger, else the folder requester cuts off the text too early
-  resize( 500, minimumSize().height() );
+  resize( 500, tqminimumSize().height() );
 }
 
 void ImportArchiveDialog::setFolder( KMFolder *defaultFolder )
diff --git a/kmail/importjob.cpp b/kmail/importjob.cpp
index 3a7de198..cddf6a65 100644
--- a/kmail/importjob.cpp
+++ b/kmail/importjob.cpp
@@ -39,11 +39,11 @@
 
 using namespace KMail;
 
-KMail::ImportJob::ImportJob( TQWidget *parentWidget )
-  : TQObject( parentWidget ),
+KMail::ImportJob::ImportJob( TQWidget *tqparentWidget )
+  : TQObject( tqparentWidget ),
     mArchive( 0 ),
     mRootFolder( 0 ),
-    mParentWidget( parentWidget ),
+    mParentWidget( tqparentWidget ),
     mNumberOfImportedMessages( 0 ),
     mCurrentFolder( 0 ),
     mCurrentMessage( 0 ),
@@ -211,7 +211,7 @@ void KMail::ImportJob::importNextMessage()
       return;
     }
     kdDebug(5006) << "importNextMessage(): Current folder of queue is now: " << mCurrentFolder->name() << endl;
-    mProgressItem->setStatus( i18n( "Importing folder %1" ).arg( mCurrentFolder->name() ) );
+    mProgressItem->seStatus( i18n( "Importing folder %1" ).arg( mCurrentFolder->name() ) );
   }
 
   mProgressItem->setProgress( ( mProgressItem->progress() + 5 ) );
@@ -221,7 +221,7 @@ void KMail::ImportJob::importNextMessage()
   messages.files.removeFirst();
 
   mCurrentMessage = new KMMessage();
-  mCurrentMessage->fromByteArray( mCurrentMessageFile->data(), true /* setStatus */ );
+  mCurrentMessage->fromByteArray( mCurrentMessageFile->data(), true /* seStatus */ );
   int retIndex;
 
   // If this is not an IMAP folder, we can add the message directly. Otherwise, the whole thing is
diff --git a/kmail/importjob.h b/kmail/importjob.h
index ee7a0ac8..17044141 100644
--- a/kmail/importjob.h
+++ b/kmail/importjob.h
@@ -55,7 +55,7 @@ class ImportJob : public TQObject
 
   public:
 
-    explicit ImportJob( TQWidget *parentWidget = 0 );
+    explicit ImportJob( TQWidget *tqparentWidget = 0 );
     ~ImportJob();
     void start();
     void setFile( const KURL &archiveFile );
diff --git a/kmail/index.cpp b/kmail/index.cpp
index ef1ba7de..632315a5 100644
--- a/kmail/index.cpp
+++ b/kmail/index.cpp
@@ -60,15 +60,15 @@ const char* const folderIndexDisabledKey = "fulltextIndexDisabled";
 
 #ifdef HAVE_INDEXLIB
 static
-TQValueList<int> vectorToQValueList( const std::vector<Q_UINT32>& input ) {
+TQValueList<int> vectorToQValueList( const std::vector<TQ_UINT32>& input ) {
 	TQValueList<int> res;
 	std::copy( input.begin(), input.end(), std::back_inserter( res ) );
 	return res;
 }
 
 static
-std::vector<Q_UINT32> QValueListToVector( const TQValueList<int>& input ) {
-	std::vector<Q_UINT32> res;
+std::vector<TQ_UINT32> QValueListToVector( const TQValueList<int>& input ) {
+	std::vector<TQ_UINT32> res;
 	// res.assign( input.begin(), input.end() ) doesn't work for some reason
 	for ( TQValueList<int>::const_iterator first = input.begin(), past = input.end(); first != past; ++first ) {
 		res.push_back( *first );
@@ -91,10 +91,10 @@ KMMsgIndex::KMMsgIndex( TQObject* parent ):
 	mSlowDown( false ) {
 	kdDebug( 5006 ) << "KMMsgIndex::KMMsgIndex()" << endl;
 
-	connect( kmkernel->folderMgr(), TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ), TQT_SLOT( slotRemoveMessage( Q_UINT32 ) ) );
-	connect( kmkernel->folderMgr(), TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ), TQT_SLOT( slotAddMessage( Q_UINT32 ) ) );
-	connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ), TQT_SLOT( slotRemoveMessage( Q_UINT32 ) ) );
-	connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ), TQT_SLOT( slotAddMessage( Q_UINT32 ) ) );
+	connect( kmkernel->folderMgr(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotRemoveMessage( TQ_UINT32 ) ) );
+	connect( kmkernel->folderMgr(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotAddMessage( TQ_UINT32 ) ) );
+	connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotRemoveMessage( TQ_UINT32 ) ) );
+	connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotAddMessage( TQ_UINT32 ) ) );
 
 	connect( mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( act() ) );
 	//connect( mSyncTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( syncIndex() ) );
@@ -272,7 +272,7 @@ void KMMsgIndex::maintenance() {
 #endif
 }
 
-int KMMsgIndex::addMessage( Q_UINT32 serNum ) {
+int KMMsgIndex::addMessage( TQ_UINT32 serNum ) {
 	kdDebug( 5006 ) << "KMMsgIndex::addMessage( " << serNum << " )" << endl;
 	if ( mState == s_error ) return 0;
 #ifdef HAVE_INDEXLIB
@@ -407,7 +407,7 @@ bool KMMsgIndex::startQuery( KMSearch* s ) {
 	connect( search, TQT_SIGNAL( finished( bool ) ), s, TQT_SIGNAL( finished( bool ) ) );
 	connect( search, TQT_SIGNAL( finished( bool ) ), s, TQT_SLOT( indexFinished() ) );
 	connect( search, TQT_SIGNAL( destroyed( TQObject* ) ), TQT_SLOT( removeSearch( TQObject* ) ) );
-	connect( search, TQT_SIGNAL( found( Q_UINT32 ) ), s, TQT_SIGNAL( found( Q_UINT32 ) ) );
+	connect( search, TQT_SIGNAL( found( TQ_UINT32 ) ), s, TQT_SIGNAL( found( TQ_UINT32 ) ) );
 	mSearches.push_back( search );
 	return true;
 }
@@ -449,13 +449,13 @@ bool KMMsgIndex::stopQuery( KMSearch* s ) {
 	return false;
 }
 
-std::vector<Q_UINT32> KMMsgIndex::simpleSearch( TQString s, bool* ok ) const {
+std::vector<TQ_UINT32> KMMsgIndex::simpleSearch( TQString s, bool* ok ) const {
 	kdDebug( 5006 ) << "KMMsgIndex::simpleSearch( -" << s.latin1() << "- )" << endl;
 	if ( mState == s_error || mState == s_disabled ) {
 		if ( ok ) *ok = false;
-		return std::vector<Q_UINT32>();
+		return std::vector<TQ_UINT32>();
 	}
-	std::vector<Q_UINT32> res;
+	std::vector<TQ_UINT32> res;
 #ifdef HAVE_INDEXLIB
 	assert( mIndex );
 	std::vector<unsigned> residx = mIndex->search( s.latin1() )->list();
@@ -482,7 +482,7 @@ bool KMMsgIndex::canHandleQuery( const KMSearchPattern* pat ) const {
 	return false;
 }
 
-void KMMsgIndex::slotAddMessage( Q_UINT32 serNum ) {
+void KMMsgIndex::slotAddMessage( TQ_UINT32 serNum ) {
 	kdDebug( 5006 ) << "KMMsgIndex::slotAddMessage( . , " << serNum << " )" << endl;
 	if ( mState == s_error || mState == s_disabled ) return;
 
@@ -493,7 +493,7 @@ void KMMsgIndex::slotAddMessage( Q_UINT32 serNum ) {
 	scheduleAction();
 }
 
-void KMMsgIndex::slotRemoveMessage( Q_UINT32 serNum ) {
+void KMMsgIndex::slotRemoveMessage( TQ_UINT32 serNum ) {
 	kdDebug( 5006 ) << "KMMsgIndex::slotRemoveMessage( . , " << serNum << " )" << endl;
 	if ( mState == s_error || mState == s_disabled ) return;
 
@@ -509,7 +509,7 @@ void KMMsgIndex::scheduleAction() {
 #endif
 }
 
-void KMMsgIndex::removeMessage( Q_UINT32 serNum ) {
+void KMMsgIndex::removeMessage( TQ_UINT32 serNum ) {
 	kdDebug( 5006 ) << "KMMsgIndex::removeMessage( " << serNum << " )" << endl;
 	if ( mState == s_error || mState == s_disabled ) return;
 
@@ -550,7 +550,7 @@ void KMMsgIndex::Search::act() {
 			TQString terms;
 			for ( KMSearchRule* rule = pat->first(); rule; rule = pat->next() ) {
 				Q_ASSERT( rule->function() == KMSearchRule::FuncContains );
-				terms += TQString::fromLatin1( " %1 " ).arg( rule->contents() );
+				terms += TQString::tqfromLatin1( " %1 " ).arg( rule->contents() );
 			}
 
 			mValues = kmkernel->msgIndex()->simpleSearch( terms, 0  );
diff --git a/kmail/index.h b/kmail/index.h
index 91c69f2d..5e7f16dc 100644
--- a/kmail/index.h
+++ b/kmail/index.h
@@ -74,7 +74,7 @@ class KMMsgIndex : public TQObject {
 		/**
 		 * Just return all the uids where the pattern exists
 		 */
-		std::vector<Q_UINT32> simpleSearch( TQString, bool* ) const;
+		std::vector<TQ_UINT32> simpleSearch( TQString, bool* ) const;
 
 		/**
 		 * Returns whether the folder is indexable. Only local and dimap
@@ -133,14 +133,14 @@ class KMMsgIndex : public TQObject {
 
 		void continueCreation();
 
-		void slotAddMessage( Q_UINT32 message );
-		void slotRemoveMessage( Q_UINT32 message );
+		void slotAddMessage( TQ_UINT32 message );
+		void slotRemoveMessage( TQ_UINT32 message );
 	private:
 		static TQString defaultPath();
 
 		bool canHandleQuery( const KMSearchPattern* ) const;
-		int addMessage( Q_UINT32 );
-		void removeMessage( Q_UINT32 );
+		int addMessage( TQ_UINT32 );
+		void removeMessage( TQ_UINT32 );
 
 		void scheduleAction();
 		bool creating() const;
@@ -151,16 +151,16 @@ class KMMsgIndex : public TQObject {
 		 * DO NOT USE THIS CLASS
 		 *
 		 * It is conceptually a private class.
-		 * Just needs to be public because of moc limitations
+		 * Just needs to be public because of tqmoc limitations
 		 */
 		class Search;
 	private:
 
-		std::vector<Q_UINT32> mPendingMsgs;
+		std::vector<TQ_UINT32> mPendingMsgs;
 		std::vector<KMFolder*> mPendingFolders;
-		std::vector<Q_UINT32> mAddedMsgs;
-		std::vector<Q_UINT32> mRemovedMsgs;
-		std::vector<Q_UINT32> mExisting;
+		std::vector<TQ_UINT32> mAddedMsgs;
+		std::vector<TQ_UINT32> mRemovedMsgs;
+		std::vector<TQ_UINT32> mExisting;
 
 		enum e_state {
 			s_idle, // doing nothing, index waiting
@@ -199,7 +199,7 @@ class KMMsgIndex::Search : public TQObject {
 		~Search();
 		KMSearch* search() const { return mSearch; }
 	signals:
-		void found( Q_UINT32 );
+		void found( TQ_UINT32 );
 		void finished( bool );
 	private slots:
 		void act();
@@ -211,7 +211,7 @@ class KMMsgIndex::Search : public TQObject {
 		 * handled by the index
 		 */
 		KMSearchPattern* mResidual;
-		std::vector<Q_UINT32> mValues;
+		std::vector<TQ_UINT32> mValues;
 		enum { s_none = 0, s_starting, s_emitting, s_emitstopped, s_done } mState;
 };
 
diff --git a/kmail/isubject.cpp b/kmail/isubject.cpp
index d231d365..caf3ef5f 100644
--- a/kmail/isubject.cpp
+++ b/kmail/isubject.cpp
@@ -18,12 +18,12 @@ namespace KMail {
 
   void ISubject::attach( Interface::Observer * pObserver )
   {
-    if ( qFind( mObserverList.begin(), mObserverList.end(), pObserver ) == mObserverList.end() )
+    if ( tqFind( mObserverList.begin(), mObserverList.end(), pObserver ) == mObserverList.end() )
       mObserverList.push_back( pObserver );
   }
 
   void ISubject::detach( Interface::Observer * pObserver ) {
-    TQValueVector<Interface::Observer*>::iterator it = qFind( mObserverList.begin(), mObserverList.end(), pObserver );
+    TQValueVector<Interface::Observer*>::iterator it = tqFind( mObserverList.begin(), mObserverList.end(), pObserver );
     if ( it != mObserverList.end() )
       mObserverList.erase( it );
   }
diff --git a/kmail/kcursorsaver.h b/kmail/kcursorsaver.h
index c18b4297..a93e92af 100644
--- a/kmail/kcursorsaver.h
+++ b/kmail/kcursorsaver.h
@@ -13,9 +13,9 @@
 class KCursorSaver : public Qt
 {
 public:
-    /// constructor taking TQCursor shapes
-    KCursorSaver(Qt::CursorShape shape) {
-        TQApplication::setOverrideCursor( TQCursor(shape) );
+    /// constructor taking TQCursor tqshapes
+    KCursorSaver(Qt::tqCursorShape tqshape) {
+        TQApplication::setOverrideCursor( TQCursor(tqshape) );
         inited = true;
     }
 
diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp
index 3c1a952c..94edd591 100644
--- a/kmail/keyresolver.cpp
+++ b/kmail/keyresolver.cpp
@@ -1379,7 +1379,7 @@ void Kleo::KeyResolver::collapseAllSplitInfos() {
     SplitInfo & si = v.front();
     for ( std::vector<SplitInfo>::const_iterator it = v.begin() + 1; it != v.end() ; ++it ) {
       si.keys.insert( si.keys.end(), it->keys.begin(), it->keys.end() );
-      qCopy( it->recipients.begin(), it->recipients.end(), std::back_inserter( si.recipients ) );
+      tqCopy( it->recipients.begin(), it->recipients.end(), std::back_inserter( si.recipients ) );
     }
     v.resize( 1 );
   }
@@ -1579,8 +1579,8 @@ std::vector<GpgME::Key> Kleo::KeyResolver::signingKeys( CryptoMessageFormat f )
 
 
 std::vector<GpgME::Key> Kleo::KeyResolver::selectKeys( const TQString & person, const TQString & msg, const std::vector<GpgME::Key> & selectedKeys ) const {
-  const bool opgp = containsOpenPGP( mCryptoMessageFormats );
-  const bool x509 = containsSMIME( mCryptoMessageFormats );
+  const bool opgp = tqcontainsOpenPGP( mCryptoMessageFormats );
+  const bool x509 = tqcontainsSMIME( mCryptoMessageFormats );
 
   Kleo::KeySelectionDialog dlg( i18n("Encryption Key Selection"),
 				msg, KPIM::getEmailAddress(person), selectedKeys,
@@ -1770,7 +1770,7 @@ Kleo::KeyResolver::ContactPreferences Kleo::KeyResolver::lookupContactPreference
     return it->second;
 
   KABC::AddressBook *ab = KABC::StdAddressBook::self( true );
-  const KABC::Addressee::List res = ab->findByEmail( address );
+  const KABC::Addressee::List res = ab->tqfindByEmail( address );
   ContactPreferences pref;
   if ( !res.isEmpty() ) {
     KABC::Addressee addr = res.first();
@@ -1792,7 +1792,7 @@ void Kleo::KeyResolver::saveContactPreference( const TQString& email, const Cont
 {
   d->mContactPreferencesMap.insert( std::make_pair( email, pref ) );
   KABC::AddressBook *ab = KABC::StdAddressBook::self( true );
-  KABC::Addressee::List res = ab->findByEmail( email );
+  KABC::Addressee::List res = ab->tqfindByEmail( email );
 
   KABC::Addressee addr;
   if ( res.isEmpty() ) {
diff --git a/kmail/khtmlparthtmlwriter.cpp b/kmail/khtmlparthtmlwriter.cpp
index 2d29d3c9..900264cd 100644
--- a/kmail/khtmlparthtmlwriter.cpp
+++ b/kmail/khtmlparthtmlwriter.cpp
@@ -86,7 +86,7 @@ namespace KMail {
 
     mHtmlPart->view()->viewport()->setUpdatesEnabled( true );
     mHtmlPart->view()->setUpdatesEnabled( true );
-    mHtmlPart->view()->viewport()->repaint( false );
+    mHtmlPart->view()->viewport()->tqrepaint( false );
     mState = Ended;
   }
 
diff --git a/kmail/kleo_util.h b/kmail/kleo_util.h
index dc0eb6d2..6baa874b 100644
--- a/kmail/kleo_util.h
+++ b/kmail/kleo_util.h
@@ -77,11 +77,11 @@ static inline bool isOpenPGP( Kleo::CryptoMessageFormat f ) {
   return f == Kleo::InlineOpenPGPFormat || f == Kleo::OpenPGPMIMEFormat ;
 }
 
-static inline bool containsSMIME( unsigned int f ) {
+static inline bool tqcontainsSMIME( unsigned int f ) {
   return f & (Kleo::SMIMEFormat|Kleo::SMIMEOpaqueFormat) ;
 }
 
-static inline bool containsOpenPGP( unsigned int f ) {
+static inline bool tqcontainsOpenPGP( unsigned int f ) {
   return f & (Kleo::OpenPGPMIMEFormat|Kleo::InlineOpenPGPFormat) ;
 }
 
diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp
index ad0f55b3..8ddf6899 100644
--- a/kmail/kmaccount.cpp
+++ b/kmail/kmaccount.cpp
@@ -12,7 +12,7 @@ using KMail::AccountManager;
 #include "messagesender.h"
 #include "kmmessage.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "kmfoldercachedimap.h"
 
 #include "progressmanager.h"
@@ -45,7 +45,7 @@ using KMail::FolderJob;
 KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *parent)
   : TQObject(parent), mPrecommand(precommand)
 {
-  BroadcastStatus::instance()->setStatusMsg(
+  BroadcasStatus::instance()->seStatusMsg(
       i18n("Executing precommand %1").arg(precommand ));
 
   mPrecommandProcess.setUseShell(true);
@@ -233,10 +233,10 @@ bool KMAccount::processNewMsg(KMMessage* aMsg)
   // This is only valid for pop accounts and produces wrong stati for imap.
   if ( type() != "cachedimap" && type() != "imap" ) {
     if ( aMsg->isOld() )
-      aMsg->setStatus(KMMsgStatusUnread);  // -sanders
-    //    aMsg->setStatus(KMMsgStatusRead);
+      aMsg->seStatus(KMMsgStatusUnread);  // -sanders
+    //    aMsg->seStatus(KMMsgStatusRead);
     else
-      aMsg->setStatus(KMMsgStatusNew);
+      aMsg->seStatus(KMMsgStatusNew);
   }
 /*
 TQFile fileD0( "testdat_xx-kmaccount-0" );
@@ -377,7 +377,7 @@ bool KMAccount::runPrecommand(const TQString &precommand)
 
   KMPrecommand precommandProcess(precommand, this);
 
-  BroadcastStatus::instance()->setStatusMsg(
+  BroadcasStatus::instance()->seStatusMsg(
       i18n("Executing precommand %1").arg(precommand ));
 
   connect(&precommandProcess, TQT_SIGNAL(finished(bool)),
@@ -426,9 +426,9 @@ TQString KMAccount::encryptStr(const TQString &aStr)
   TQString result;
   for (uint i = 0; i < aStr.length(); i++)
     /* yes, no typo. can't encode ' ' or '!' because
-       they're the unicode BOM. stupid scrambling. stupid. */
-    result += (aStr[i].unicode() <= 0x21 ) ? aStr[i] :
-      TQChar(0x1001F - aStr[i].unicode());
+       they're the tqunicode BOM. stupid scrambling. stupid. */
+    result += (aStr[i].tqunicode() <= 0x21 ) ? aStr[i] :
+      TQChar(0x1001F - aStr[i].tqunicode());
   return result;
 }
 
@@ -451,7 +451,7 @@ TQString KMAccount::importPassword(const TQString &aStr)
   return encryptStr(result);
 }
 
-void KMAccount::invalidateIMAPFolders()
+void KMAccount::tqinvalidateIMAPFolders()
 {
   // Default: Don't do anything. The IMAP account will handle it
 }
diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h
index 44cd67b0..2872b111 100644
--- a/kmail/kmaccount.h
+++ b/kmail/kmaccount.h
@@ -206,9 +206,9 @@ public:
   virtual void setHasInbox( bool has ) { mHasInbox = has; }
 
   /**
-   * If this account is a disconnected IMAP account, invalidate it.
+   * If this account is a disconnected IMAP account, tqinvalidate it.
    */
-  virtual void invalidateIMAPFolders();
+  virtual void tqinvalidateIMAPFolders();
 
   /**
    * Determines whether the account can be checked, currently.
diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp
index b673b5e1..4fc57d2c 100644
--- a/kmail/kmacctcachedimap.cpp
+++ b/kmail/kmacctcachedimap.cpp
@@ -336,12 +336,12 @@ void KMAcctCachedImap::writeConfig( KConfig/*Base*/ & config ) /*const*/ {
   config.writeEntry( "groupwareType", mGroupwareType );
 }
 
-void KMAcctCachedImap::invalidateIMAPFolders()
+void KMAcctCachedImap::tqinvalidateIMAPFolders()
 {
-  invalidateIMAPFolders( mFolder );
+  tqinvalidateIMAPFolders( mFolder );
 }
 
-void KMAcctCachedImap::invalidateIMAPFolders( KMFolderCachedImap* folder )
+void KMAcctCachedImap::tqinvalidateIMAPFolders( KMFolderCachedImap* folder )
 {
   if( !folder || !folder->folder() )
     return;
@@ -361,7 +361,7 @@ void KMAcctCachedImap::invalidateIMAPFolders( KMFolderCachedImap* folder )
     KMFolder *f = *it;
     if( f && f->folderType() == KMFolderTypeCachedImap ) {
       KMFolderCachedImap *cfolder = static_cast<KMFolderCachedImap*>(f->storage());
-      // This invalidates the folder completely
+      // This tqinvalidates the folder completely
       cfolder->setUidValidity("INVALID");
       cfolder->writeUidCache();
     }
diff --git a/kmail/kmacctcachedimap.h b/kmail/kmacctcachedimap.h
index 72ed5c7d..5c3aa6c3 100644
--- a/kmail/kmacctcachedimap.h
+++ b/kmail/kmacctcachedimap.h
@@ -97,8 +97,8 @@ public:
   /**
    * Invalidate the local cache.
    */
-  virtual void invalidateIMAPFolders();
-  virtual void invalidateIMAPFolders( KMFolderCachedImap* );
+  virtual void tqinvalidateIMAPFolders();
+  virtual void tqinvalidateIMAPFolders( KMFolderCachedImap* );
 
   /**
    * Remember that a folder got explicitely deleted - including all child folders
diff --git a/kmail/kmacctfolder.h b/kmail/kmacctfolder.h
index 97dca0d7..6545d4e6 100644
--- a/kmail/kmacctfolder.h
+++ b/kmail/kmacctfolder.h
@@ -24,7 +24,7 @@
 
 class KMAccount;
 
-/** Simple wrapper class that contains the kmail account handling
+/** Simple wrapper class that tqcontains the kmail account handling
  * stuff that is usually not required outside kmail.
  *
  * WARNING: do not add virtual methods in this class. This class is
diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp
index 4ead745c..12d17af8 100644
--- a/kmail/kmacctimap.cpp
+++ b/kmail/kmacctimap.cpp
@@ -28,7 +28,7 @@ using KMail::SieveConfig;
 
 #include "kmmessage.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "kmfoldertree.h"
 #include "kmfoldermgr.h"
 #include "kmfolderimap.h"
@@ -395,7 +395,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
   if ( mMailCheckProgressItem ) {
     mMailCheckProgressItem->incCompletedItems();
     mMailCheckProgressItem->updateProgress();
-    mMailCheckProgressItem->setStatus( folder->prettyURL() + i18n(" completed") );
+    mMailCheckProgressItem->seStatus( folder->prettyURL() + i18n(" completed") );
   }
   mCountRemainChecks--;
 
@@ -410,8 +410,8 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
   }
 
   // Filter messages
-  TQValueListIterator<Q_UINT32> filterIt = mFilterSerNums.begin();
-  TQValueList<Q_UINT32> inTransit;
+  TQValueListIterator<TQ_UINT32> filterIt = mFilterSerNums.begin();
+  TQValueList<TQ_UINT32> inTransit;
 
   if (ActionScheduler::isEnabled() ||
       kmkernel->filterMgr()->atLeastOneOnlineImapFolderTarget()) {
@@ -420,7 +420,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
     if (!mScheduler) {
 	mScheduler = new KMail::ActionScheduler( set, filters );
 	mScheduler->setAccountId( id() );
-	connect( mScheduler, TQT_SIGNAL(filtered(Q_UINT32)), this, TQT_SLOT(slotFiltered(Q_UINT32)) );
+	connect( mScheduler, TQT_SIGNAL(filtered(TQ_UINT32)), this, TQT_SLOT(slotFiltered(TQ_UINT32)) );
     } else {
 	mScheduler->setFilterList( filters );
     }
@@ -496,7 +496,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
 }
 
 //-----------------------------------------------------------------------------
-void KMAcctImap::slotFiltered(Q_UINT32 serNum)
+void KMAcctImap::slotFiltered(TQ_UINT32 serNum)
 {
     mFilterSerNumsToSave.remove( TQString( "%1" ).arg( serNum ) );
 }
@@ -577,10 +577,10 @@ void KMAcctImap::slotFolderSelected( KMFolderImap* folder, bool )
   folder->close( "acctimap" );
 }
 
-void KMAcctImap::execFilters(Q_UINT32 serNum)
+void KMAcctImap::execFilters(TQ_UINT32 serNum)
 {
   if ( !kmkernel->filterMgr()->atLeastOneFilterAppliesTo( id() ) ) return;
-  TQValueListIterator<Q_UINT32> findIt = mFilterSerNums.find( serNum );
+  TQValueListIterator<TQ_UINT32> findIt = mFilterSerNums.find( serNum );
   if ( findIt != mFilterSerNums.end() )
       return;
   mFilterSerNums.append( serNum );
@@ -594,7 +594,7 @@ int KMAcctImap::slotFilterMsg( KMMessage *msg )
     return -1;
   }
   msg->setTransferInProgress(false);
-  Q_UINT32 serNum = msg->getMsgSerNum();
+  TQ_UINT32 serNum = msg->getMsgSerNum();
   if ( serNum )
     mFilterSerNumsToSave.remove( TQString( "%1" ).arg( serNum ) );
 
diff --git a/kmail/kmacctimap.h b/kmail/kmacctimap.h
index fac17eeb..f3fcc693 100644
--- a/kmail/kmacctimap.h
+++ b/kmail/kmacctimap.h
@@ -92,13 +92,13 @@ public:
   /**
    * Queues a message for automatic filtering
    */
-  void execFilters(Q_UINT32 serNum);
+  void execFilters(TQ_UINT32 serNum);
     
 public slots:
   /**
    * updates the new-mail-check folderlist
    */
-  void slotFiltered(Q_UINT32 serNum);
+  void slotFiltered(TQ_UINT32 serNum);
   void slotUpdateFolderList();
 
 protected:
@@ -144,7 +144,7 @@ private:
   int mCountRemainChecks;
   /** used to reset connection errors */
   TQTimer mErrorTimer;
-  TQValueList<Q_UINT32> mFilterSerNums;
+  TQValueList<TQ_UINT32> mFilterSerNums;
   TQDict<int> mFilterSerNumsToSave;
   KMail::ActionScheduler *mScheduler;
 };
diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp
index d1e15f83..47e04f33 100644
--- a/kmail/kmacctlocal.cpp
+++ b/kmail/kmacctlocal.cpp
@@ -8,7 +8,7 @@
 #include "kmfoldermbox.h"
 #include "kmacctfolder.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "progressmanager.h"
 using KPIM::ProgressManager;
 
@@ -103,7 +103,7 @@ bool KMAcctLocal::preProcess()
   if ( precommand().isEmpty() ) {
     TQFileInfo fi( location() );
     if ( fi.size() == 0 ) {
-      BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, 0 );
+      BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
       checkDone( mHasNewMail, CheckOK );
       return false;
     }
@@ -119,12 +119,12 @@ bool KMAcctLocal::preProcess()
 
   if (!mFolder) {
     checkDone( mHasNewMail, CheckError );
-    BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." ));
+    BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
     return false;
   }
 
-  //BroadcastStatus::instance()->reset();
-  BroadcastStatus::instance()->setStatusMsg(
+  //BroadcasStatus::instance()->reset();
+  BroadcasStatus::instance()->seStatusMsg(
         i18n("Preparing transmission from \"%1\"...").arg(mName));
 
 
@@ -142,7 +142,7 @@ bool KMAcctLocal::preProcess()
   {
     kdDebug(5006) << "cannot run precommand " << precommand() << endl;
     checkDone( mHasNewMail, CheckError );
-    BroadcastStatus::instance()->setStatusMsg( i18n( "Running precommand failed." ));
+    BroadcasStatus::instance()->seStatusMsg( i18n( "Running precommand failed." ));
     return false;
   }
 
@@ -155,7 +155,7 @@ bool KMAcctLocal::preProcess()
     kdDebug(5006) << "cannot open file " << mMailFolder->path() << "/"
       << mMailFolder->name() << endl;
     checkDone( mHasNewMail, CheckError );
-    BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." ));
+    BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
     return false;
   }
 
@@ -165,7 +165,7 @@ bool KMAcctLocal::preProcess()
     checkDone( mHasNewMail, CheckError );
     TQString errMsg = i18n( "Transmission failed: Could not lock %1." )
       .arg( mMailFolder->location() );
-    BroadcastStatus::instance()->setStatusMsg( errMsg );
+    BroadcasStatus::instance()->seStatusMsg( errMsg );
     return false;
   }
 
@@ -179,7 +179,7 @@ bool KMAcctLocal::preProcess()
   mStatusMsgStub = i18n("Moving message %3 of %2 from %1.")
     .arg(mMailFolder->location()).arg( mNumMsgs );
 
-  //BroadcastStatus::instance()->setStatusProgressEnable( "L" + mName, true );
+  //BroadcasStatus::instance()->seStatusProgressEnable( "L" + mName, true );
   return true;
 }
 
@@ -193,10 +193,10 @@ bool KMAcctLocal::fetchMsg()
   if (kmkernel->mailCheckAborted()) break; */
 
   const TQString statusMsg = mStatusMsgStub.arg( mMsgsFetched );
-  //BroadcastStatus::instance()->setStatusMsg( statusMsg );
+  //BroadcasStatus::instance()->seStatusMsg( statusMsg );
   mMailCheckProgressItem->incCompletedItems();
   mMailCheckProgressItem->updateProgress();
-  mMailCheckProgressItem->setStatus( statusMsg );
+  mMailCheckProgressItem->seStatus( statusMsg );
 
   msg = mMailFolder->take(0);
   if (msg)
@@ -214,7 +214,7 @@ bool KMAcctLocal::fetchMsg()
       fileD0.close();  // If data is 0 we just create a zero length file.
     }
 #endif
-    msg->setStatus(msg->headerField("Status").latin1(),
+    msg->seStatus(msg->headerField("Status").latin1(),
       msg->headerField("X-Status").latin1());
     msg->setEncryptionStateChar( msg->headerField( "X-KMail-EncryptionState" ).at(0) );
     msg->setSignatureStateChar( msg->headerField( "X-KMail-SignatureState" ).at(0));
@@ -249,8 +249,8 @@ void KMAcctLocal::postProcess()
     }
 
     if( mMailCheckProgressItem ) { // do this only once...
-      BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, mNumMsgs );
-      mMailCheckProgressItem->setStatus(
+      BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, mNumMsgs );
+      mMailCheckProgressItem->seStatus(
         i18n( "Fetched 1 message from mailbox %1.",
               "Fetched %n messages from mailbox %1.",
               mNumMsgs ).arg( mMailFolder->location() ) );
diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp
index b3c5d31c..ca378920 100644
--- a/kmail/kmacctmaildir.cpp
+++ b/kmail/kmacctmaildir.cpp
@@ -9,7 +9,7 @@
 #include "kmfoldermaildir.h"
 #include "kmacctfolder.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "progressmanager.h"
 using KPIM::ProgressManager;
 
@@ -86,7 +86,7 @@ void KMAcctMaildir::processNewMail(bool)
     TQFileInfo fi( location() );
     if ( !fi.exists() ) {
       checkDone( hasNewMail, CheckOK );
-      BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, 0 );
+      BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, 0 );
       return;
     }
   }
@@ -102,11 +102,11 @@ void KMAcctMaildir::processNewMail(bool)
 
   if (!mFolder) {
     checkDone( hasNewMail, CheckError );
-    BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." ));
+    BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
     return;
   }
 
-  BroadcastStatus::instance()->setStatusMsg(
+  BroadcasStatus::instance()->seStatusMsg(
 	i18n("Preparing transmission from \"%1\"...").arg(mName));
 
   Q_ASSERT( !mMailCheckProgressItem );
@@ -123,7 +123,7 @@ void KMAcctMaildir::processNewMail(bool)
   {
     kdDebug(5006) << "cannot run precommand " << precommand() << endl;
     checkDone( hasNewMail, CheckError );
-    BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." ));
+    BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
     return;
   }
 
@@ -134,7 +134,7 @@ void KMAcctMaildir::processNewMail(bool)
     KMessageBox::sorry(0, aStr);
     kdDebug(5006) << "cannot open folder " << mailFolder.location() << endl;
     checkDone( hasNewMail, CheckError );
-    BroadcastStatus::instance()->setStatusMsg( i18n( "Transmission failed." ));
+    BroadcasStatus::instance()->seStatusMsg( i18n( "Transmission failed." ));
     return;
   }
 
@@ -156,7 +156,7 @@ void KMAcctMaildir::processNewMail(bool)
   {
 
     if( kmkernel->mailCheckAborted() ) {
-      BroadcastStatus::instance()->setStatusMsg( i18n("Transmission aborted.") );
+      BroadcasStatus::instance()->seStatusMsg( i18n("Transmission aborted.") );
       num = i;
       addedOk = false;
     }
@@ -165,12 +165,12 @@ void KMAcctMaildir::processNewMail(bool)
     TQString statusMsg = statusMsgStub.arg(i);
     mMailCheckProgressItem->incCompletedItems();
     mMailCheckProgressItem->updateProgress();
-    mMailCheckProgressItem->setStatus( statusMsg );
+    mMailCheckProgressItem->seStatus( statusMsg );
 
     msg = mailFolder.take(0);
     if (msg)
     {
-      msg->setStatus(msg->headerField("Status").latin1(),
+      msg->seStatus(msg->headerField("Status").latin1(),
         msg->headerField("X-Status").latin1());
       msg->setEncryptionStateChar( msg->headerField( "X-KMail-EncryptionState" ).at(0));
       msg->setSignatureStateChar( msg->headerField( "X-KMail-SignatureState" ).at(0));
@@ -188,8 +188,8 @@ void KMAcctMaildir::processNewMail(bool)
   }
 
   if( mMailCheckProgressItem ) { // do this only once...
-    BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( num );
-    mMailCheckProgressItem->setStatus(
+    BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( num );
+    mMailCheckProgressItem->seStatus(
       i18n( "Fetched 1 message from maildir folder %1.",
             "Fetched %n messages from maildir folder %1.",
             num ).arg(mailFolder.location() ) );
@@ -199,7 +199,7 @@ void KMAcctMaildir::processNewMail(bool)
   }
   if (addedOk)
   {
-    BroadcastStatus::instance()->setStatusMsgTransmissionCompleted( mName, num );
+    BroadcasStatus::instance()->seStatusMsgTransmissionCompleted( mName, num );
   }
   // else warning is written already
 
diff --git a/kmail/kmailIface.h b/kmail/kmailIface.h
index 2338a4c4..eb4677f7 100644
--- a/kmail/kmailIface.h
+++ b/kmail/kmailIface.h
@@ -176,7 +176,7 @@ k_dcop_hidden:
       @param messageId this parameter is ignored.
   */
   /*  @TODO Get rid of the messageId parameter.  */
-  virtual bool showMail( Q_UINT32 serialNumber, TQString messageId ) = 0;
+  virtual bool showMail( TQ_UINT32 serialNumber, TQString messageId ) = 0;
 
   /**
    * DCOP-enabled for KMailUniqueAppHandler in the kontact plugin
@@ -193,9 +193,9 @@ k_dcop_hidden:
    *
    * DCOP-enabled for use in kaddressbook drop
    */
-  virtual TQString getFrom( Q_UINT32 serialNumber ) = 0;
+  virtual TQString getFrom( TQ_UINT32 serialNumber ) = 0;
   virtual TQString debugScheduler() = 0;
-  virtual TQString debugSernum( Q_UINT32 serialNumber ) = 0;
+  virtual TQString debugSernum( TQ_UINT32 serialNumber ) = 0;
 
   /** Does essentially the same as dcopAddMessage except that it doesn't reject
       duplicate messages.
diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp
index 22d48f1e..cb40bc30 100644
--- a/kmail/kmail_part.cpp
+++ b/kmail/kmail_part.cpp
@@ -60,10 +60,10 @@ using KRecentAddress::RecentAddresses;
 typedef KParts::GenericFactory< KMailPart > KMailFactory;
 K_EXPORT_COMPONENT_FACTORY( libkmailpart, KMailFactory )
 
-KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
+KMailPart::KMailPart(TQWidget *tqparentWidget, const char *widgetName,
 		     TQObject *parent, const char *name, const TQStringList &) :
   DCOPObject("KMailIface"), KParts::ReadOnlyPart(parent, name),
-  mParentWidget( parentWidget )
+  mParentWidget( tqparentWidget )
 {
   kdDebug(5006) << "KMailPart()" << endl;
   kdDebug(5006) << "  InstanceName: " << kapp->instanceName() << endl;
@@ -99,7 +99,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
   kapp->dcopClient()->resume(); // Ok. We are ready for DCOP requests.
 
   // create a canvas to insert our widget
-  TQWidget *canvas = new TQWidget(parentWidget, widgetName);
+  TQWidget *canvas = new TQWidget(tqparentWidget, widgetName);
   canvas->setFocusPolicy(TQWidget::ClickFocus);
   setWidget(canvas);
   KGlobal::iconLoader()->addAppDir("kmail");
@@ -223,7 +223,7 @@ void KMailPart::guiActivateEvent(KParts::GUIActivateEvent *e)
   mainWidget->initializeFilterActions();
   mainWidget->initializeFolderShortcutActions();
   mainWidget->setupForwardingActionsList();
-  mainWidget->updateVactionScriptStatus();
+  mainWidget->updateVactionScripStatus();
 }
 
 void KMailPart::exit()
@@ -231,7 +231,7 @@ void KMailPart::exit()
   delete this;
 }
 
-TQWidget* KMailPart::parentWidget() const
+TQWidget* KMailPart::tqparentWidget() const
 {
   return mParentWidget;
 }
@@ -244,7 +244,7 @@ KMailStatusBarExtension::KMailStatusBarExtension( KMailPart *parent )
 
 KMainWindow * KMailStatusBarExtension::mainWindow() const
 {
-  return static_cast<KMainWindow*>( mParent->parentWidget() );
+  return static_cast<KMainWindow*>( mParent->tqparentWidget() );
 }
 
 #include "kmail_part.moc"
diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h
index 97a66751..69203db9 100644
--- a/kmail/kmail_part.h
+++ b/kmail/kmail_part.h
@@ -53,11 +53,11 @@ class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPar
 {
     Q_OBJECT
   public:
-    KMailPart(TQWidget *parentWidget, const char *widgetName,
+    KMailPart(TQWidget *tqparentWidget, const char *widgetName,
               TQObject *parent, const char *name, const TQStringList &);
     virtual ~KMailPart();
 
-    TQWidget* parentWidget() const;
+    TQWidget* tqparentWidget() const;
 
     static KAboutData *createAboutData();
 
diff --git a/kmail/kmailicalIface.h b/kmail/kmailicalIface.h
index fc1b7a81..91f15df5 100644
--- a/kmail/kmailicalIface.h
+++ b/kmail/kmailicalIface.h
@@ -75,18 +75,18 @@ k_dcop:
   virtual KMailICalIface::StorageFormat storageFormat( const TQString& resource ) = 0;
 
   virtual KURL getAttachment( const TQString& resource,
-                              Q_UINT32 sernum,
+                              TQ_UINT32 sernum,
                               const TQString& filename ) = 0;
   virtual TQString attachmentMimetype( const TQString &resource,
-                                      Q_UINT32 sernum,
+                                      TQ_UINT32 sernum,
                                       const TQString &filename ) = 0;
 
-  virtual TQStringList listAttachments( const TQString &resource, Q_UINT32 sernum ) = 0;
+  virtual TQStringList listAttachments( const TQString &resource, TQ_UINT32 sernum ) = 0;
 
   /// Update a kolab storage entry. Returns the new mail serial number,
   /// or 0 if something went wrong. Can be used for adding as well.
-  virtual Q_UINT32 update( const TQString& resource,
-                           Q_UINT32 sernum,
+  virtual TQ_UINT32 update( const TQString& resource,
+                           TQ_UINT32 sernum,
                            const TQString& subject,
                            const TQString& plainTextBody,
                            const TQMap<TQCString, TQString>& customHeaders,
@@ -96,14 +96,14 @@ k_dcop:
                            const TQStringList& deletedAttachments ) = 0;
 
   virtual bool deleteIncidenceKolab( const TQString& resource,
-                                     Q_UINT32 sernum ) = 0;
+                                     TQ_UINT32 sernum ) = 0;
 
   /// Return the number of mails that need to be looked at by incidencesKolab.
   /// This allows to call incidencesKolab in chunks.
   virtual int incidencesKolabCount( const TQString& mimetype /*ignored*/,
                                     const TQString& resource ) = 0;
 
-  virtual TQMap<Q_UINT32, TQString> incidencesKolab( const TQString& mimetype,
+  virtual TQMap<TQ_UINT32, TQString> incidencesKolab( const TQString& mimetype,
                                                    const TQString& resource,
                                                    int startIndex,
                                                    int nbMessages ) = 0;
@@ -140,8 +140,8 @@ k_dcop:
 
 k_dcop_signals:
   void incidenceAdded( const TQString& type, const TQString& folder,
-                       Q_UINT32 sernum, int format, const TQString& entry );
-  void asyncLoadResult( const TQMap<Q_UINT32, TQString>, const TQString& type,
+                       TQ_UINT32 sernum, int format, const TQString& entry );
+  void asyncLoadResult( const TQMap<TQ_UINT32, TQString>, const TQString& type,
                         const TQString& folder );
   void incidenceDeleted( const TQString& type, const TQString& folder,
                          const TQString& uid );
@@ -164,14 +164,14 @@ inline TQDataStream& operator>>( TQDataStream& str, KMailICalIface::SubResource&
 
 inline TQDataStream& operator<<( TQDataStream& str, const KMailICalIface::StorageFormat& format  )
 {
-  Q_UINT32 foo = format;
+  TQ_UINT32 foo = format;
   str << foo;
   return str;
 }
 
 inline TQDataStream& operator>>( TQDataStream& str, KMailICalIface::StorageFormat& format  )
 {
-  Q_UINT32 foo;
+  TQ_UINT32 foo;
   str >> foo;
   format = ( KMailICalIface::StorageFormat )foo;
   return str;
diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp
index 05524e02..41e9f96d 100644
--- a/kmail/kmailicalifaceimpl.cpp
+++ b/kmail/kmailicalifaceimpl.cpp
@@ -236,7 +236,7 @@ inline static void debugBodyParts( const char*, const KMMessage& ) {}
 
 // Add (or overwrite, resp.) an attachment in an existing mail,
 // attachments must be local files, they are identified by their names.
-// If lookupByName if false the attachment to replace is looked up by mimetype.
+// If lookupByName if false the attachment to tqreplace is looked up by mimetype.
 // return value: wrong if attachment could not be added/updated
 bool KMailICalIfaceImpl::updateAttachment( KMMessage& msg,
                                            const TQString& attachmentURL,
@@ -325,7 +325,7 @@ bool KMailICalIfaceImpl::kolabXMLFoundAndDecoded( const KMMessage& msg, const TQ
 // Delete an attachment in an existing mail.
 // return value: wrong if attachment could not be deleted
 //
-// This code could be optimized: for now we just replace
+// This code could be optimized: for now we just tqreplace
 // the attachment by an empty dummy attachment since Mimelib
 // does not provide an option for deleting attachments yet.
 bool KMailICalIfaceImpl::deleteAttachment( KMMessage& msg,
@@ -402,7 +402,7 @@ static void setXMLContentTypeHeader( KMMessage *msg, const TQString plainTextBod
 }
 
 // Store a new entry that was received from the resource
-Q_UINT32 KMailICalIfaceImpl::addIncidenceKolab( KMFolder& folder,
+TQ_UINT32 KMailICalIfaceImpl::addIncidenceKolab( KMFolder& folder,
                                                 const TQString& subject,
                                                 const TQString& plainTextBody,
                                                 const TQMap<TQCString, TQString>& customHeaders,
@@ -412,7 +412,7 @@ Q_UINT32 KMailICalIfaceImpl::addIncidenceKolab( KMFolder& folder,
 {
   kdDebug(5006) << "KMailICalIfaceImpl::addIncidenceKolab( " << attachmentNames << " )" << endl;
 
-  Q_UINT32 sernum = 0;
+  TQ_UINT32 sernum = 0;
   bool bAttachOK = true;
 
   // Make a new message for the incidence
@@ -477,7 +477,7 @@ Q_UINT32 KMailICalIfaceImpl::addIncidenceKolab( KMFolder& folder,
 }
 
 bool KMailICalIfaceImpl::deleteIncidenceKolab( const TQString& resource,
-                                               Q_UINT32 sernum )
+                                               TQ_UINT32 sernum )
 {
   // Find the message from the serial number and delete it.
   if( !mUseResourceIMAP )
@@ -530,7 +530,7 @@ int KMailICalIfaceImpl::incidencesKolabCount( const TQString& mimetype,
   return n;
 }
 
-TQMap<Q_UINT32, TQString> KMailICalIfaceImpl::incidencesKolab( const TQString& mimetype,
+TQMap<TQ_UINT32, TQString> KMailICalIfaceImpl::incidencesKolab( const TQString& mimetype,
                                                              const TQString& resource,
                                                              int startIndex,
                                                              int nbMessages )
@@ -539,7 +539,7 @@ TQMap<Q_UINT32, TQString> KMailICalIfaceImpl::incidencesKolab( const TQString& m
   /// TQMap with serialNumber/attachment pairs.
   /// (serial numbers of the mail are provided for easier later update)
 
-  TQMap<Q_UINT32, TQString> aMap;
+  TQMap<TQ_UINT32, TQString> aMap;
   if( !mUseResourceIMAP )
     return aMap;
 
@@ -613,7 +613,7 @@ void KMailICalIfaceImpl::slotMessageRetrieved( KMMessage* msg )
 
   KMFolder *parent = msg->parent();
   Q_ASSERT( parent );
-  Q_UINT32 sernum = msg->getMsgSerNum();
+  TQ_UINT32 sernum = msg->getMsgSerNum();
 
   // do we have an accumulator for this folder?
   Accumulator *ac = mAccumulators.find( parent->location() );
@@ -622,7 +622,7 @@ void KMailICalIfaceImpl::slotMessageRetrieved( KMMessage* msg )
     if ( !vPartFoundAndDecoded( msg, s ) ) return;
     TQString uid( "UID" );
     vPartMicroParser( s, uid );
-    const Q_UINT32 sernum = msg->getMsgSerNum();
+    const TQ_UINT32 sernum = msg->getMsgSerNum();
     mUIDToSerNum.insert( uid, sernum );
     ac->add( s );
     if( ac->isFull() ) {
@@ -637,7 +637,7 @@ void KMailICalIfaceImpl::slotMessageRetrieved( KMMessage* msg )
      slotIncidenceAdded( msg->parent(), msg->getMsgSerNum() );
   }
 
-  if ( mTheUnGetMes.contains( sernum ) ) {
+  if ( mTheUnGetMes.tqcontains( sernum ) ) {
     mTheUnGetMes.remove( sernum );
     int i = 0;
     KMFolder* folder = 0;
@@ -666,24 +666,24 @@ int KMailICalIfaceImpl::dimapAccounts()
 
 static TQString subresourceLabelForPresentation( const KMFolder * folder )
 {
-    if( KMailICalIfaceImpl::getResourceMap()->contains( folder->location() ) ) {
+    if( KMailICalIfaceImpl::getResourceMap()->tqcontains( folder->location() ) ) {
         return folder->label();
     }
 
     TQString label = folder->prettyURL();
-    TQStringList parts = TQStringList::split( TQString::fromLatin1("/"), label );
+    TQStringList parts = TQStringList::split( TQString::tqfromLatin1("/"), label );
 
     // In the common special case of some other user's folder shared with us
     // the url looks like "Server Name/user/$USERNAME/Folder/Name". Make
     // those a bit nicer.
-    if ( parts[1] == TQString::fromLatin1("user") ) {
+    if ( parts[1] == TQString::tqfromLatin1("user") ) {
         TQStringList remainder(parts);
         remainder.pop_front();
         remainder.pop_front();
         remainder.pop_front();
         label = i18n("%1's %2")
             .arg( parts[2] )
-            .arg( remainder.join( TQString::fromLatin1("/") ) );
+            .arg( remainder.join( TQString::tqfromLatin1("/") ) );
     }
     // Another special case is our own folders, under the imap INBOX, make
     // those prettier too
@@ -698,15 +698,15 @@ static TQString subresourceLabelForPresentation( const KMFolder * folder )
           // Fix kolab issue 2531 folder->storage() )->account() can be null
           if( folder->storage() && static_cast<const KMFolderCachedImap*>( folder->storage() )->account() ) {
           label = i18n( "My %1 (%2)")
-              .arg( remainder.join( TQString::fromLatin1("/") ),
+              .arg( remainder.join( TQString::tqfromLatin1("/") ),
                     static_cast<const KMFolderCachedImap*>( folder->storage() )->account()->name() );
           } else {
             label = i18n("My %1")
-              .arg( remainder.join( TQString::fromLatin1("/") ) );
+              .arg( remainder.join( TQString::tqfromLatin1("/") ) );
           }
         } else {
           label = i18n("My %1")
-              .arg( remainder.join( TQString::fromLatin1("/") ) );
+              .arg( remainder.join( TQString::tqfromLatin1("/") ) );
         }
         break;
       }
@@ -812,8 +812,8 @@ KMailICalIfaceImpl::StorageFormat KMailICalIfaceImpl::storageFormat( const TQStr
   // number, and the mail is just added instead. In this case
   // the deletedAttachments can be forgotten.
 */
-Q_UINT32 KMailICalIfaceImpl::update( const TQString& resource,
-                                     Q_UINT32 sernum,
+TQ_UINT32 KMailICalIfaceImpl::update( const TQString& resource,
+                                     TQ_UINT32 sernum,
                                      const TQString& subject,
                                      const TQString& plainTextBody,
                                      const TQMap<TQCString, TQString>& customHeaders,
@@ -822,7 +822,7 @@ Q_UINT32 KMailICalIfaceImpl::update( const TQString& resource,
                                      const TQStringList& attachmentNames,
                                      const TQStringList& deletedAttachments )
 {
-  Q_UINT32 rc = 0;
+  TQ_UINT32 rc = 0;
 
    if( !mUseResourceIMAP )
     return rc;
@@ -931,7 +931,7 @@ Q_UINT32 KMailICalIfaceImpl::update( const TQString& resource,
 }
 
 KURL KMailICalIfaceImpl::getAttachment( const TQString& resource,
-                                        Q_UINT32 sernum,
+                                        TQ_UINT32 sernum,
                                         const TQString& filename )
 {
   // This finds the attachment with the filename, saves it to a
@@ -991,7 +991,7 @@ KURL KMailICalIfaceImpl::getAttachment( const TQString& resource,
 }
 
 TQString KMailICalIfaceImpl::attachmentMimetype( const TQString & resource,
-                                                Q_UINT32 sernum,
+                                                TQ_UINT32 sernum,
                                                 const TQString & filename )
 {
   if( !mUseResourceIMAP )
@@ -1020,7 +1020,7 @@ TQString KMailICalIfaceImpl::attachmentMimetype( const TQString & resource,
   return TQString();
 }
 
-TQStringList KMailICalIfaceImpl::listAttachments(const TQString & resource, Q_UINT32 sernum)
+TQStringList KMailICalIfaceImpl::listAttachments(const TQString & resource, TQ_UINT32 sernum)
 {
   TQStringList rv;
   if( !mUseResourceIMAP )
@@ -1044,7 +1044,7 @@ TQStringList KMailICalIfaceImpl::listAttachments(const TQString & resource, Q_UI
         TQString name;
         DwMediaType& contentType = part->Headers().ContentType();
         if ( TQString( contentType.SubtypeStr().c_str() ).startsWith( "x-vnd.kolab." )
-           || TQString( contentType.SubtypeStr().c_str() ).contains( "tnef" ) )
+           || TQString( contentType.SubtypeStr().c_str() ).tqcontains( "tnef" ) )
           continue;
         if ( !part->Headers().ContentDisposition().Filename().empty() )
           name = part->Headers().ContentDisposition().Filename().c_str();
@@ -1080,7 +1080,7 @@ void KMailICalIfaceImpl::slotFolderRemoved( KMFolder* folder )
 
 // KMail added a file to one of the groupware folders
 void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder,
-                                             Q_UINT32 sernum )
+                                             TQ_UINT32 sernum )
 {
   if( mResourceQuiet || !mUseResourceIMAP )
     return;
@@ -1127,11 +1127,11 @@ void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder,
         folder->unGetMsg( i );
       return;
     }
-    const Q_UINT32 sernum = msg->getMsgSerNum();
+    const TQ_UINT32 sernum = msg->getMsgSerNum();
     mUIDToSerNum.insert( uid, sernum );
 
     // tell the resource if we didn't trigger this ourselves
-    if ( mInTransit.contains( uid ) ) {
+    if ( mInTransit.tqcontains( uid ) ) {
       mInTransit.remove( uid );
     }
     incidenceAdded( type, folder->location(), sernum, format, s );
@@ -1150,7 +1150,7 @@ void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder,
 
 // KMail deleted a file
 void KMailICalIfaceImpl::slotIncidenceDeleted( KMFolder* folder,
-                                               Q_UINT32 sernum )
+                                               TQ_UINT32 sernum )
 {
   if( mResourceQuiet || !mUseResourceIMAP )
     return;
@@ -1311,33 +1311,33 @@ TQString KMailICalIfaceImpl::folderName( KFolderTreeItem::Type type, int languag
        GroupwarePage in configuredialog.cpp */
 
     // English
-    folderNames[0][KFolderTreeItem::Calendar] = TQString::fromLatin1("Calendar");
-    folderNames[0][KFolderTreeItem::Tasks] = TQString::fromLatin1("Tasks");
-    folderNames[0][KFolderTreeItem::Journals] = TQString::fromLatin1("Journal");
-    folderNames[0][KFolderTreeItem::Contacts] = TQString::fromLatin1("Contacts");
-    folderNames[0][KFolderTreeItem::Notes] = TQString::fromLatin1("Notes");
+    folderNames[0][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Calendar");
+    folderNames[0][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("Tasks");
+    folderNames[0][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Journal");
+    folderNames[0][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Contacts");
+    folderNames[0][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notes");
 
     // German
-    folderNames[1][KFolderTreeItem::Calendar] = TQString::fromLatin1("Kalender");
-    folderNames[1][KFolderTreeItem::Tasks] = TQString::fromLatin1("Aufgaben");
-    folderNames[1][KFolderTreeItem::Journals] = TQString::fromLatin1("Journal");
-    folderNames[1][KFolderTreeItem::Contacts] = TQString::fromLatin1("Kontakte");
-    folderNames[1][KFolderTreeItem::Notes] = TQString::fromLatin1("Notizen");
+    folderNames[1][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Kalender");
+    folderNames[1][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("Aufgaben");
+    folderNames[1][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Journal");
+    folderNames[1][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Kontakte");
+    folderNames[1][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notizen");
 
     // French
-    folderNames[2][KFolderTreeItem::Calendar] = TQString::fromLatin1("Calendrier");
+    folderNames[2][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Calendrier");
     // Tasks = Tâches (â == 0xE2 in latin1)
-    folderNames[2][KFolderTreeItem::Tasks] = TQString::fromLatin1("T\342ches");
-    folderNames[2][KFolderTreeItem::Journals] = TQString::fromLatin1("Journal");
-    folderNames[2][KFolderTreeItem::Contacts] = TQString::fromLatin1("Contacts");
-    folderNames[2][KFolderTreeItem::Notes] = TQString::fromLatin1("Notes");
+    folderNames[2][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("T\342ches");
+    folderNames[2][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Journal");
+    folderNames[2][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Contacts");
+    folderNames[2][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notes");
 
     // Dutch
-    folderNames[3][KFolderTreeItem::Calendar] = TQString::fromLatin1("Agenda");
-    folderNames[3][KFolderTreeItem::Tasks] = TQString::fromLatin1("Taken");
-    folderNames[3][KFolderTreeItem::Journals] = TQString::fromLatin1("Logboek");
-    folderNames[3][KFolderTreeItem::Contacts] = TQString::fromLatin1("Contactpersonen");
-    folderNames[3][KFolderTreeItem::Notes] = TQString::fromLatin1("Notities");
+    folderNames[3][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Agenda");
+    folderNames[3][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("Taken");
+    folderNames[3][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Logboek");
+    folderNames[3][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Contactpersonen");
+    folderNames[3][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notities");
   }
 
   if( language < 0 || language > 3 ) {
@@ -1352,7 +1352,7 @@ TQString KMailICalIfaceImpl::folderName( KFolderTreeItem::Type type, int languag
 // Find message matching a given UID
 KMMessage *KMailICalIfaceImpl::findMessageByUID( const TQString& uid, KMFolder* folder )
 {
-  if( !folder || !mUIDToSerNum.contains( uid ) ) return 0;
+  if( !folder || !mUIDToSerNum.tqcontains( uid ) ) return 0;
   int i;
   KMFolder *aFolder;
   KMMsgDict::instance()->getLocation( mUIDToSerNum[uid], &aFolder, &i );
@@ -1361,7 +1361,7 @@ KMMessage *KMailICalIfaceImpl::findMessageByUID( const TQString& uid, KMFolder*
 }
 
 // Find message matching a given serial number
-KMMessage *KMailICalIfaceImpl::findMessageBySerNum( Q_UINT32 serNum, KMFolder* folder )
+KMMessage *KMailICalIfaceImpl::findMessageBySerNum( TQ_UINT32 serNum, KMFolder* folder )
 {
   if( !folder ) return 0;
 
@@ -1560,7 +1560,7 @@ void KMailICalIfaceImpl::triggerKolabFreeBusy( const KURL& folderURL )
 {
   /* Steffen said: you must issue an authenticated HTTP GET request to
      https://kolabserver/freebusy/trigger/user@domain/Folder/NestedFolder.pfb
-     (replace .pfb with .xpfb for extended fb lists). */
+     (tqreplace .pfb with .xpfb for extended fb lists). */
   KURL httpURL( folderURL );
   // Keep username ("user@domain"), pass, and host from the imap url
   httpURL.setProtocol( "https" );
@@ -1575,7 +1575,7 @@ void KMailICalIfaceImpl::triggerKolabFreeBusy( const KURL& folderURL )
     return;
   }
   if ( path.startsWith( "/INBOX/", false ) ) {
-    // If INBOX, replace it with the username (which is user@domain)
+    // If INBOX, tqreplace it with the username (which is user@domain)
     path = path.mid( secondSlash );
     path.prepend( folderURL.user() );
   } else {
@@ -1922,8 +1922,8 @@ void KMailICalIfaceImpl::readConfig()
         KMFolderCachedImap *imapFolder = static_cast<KMFolderCachedImap*>( storage );
 
         const TQString attributes = imapFolder->folderAttributes();
-        if ( attributes.contains( "X-FolderClass" ) ) {
-          if ( !attributes.contains( "X-SpecialFolder" ) || (*it)->location().contains( "@" ) ) {
+        if ( attributes.tqcontains( "X-FolderClass" ) ) {
+          if ( !attributes.tqcontains( "X-SpecialFolder" ) || (*it)->location().tqcontains( "@" ) ) {
             const Scalix::FolderAttributeParser parser( attributes );
             if ( !parser.folderClass().isEmpty() ) {
               FolderContentsType type = Scalix::Utils::scalixIdToContentsType( parser.folderClass() );
@@ -2051,7 +2051,7 @@ KMFolder* KMailICalIfaceImpl::initScalixFolder( KMail::FolderContentsType conten
       KMFolderCachedImap *imapFolder = static_cast<KMFolderCachedImap*>( storage );
 
       const TQString attributes = imapFolder->folderAttributes();
-      if ( attributes.contains( "X-SpecialFolder" ) ) {
+      if ( attributes.tqcontains( "X-SpecialFolder" ) ) {
         const Scalix::FolderAttributeParser parser( attributes );
         if ( contentsType == Scalix::Utils::scalixIdToContentsType( parser.folderClass() ) ) {
           folder = *it;
@@ -2084,10 +2084,10 @@ KMFolder* KMailICalIfaceImpl::initScalixFolder( KMail::FolderContentsType conten
 void KMailICalIfaceImpl::connectFolder( KMFolder* folder )
 {
   // avoid multiple connections
-  disconnect( folder, TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ),
-              this, TQT_SLOT( slotIncidenceAdded( KMFolder*, Q_UINT32 ) ) );
-  disconnect( folder, TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ),
-              this, TQT_SLOT( slotIncidenceDeleted( KMFolder*, Q_UINT32 ) ) );
+  disconnect( folder, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ),
+              this, TQT_SLOT( slotIncidenceAdded( KMFolder*, TQ_UINT32 ) ) );
+  disconnect( folder, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ),
+              this, TQT_SLOT( slotIncidenceDeleted( KMFolder*, TQ_UINT32 ) ) );
   disconnect( folder, TQT_SIGNAL( expunged( KMFolder* ) ),
               this, TQT_SLOT( slotRefreshFolder( KMFolder* ) ) );
   disconnect( folder->storage(), TQT_SIGNAL( readOnlyChanged( KMFolder* ) ),
@@ -2098,10 +2098,10 @@ void KMailICalIfaceImpl::connectFolder( KMFolder* folder )
               this, TQT_SLOT( slotFolderLocationChanged( const TQString&, const TQString&) ) );
 
   // Setup the signals to listen for changes
-  connect( folder, TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ),
-           this, TQT_SLOT( slotIncidenceAdded( KMFolder*, Q_UINT32 ) ) );
-  connect( folder, TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ),
-           this, TQT_SLOT( slotIncidenceDeleted( KMFolder*, Q_UINT32 ) ) );
+  connect( folder, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ),
+           this, TQT_SLOT( slotIncidenceAdded( KMFolder*, TQ_UINT32 ) ) );
+  connect( folder, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ),
+           this, TQT_SLOT( slotIncidenceDeleted( KMFolder*, TQ_UINT32 ) ) );
   connect( folder, TQT_SIGNAL( expunged( KMFolder* ) ),
            this, TQT_SLOT( slotRefreshFolder( KMFolder* ) ) );
   connect( folder->storage(), TQT_SIGNAL( readOnlyChanged( KMFolder* ) ),
@@ -2139,15 +2139,15 @@ TQString KMailICalIfaceImpl::folderPixmap( KFolderTreeItem::Type type ) const
     return TQString::null;
 
   if( type == KFolderTreeItem::Contacts )
-    return TQString::fromLatin1( "kmgroupware_folder_contacts" );
+    return TQString::tqfromLatin1( "kmgroupware_folder_contacts" );
   else if( type == KFolderTreeItem::Calendar )
-    return TQString::fromLatin1( "kmgroupware_folder_calendar" );
+    return TQString::tqfromLatin1( "kmgroupware_folder_calendar" );
   else if( type == KFolderTreeItem::Notes )
-    return TQString::fromLatin1( "kmgroupware_folder_notes" );
+    return TQString::tqfromLatin1( "kmgroupware_folder_notes" );
   else if( type == KFolderTreeItem::Tasks )
-    return TQString::fromLatin1( "kmgroupware_folder_tasks" );
+    return TQString::tqfromLatin1( "kmgroupware_folder_tasks" );
   else if( type == KFolderTreeItem::Journals )
-    return TQString::fromLatin1( "kmgroupware_folder_journals" );
+    return TQString::tqfromLatin1( "kmgroupware_folder_journals" );
 
   return TQString::null;
 }
diff --git a/kmail/kmailicalifaceimpl.h b/kmail/kmailicalifaceimpl.h
index c0308f92..ae2d1d6e 100644
--- a/kmail/kmailicalifaceimpl.h
+++ b/kmail/kmailicalifaceimpl.h
@@ -31,7 +31,7 @@
     your version.
 */
 
-/** @file This file contains the class KMailICalIfaceImpl which actually
+/** @file This file tqcontains the class KMailICalIfaceImpl which actually
 * implements the ICal (DCOP) interface for KMail.
 */
 
@@ -95,8 +95,8 @@ public:
   /// given the subject as Subject: header.
   /// Returns the new mail serial number,
   /// or 0 if something went wrong,
-  Q_UINT32 update( const TQString& resource,
-                   Q_UINT32 sernum,
+  TQ_UINT32 update( const TQString& resource,
+                   TQ_UINT32 sernum,
                    const TQString& subject,
                    const TQString& plainTextBody,
                    const TQMap<TQCString, TQString>& customHeaders,
@@ -106,10 +106,10 @@ public:
                    const TQStringList& deletedAttachments );
 
   bool deleteIncidenceKolab( const TQString& resource,
-                             Q_UINT32 sernum );
+                             TQ_UINT32 sernum );
   int incidencesKolabCount( const TQString& mimetype,
                             const TQString& resource );
-  TQMap<Q_UINT32, TQString> incidencesKolab( const TQString& mimetype,
+  TQMap<TQ_UINT32, TQString> incidencesKolab( const TQString& mimetype,
                                            const TQString& resource,
                                            int startIndex,
                                            int nbMessages );
@@ -122,14 +122,14 @@ public:
   // "Get" an attachment. This actually saves the attachment in a file
   // and returns a URL to it
   KURL getAttachment( const TQString& resource,
-                      Q_UINT32 sernum,
+                      TQ_UINT32 sernum,
                       const TQString& filename );
 
   TQString attachmentMimetype( const TQString &resource,
-                              Q_UINT32 sernum,
+                              TQ_UINT32 sernum,
                               const TQString &filename );
 
-  TQStringList listAttachments( const TQString &resource, Q_UINT32 sernum );
+  TQStringList listAttachments( const TQString &resource, TQ_UINT32 sernum );
 
 
   bool removeSubresource( const TQString& );
@@ -195,7 +195,7 @@ public:
   /** Find message matching a given UID. */
   KMMessage* findMessageByUID( const TQString& uid, KMFolder* folder );
   /** Find message matching a given serial number. */
-  static KMMessage* findMessageBySerNum( Q_UINT32 serNum, KMFolder* folder );
+  static KMMessage* findMessageBySerNum( TQ_UINT32 serNum, KMFolder* folder );
 
   /** Convenience function to delete a message. */
   void deleteMsg( KMMessage* msg );
@@ -231,8 +231,8 @@ public slots:
   void readConfig();
   void slotFolderRemoved( KMFolder* folder );
 
-  void slotIncidenceAdded( KMFolder* folder, Q_UINT32 sernum );
-  void slotIncidenceDeleted( KMFolder* folder, Q_UINT32 sernum );
+  void slotIncidenceAdded( KMFolder* folder, TQ_UINT32 sernum );
+  void slotIncidenceDeleted( KMFolder* folder, TQ_UINT32 sernum );
   void slotRefresh( const TQString& type);
 
   // Called when a folder is made readonly or readwrite, or renamed,
@@ -281,7 +281,7 @@ private:
                          bool lookupByName );
   bool deleteAttachment( KMMessage& msg,
                          const TQString& attachmentURL );
-  Q_UINT32 addIncidenceKolab( KMFolder& folder,
+  TQ_UINT32 addIncidenceKolab( KMFolder& folder,
                               const TQString& subject,
                               const TQString& plainTextBody,
                               const TQMap<TQCString, TQString>& customHeaders,
@@ -344,8 +344,8 @@ private:
    * Since these are transient attributes of only a small but changing number
    * of incidences they are not encapsulated in a struct or somesuch.
    */
-  TQMap<TQString, Q_UINT32> mUIDToSerNum;
-  TQMap<Q_UINT32, bool> mTheUnGetMes;
+  TQMap<TQString, TQ_UINT32> mUIDToSerNum;
+  TQMap<TQ_UINT32, bool> mTheUnGetMes;
   TQMap<TQString, TQString> mPendingUpdates;
   TQMap<TQString, bool> mInTransit;
   static TQMap<TQString, TQString> *mSubResourceUINamesMap;
diff --git a/kmail/kmatmlistview.cpp b/kmail/kmatmlistview.cpp
index a30fe30c..84967646 100644
--- a/kmail/kmatmlistview.cpp
+++ b/kmail/kmatmlistview.cpp
@@ -52,9 +52,9 @@ void KMAtmListViewItem::updateCheckBox( int headerSection, TQCheckBox *cb )
   //Set the correct background color
   TQColor bg;
   if ( isSelected() ) {
-    bg = listView()->colorGroup().highlight();
+    bg = listView()->tqcolorGroup().highlight();
   } else {
-    bg = listView()->colorGroup().base();
+    bg = listView()->tqcolorGroup().base();
   }
   cb->setPaletteBackgroundColor( bg );
 }
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index 7bf978b0..907d2110 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -216,7 +216,7 @@ KMMessage *KMCommand::retrievedMessage() const
   return mRetrievedMsgs.getFirst();
 }
 
-TQWidget *KMCommand::parentWidget() const
+TQWidget *KMCommand::tqparentWidget() const
 {
   return mParent;
 }
@@ -296,7 +296,7 @@ void KMCommand::transferSelectedMsgs()
   mCountMsgs = mMsgList.count();
   uint totalSize = 0;
   // the KProgressDialog for the user-feedback. Only enable it if it's needed.
-  // For some commands like KMSetStatusCommand it's not needed. Note, that
+  // For some commands like KMSeStatusCommand it's not needed. Note, that
   // for some reason the KProgressDialog eats the MouseReleaseEvent (if a
   // command is executed after the MousePressEvent), cf. bug #71761.
   if ( mCountMsgs > 0 ) {
@@ -537,7 +537,7 @@ KMAddBookmarksCommand::KMAddBookmarksCommand( const KURL &url, TQWidget *parent
 
 KMCommand::Result KMAddBookmarksCommand::execute()
 {
-  TQString filename = locateLocal( "data", TQString::fromLatin1("konqueror/bookmarks.xml") );
+  TQString filename = locateLocal( "data", TQString::tqfromLatin1("konqueror/bookmarks.xml") );
   KBookmarkManager *bookManager = KBookmarkManager::managerForFile( filename,
                                                                     false );
   KBookmarkGroup group = bookManager->root();
@@ -558,7 +558,7 @@ KMMailtoAddAddrBookCommand::KMMailtoAddAddrBookCommand( const KURL &url,
 KMCommand::Result KMMailtoAddAddrBookCommand::execute()
 {
   KAddrBookExternal::addEmail( KMMessage::decodeMailtoUrl( mUrl.path() ),
-                               parentWidget() );
+                               tqparentWidget() );
 
   return OK;
 }
@@ -573,7 +573,7 @@ KMMailtoOpenAddrBookCommand::KMMailtoOpenAddrBookCommand( const KURL &url,
 KMCommand::Result KMMailtoOpenAddrBookCommand::execute()
 {
   KAddrBookExternal::openEmail( KMMessage::decodeMailtoUrl( mUrl.path() ),
-                                parentWidget() );
+                                tqparentWidget() );
 
   return OK;
 }
@@ -595,14 +595,14 @@ KMCommand::Result KMUrlCopyCommand::execute()
     clip->setText( address );
     clip->setSelectionMode( false );
     clip->setText( address );
-    KPIM::BroadcastStatus::instance()->setStatusMsg( i18n( "Address copied to clipboard." ));
+    KPIM::BroadcasStatus::instance()->seStatusMsg( i18n( "Address copied to clipboard." ));
   } else {
     // put the url into the mouse selection and the clipboard
     clip->setSelectionMode( true );
     clip->setText( mUrl.url() );
     clip->setSelectionMode( false );
     clip->setText( mUrl.url() );
-    KPIM::BroadcastStatus::instance()->setStatusMsg( i18n( "URL copied to clipboard." ));
+    KPIM::BroadcasStatus::instance()->seStatusMsg( i18n( "URL copied to clipboard." ));
   }
 
   return OK;
@@ -633,13 +633,13 @@ KMCommand::Result KMUrlSaveCommand::execute()
   if ( mUrl.isEmpty() )
     return OK;
   KURL saveUrl = KFileDialog::getSaveURL(mUrl.fileName(), TQString::null,
-                                         parentWidget() );
+                                         tqparentWidget() );
   if ( saveUrl.isEmpty() )
     return Canceled;
-  if ( KIO::NetAccess::exists( saveUrl, false, parentWidget() ) )
+  if ( KIO::NetAccess::exists( saveUrl, false, tqparentWidget() ) )
   {
     if (KMessageBox::warningContinueCancel(0,
-        i18n("<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>")
+        i18n("<qt>File <b>%1</b> exists.<br>Do you want to tqreplace it?</qt>")
         .arg(saveUrl.prettyURL()), i18n("Save to File"), i18n("&Replace"))
         != KMessageBox::Continue)
       return Canceled;
@@ -753,8 +753,8 @@ KMCommand::Result KMShowMsgSrcCommand::execute()
     viewer->resize(TQApplication::desktop()->screenGeometry(scnum).width()/2,
                   2*TQApplication::desktop()->screenGeometry(scnum).height()/3);
   } else {
-    viewer->resize(TQApplication::desktop()->geometry().width()/2,
-                  2*TQApplication::desktop()->geometry().height()/3);
+    viewer->resize(TQApplication::desktop()->tqgeometry().width()/2,
+                  2*TQApplication::desktop()->tqgeometry().height()/3);
   }
   viewer->show();
 
@@ -763,7 +763,7 @@ KMCommand::Result KMShowMsgSrcCommand::execute()
 
 static KURL subjectToUrl( const TQString & subject )
 {
-  // We need to replace colons with underscores since those cause problems with KFileDialog (bug
+  // We need to tqreplace colons with underscores since those cause problems with KFileDialog (bug
   // in KFileDialog though) and also on Windows filesystems.
   // We also look at the special case of ": ", since converting that to "_ " would look strange,
   // simply "_" looks better.
@@ -774,11 +774,11 @@ static KURL subjectToUrl( const TQString & subject )
   // https://issues.kolab.org/issue3805
   const TQString filter = i18n( "*.mbox|email messages (*.mbox)\n*|all files (*)" );
   TQString cleanSubject = subject.stripWhiteSpace()
-                                  .replace( TQDir::separator(), '_' )
-                                  .replace( ": ", "_" )
-                                  .replace( ':', '_' )
-                                  .replace( '.', '_' )
-                                  .replace( '~', '_' );
+                                  .tqreplace( TQDir::separator(), '_' )
+                                  .tqreplace( ": ", "_" )
+                                  .tqreplace( ':', '_' )
+                                  .tqreplace( '.', '_' )
+                                  .tqreplace( '~', '_' );
   return KFileDialog::getSaveURL( cleanSubject, filter );
 }
 
@@ -945,7 +945,7 @@ void KMSaveMsgCommand::slotMessageRetrievedForSaving(KMMessage *msg)
   ++mMsgListIndex;
   // Get rid of the message.
   if ( msg && msg->parent() && msg->getMsgSerNum() &&
-       mUngetMsgs.contains( msg ) ) {
+       mUngetMsgs.tqcontains( msg ) ) {
     int idx = -1;
     KMFolder * p = 0;
     KMMsgDict::instance()->getLocation( msg, &p, &idx );
@@ -962,7 +962,7 @@ void KMSaveMsgCommand::slotSaveResult(KIO::Job *job)
     if (job->error() == KIO::ERR_FILE_ALREADY_EXIST)
     {
       if (KMessageBox::warningContinueCancel(0,
-        i18n("File %1 exists.\nDo you want to replace it?")
+        i18n("File %1 exists.\nDo you want to tqreplace it?")
         .arg(mUrl.prettyURL()), i18n("Save to File"), i18n("&Replace"))
         == KMessageBox::Continue) {
         mOffset = 0;
@@ -1006,7 +1006,7 @@ KMCommand::Result KMOpenMsgCommand::execute()
 {
   if ( mUrl.isEmpty() ) {
     mUrl = KFileDialog::getOpenURL( ":OpenMessage", "message/rfc822 application/mbox",
-                                    parentWidget(), i18n("Open Message") );
+                                    tqparentWidget(), i18n("Open Message") );
   }
   if ( mUrl.isEmpty() ) {
     setDeletesItself( false );
@@ -1043,7 +1043,7 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job )
     if ( mMsgString.compare( 0, 5, "From ", 5 ) == 0 ) {
       startOfMessage = mMsgString.find( '\n' );
       if ( startOfMessage == -1 ) {
-        KMessageBox::sorry( parentWidget(),
+        KMessageBox::sorry( tqparentWidget(),
                             i18n( "The file does not contain a message." ) );
         setResult( Failed );
         emit completed( this );
@@ -1071,7 +1071,7 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job )
     dwMsg->Parse();
     // check whether we have a message ( no headers => this isn't a message )
     if ( dwMsg->Headers().NumFields() == 0 ) {
-      KMessageBox::sorry( parentWidget(),
+      KMessageBox::sorry( tqparentWidget(),
                           i18n( "The file does not contain a message." ) );
       delete dwMsg; dwMsg = 0;
       setResult( Failed );
@@ -1090,7 +1090,7 @@ void KMOpenMsgCommand::slotResult( KIO::Job *job )
     win->show();
     if ( multipleMessages )
       KMessageBox::information( win,
-                                i18n( "The file contains multiple messages. "
+                                i18n( "The file tqcontains multiple messages. "
                                       "Only the first message is shown." ) );
     setResult( OK );
     emit completed( this );
@@ -1395,7 +1395,7 @@ KMCommand::Result KMForwardDigestCommand::execute()
       id = msg->headerField( "X-KMail-Identity" ).stripWhiteSpace().toUInt();
     // set the part header
     msgPartText += "--";
-    msgPartText += TQString::fromLatin1( boundary );
+    msgPartText += TQString::tqfromLatin1( boundary );
     msgPartText += "\nContent-Type: MESSAGE/RFC822";
     msgPartText += TQString( "; CHARSET=%1" ).arg( msg->charset() );
     msgPartText += '\n';
@@ -1403,7 +1403,7 @@ KMCommand::Result KMForwardDigestCommand::execute()
     dwh.MessageId().CreateDefault();
     msgPartText += TQString( "Content-ID: %1\n" ).arg( dwh.MessageId().AsString().c_str() );
     msgPartText += TQString( "Content-Description: %1" ).arg( msg->subject() );
-    if ( !msg->subject().contains( "(fwd)" ) )
+    if ( !msg->subject().tqcontains( "(fwd)" ) )
       msgPartText += " (fwd)";
     msgPartText += "\n\n";
     // remove headers that shouldn't be forwarded
@@ -1422,7 +1422,7 @@ KMCommand::Result KMForwardDigestCommand::execute()
     id = mIdentity; // use folder identity if no message had an id set
   fwdMsg->initHeader( id );
   msgPartText += "--";
-  msgPartText += TQString::fromLatin1( boundary );
+  msgPartText += TQString::tqfromLatin1( boundary );
   msgPartText += "--\n";
   TQCString tmp;
   msgPart->setTypeStr( "MULTIPART" );
@@ -1452,7 +1452,7 @@ KMCommand::Result KMRedirectCommand::execute()
   if ( !msg || !msg->codec() )
     return Failed;
 
-  RedirectDialog dlg( parentWidget(), "redirect", true,
+  RedirectDialog dlg( tqparentWidget(), "redirect", true,
                       kmkernel->msgSender()->sendImmediate() );
   if (dlg.exec()==TQDialog::Rejected) return Failed;
 
@@ -1639,18 +1639,18 @@ KMCommand::Result KMPrintCommand::execute()
 }
 
 
-KMSetStatusCommand::KMSetStatusCommand( KMMsgStatus status,
-  const TQValueList<Q_UINT32> &serNums, bool toggle )
+KMSeStatusCommand::KMSeStatusCommand( KMMsgStatus status,
+  const TQValueList<TQ_UINT32> &serNums, bool toggle )
   : mStatus( status ), mSerNums( serNums ), mToggle( toggle )
 {
 }
 
-KMCommand::Result KMSetStatusCommand::execute()
+KMCommand::Result KMSeStatusCommand::execute()
 {
-  TQValueListIterator<Q_UINT32> it;
+  TQValueListIterator<TQ_UINT32> it;
   int idx = -1;
   KMFolder *folder = 0;
-  bool parentStatus = false;
+  bool parenStatus = false;
 
   // Toggle actions on threads toggle the whole thread
   // depending on the state of the parent.
@@ -1660,9 +1660,9 @@ KMCommand::Result KMSetStatusCommand::execute()
     if (folder) {
       msg = folder->getMsgBase(idx);
       if (msg && (msg->status()&mStatus))
-        parentStatus = true;
+        parenStatus = true;
       else
-        parentStatus = false;
+        parenStatus = false;
     }
   }
   TQMap< KMFolder*, TQValueList<int> > folderMap;
@@ -1678,7 +1678,7 @@ KMCommand::Result KMSetStatusCommand::execute()
             myStatus = true;
           else
             myStatus = false;
-          if (myStatus != parentStatus)
+          if (myStatus != parenStatus)
             continue;
         }
       }
@@ -1690,7 +1690,7 @@ KMCommand::Result KMSetStatusCommand::execute()
   TQMapIterator< KMFolder*, TQValueList<int> > it2 = folderMap.begin();
   while ( it2 != folderMap.end() ) {
      KMFolder *f = it2.key();
-     f->setStatus( (*it2), mStatus, mToggle );
+     f->seStatus( (*it2), mStatus, mToggle );
      ++it2;
   }
   //kapp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", TQByteArray() );
@@ -1734,15 +1734,15 @@ KMCommand::Result KMFilterActionCommand::execute()
     ProgressManager::createProgressItem ( "filter"+ProgressManager::getUniqueID(),
                                           i18n( "Filtering messages" ) );
   progressItem->setTotalItems( msgCountToFilter );
-  TQValueList<Q_UINT32>::const_iterator it;
+  TQValueList<TQ_UINT32>::const_iterator it;
   for ( it = serNumList.begin(); it != serNumList.end(); it++ ) {
-    Q_UINT32 serNum = *it;
+    TQ_UINT32 serNum = *it;
     int diff = msgCountToFilter - ++msgCount;
     if ( diff < 10 || !( msgCount % 20 ) || msgCount <= 10 ) {
       progressItem->updateProgress();
       TQString statusMsg = i18n("Filtering message %1 of %2");
       statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter );
-      KPIM::BroadcastStatus::instance()->setStatusMsg( statusMsg );
+      KPIM::BroadcasStatus::instance()->seStatusMsg( statusMsg );
       KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
     }
 
@@ -1932,7 +1932,7 @@ void KMMenuCommand::makeFolderMenu(KMFolderNode* node, bool move,
       continue;
     KMFolder *child = static_cast<KMFolder*>(it);
     TQString label = child->label();
-    label.replace("&","&&");
+    label.tqreplace("&","&&");
     if (child->child() && child->child()->first()) {
       // descend
       TQPopupMenu *subMenu = new TQPopupMenu(menu, "subMenu");
@@ -1994,7 +1994,7 @@ KMCommand::Result KMCopyCommand::execute()
       msg = srcFolder->getMsg(idx);
       // corrupt IMAP cache, see FolderStorage::getMsg()
       if ( msg == 0 ) {
-        KMessageBox::error( parentWidget(), i18n("Corrupt IMAP cache detected in folder %1. "
+        KMessageBox::error( tqparentWidget(), i18n("Corrupt IMAP cache detected in folder %1. "
             "Copying of messages aborted.").arg( srcFolder->prettyURL() ) );
         deleteLater();
         return Failed;
@@ -2015,7 +2015,7 @@ KMCommand::Result KMCopyCommand::execute()
       // make sure the attachment state is only calculated when it's complete
       if (!newMsg->isComplete())
         newMsg->setReadyToShow(false);
-      newMsg->setStatus(msg->status());
+      newMsg->seStatus(msg->status());
 
       if (srcFolder && !newMsg->isComplete())
       {
@@ -2145,7 +2145,7 @@ KMMoveCommand::KMMoveCommand( KMFolder* destFolder,
   mSerNumList.append( msgBase->getMsgSerNum() );
 }
 
-KMMoveCommand::KMMoveCommand( Q_UINT32 )
+KMMoveCommand::KMMoveCommand( TQ_UINT32 )
   : mProgressItem( 0 )
 {
 }
@@ -2180,13 +2180,13 @@ KMCommand::Result KMMoveCommand::execute()
   mCompleteWithAddedMsg = false;
 
   if (mDestFolder) {
-    connect (mDestFolder, TQT_SIGNAL(msgAdded(KMFolder*, Q_UINT32)),
-             this, TQT_SLOT(slotMsgAddedToDestFolder(KMFolder*, Q_UINT32)));
+    connect (mDestFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+             this, TQT_SLOT(slotMsgAddedToDestFolder(KMFolder*, TQ_UINT32)));
     mLostBoys = mSerNumList;
   }
   mProgressItem->setTotalItems( mSerNumList.count() );
 
-  for ( TQValueList<Q_UINT32>::ConstIterator it = mSerNumList.constBegin(); it != mSerNumList.constEnd(); ++it ) {
+  for ( TQValueList<TQ_UINT32>::ConstIterator it = mSerNumList.constBegin(); it != mSerNumList.constEnd(); ++it ) {
     if ( *it == 0 ) {
       kdDebug(5006) << k_funcinfo << "serial number == 0!" << endl;
       continue; // invalid message
@@ -2305,7 +2305,7 @@ void KMMoveCommand::slotImapFolderCompleted(KMFolderImap* imapFolder, bool succe
   }
 }
 
-void KMMoveCommand::slotMsgAddedToDestFolder(KMFolder *folder, Q_UINT32 serNum)
+void KMMoveCommand::slotMsgAddedToDestFolder(KMFolder *folder, TQ_UINT32 serNum)
 {
   if ( folder != mDestFolder || mLostBoys.find( serNum ) == mLostBoys.end() ) {
     //kdDebug(5006) << "KMMoveCommand::msgAddedToDestFolder different "
@@ -2315,8 +2315,8 @@ void KMMoveCommand::slotMsgAddedToDestFolder(KMFolder *folder, Q_UINT32 serNum)
   mLostBoys.remove(serNum);
   if ( mLostBoys.isEmpty() ) {
     // we are done. All messages transferred to the host succesfully
-    disconnect (mDestFolder, TQT_SIGNAL(msgAdded(KMFolder*, Q_UINT32)),
-             this, TQT_SLOT(slotMsgAddedToDestFolder(KMFolder*, Q_UINT32)));
+    disconnect (mDestFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+             this, TQT_SLOT(slotMsgAddedToDestFolder(KMFolder*, TQ_UINT32)));
     if (mDestFolder && mDestFolder->folderType() != KMFolderTypeImap) {
       mDestFolder->sync();
     }
@@ -2370,7 +2370,7 @@ KMDeleteMsgCommand::KMDeleteMsgCommand( KMFolder* srcFolder, KMMessage * msg )
   mOpenedFolders.push_back( srcFolder );
 }
 
-KMDeleteMsgCommand::KMDeleteMsgCommand( Q_UINT32 sernum )
+KMDeleteMsgCommand::KMDeleteMsgCommand( TQ_UINT32 sernum )
 :KMMoveCommand( sernum )
 {
   if ( !sernum ) {
@@ -2453,7 +2453,7 @@ KMCommand::Result KMUrlClickedCommand::execute()
            (mUrl.protocol() == "smb")  || (mUrl.protocol() == "fish")  ||
            (mUrl.protocol() == "news"))
   {
-    KPIM::BroadcastStatus::instance()->setStatusMsg( i18n("Opening URL..."));
+    KPIM::BroadcasStatus::instance()->seStatusMsg( i18n("Opening URL..."));
     KMimeType::Ptr mime = KMimeType::findByURL( mUrl );
     if (mime->name() == "application/x-desktop" ||
         mime->name() == "application/x-executable" ||
@@ -2555,7 +2555,7 @@ void KMSaveAttachmentsCommand::slotSaveAll()
   if ( mAttachmentMap.count() > 1 ) {
     // get the dir
     dirUrl = KDirSelectDialog::selectDirectory( TQString::null, false,
-                                                parentWidget(),
+                                                tqparentWidget(),
                                                 i18n("Save Attachments To") );
     if ( !dirUrl.isValid() ) {
       setResult( Canceled );
@@ -2570,14 +2570,14 @@ void KMSaveAttachmentsCommand::slotSaveAll()
   else {
     // only one item, get the desired filename
     partNode *node = mAttachmentMap.begin().key();
-    // replace all ':' with '_' because ':' isn't allowed on FAT volumes
+    // tqreplace all ':' with '_' because ':' isn't allowed on FAT volumes
     TQString s =
-      node->msgPart().fileName().stripWhiteSpace().replace( ':', '_' );
+      node->msgPart().fileName().stripWhiteSpace().tqreplace( ':', '_' );
     if ( s.isEmpty() )
-      s = node->msgPart().name().stripWhiteSpace().replace( ':', '_' );
+      s = node->msgPart().name().stripWhiteSpace().tqreplace( ':', '_' );
     if ( s.isEmpty() )
       s = i18n("filename for an unnamed attachment", "attachment.1");
-    url = KFileDialog::getSaveURL( s, TQString::null, parentWidget(),
+    url = KFileDialog::getSaveURL( s, TQString::null, tqparentWidget(),
                                    TQString::null );
     if ( url.isEmpty() ) {
       setResult( Canceled );
@@ -2598,9 +2598,9 @@ void KMSaveAttachmentsCommand::slotSaveAll()
     if ( !dirUrl.isEmpty() ) {
       curUrl = dirUrl;
       TQString s =
-        it.key()->msgPart().fileName().stripWhiteSpace().replace( ':', '_' );
+        it.key()->msgPart().fileName().stripWhiteSpace().tqreplace( ':', '_' );
       if ( s.isEmpty() )
-        s = it.key()->msgPart().name().stripWhiteSpace().replace( ':', '_' );
+        s = it.key()->msgPart().name().stripWhiteSpace().tqreplace( ':', '_' );
       if ( s.isEmpty() ) {
         ++unnamedAtmCount;
         s = i18n("filename for the %1-th unnamed attachment",
@@ -2619,7 +2619,7 @@ void KMSaveAttachmentsCommand::slotSaveAll()
      TQString origFile = curUrl.fileName();
      TQString file = origFile;
 
-     while ( renameNumbering.contains(file) ) {
+     while ( renameNumbering.tqcontains(file) ) {
        file = origFile;
        int num = renameNumbering[file] + 1;
        int dotIdx = file.findRev('.');
@@ -2628,21 +2628,21 @@ void KMSaveAttachmentsCommand::slotSaveAll()
      curUrl.setFileName(file);
 
      // Increment the counter for both the old and the new filename
-     if ( !renameNumbering.contains(origFile))
+     if ( !renameNumbering.tqcontains(origFile))
          renameNumbering[origFile] = 1;
      else
          renameNumbering[origFile]++;
 
      if ( file != origFile ) {
-        if ( !renameNumbering.contains(file))
+        if ( !renameNumbering.tqcontains(file))
             renameNumbering[file] = 1;
         else
             renameNumbering[file]++;
      }
 
 
-      if ( KIO::NetAccess::exists( curUrl, false, parentWidget() ) ) {
-        if ( KMessageBox::warningContinueCancel( parentWidget(),
+      if ( KIO::NetAccess::exists( curUrl, false, tqparentWidget() ) ) {
+        if ( KMessageBox::warningContinueCancel( tqparentWidget(),
               i18n( "A file named %1 already exists. Do you want to overwrite it?" )
               .arg( curUrl.fileName() ),
               i18n( "File Already Exists" ), i18n("&Overwrite") ) == KMessageBox::Cancel) {
@@ -2666,7 +2666,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node,
   bool bSaveEncrypted = false;
   bool bEncryptedParts = node->encryptionState() != KMMsgNotEncrypted;
   if( bEncryptedParts )
-    if( KMessageBox::questionYesNo( parentWidget(),
+    if( KMessageBox::questionYesNo( tqparentWidget(),
           i18n( "The part %1 of the message is encrypted. Do you want to keep the encryption when saving?" ).
           arg( url.fileName() ),
           i18n( "KMail Question" ), i18n("Keep Encryption"), i18n("Do Not Keep") ) ==
@@ -2675,7 +2675,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node,
 
   bool bSaveWithSig = true;
   if( node->signatureState() != KMMsgNotSigned )
-    if( KMessageBox::questionYesNo( parentWidget(),
+    if( KMessageBox::questionYesNo( tqparentWidget(),
           i18n( "The part %1 of the message is signed. Do you want to keep the signature when saving?" ).
           arg( url.fileName() ),
           i18n( "KMail Question" ), i18n("Keep Signature"), i18n("Do Not Keep") ) !=
@@ -2749,7 +2749,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node,
     file.setName( url.path() );
     if ( !file.open( IO_WriteOnly ) )
     {
-      KMessageBox::error( parentWidget(),
+      KMessageBox::error( tqparentWidget(),
           i18n( "%2 is detailed error description",
             "Could not write the file %1:\n%2" )
           .arg( file.name() )
@@ -2773,9 +2773,9 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node,
   if ( !url.isLocalFile() )
   {
     tf.close();
-    if ( !KIO::NetAccess::upload( tf.name(), url, parentWidget() ) )
+    if ( !KIO::NetAccess::upload( tf.name(), url, tqparentWidget() ) )
     {
-      KMessageBox::error( parentWidget(),
+      KMessageBox::error( tqparentWidget(),
           i18n( "Could not write the file %1." )
           .arg( url.path() ),
           i18n( "KMail Error" ) );
@@ -2987,7 +2987,7 @@ KMCommand::Result KMIMChatCommand::execute()
   TQString addr = KMMessage::decodeMailtoUrl( mUrl.path() );
   // find UID for mail address
   KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
-  KABC::AddresseeList addressees = addressBook->findByEmail( KPIM::getEmailAddress( addr ) ) ;
+  KABC::AddresseeList addressees = addressBook->tqfindByEmail( KPIM::getEmailAddress( addr ) ) ;
 
   // start chat
   if( addressees.count() == 1 ) {
@@ -3011,11 +3011,11 @@ KMCommand::Result KMIMChatCommand::execute()
       {
           nameList.append( (*it).realName() );
       }
-      TQString names = nameList.join( TQString::fromLatin1( ",\n" ) );
+      TQString names = nameList.join( TQString::tqfromLatin1( ",\n" ) );
       apology = apology.arg( names );
     }
 
-    KMessageBox::sorry( parentWidget(), apology );
+    KMessageBox::sorry( tqparentWidget(), apology );
     return Failed;
   }
 }
@@ -3128,13 +3128,13 @@ KService::Ptr KMHandleAttachmentCommand::getServiceOffer()
   mimetype = KMimeType::mimeType( contentTypeStr );
   if ( mimetype->name() == "application/octet-stream" ) {
     // consider the filename if Content-Type is application/octet-stream
-    mimetype = KMimeType::findByPath( mAtmName, 0, true /* no disk access */ );
+    mimetype = KMimeType::tqfindByPath( mAtmName, 0, true /* no disk access */ );
   }
   if ( ( mimetype->name() == "application/octet-stream" )
        && msgPart.isComplete() ) {
     // consider the attachment's contents if neither the Content-Type header
     // nor the filename give us a clue
-    mimetype = KMimeType::findByFileContent( mAtmName );
+    mimetype = KMimeType::tqfindByFileContent( mAtmName );
   }
   return KServiceTypeProfile::preferredService( mimetype->name(), "Application" );
 }
@@ -3196,13 +3196,13 @@ void KMHandleAttachmentCommand::atmSave()
   parts.append( mNode );
   // save, do not leave encoded
   KMSaveAttachmentsCommand *command =
-    new KMSaveAttachmentsCommand( parentWidget(), parts, mMsg, false );
+    new KMSaveAttachmentsCommand( tqparentWidget(), parts, mMsg, false );
   command->start();
 }
 
 void KMHandleAttachmentCommand::atmProperties()
 {
-  KMMsgPartDialogCompat dlg( parentWidget() , 0, true );
+  KMMsgPartDialogCompat dlg( tqparentWidget() , 0, true );
   KMMessagePart& msgPart = mNode->msgPart();
   dlg.setMsgPart( &msgPart );
   dlg.exec();
@@ -3229,12 +3229,12 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus()
   if ( !listjob.get() ) {
     const TQString msg = i18n( "Chiasmus backend does not offer the "
                               "\"x-obtain-keys\" function. Please report this bug." );
-    KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
+    KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
     return;
   }
 
   if ( listjob->exec() ) {
-    listjob->showErrorDialog( parentWidget(), i18n( "Chiasmus Backend Error" ) );
+    listjob->showErrorDialog( tqparentWidget(), i18n( "Chiasmus Backend Error" ) );
     return;
   }
 
@@ -3243,7 +3243,7 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus()
     const TQString msg = i18n( "Unexpected return value from Chiasmus backend: "
                               "The \"x-obtain-keys\" function did not return a "
                               "string list. Please report this bug." );
-    KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
+    KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
     return;
   }
 
@@ -3252,11 +3252,11 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus()
     const TQString msg = i18n( "No keys have been found. Please check that a "
                               "valid key path has been set in the Chiasmus "
                               "configuration." );
-    KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
+    KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
     return;
   }
 
-  ChiasmusKeySelector selectorDlg( parentWidget(), i18n( "Chiasmus Decryption Key Selection" ),
+  ChiasmusKeySelector selectorDlg( tqparentWidget(), i18n( "Chiasmus Decryption Key Selection" ),
                                    keys, GlobalSettings::chiasmusDecryptionKey(),
                                    GlobalSettings::chiasmusDecryptionOptions() );
   if ( selectorDlg.exec() != TQDialog::Accepted )
@@ -3270,7 +3270,7 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus()
   if ( !job ) {
     const TQString msg = i18n( "Chiasmus backend does not offer the "
                               "\"x-decrypt\" function. Please report this bug." );
-    KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
+    KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
     return;
   }
 
@@ -3281,13 +3281,13 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus()
        !job->setProperty( "input", input ) ) {
     const TQString msg = i18n( "The \"x-decrypt\" function does not accept "
                               "the expected parameters. Please report this bug." );
-    KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
+    KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
     return;
   }
 
   setDeletesItself( true ); // the job below is async, we have to cleanup ourselves
   if ( job->start() ) {
-    job->showErrorDialog( parentWidget(), i18n( "Chiasmus Decryption Error" ) );
+    job->showErrorDialog( tqparentWidget(), i18n( "Chiasmus Decryption Error" ) );
     return;
   }
 
@@ -3313,7 +3313,7 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::E
   if ( err.isCanceled() )
     return;
   if ( err ) {
-    job->showErrorDialog( parentWidget(), i18n( "Chiasmus Decryption Error" ) );
+    job->showErrorDialog( tqparentWidget(), i18n( "Chiasmus Decryption Error" ) );
     return;
   }
 
@@ -3321,21 +3321,21 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::E
     const TQString msg = i18n( "Unexpected return value from Chiasmus backend: "
                               "The \"x-decrypt\" function did not return a "
                               "byte array. Please report this bug." );
-    KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
+    KMessageBox::error( tqparentWidget(), msg, i18n( "Chiasmus Backend Error" ) );
     return;
   }
 
-  const KURL url = KFileDialog::getSaveURL( chomp( mAtmName, ".xia", false ), TQString::null, parentWidget() );
+  const KURL url = KFileDialog::getSaveURL( chomp( mAtmName, ".xia", false ), TQString::null, tqparentWidget() );
   if ( url.isEmpty() )
     return;
 
-  bool overwrite = KMail::Util::checkOverwrite( url, parentWidget() );
+  bool overwrite = KMail::Util::checkOverwrite( url, tqparentWidget() );
   if ( !overwrite )
     return;
 
   d.setDisabled( true ); // we got this far, don't delete yet
   KIO::Job * uploadJob = KIO::storedPut( result.toByteArray(), url, -1, overwrite, false /*resume*/ );
-  uploadJob->setWindow( parentWidget() );
+  uploadJob->setWindow( tqparentWidget() );
   connect( uploadJob, TQT_SIGNAL(result(KIO::Job*)),
            this, TQT_SLOT(slotAtmDecryptWithChiasmusUploadResult(KIO::Job*)) );
 }
@@ -3452,7 +3452,7 @@ KMCommand::Result KMDeleteAttachmentCommand::doAttachmentModify()
 
   KMMessage *newMsg = new KMMessage();
   newMsg->fromDwString( msg->asDwString() );
-  newMsg->setStatus( msg->status() );
+  newMsg->seStatus( msg->status() );
 
   storeChangedMessage( newMsg );
   return OK;
@@ -3500,7 +3500,7 @@ KMCommand::Result KMEditAttachmentCommand::doAttachmentModify()
   KMail::EditorWatcher *watcher =
           new KMail::EditorWatcher( KURL( mTempFile.file()->name() ),
                                     part.typeStr() + "/" + part.subtypeStr(),
-                                    false, this, parentWidget() );
+                                    false, this, tqparentWidget() );
   connect( watcher, TQT_SIGNAL(editDone(KMail::EditorWatcher*)), TQT_SLOT(editDone(KMail::EditorWatcher*)) );
   if ( !watcher->start() )
     return Failed;
@@ -3543,7 +3543,7 @@ void KMEditAttachmentCommand::editDone(KMail::EditorWatcher * watcher)
 
   KMMessage *newMsg = new KMMessage();
   newMsg->fromDwString( msg->asDwString() );
-  newMsg->setStatus( msg->status() );
+  newMsg->seStatus( msg->status() );
 
   storeChangedMessage( newMsg );
 }
diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h
index 781a8087..5fbebb65 100644
--- a/kmail/kmcommands.h
+++ b/kmail/kmcommands.h
@@ -98,7 +98,7 @@ protected:
   // Returns the single message retrieved
   KMMessage *retrievedMessage() const;
   // Returns the parent widget
-  TQWidget *parentWidget() const;
+  TQWidget *tqparentWidget() const;
 
   bool deletesItself() { return mDeletesItself; }
   /** Specify whether the subclass takes care of the deletion of the object.
@@ -627,20 +627,20 @@ private:
   TQString mEncoding;
 };
 
-class KDE_EXPORT KMSetStatusCommand : public KMCommand
+class KDE_EXPORT KMSeStatusCommand : public KMCommand
 {
   Q_OBJECT
 
 public:
   // Serial numbers
-  KMSetStatusCommand( KMMsgStatus status, const TQValueList<Q_UINT32> &,
+  KMSeStatusCommand( KMMsgStatus status, const TQValueList<TQ_UINT32> &,
                       bool toggle=false );
 
 private:
   virtual Result execute();
 
   KMMsgStatus mStatus;
-  TQValueList<Q_UINT32> mSerNums;
+  TQValueList<TQ_UINT32> mSerNums;
   TQValueList<int> mIds;
   bool mToggle;
 };
@@ -671,7 +671,7 @@ public:
 
 private:
   virtual Result execute();
-  TQValueList<Q_UINT32> serNumList;
+  TQValueList<TQ_UINT32> serNumList;
   KMFilter *mFilter;
 };
 
@@ -783,12 +783,12 @@ public:
 
 public slots:
   void slotImapFolderCompleted(KMFolderImap *folder, bool success);
-  void slotMsgAddedToDestFolder(KMFolder *folder, Q_UINT32 serNum);
+  void slotMsgAddedToDestFolder(KMFolder *folder, TQ_UINT32 serNum);
   void slotMoveCanceled();
 
 protected:
   // Needed for KMDeleteCommand for "move to trash"
-  KMMoveCommand( Q_UINT32 sernum );
+  KMMoveCommand( TQ_UINT32 sernum );
   void setDestFolder( KMFolder* folder ) { mDestFolder = folder; }
   void addMsg( KMMsgBase *msg ) { mSerNumList.append( msg->getMsgSerNum() ); }
   TQValueVector<KMFolder*> mOpenedFolders;
@@ -798,10 +798,10 @@ private:
   void completeMove( Result result );
 
   KMFolder *mDestFolder;
-  TQValueList<Q_UINT32> mSerNumList;
+  TQValueList<TQ_UINT32> mSerNumList;
   // List of serial numbers that have to be transferred to a host.
   // Ticked off as they come in via msgAdded signals.
-  TQValueList<Q_UINT32> mLostBoys;
+  TQValueList<TQ_UINT32> mLostBoys;
   KPIM::ProgressItem *mProgressItem;
   bool mCompleteWithAddedMsg;
 };
@@ -813,7 +813,7 @@ class KDE_EXPORT KMDeleteMsgCommand : public KMMoveCommand
 public:
   KMDeleteMsgCommand( KMFolder* srcFolder, const TQPtrList<KMMsgBase> &msgList );
   KMDeleteMsgCommand( KMFolder* srcFolder, KMMessage * msg );
-  KMDeleteMsgCommand( Q_UINT32 sernum );
+  KMDeleteMsgCommand( TQ_UINT32 sernum );
 
 private:
   static KMFolder * findTrashFolder( KMFolder * srcFolder );
@@ -1054,7 +1054,7 @@ class KDE_EXPORT AttachmentModifyCommand : public KMCommand
 
   protected:
     int mPartIndex;
-    Q_UINT32 mSernum;
+    TQ_UINT32 mSernum;
 
   private:
     Result execute();
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index a1ab32d8..e6ec6f96 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -199,7 +199,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
   mHeadersToEditorSplitter = new TQSplitter( Qt::Vertical, mMainWidget, "mHeadersToEditorSplitter" );
   mHeadersToEditorSplitter->setChildrenCollapsible( false );
   mHeadersArea = new TQWidget( mHeadersToEditorSplitter );
-  mHeadersArea->setSizePolicy( mHeadersToEditorSplitter->sizePolicy().horData(), TQSizePolicy::Maximum );
+  mHeadersArea->tqsetSizePolicy( mHeadersToEditorSplitter->sizePolicy().horData(), TQSizePolicy::Maximum );
   TQVBoxLayout *v = new TQVBoxLayout( mMainWidget );
   v->addWidget( mHeadersToEditorSplitter );
   mIdentity = new KPIM::IdentityCombo(kmkernel->identityManager(), mHeadersArea);
@@ -286,7 +286,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
     connect( mRecipientsEditor,
              TQT_SIGNAL( completionModeChanged( KGlobalSettings::Completion ) ),
              TQT_SLOT( slotCompletionModeChanged( KGlobalSettings::Completion ) ) );
-    connect( mRecipientsEditor, TQT_SIGNAL(sizeHintChanged()), TQT_SLOT(recipientEditorSizeHintChanged()) );
+    connect( mRecipientsEditor, TQT_SIGNAL(tqsizeHintChanged()), TQT_SLOT(recipientEditorSizeHintChanged()) );
 
     mRecipientsEditor->setFocus();
   }
@@ -341,7 +341,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
   TQHBoxLayout *hbox = new TQHBoxLayout( vbox );
   {
       mSignatureStateIndicator = new TQLabel( editorAndCryptoStateIndicators );
-      mSignatureStateIndicator->setAlignment( Qt::AlignHCenter );
+      mSignatureStateIndicator->tqsetAlignment( Qt::AlignHCenter );
       hbox->addWidget( mSignatureStateIndicator );
 
       KConfigGroup reader( KMKernel::config(), "Reader" );
@@ -353,7 +353,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
       mSignatureStateIndicator->setPalette( p );
 
       mEncryptionStateIndicator = new TQLabel( editorAndCryptoStateIndicators );
-      mEncryptionStateIndicator->setAlignment( Qt::AlignHCenter );
+      mEncryptionStateIndicator->tqsetAlignment( Qt::AlignHCenter );
       hbox->addWidget( mEncryptionStateIndicator );
       p.setColor( TQColorGroup::Background, reader.readColorEntry( "PGPMessageEncr" , &defaultEncryptedColor ) );
       mEncryptionStateIndicator->setPalette( p );
@@ -965,13 +965,13 @@ int KMComposeWin::calcColumnWidth(int which, long allShowing, int width)
   w->setBuddy( mEditor ); // set dummy so we don't calculate width of '&' for this label.
   w->adjustSize();
   w->show();
-  return QMAX( width, w->sizeHint().width() );
+  return QMAX( width, w->tqsizeHint().width() );
 }
 
 void KMComposeWin::rethinkFields(bool fromSlot)
 {
   //This sucks even more but again no ids. sorry (sven)
-  int mask, row, numRows;
+  int tqmask, row, numRows;
   long showHeaders;
 
   if (mShowHeaders < 0)
@@ -979,8 +979,8 @@ void KMComposeWin::rethinkFields(bool fromSlot)
   else
     showHeaders = mShowHeaders;
 
-  for (mask=1,mNumHeaders=0; mask<=showHeaders; mask<<=1)
-    if ((showHeaders&mask) != 0) mNumHeaders++;
+  for (tqmask=1,mNumHeaders=0; tqmask<=showHeaders; tqmask<<=1)
+    if ((showHeaders&tqmask) != 0) mNumHeaders++;
 
   numRows = mNumHeaders + 1;
 
@@ -1109,9 +1109,9 @@ void KMComposeWin::rethinkFields(bool fromSlot)
   else
     mAtmListView->hide();
   resize(this->size());
-  repaint();
+  tqrepaint();
 
-  mHeadersArea->setMaximumHeight( mHeadersArea->sizeHint().height() );
+  mHeadersArea->setMaximumHeight( mHeadersArea->tqsizeHint().height() );
   mGrid->activate();
   mHeadersArea->show();
 
@@ -1182,7 +1182,7 @@ void KMComposeWin::rethinkHeaderLine(int aValue, int aMask, int& aRow,
   if (aValue & aMask)
   {
     aLbl->adjustSize();
-    aLbl->resize((int)aLbl->sizeHint().width(),aLbl->sizeHint().height() + 6);
+    aLbl->resize((int)aLbl->tqsizeHint().width(),aLbl->tqsizeHint().height() + 6);
     aLbl->setMinimumSize(aLbl->size());
     aLbl->show();
     aLbl->setBuddy(aCbx);
@@ -1193,7 +1193,7 @@ void KMComposeWin::rethinkHeaderLine(int aValue, int aMask, int& aRow,
     mGrid->addWidget(aCbx, aRow, 1);
     if ( aChk ) {
       mGrid->addWidget(aChk, aRow, 2);
-      aChk->setFixedSize(aChk->sizeHint().width(), aLbl->height());
+      aChk->setFixedSize(aChk->tqsizeHint().width(), aLbl->height());
       aChk->show();
     }
     aRow++;
@@ -1219,8 +1219,8 @@ void KMComposeWin::getTransportMenu()
   int id = 0;
   for(it = availTransports.begin(); it != availTransports.end() ; ++it, id++)
   {
-    mActNowMenu->insertItem((*it).replace("&", "&&"), id);
-    mActLaterMenu->insertItem((*it).replace("&", "&&"), id);
+    mActNowMenu->insertItem((*it).tqreplace("&", "&&"), id);
+    mActLaterMenu->insertItem((*it).tqreplace("&", "&&"), id);
   }
 }
 
@@ -1337,9 +1337,9 @@ void KMComposeWin::setupActions(void)
   KStdAction::selectAll (this, TQT_SLOT(slotMarkAll()), actionCollection());
 
   KStdAction::find (this, TQT_SLOT(slotFind()), actionCollection());
-  KStdAction::findNext(this, TQT_SLOT(slotSearchAgain()), actionCollection());
+  KStdAction::tqfindNext(this, TQT_SLOT(slotSearchAgain()), actionCollection());
 
-  KStdAction::replace (this, TQT_SLOT(slotReplace()), actionCollection());
+  KStdAction::tqreplace (this, TQT_SLOT(slotReplace()), actionCollection());
   KStdAction::spelling (this, TQT_SLOT(slotSpellcheck()), actionCollection(), "spellcheck");
 
   mPasteQuotation = new KAction (i18n("Pa&ste as Quotation"),0,this,TQT_SLOT( slotPasteClipboardAsQuotation()),
@@ -1685,7 +1685,7 @@ void KMComposeWin::setupEditor(void)
   connect( mEditor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ),
           this, TQT_SLOT( fontChanged( const TQFont & ) ) );
   connect( mEditor, TQT_SIGNAL( currentAlignmentChanged( int ) ),
-          this, TQT_SLOT( alignmentChanged( int ) ) );
+          this, TQT_SLOT( tqalignmentChanged( int ) ) );
 
 }
 
@@ -1695,8 +1695,8 @@ static TQString cleanedUpHeaderString( const TQString & s )
 {
   // remove invalid characters from the header strings
   TQString res( s );
-  res.replace( '\r', "" );
-  res.replace( '\n', " " );
+  res.tqreplace( '\r', "" );
+  res.tqreplace( '\n', " " );
   return res.stripWhiteSpace();
 }
 
@@ -2277,29 +2277,29 @@ bool KMComposeWin::userForgotAttachment()
 
   if ( attachWordsList.isEmpty() ) {
     // default value (FIXME: this is duplicated in configuredialog.cpp)
-    attachWordsList << TQString::fromLatin1("attachment")
-                    << TQString::fromLatin1("attached");
-    if ( TQString::fromLatin1("attachment") != i18n("attachment") )
+    attachWordsList << TQString::tqfromLatin1("attachment")
+                    << TQString::tqfromLatin1("attached");
+    if ( TQString::tqfromLatin1("attachment") != i18n("attachment") )
       attachWordsList << i18n("attachment");
-    if ( TQString::fromLatin1("attached") != i18n("attached") )
+    if ( TQString::tqfromLatin1("attached") != i18n("attached") )
       attachWordsList << i18n("attached");
   }
 
-  TQRegExp rx ( TQString::fromLatin1("\\b") +
+  TQRegExp rx ( TQString::tqfromLatin1("\\b") +
                attachWordsList.join("\\b|\\b") +
-               TQString::fromLatin1("\\b") );
+               TQString::tqfromLatin1("\\b") );
   rx.setCaseSensitive( false );
 
   bool gotMatch = false;
 
-  // check whether the subject contains one of the attachment key words
+  // check whether the subject tqcontains one of the attachment key words
   // unless the message is a reply or a forwarded message
   TQString subj = subject();
   gotMatch =    ( KMMessage::stripOffPrefixes( subj ) == subj )
              && ( rx.search( subj ) >= 0 );
 
   if ( !gotMatch ) {
-    // check whether the non-quoted text contains one of the attachment key
+    // check whether the non-quoted text tqcontains one of the attachment key
     // words
     TQRegExp quotationRx ("^([ \\t]*([|>:}#]|[A-Za-z]+>))+");
     for ( int i = 0; i < mEditor->numLines(); ++i ) {
@@ -3633,7 +3633,7 @@ void KMComposeWin::slotSearchAgain()
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotReplace()
 {
-  mEditor->replace();
+  mEditor->tqreplace();
 }
 
 //-----------------------------------------------------------------------------
@@ -3681,7 +3681,7 @@ void KMComposeWin::slotPasteClipboardAsAttachment()
 
   TQMimeSource *mimeSource = TQApplication::clipboard()->data();
   if ( TQImageDrag::canDecode(mimeSource) ) {
-    slotAttachPNGImageData(mimeSource->encodedData("image/png"));
+    slotAttachPNGImageData(mimeSource->tqencodedData("image/png"));
   }
   else {
     bool ok;
@@ -3725,7 +3725,7 @@ TQString KMComposeWin::addQuotesToText(const TQString &inputText)
 {
     TQString answer = TQString( inputText );
     TQString indentStr = quotePrefixName();
-    answer.replace( '\n', '\n' + indentStr);
+    answer.tqreplace( '\n', '\n' + indentStr);
     answer.prepend( indentStr );
     answer += '\n';
     return KMMessage::smartQuote( answer, GlobalSettings::self()->lineWrapWidth() );
@@ -3743,7 +3743,7 @@ TQString KMComposeWin::removeQuotesFromText(const TQString &inputText)
     // now remove all remaining leading quotes
     quotePrefix = '\n' + quotePrefixName();
     rx = quotePrefix;
-    s.replace(rx, "\n");
+    s.tqreplace(rx, "\n");
 
     return s;
 }
@@ -3773,7 +3773,7 @@ void KMComposeWin::slotRemoveQuotes()
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotUndo()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   if ( ::qt_cast<KEdit*>(fw) )
@@ -3784,7 +3784,7 @@ void KMComposeWin::slotUndo()
 
 void KMComposeWin::slotRedo()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   if (::qt_cast<KEdit*>(fw))
@@ -3796,7 +3796,7 @@ void KMComposeWin::slotRedo()
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotCut()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   if (::qt_cast<KEdit*>(fw))
@@ -3809,7 +3809,7 @@ void KMComposeWin::slotCut()
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotCopy()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
 #ifdef KeyPress
@@ -3829,12 +3829,12 @@ void KMComposeWin::slotPasteClipboard()
 
 void KMComposeWin::paste( QClipboard::Mode mode )
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   TQMimeSource *mimeSource = TQApplication::clipboard()->data( mode );
   if ( mimeSource->provides("image/png") )  {
-    slotAttachPNGImageData(mimeSource->encodedData("image/png"));
+    slotAttachPNGImageData(mimeSource->tqencodedData("image/png"));
   } else if ( KURLDrag::canDecode( mimeSource ) ) {
         KURL::List urlList;
         if( KURLDrag::decode( mimeSource, urlList ) ) {
@@ -3872,7 +3872,7 @@ void KMComposeWin::paste( QClipboard::Mode mode )
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotMarkAll()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   if (::qt_cast<TQLineEdit*>(fw))
@@ -3918,7 +3918,7 @@ void KMComposeWin::slotUpdWinTitle(const TQString& text)
   // newlines tend to become boxes.
   if (text.isEmpty())
     setCaption("("+i18n("unnamed")+")");
-  else setCaption( s.replace( TQChar('\n'), ' ' ) );
+  else setCaption( s.tqreplace( TQChar('\n'), ' ' ) );
 }
 
 
@@ -4605,15 +4605,15 @@ void KMComposeWin::slotCleanSpace()
 
   // Squeeze tabs and spaces
   TQRegExp squeeze( "[\t ]+" );
-  s.replace( squeeze, TQChar( ' ' ) );
+  s.tqreplace( squeeze, TQChar( ' ' ) );
 
   // Remove trailing whitespace
   TQRegExp trailing( "\\s+$" );
-  s.replace( trailing, TQChar( '\n' ) );
+  s.tqreplace( trailing, TQChar( '\n' ) );
 
   // Single space lines
   TQRegExp singleSpace( "[\n]{2,}" );
-  s.replace( singleSpace, TQChar( '\n' ) );
+  s.tqreplace( singleSpace, TQChar( '\n' ) );
 
   // Restore the signature
   if ( restore )
@@ -4820,7 +4820,7 @@ void KMComposeWin::slotIdentityChanged( uint uoid )
   // don't overwrite the BCC field under certain circomstances
   // NOT edited and preset BCC from the identity
   if( mEdtBcc && !mEdtBcc->edited() && !ident.bcc().isEmpty() ) {
-    // BCC NOT empty AND contains a diff adress then the preset BCC
+    // BCC NOT empty AND tqcontains a diff adress then the preset BCC
     // of the new identity
     if( !mEdtBcc->text().isEmpty() && mEdtBcc->text() != ident.bcc() && !mEdtBcc->edited() ) {
       mEdtBcc->setText( ident.bcc() );
@@ -4829,7 +4829,7 @@ void KMComposeWin::slotIdentityChanged( uint uoid )
       // of the identity, we assume that since the user typed it
       // they want to keep it
       if ( mEdtBcc->text() != ident.bcc() && !mEdtBcc->text().isEmpty() ) {
-        TQString temp_string( mEdtBcc->text() + TQString::fromLatin1(",") + ident.bcc() );
+        TQString temp_string( mEdtBcc->text() + TQString::tqfromLatin1(",") + ident.bcc() );
         mEdtBcc->setText( temp_string );
       } else {
         // if the user typed the same address as the preset BCC
@@ -4843,7 +4843,7 @@ void KMComposeWin::slotIdentityChanged( uint uoid )
   // allowing the user to keep all addresses
   if( mEdtBcc && mEdtBcc->edited() && !ident.bcc().isEmpty() ) {
     if( !mEdtBcc->text().isEmpty() ) {
-      TQString temp_string ( mEdtBcc->text() + TQString::fromLatin1(",") + ident.bcc() );
+      TQString temp_string ( mEdtBcc->text() + TQString::tqfromLatin1(",") + ident.bcc() );
       mEdtBcc->setText( temp_string );
     } else {
       mEdtBcc->setText( ident.bcc() );
@@ -4935,7 +4935,7 @@ void KMComposeWin::slotIdentityChanged( uint uoid )
     if ( pos >= 0 && !mOldSigText.isEmpty() ) {
       const int oldLength = mOldSigText.length();
       mOldSigText = "\n\n"+ ident.signature().rawText() + "\n"; // see insertSignature()
-      edtText = edtText.replace( pos, oldLength, mOldSigText );
+      edtText = edtText.tqreplace( pos, oldLength, mOldSigText );
       mEditor->setText( edtText );
     } else {
       insertSignature( Append );
@@ -4982,7 +4982,7 @@ void KMComposeWin::slotSpellcheckConfig()
   KWin kwin;
   TQTabDialog qtd (this, "tabdialog", true);
   KSpellConfig mKSpellConfig (&qtd);
-  mKSpellConfig.layout()->setMargin( KDialog::marginHint() );
+  mKSpellConfig.tqlayout()->setMargin( KDialog::marginHint() );
 
   qtd.addTab (&mKSpellConfig, i18n("Spellchecker"));
   qtd.setCancelButton ();
@@ -4996,7 +4996,7 @@ void KMComposeWin::slotSpellcheckConfig()
 }
 
 //-----------------------------------------------------------------------------
-void KMComposeWin::slotStatusMessage(const TQString &message)
+void KMComposeWin::sloStatusMessage(const TQString &message)
 {
     statusBar()->changeItem( message, 0 );
 }
@@ -5177,19 +5177,19 @@ void KMComposeWin::slotSizeAction( int size )
 void KMComposeWin::slotAlignLeft()
 {
     toggleMarkup(true);
-    mEditor->TQTextEdit::setAlignment( AlignLeft );
+    mEditor->TQTextEdit::tqsetAlignment( AlignLeft );
 }
 
 void KMComposeWin::slotAlignCenter()
 {
     toggleMarkup(true);
-    mEditor->TQTextEdit::setAlignment( AlignHCenter );
+    mEditor->TQTextEdit::tqsetAlignment( AlignHCenter );
 }
 
 void KMComposeWin::slotAlignRight()
 {
     toggleMarkup(true);
-    mEditor->TQTextEdit::setAlignment( AlignRight );
+    mEditor->TQTextEdit::tqsetAlignment( AlignRight );
 }
 
 void KMComposeWin::slotTextBold()
@@ -5252,7 +5252,7 @@ void KMComposeWin::fontChanged( const TQFont &f )
   fontSizeAction->setFontSize( f.pointSize() );
 }
 
-void KMComposeWin::alignmentChanged( int a )
+void KMComposeWin::tqalignmentChanged( int a )
 {
     //toggleMarkup();
     alignLeftAction->setChecked( ( a == AlignAuto ) || ( a & AlignLeft ) );
@@ -5404,6 +5404,6 @@ void KMComposeWin::recipientEditorSizeHintChanged()
 
 void KMComposeWin::setMaximumHeaderSize()
 {
-  mHeadersArea->setMaximumHeight( mHeadersArea->sizeHint().height() );
+  mHeadersArea->setMaximumHeight( mHeadersArea->tqsizeHint().height() );
 }
 
diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h
index f38a8f68..30362e85 100644
--- a/kmail/kmcomposewin.h
+++ b/kmail/kmcomposewin.h
@@ -368,7 +368,7 @@ private slots:
   /**
    * XML-GUI stuff
    */
-  void slotStatusMessage(const TQString &message);
+  void sloStatusMessage(const TQString &message);
   void slotEditToolbars();
   void slotUpdateToolbars();
   void slotEditKeys();
@@ -502,7 +502,7 @@ private slots:
   void slotFormatReset();
   void slotTextColor();
   void fontChanged( const TQFont & );
-  void alignmentChanged( int );
+  void tqalignmentChanged( int );
 
 public: // kmkernel, attachmentlistview
   bool addAttach(const KURL url);
@@ -555,7 +555,7 @@ private:
                           const TQString &toolTip = TQString::null,
                           const TQString &whatsThis = TQString::null );
 
-  void rethinkHeaderLine( int value, int mask, int& row,
+  void rethinkHeaderLine( int value, int tqmask, int& row,
                           TQLabel* lbl, TQComboBox* cbx, TQCheckBox *chk );
 
   /**
@@ -671,7 +671,7 @@ private:
   /**
    * Decrypt an OpenPGP block or strip off the OpenPGP envelope of a text
    * block with a clear text signature. This is only done if the given
-   * string contains exactly one OpenPGP block.
+   * string tqcontains exactly one OpenPGP block.
    * This function is for example used to restore the unencrypted/unsigned
    * message text for editting.
    */
diff --git a/kmail/kmdict.cpp b/kmail/kmdict.cpp
index 0ad9367b..de4ed86f 100644
--- a/kmail/kmdict.cpp
+++ b/kmail/kmdict.cpp
@@ -54,7 +54,7 @@ void KMDict::clear()
 
 //-----------------------------------------------------------------------------
 
-void KMDict::replace( long key, KMDictItem *item )
+void KMDict::tqreplace( long key, KMDictItem *item )
 {
   insert( key, item );
   removeFollowing( item, key );           // remove other items with same key
diff --git a/kmail/kmdict.h b/kmail/kmdict.h
index 520315ad..374577c2 100644
--- a/kmail/kmdict.h
+++ b/kmail/kmdict.h
@@ -40,7 +40,7 @@ public:
   int size() { return mSize; }
   
   /** Inserts an item, replacing old ones with the same key. */
-  void replace(long key, KMDictItem *item);
+  void tqreplace(long key, KMDictItem *item);
  
   /** Inserts an item without replacing ones with the same key. */
   void insert(long key, KMDictItem *item);
diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp
index 6fdc3352..46fd2a83 100644
--- a/kmail/kmedit.cpp
+++ b/kmail/kmedit.cpp
@@ -112,7 +112,7 @@ void KMEdit::keyPressEvent( TQKeyEvent* e )
                 && ( col >= int( bot ) ) ) {
 
 		// The cursor position might have changed unpredictably if there was selected
-		// text which got replaced by a new line, so we query it again:
+		// text which got tqreplaced by a new line, so we query it again:
 		getCursorPosition( &line, &col );
                 TQString newLine = text( line );
                 // remove leading white space from the new line and instead
@@ -122,7 +122,7 @@ void KMEdit::keyPressEvent( TQKeyEvent* e )
                        && newLine[leadingWhiteSpaceCount].isSpace() ) {
                     ++leadingWhiteSpaceCount;
                 }
-                newLine = newLine.replace( 0, leadingWhiteSpaceCount,
+                newLine = newLine.tqreplace( 0, leadingWhiteSpaceCount,
                                            lineText.left( bot ) );
                 removeParagraph( line );
                 insertParagraph( newLine, line );
@@ -148,7 +148,7 @@ void KMEdit::contentsDropEvent(TQDropEvent *e)
         TQBuffer serNumBuffer(serNums);
         serNumBuffer.open(IO_ReadOnly);
         TQDataStream serNumStream(&serNumBuffer);
-        Q_UINT32 serNum;
+        TQ_UINT32 serNum;
         KMFolder *folder = 0;
         int idx;
         TQPtrList<KMMsgBase> messageList;
@@ -169,7 +169,7 @@ void KMEdit::contentsDropEvent(TQDropEvent *e)
         command->start();
     }
     else if( e->provides("image/png") ) {
-        emit attachPNGImageData(e->encodedData("image/png"));
+        emit attachPNGImageData(e->tqencodedData("image/png"));
     }
     else if( KURLDrag::canDecode( e ) ) {
         KURL::List urlList;
@@ -383,7 +383,7 @@ KMSyntaxHighter::KMSyntaxHighter( TQTextEdit *textEdit,
 
 bool KMSyntaxHighter::isMisspelled( const TQString &word )
 {
-  if ( mIgnoredWords.contains( word ) ) {
+  if ( mIgnoredWords.tqcontains( word ) ) {
     return false;
   }
   else {
@@ -440,8 +440,8 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
       (*mExtEditorTempFile->textStream()) << text();
 
       mExtEditorTempFile->close();
-      // replace %f in the system line
-      sysLine.replace( "%f", mExtEditorTempFile->name() );
+      // tqreplace %f in the system line
+      sysLine.tqreplace( "%f", mExtEditorTempFile->name() );
       mExtEditorProcess = new KProcess();
       mExtEditorProcess->setUseShell( true );
       sysLine += " ";
@@ -454,7 +454,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
               TQT_SLOT(slotExternalEditorDone(KProcess*)));
       if (!mExtEditorProcess->start())
       {
-        KMessageBox::error( topLevelWidget(),
+        KMessageBox::error( tqtopLevelWidget(),
                             i18n("Unable to start external editor.") );
         killExternalEditor();
       } else {
@@ -503,7 +503,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
         lastSpace = paraText.length();
       TQString word = paraText.mid( firstSpace, lastSpace - firstSpace );
       //Continue if this word was misspelled
-      if( !word.isEmpty() && mReplacements.contains( word ) )
+      if( !word.isEmpty() && mReplacements.tqcontains( word ) )
       {
         KPopupMenu p;
 
@@ -607,7 +607,7 @@ void KMEdit::slotExternalEditorTempFileChanged( const TQString & fileName ) {
 
   insertLine(TQString::fromLocal8Bit(KPIM::kFileToString( fileName, true, false )), -1);
   setAutoUpdate(true);
-  repaint();
+  tqrepaint();
 }
 
 void KMEdit::slotExternalEditorDone( KProcess * proc ) {
@@ -627,7 +627,7 @@ void KMEdit::killExternalEditor() {
 bool KMEdit::checkExternalEditorFinished() {
   if ( !mExtEditorProcess )
     return true;
-  switch ( KMessageBox::warningYesNoCancel( topLevelWidget(),
+  switch ( KMessageBox::warningYesNoCancel( tqtopLevelWidget(),
            i18n("The external editor is still running.\n"
                 "Abort the external editor or leave it open?"),
            i18n("External Editor"),
@@ -870,7 +870,7 @@ void KMEdit::slotSpellResult(const TQString &s)
 void KMEdit::slotSpellDone()
 {
   kdDebug(5006)<<" void KMEdit::slotSpellDone()\n";
-  KSpell::spellStatus status = mKSpellForDialog->status();
+  KSpell::spelltqStatus status = mKSpellForDialog->status();
   delete mKSpellForDialog;
   mKSpellForDialog = 0;
 
@@ -880,7 +880,7 @@ void KMEdit::slotSpellDone()
   mComposer->sujectLineWidget()->deselect();
   if (status == KSpell::Error)
   {
-     KMessageBox::sorry( topLevelWidget(),
+     KMessageBox::sorry( tqtopLevelWidget(),
                          i18n("ISpell/Aspell could not be started. Please "
                               "make sure you have ISpell or Aspell properly "
                               "configured and in your PATH.") );
@@ -889,7 +889,7 @@ void KMEdit::slotSpellDone()
   else if (status == KSpell::Crashed)
   {
      spellcheck_stop();
-     KMessageBox::sorry( topLevelWidget(),
+     KMessageBox::sorry( tqtopLevelWidget(),
                          i18n("ISpell/Aspell seems to have crashed.") );
      emit spellcheck_done( KS_CANCEL );
   }
@@ -898,7 +898,7 @@ void KMEdit::slotSpellDone()
       if( mSpellLineEdit )
           spellcheck();
       else if( !mComposer->subjectTextWasSpellChecked() && status == KSpell::FinishedNoMisspellingsEncountered )
-          KMessageBox::information( topLevelWidget(),
+          KMessageBox::information( tqtopLevelWidget(),
                                     i18n("No misspellings encountered.") );
   }
 }
diff --git a/kmail/kmfawidgets.cpp b/kmail/kmfawidgets.cpp
index 370d796c..2316321f 100644
--- a/kmail/kmfawidgets.cpp
+++ b/kmail/kmfawidgets.cpp
@@ -35,7 +35,7 @@ KMFilterActionWithAddressWidget::KMFilterActionWithAddressWidget( TQWidget* pare
   hbl->addWidget( mLineEdit, 1 /*stretch*/ );
   mBtn = new TQPushButton( TQString::null ,this );
   mBtn->setPixmap( BarIcon( "contents", KIcon::SizeSmall ) );
-  mBtn->setFixedHeight( mLineEdit->sizeHint().height() );
+  mBtn->setFixedHeight( mLineEdit->tqsizeHint().height() );
   TQToolTip::add( mBtn, i18n( "Open Address Book" ) );
   hbl->addWidget( mBtn );
 
@@ -136,7 +136,7 @@ void KMSoundTestWidget::playSound()
     if ( parameter.isEmpty() )
         return ;
     TQString play = parameter;
-    TQString file = TQString::fromLatin1("file:");
+    TQString file = TQString::tqfromLatin1("file:");
     if (parameter.startsWith(file))
         play = parameter.mid(file.length());
     KAudioPlayer::play(TQFile::encodeName(play));
diff --git a/kmail/kmfilter.cpp b/kmail/kmfilter.cpp
index 28a64633..1d36677d 100644
--- a/kmail/kmfilter.cpp
+++ b/kmail/kmfilter.cpp
@@ -186,9 +186,9 @@ bool KMFilter::folderRemoved( KMFolder* aFolder, KMFolder* aNewFolder )
 
 void KMFilter::setApplyOnAccount( uint id, bool aApply )
 {
-  if (aApply && !mAccounts.contains( id )) {
+  if (aApply && !mAccounts.tqcontains( id )) {
     mAccounts.append( id );
-  } else if (!aApply && mAccounts.contains( id )) {
+  } else if (!aApply && mAccounts.tqcontains( id )) {
     mAccounts.remove( id );
   }
 }
@@ -203,7 +203,7 @@ bool KMFilter::applyOnAccount( uint id ) const
     return result;
   }
   if ( applicability() == Checked )
-    return mAccounts.contains( id );
+    return mAccounts.tqcontains( id );
 
   return false;
 }
@@ -236,9 +236,9 @@ void KMFilter::readConfig(KConfig* config)
       bApplyOnExplicit = true;
       mApplicability = ButImap;
     } else {
-      bApplyOnInbound = bool(sets.contains("check-mail"));
-      bApplyOnOutbound = bool(sets.contains("send-mail"));
-      bApplyOnExplicit = bool(sets.contains("manual-filtering"));
+      bApplyOnInbound = bool(sets.tqcontains("check-mail"));
+      bApplyOnOutbound = bool(sets.tqcontains("send-mail"));
+      bApplyOnExplicit = bool(sets.tqcontains("manual-filtering"));
       mApplicability = (AccountType)config->readNumEntry( "Applicability", ButImap );
     }
 
diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp
index 9b277d8e..180c2746 100644
--- a/kmail/kmfilteraction.cpp
+++ b/kmail/kmfilteraction.cpp
@@ -486,18 +486,18 @@ TQString KMFilterActionWithCommand::substituteCommandLineArgsFor( KMMessage *aMs
     // TQString( "%0 and %1 and %1" ).arg( 0 ).arg( 1 )
     // returns "0 and 1 and %1", so we must call .arg as
     // many times as there are %n's, regardless of their multiplicity.
-    if ((*it) == -1) result.replace( "%-1", tempFileName );
+    if ((*it) == -1) result.tqreplace( "%-1", tempFileName );
     else result = result.arg( tempFileName );
   }
 
-  // And finally, replace the %{foo} with the content of the foo
+  // And finally, tqreplace the %{foo} with the content of the foo
   // header field:
   TQRegExp header_rx( "%\\{([a-z0-9-]+)\\}", false );
   int idx = 0;
   while ( ( idx = header_rx.search( result, idx ) ) != -1 ) {
-    TQString replacement = KProcess::quote( aMsg->headerField( header_rx.cap(1).latin1() ) );
-    result.replace( idx, header_rx.matchedLength(), replacement );
-    idx += replacement.length();
+    TQString tqreplacement = KProcess::quote( aMsg->headerField( header_rx.cap(1).latin1() ) );
+    result.tqreplace( idx, header_rx.matchedLength(), tqreplacement );
+    idx += tqreplacement.length();
   }
 
   return result;
@@ -742,13 +742,13 @@ void KMFilterActionIdentity::setParamWidgetValue( TQWidget * paramWidget ) const
 }
 
 //=============================================================================
-// KMFilterActionSetStatus - set status to
+// KMFilterActionSeStatus - set status to
 // Set the status of messages
 //=============================================================================
-class KMFilterActionSetStatus: public KMFilterActionWithStringList
+class KMFilterActionSeStatus: public KMFilterActionWithStringList
 {
 public:
-  KMFilterActionSetStatus();
+  KMFilterActionSeStatus();
   virtual ReturnCode process(KMMessage* msg) const;
   virtual bool requiresBody(KMMsgBase*) const;
 
@@ -778,16 +778,16 @@ static const KMMsgStatus stati[] =
 };
 static const int StatiCount = sizeof( stati ) / sizeof( KMMsgStatus );
 
-KMFilterAction* KMFilterActionSetStatus::newAction()
+KMFilterAction* KMFilterActionSeStatus::newAction()
 {
-  return (new KMFilterActionSetStatus);
+  return (new KMFilterActionSeStatus);
 }
 
-KMFilterActionSetStatus::KMFilterActionSetStatus()
+KMFilterActionSeStatus::KMFilterActionSeStatus()
   : KMFilterActionWithStringList( "set status", i18n("Mark As") )
 {
   // if you change this list, also update
-  // KMFilterActionSetStatus::stati above
+  // KMFilterActionSeStatus::stati above
   mParameterList.append( "" );
   mParameterList.append( i18n("msg status","Important") );
   mParameterList.append( i18n("msg status","Read") );
@@ -804,22 +804,22 @@ KMFilterActionSetStatus::KMFilterActionSetStatus()
   mParameter = *mParameterList.at(0);
 }
 
-KMFilterAction::ReturnCode KMFilterActionSetStatus::process(KMMessage* msg) const
+KMFilterAction::ReturnCode KMFilterActionSeStatus::process(KMMessage* msg) const
 {
   int idx = mParameterList.findIndex( mParameter );
   if ( idx < 1 ) return ErrorButGoOn;
 
   KMMsgStatus status = stati[idx-1] ;
-  msg->setStatus( status );
+  msg->seStatus( status );
   return GoOn;
 }
 
-bool KMFilterActionSetStatus::requiresBody(KMMsgBase*) const
+bool KMFilterActionSeStatus::requiresBody(KMMsgBase*) const
 {
   return false;
 }
 
-void KMFilterActionSetStatus::argsFromString( const TQString argsStr )
+void KMFilterActionSeStatus::argsFromString( const TQString argsStr )
 {
   if ( argsStr.length() == 1 ) {
     for ( int i = 0 ; i < StatiCount ; i++ )
@@ -831,7 +831,7 @@ void KMFilterActionSetStatus::argsFromString( const TQString argsStr )
   mParameter = *mParameterList.at(0);
 }
 
-const TQString KMFilterActionSetStatus::argsAsString() const
+const TQString KMFilterActionSeStatus::argsAsString() const
 {
   int idx = mParameterList.findIndex( mParameter );
   if ( idx < 1 ) return TQString::null;
@@ -840,7 +840,7 @@ const TQString KMFilterActionSetStatus::argsAsString() const
   return KMMsgBase::statusToStr(status);
 }
 
-const TQString KMFilterActionSetStatus::displayString() const
+const TQString KMFilterActionSeStatus::displayString() const
 {
   // FIXME after string freeze:
   // return i18n("").arg( );
@@ -1064,7 +1064,7 @@ TQWidget* KMFilterActionAddHeader::createParamWidget( TQWidget* parent ) const
   cb->setInsertionPolicy( TQComboBox::AtBottom );
   hbl->addWidget( cb, 0 /* stretch */ );
   TQLabel *l = new TQLabel( i18n("With value:"), w );
-  l->setFixedWidth( l->sizeHint().width() );
+  l->setFixedWidth( l->tqsizeHint().width() );
   hbl->addWidget( l, 0 );
   TQLineEdit *le = new KLineEdit( w, "ledit" );
   hbl->addWidget( le, 1 );
@@ -1194,9 +1194,9 @@ KMFilterAction::ReturnCode KMFilterActionRewriteHeader::process(KMMessage* msg)
   if ( mParameter.isEmpty() || !mRegExp.isValid() )
     return ErrorButGoOn;
 
-  KRegExp3 rx = mRegExp; // KRegExp3::replace is not const.
+  KRegExp3 rx = mRegExp; // KRegExp3::tqreplace is not const.
 
-  TQString newValue = rx.replace( msg->headerField( mParameter.latin1() ),
+  TQString newValue = rx.tqreplace( msg->headerField( mParameter.latin1() ),
                                      mReplacementString );
 
   msg->setHeaderField( mParameter.latin1(), newValue );
@@ -1214,17 +1214,17 @@ TQWidget* KMFilterActionRewriteHeader::createParamWidget( TQWidget* parent ) con
   hbl->addWidget( cb, 0 /* stretch */ );
 
   TQLabel *l = new TQLabel( i18n("Replace:"), w );
-  l->setFixedWidth( l->sizeHint().width() );
+  l->setFixedWidth( l->tqsizeHint().width() );
   hbl->addWidget( l, 0 );
 
   RegExpLineEdit *rele = new RegExpLineEdit( w, "search" );
   hbl->addWidget( rele, 1 );
 
   l = new TQLabel( i18n("With:"), w );
-  l->setFixedWidth( l->sizeHint().width() );
+  l->setFixedWidth( l->tqsizeHint().width() );
   hbl->addWidget( l, 0 );
 
-  TQLineEdit *le = new KLineEdit( w, "replace" );
+  TQLineEdit *le = new KLineEdit( w, "tqreplace" );
   hbl->addWidget( le, 1 );
 
   setParamWidgetValue( w );
@@ -1250,7 +1250,7 @@ void KMFilterActionRewriteHeader::setParamWidgetValue( TQWidget* paramWidget ) c
   Q_ASSERT( rele );
   rele->setText( mRegExp.pattern() );
 
-  TQLineEdit *le = (TQLineEdit*)paramWidget->child("replace");
+  TQLineEdit *le = (TQLineEdit*)paramWidget->child("tqreplace");
   Q_ASSERT( le );
   le->setText( mReplacementString );
 }
@@ -1265,7 +1265,7 @@ void KMFilterActionRewriteHeader::applyParamWidgetValue( TQWidget* paramWidget )
   Q_ASSERT( rele );
   mRegExp.setPattern( rele->text() );
 
-  TQLineEdit *le = (TQLineEdit*)paramWidget->child("replace");
+  TQLineEdit *le = (TQLineEdit*)paramWidget->child("tqreplace");
   Q_ASSERT( le );
   mReplacementString = le->text();
 }
@@ -1280,7 +1280,7 @@ void KMFilterActionRewriteHeader::clearParamWidget( TQWidget* paramWidget ) cons
   Q_ASSERT( rele );
   rele->clear();
 
-  TQLineEdit *le = (TQLineEdit*)paramWidget->child("replace");
+  TQLineEdit *le = (TQLineEdit*)paramWidget->child("tqreplace");
   Q_ASSERT( le );
   le->clear();
 }
@@ -1898,7 +1898,7 @@ KMFilterAction::ReturnCode KMFilterActionExecSound::process(KMMessage*) const
   if ( mParameter.isEmpty() )
     return ErrorButGoOn;
   TQString play = mParameter;
-  TQString file = TQString::fromLatin1("file:");
+  TQString file = TQString::tqfromLatin1("file:");
   if (mParameter.startsWith(file))
     play = mParameter.mid(file.length());
   KAudioPlayer::play(TQFile::encodeName(play));
@@ -1970,7 +1970,7 @@ void KMFilterActionDict::init(void)
   insert( KMFilterActionMove::newAction );
   insert( KMFilterActionCopy::newAction );
   insert( KMFilterActionIdentity::newAction );
-  insert( KMFilterActionSetStatus::newAction );
+  insert( KMFilterActionSeStatus::newAction );
   insert( KMFilterActionFakeDisposition::newAction );
   insert( KMFilterActionTransport::newAction );
   insert( KMFilterActionReplyTo::newAction );
diff --git a/kmail/kmfilteraction.h b/kmail/kmfilteraction.h
index 35f7008e..55aba2cf 100644
--- a/kmail/kmfilteraction.h
+++ b/kmail/kmfilteraction.h
@@ -648,7 +648,7 @@ struct KMFilterActionDesc
   KMFilterActionNewFunc create;
 };
 
-/** Dictionary that contains a list of all registered filter actions
+/** Dictionary that tqcontains a list of all registered filter actions
     with their creation functions. They are hard-coded into the
     constructor. If you want to add a new KMFilterAction, make
     sure you add the details of it in init, too.
diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp
index 558031f0..c9e42d1c 100644
--- a/kmail/kmfilterdlg.cpp
+++ b/kmail/kmfilterdlg.cpp
@@ -131,7 +131,7 @@ const char * KMPopFilterDlgHelpAnchor =  "popfilters-id" ;
 KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, bool createDummyFilter )
   : KDialogBase( parent, name,  false  /* modality */,
 		 (popFilter)? i18n("POP3 Filter Rules"): i18n("Filter Rules") /* caption*/,
-		 Help|Ok|Apply|Cancel|User1|User2 /* button mask */,
+		 Help|Ok|Apply|Cancel|User1|User2 /* button tqmask */,
 		 Ok /* default btn */,  false  /* separator */),
   bPopFilter(popFilter)
 {
@@ -234,7 +234,7 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo
       mConfigureShortcut = new TQCheckBox( i18n("Add this filter to the Apply Filter menu"), adv_w );
       gl->addMultiCellWidget( mConfigureShortcut, 7, 7, 0, 1 );
       TQLabel *keyButtonLabel = new TQLabel( i18n( "Shortcut:" ), adv_w );
-      keyButtonLabel->setAlignment( AlignVCenter | AlignRight );
+      keyButtonLabel->tqsetAlignment( AlignVCenter | AlignRight );
       gl->addMultiCellWidget( keyButtonLabel, 7, 7, 2, 2 );
       mKeyButton = new KKeyButton( adv_w, "FilterShortcutSelector" );
       gl->addMultiCellWidget( mKeyButton, 7, 7, 3, 3 );
@@ -339,11 +339,11 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo
   connect( this, TQT_SIGNAL(finished()),
 	   this, TQT_SLOT(slotFinished()) );
 
-  KConfigGroup geometry( KMKernel::config(), "Geometry");
+  KConfigGroup tqgeometry( KMKernel::config(), "Geometry");
   const char * configKey
     = bPopFilter ? "popFilterDialogSize" : "filterDialogSize";
-  if ( geometry.hasKey( configKey ) )
-    resize( geometry.readSizeEntry( configKey ) );
+  if ( tqgeometry.hasKey( configKey ) )
+    resize( tqgeometry.readSizeEntry( configKey ) );
   else
     adjustSize();
 
@@ -356,8 +356,8 @@ void KMFilterDlg::slotFinished() {
 }
 
 void KMFilterDlg::slotSaveSize() {
-  KConfigGroup geometry( KMKernel::config(), "Geometry" );
-  geometry.writeEntry( bPopFilter ? "popFilterDialogSize" : "filterDialogSize", size() );
+  KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+  tqgeometry.writeEntry( bPopFilter ? "popFilterDialogSize" : "filterDialogSize", size() );
 }
 
 /** Set action of popFilter */
@@ -595,19 +595,19 @@ KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, cons
   mBtnTop = new KPushButton( TQString::null, hb );
   mBtnTop->setAutoRepeat( true );
   mBtnTop->setIconSet( BarIconSet( "top", KIcon::SizeSmall ) );
-  mBtnTop->setMinimumSize( mBtnTop->sizeHint() * 1.2 );
+  mBtnTop->setMinimumSize( mBtnTop->tqsizeHint() * 1.2 );
   mBtnUp = new KPushButton( TQString::null, hb );
   mBtnUp->setAutoRepeat( true );
   mBtnUp->setIconSet( BarIconSet( "up", KIcon::SizeSmall ) );
-  mBtnUp->setMinimumSize( mBtnUp->sizeHint() * 1.2 );
+  mBtnUp->setMinimumSize( mBtnUp->tqsizeHint() * 1.2 );
   mBtnDown = new KPushButton( TQString::null, hb );
   mBtnDown->setAutoRepeat( true );
   mBtnDown->setIconSet( BarIconSet( "down", KIcon::SizeSmall ) );
-  mBtnDown->setMinimumSize( mBtnDown->sizeHint() * 1.2 );
+  mBtnDown->setMinimumSize( mBtnDown->tqsizeHint() * 1.2 );
   mBtnBot = new KPushButton( TQString::null, hb );
   mBtnBot->setAutoRepeat( true );
   mBtnBot->setIconSet( BarIconSet( "bottom", KIcon::SizeSmall ) );
-  mBtnBot->setMinimumSize( mBtnBot->sizeHint() * 1.2 );
+  mBtnBot->setMinimumSize( mBtnBot->tqsizeHint() * 1.2 );
   TQToolTip::add( mBtnTop, i18n("Top") );
   TQToolTip::add( mBtnUp, i18n("Up") );
   TQToolTip::add( mBtnDown, i18n("Down") );
@@ -622,13 +622,13 @@ KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, cons
   hb->setSpacing(4);
   mBtnNew = new TQPushButton( TQString::null, hb );
   mBtnNew->setPixmap( BarIcon( "filenew", KIcon::SizeSmall ) );
-  mBtnNew->setMinimumSize( mBtnNew->sizeHint() * 1.2 );
+  mBtnNew->setMinimumSize( mBtnNew->tqsizeHint() * 1.2 );
   mBtnCopy = new TQPushButton( TQString::null, hb );
   mBtnCopy->setIconSet( BarIconSet( "editcopy", KIcon::SizeSmall ) );
-  mBtnCopy->setMinimumSize( mBtnCopy->sizeHint() * 1.2 );
+  mBtnCopy->setMinimumSize( mBtnCopy->tqsizeHint() * 1.2 );
   mBtnDelete = new TQPushButton( TQString::null, hb );
   mBtnDelete->setIconSet( BarIconSet( "editdelete", KIcon::SizeSmall ) );
-  mBtnDelete->setMinimumSize( mBtnDelete->sizeHint() * 1.2 );
+  mBtnDelete->setMinimumSize( mBtnDelete->tqsizeHint() * 1.2 );
   mBtnRename = new TQPushButton( i18n("Rename..."), hb );
   TQToolTip::add( mBtnNew, i18n("New") );
   TQToolTip::add( mBtnCopy, i18n("Copy") );
@@ -948,7 +948,7 @@ void KMFilterListBox::slotRename()
      i18n("Rename filter \"%1\" to:\n(leave the field empty for automatic naming)")
         .arg( filter->pattern()->name() ) /*label*/,
      filter->pattern()->name() /* initial value */,
-     &okPressed, topLevelWidget(), 0, validator
+     &okPressed, tqtopLevelWidget(), 0, validator
      );
   delete validator;
 
@@ -1140,13 +1140,13 @@ KMFilterActionWidget::KMFilterActionWidget( TQWidget *parent, const char* name )
 
   // don't show scroll bars.
   mComboBox->setSizeLimit( mComboBox->count() );
-  // layout management:
-  // o the combo box is not to be made larger than it's sizeHint(),
+  // tqlayout management:
+  // o the combo box is not to be made larger than it's tqsizeHint(),
   //   the parameter widget should grow instead.
   // o the whole widget takes all space horizontally, but is fixed vertically.
   mComboBox->adjustSize();
-  mComboBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
-  setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+  mComboBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
   updateGeometry();
 
   // redirect focus to the filter action combo box
diff --git a/kmail/kmfilterdlg.h b/kmail/kmfilterdlg.h
index 18da9b56..4b8d67a7 100644
--- a/kmail/kmfilterdlg.h
+++ b/kmail/kmfilterdlg.h
@@ -216,7 +216,7 @@ private:
       that they are 'forced' to create parameter widgets for the
       widget stack and to clear them on setAction. */
   TQPtrList<KMFilterAction> mActionList;
-  /** The combo box that contains the labels of all KMFilterActions.
+  /** The combo box that tqcontains the labels of all KMFilterActions.
       It's @p activated(int) signal is internally
       connected to the @p raiseWidget(int) slot of @p mWidgetStack. */
   TQComboBox      *mComboBox;
@@ -386,7 +386,7 @@ protected slots:
   void slotExportFilters();
 
 protected:
-  /** The widget that contains the ListBox showing the filters, and
+  /** The widget that tqcontains the ListBox showing the filters, and
       the controls to remove filters, add new ones and to change their
       order. */
   KMFilterListBox *mFilterList;
diff --git a/kmail/kmfiltermgr.cpp b/kmail/kmfiltermgr.cpp
index beb3e60a..2d1e6c91 100644
--- a/kmail/kmfiltermgr.cpp
+++ b/kmail/kmfiltermgr.cpp
@@ -174,7 +174,7 @@ int KMFilterMgr::process( KMMessage * msg, const KMFilter * filter ) {
   return result;
 }
 
-int KMFilterMgr::process( Q_UINT32 serNum, const KMFilter *filter )
+int KMFilterMgr::process( TQ_UINT32 serNum, const KMFilter *filter )
 {
   bool stopIt = false;
   int result = 1;
@@ -284,7 +284,7 @@ int KMFilterMgr::process( KMMessage * msg, FilterSet set,
   return 1;
 }
 
-bool KMFilterMgr::isMatching( Q_UINT32 serNum, const KMFilter *filter )
+bool KMFilterMgr::isMatching( TQ_UINT32 serNum, const KMFilter *filter )
 {
   bool result = false;
   if ( FilterLog::instance()->isLogging() ) {
@@ -437,11 +437,11 @@ const TQString KMFilterMgr::createUniqueName( const TQString & name )
 
 //-----------------------------------------------------------------------------
 void KMFilterMgr::appendFilters( const TQValueList<KMFilter*> &filters,
-                                 bool replaceIfNameExists )
+                                 bool tqreplaceIfNameExists )
 {
   mDirtyBufferedFolderTarget = true;
   beginUpdate();
-  if ( replaceIfNameExists ) {
+  if ( tqreplaceIfNameExists ) {
     TQValueListConstIterator<KMFilter*> it1 = filters.constBegin();
     for ( ; it1 != filters.constEnd() ; ++it1 ) {
       TQValueListConstIterator<KMFilter*> it2 = mFilters.constBegin();
diff --git a/kmail/kmfiltermgr.h b/kmail/kmfiltermgr.h
index 60923866..eabfe093 100644
--- a/kmail/kmfiltermgr.h
+++ b/kmail/kmfiltermgr.h
@@ -89,7 +89,7 @@ public:
       write everything back into the configuration. The filter manager
       takes ownership of the filters in the list. */
   void appendFilters( const TQValueList<KMFilter*> &filters,
-                      bool replaceIfNameExists = false );
+                      bool tqreplaceIfNameExists = false );
 
   /** Replace the list of filters under control of the filter manager.
    * The manager takes ownershipt of the filters. */
@@ -123,7 +123,7 @@ public:
 
   /** For ad-hoc filters. Applies @p filter to message with @p serNum .
       Return codes are as with the above method. */
-  int process( Q_UINT32 serNum, const KMFilter * filter );
+  int process( TQ_UINT32 serNum, const KMFilter * filter );
 
   void cleanup();
   /** Increment the reference count for the filter manager.
@@ -182,7 +182,7 @@ signals:
 private:
   int processPop( KMMessage *msg ) const;
   /** Find out if a message matches the filter criteria */
-  bool isMatching( Q_UINT32 serNum, const KMFilter *filter );
+  bool isMatching( TQ_UINT32 serNum, const KMFilter *filter );
 
   TQGuardedPtr<KMFilterDlg> mEditDialog;
   TQValueVector<KMFolder *> mOpenFolders;
diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp
index 68fb52f0..3825d1ee 100644
--- a/kmail/kmfolder.cpp
+++ b/kmail/kmfolder.cpp
@@ -87,15 +87,15 @@ KMFolder::KMFolder( KMFolderDir* aParent, const TQString& aFolderName,
   }
 
   if ( aParent ) {
-    connect( mStorage, TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ),
-             aParent->manager(), TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ) );
-    connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ),
-             parent()->manager(), TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ) );
-    connect( this, TQT_SIGNAL( msgChanged( KMFolder*, Q_UINT32, int ) ),
-             parent()->manager(), TQT_SIGNAL( msgChanged( KMFolder*, Q_UINT32, int ) ) );
+    connect( mStorage, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ),
+             aParent->manager(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) );
+    connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ),
+             parent()->manager(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) );
+    connect( this, TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ),
+             parent()->manager(), TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ) );
     connect( this, TQT_SIGNAL( msgHeaderChanged( KMFolder*,  int ) ),
              parent()->manager(), TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) );
-    connect( mStorage, TQT_SIGNAL( invalidated( KMFolder* ) ),
+    connect( mStorage, TQT_SIGNAL( tqinvalidated( KMFolder* ) ),
              parent()->manager(), TQT_SIGNAL( folderInvalidated( KMFolder* ) ) );
   }
 
@@ -105,17 +105,17 @@ KMFolder::KMFolder( KMFolderDir* aParent, const TQString& aFolderName,
   connect( mStorage, TQT_SIGNAL( expunged( KMFolder* ) ),
            TQT_SIGNAL( expunged( KMFolder* ) ) );
   connect( mStorage, TQT_SIGNAL( nameChanged() ), TQT_SIGNAL( nameChanged() ) );
-  connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ),
-           TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ) );
+  connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ),
+           TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) );
   connect( mStorage, TQT_SIGNAL( msgRemoved( int, TQString ) ),
            TQT_SIGNAL( msgRemoved( int, TQString ) ) );
   connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder* ) ),
            TQT_SIGNAL( msgRemoved( KMFolder* ) ) );
   connect( mStorage, TQT_SIGNAL( msgAdded( int ) ), TQT_SIGNAL( msgAdded( int ) ) );
-  connect( mStorage, TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ),
-           TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ) );
-  connect( mStorage, TQT_SIGNAL( msgChanged( KMFolder*, Q_UINT32 , int ) ),
-           TQT_SIGNAL( msgChanged( KMFolder*, Q_UINT32 , int ) ) );
+  connect( mStorage, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ),
+           TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) );
+  connect( mStorage, TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32 , int ) ),
+           TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32 , int ) ) );
   connect( mStorage, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ),
            TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) );
   connect( mStorage, TQT_SIGNAL( statusMsg( const TQString& ) ),
@@ -717,8 +717,8 @@ TQString KMFolder::idString() const
   TQString escapedName = name();
   /* Escape [ and ] as they are disallowed for kconfig sections and that is
      what the idString is primarily used for. */
-  escapedName.replace( "[", "%(" );
-  escapedName.replace( "]", "%)" );
+  escapedName.tqreplace( "[", "%(" );
+  escapedName.tqreplace( "]", "%)" );
   return relativePath + escapedName;
 }
 
@@ -828,15 +828,15 @@ int KMFolder::writeIndex( bool createEmptyIndex )
   return mStorage->writeIndex( createEmptyIndex );
 }
 
-void KMFolder::setStatus( int idx, KMMsgStatus status, bool toggle )
+void KMFolder::seStatus( int idx, KMMsgStatus status, bool toggle )
 {
-  mStorage->setStatus( idx, status, toggle );
+  mStorage->seStatus( idx, status, toggle );
 }
 
-void KMFolder::setStatus( TQValueList<int>& ids, KMMsgStatus status,
+void KMFolder::seStatus( TQValueList<int>& ids, KMMsgStatus status,
                           bool toggle )
 {
-  mStorage->setStatus( ids, status, toggle);
+  mStorage->seStatus( ids, status, toggle);
 }
 
 void KMFolder::setIconPaths( const TQString &normalPath,
diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h
index 3ff1d67d..77979b98 100644
--- a/kmail/kmfolder.h
+++ b/kmail/kmfolder.h
@@ -53,7 +53,7 @@ namespace KMail {
 }
 using KMail::AttachmentStrategy;
 
-typedef TQValueList<Q_UINT32> SerNumList;
+typedef TQValueList<TQ_UINT32> SerNumList;
 
 /** Mail folder.
  * (description will be here).
@@ -272,7 +272,7 @@ public:
       contained by this folder */
   int countUnreadRecursive();
 
-  /** Called by KMMsgBase::setStatus when status of a message has changed
+  /** Called by KMMsgBase::seStatus when status of a message has changed
       required to keep the number unread messages variable current. */
   void msgStatusChanged( const KMMsgStatus oldStatus,
                          const KMMsgStatus newStatus,
@@ -337,7 +337,7 @@ public:
   /** Change the dirty flag. */
   void setDirty(bool f);
 
-  /** Returns true if the folder contains deleted messages */
+  /** Returns true if the folder tqcontains deleted messages */
   bool needsCompacting() const;
   void setNeedsCompacting(bool f);
 
@@ -489,10 +489,10 @@ public:
   int writeIndex( bool createEmptyIndex = false );
 
   /** Set the status of the message at index @p idx to @p status. */
-  void setStatus(int idx, KMMsgStatus status, bool toggle=false);
+  void seStatus(int idx, KMMsgStatus status, bool toggle=false);
 
   /** Set the status of the message(s) in the TQValueList @p ids to @p status. */
-  void setStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle=false);
+  void seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle=false);
 
   /** Icon related methods */
   bool useCustomIcons() const { return mUseCustomIcons; }
@@ -541,7 +541,7 @@ public:
 
   /**
   * Returns true if the name is valid for a child of this folder.
-  * If the name contains invalid characters then false is returned and message will contain
+  * If the name tqcontains invalid characters then false is returned and message will contain
   * an explanation that can be presented to the user.
   */
   bool isValidName( const TQString &folderName, TQString &message );
@@ -573,7 +573,7 @@ signals:
   void shortcutChanged( KMFolder * );
 
   /** Emitted before a message is removed from the folder. */
-  void msgRemoved(KMFolder*, Q_UINT32 sernum);
+  void msgRemoved(KMFolder*, TQ_UINT32 sernum);
 
   /** Emitted after a message is removed from the folder. */
   void msgRemoved( int idx, TQString msgIdMD5 );
@@ -581,10 +581,10 @@ signals:
 
   /** Emitted when a message is added from the folder. */
   void msgAdded(int idx);
-  void msgAdded(KMFolder*, Q_UINT32 sernum);
+  void msgAdded(KMFolder*, TQ_UINT32 sernum);
 
   /** Emitted, when the status of a message is changed */
-  void msgChanged(KMFolder*, Q_UINT32 sernum, int delta);
+  void msgChanged(KMFolder*, TQ_UINT32 sernum, int delta);
 
   /** Emitted when a field of the header of a specific message changed. */
   void msgHeaderChanged(KMFolder*, int);
diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
index a1c71726..61e155ac 100644
--- a/kmail/kmfoldercachedimap.cpp
+++ b/kmail/kmfoldercachedimap.cpp
@@ -49,7 +49,7 @@ using KMail::AccountManager;
 #include "kmglobal.h"
 #include "acljobs.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "progressmanager.h"
 
 using KMail::CachedImapJob;
@@ -549,7 +549,7 @@ int KMFolderCachedImap::addMsgInternal( KMMessage* msg, bool newMail,
       if ( imapPath() == "/INBOX/" )
         filter = true;
     } else {
-      if ( GlobalSettings::filterSourceFolders().contains( folder()->id() ) )
+      if ( GlobalSettings::filterSourceFolders().tqcontains( folder()->id() ) )
         filter = true;
     }
     if ( filter )
@@ -744,7 +744,7 @@ void KMFolderCachedImap::slotTroubleshoot()
     TQString s2 = i18n("&Refresh");
     if( KMessageBox::warningContinueCancel( 0, str, s1, s2 ) ==
         KMessageBox::Continue )
-      account()->invalidateIMAPFolders( this );
+      account()->tqinvalidateIMAPFolders( this );
   } else {
     // Rebuild index file
     switch ( rc ) {
@@ -1394,11 +1394,11 @@ void KMFolderCachedImap::buildSubFolderList()
     while( node ) {
       if( !node->isDir() ) {
         KMFolderCachedImap* storage = static_cast<KMFolderCachedImap*>(static_cast<KMFolder*>(node)->storage());
-        const bool folderIsNew = mNewlyCreatedSubfolders.contains( TQGuardedPtr<KMFolderCachedImap>( storage ) );
+        const bool folderIsNew = mNewlyCreatedSubfolders.tqcontains( TQGuardedPtr<KMFolderCachedImap>( storage ) );
         // Only sync folders that have been accepted by the server
         if ( !storage->imapPath().isEmpty()
              // and that were not just deleted from it
-             && !foldersForDeletionOnServer.contains( storage->imapPath() ) ) {
+             && !foldersForDeletionOnServer.tqcontains( storage->imapPath() ) ) {
           if ( mRecurse || folderIsNew ) {
             mSubfoldersForSync << storage;
           }
@@ -1618,18 +1618,18 @@ void KMFolderCachedImap::slotImapStatusChanged(KMFolder* folder, const TQString&
 }
 
 // This is not perfect, what if the status didn't really change? Oh well ...
-void KMFolderCachedImap::setStatus( int idx, KMMsgStatus status, bool toggle)
+void KMFolderCachedImap::seStatus( int idx, KMMsgStatus status, bool toggle)
 {
-  KMFolderMaildir::setStatus( idx, status, toggle );
+  KMFolderMaildir::seStatus( idx, status, toggle );
   const KMMsgBase *msg = getMsgBase( idx );
   Q_ASSERT( msg );
   if ( msg )
     mUIDsOfLocallyChangedStatuses.insert( msg->UID() );
 }
 
-void KMFolderCachedImap::setStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle)
+void KMFolderCachedImap::seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle)
 {
-  KMFolderMaildir::setStatus(ids, status, toggle);
+  KMFolderMaildir::seStatus(ids, status, toggle);
   for (TQValueList<int>::iterator it = ids.begin(); it != ids.end(); it++ ) {
     const KMMsgBase *msg = getMsgBase( *it );
     Q_ASSERT( msg );
@@ -1907,7 +1907,7 @@ void KMFolderCachedImap::slotGetMessagesData(KIO::Job * job, const TQByteArray &
            kdDebug(5006) << "Looking at uid " << uid << " high water is: " << lastUid() << " we should delete it" << endl;
 #endif
           // double check we deleted it since the last sync
-           if ( mDeletedUIDsSinceLastSync.contains(uid) ) {
+           if ( mDeletedUIDsSinceLastSync.tqcontains(uid) ) {
                if ( mUserRightsState != KMail::ACLJobs::Ok || ( mUserRights & KMail::ACLJobs::Delete ) ) {
 #if MAIL_LOSS_DEBUGGING
                    kdDebug(5006) << "message with uid " << uid << " is gone from local cache. Must be deleted on server!!!" << endl;
@@ -1941,8 +1941,8 @@ void KMFolderCachedImap::slotGetMessagesData(KIO::Job * job, const TQByteArray &
         kdDebug(5006) << "Looking at uid " << uid << " high water is: " << lastUid() << " we should download it" << endl;
 #endif
         // The message is new since the last sync, but we might have just uploaded it, in which case
-        // the uid map already contains it.
-        if ( !uidMap.contains( uid ) ) {
+        // the uid map already tqcontains it.
+        if ( !uidMap.tqcontains( uid ) ) {
           mMsgsForDownload << KMail::CachedImapJob::MsgForDownload(uid, flags, size);
           if( imapPath() == "/INBOX/" )
             mUidsForDownload << uid;
@@ -2596,7 +2596,7 @@ void KMFolderCachedImap::resetSyncState()
   KPIM::ProgressItem *progressItem = mAccount->mailCheckProgressItem();
   TQString str = i18n("Aborted");
   if (progressItem)
-     progressItem->setStatus( str );
+     progressItem->seStatus( str );
   emit statusMsg( str );
   emit syncStateChanged();
 }
@@ -2620,7 +2620,7 @@ void KMFolderCachedImap::newState( int progress, const TQString& syncStatus )
     else
       str = TQString( "%1: %2" ).arg( label() ).arg( syncStatus );
     if( progressItem )
-      progressItem->setStatus( str );
+      progressItem->seStatus( str );
     emit statusMsg( str );
   }
   if( progressItem )
@@ -2944,7 +2944,7 @@ KMFolderCachedImap::slotSetAnnotationResult(KIO::Job *job)
 
   bool cont = true;
   if ( job->error() ) {
-    // Don't show error if the server doesn't support ANNOTATEMORE and this folder only contains mail
+    // Don't show error if the server doesn't support ANNOTATEMORE and this folder only tqcontains mail
     if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION && contentsType() == ContentsTypeMail ) {
       if (mAccount->slave()) mAccount->removeJob(job);
     } else {
@@ -3095,7 +3095,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages()
       break;
 
     // create subfolder for this incident
-    TQDate today = TQDate::currentDate();
+    TQDate today = TQDate::tqcurrentDate();
     TQString baseName = folder()->label() + "-" + TQString::number( today.year() )
         + (today.month() < 10 ? "0" : "" ) + TQString::number( today.month() )
         + (today.day() < 10 ? "0" : "" ) + TQString::number( today.day() );
diff --git a/kmail/kmfoldercachedimap.h b/kmail/kmfoldercachedimap.h
index 21abeabf..61fcfcba 100644
--- a/kmail/kmfoldercachedimap.h
+++ b/kmail/kmfoldercachedimap.h
@@ -283,8 +283,8 @@ public:
   void setACLList( const ACLList& arr );
 
   // Reimplemented so the mStatusChangedLocally bool can be set
-  virtual void setStatus( int id, KMMsgStatus status, bool toggle );
-  virtual void setStatus( TQValueList<int>& ids, KMMsgStatus status, bool toggle );
+  virtual void seStatus( int id, KMMsgStatus status, bool toggle );
+  virtual void seStatus( TQValueList<int>& ids, KMMsgStatus status, bool toggle );
 
   TQString annotationFolderType() const { return mAnnotationFolderType; }
 
@@ -588,7 +588,7 @@ private:
   bool mSharedSeenFlagsChanged;
 
  /**
-  * UIDs added by setStatus. Indicates that the client has changed
+  * UIDs added by seStatus. Indicates that the client has changed
   * the status of those mails. The mail flags for changed mails will be
   * uploaded to the server, overwriting the server's notion of the status
   * of the mails in this folder.
diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp
index 533173e5..4e17ce23 100644
--- a/kmail/kmfolderdia.cpp
+++ b/kmail/kmfolderdia.cpp
@@ -185,7 +185,7 @@ void KMFolderDialog::slotOk()
 
   mDelayedSavingTabs = 0; // number of tabs which need delayed saving
   for ( unsigned int i = 0 ; i < mTabs.count() ; ++i ) {
-    FolderDiaTab::AcceptStatus s = mTabs[i]->accept();
+    FolderDiaTab::AccepStatus s = mTabs[i]->accept();
     if ( s == FolderDiaTab::Canceled ) {
       slotCancelAccept();
       return;
@@ -234,14 +234,14 @@ void KMFolderDialog::setFolder( KMFolder* folder )
   mFolder = folder;
 }
 
-static void addLine( TQWidget *parent, TQVBoxLayout* layout )
+static void addLine( TQWidget *parent, TQVBoxLayout* tqlayout )
 {
    TQFrame *line = new TQFrame( parent, "line" );
    line->setGeometry( TQRect( 80, 150, 250, 20 ) );
    line->setFrameShape( TQFrame::HLine );
    line->setFrameShadow( TQFrame::Sunken );
    line->setFrameShape( TQFrame::HLine );
-   layout->addWidget( line );
+   tqlayout->addWidget( line );
 }
 
 //----------------------------------------------------------------------------
@@ -331,7 +331,7 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg,
     mNameEdit->setText( mDlg->folder() ? mDlg->folder()->label() : i18n("unnamed") );
     if (!aName.isEmpty())
             mNameEdit->setText(aName);
-    mNameEdit->setMinimumSize(mNameEdit->sizeHint());
+    mNameEdit->setMinimumSize(mNameEdit->tqsizeHint());
     // prevent renaming of IMAP inbox
     if ( mDlg->folder() && mDlg->folder()->isSystemFolder() ) {
       TQString imapPath;
@@ -449,7 +449,7 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg,
 
   addLine( this, topLayout );
 
-  // use grid layout for the following combobox settings
+  // use grid tqlayout for the following combobox settings
   TQGridLayout *gl = new TQGridLayout( topLayout, 3, 2, KDialog::spacingHint() );
   gl->setColStretch( 1, 100 ); // make the second column use all available space
   int row = -1;
diff --git a/kmail/kmfolderdia.h b/kmail/kmfolderdia.h
index 4db30ab1..31fb26d9 100644
--- a/kmail/kmfolderdia.h
+++ b/kmail/kmfolderdia.h
@@ -82,12 +82,12 @@ public:
   /// @return whether save succeeded
   virtual bool save() = 0;
 
-  enum AcceptStatus { Accepted, Canceled, Delayed };
+  enum AccepStatus { Accepted, Canceled, Delayed };
   /// Called when clicking OK.
   /// If a module returns Delayed, the closing is cancelled for now,
   /// and the module can close the dialog later on (i.e. after an async
   /// operation like a KIO job).
-  virtual AcceptStatus accept() {
+  virtual AccepStatus accept() {
     return save() ? Accepted : Canceled;
   }
 
diff --git a/kmail/kmfolderdir.cpp b/kmail/kmfolderdir.cpp
index 1ecab637..f3b80e3f 100644
--- a/kmail/kmfolderdir.cpp
+++ b/kmail/kmfolderdir.cpp
@@ -258,7 +258,7 @@ bool KMFolderDir::reload(void)
           // For this to be a cached IMAP folder, it must be in the KMail dimap
           // subdir and must be have a uidcache file or be a maildir folder
           TQString maildir(fname + "/new");
-          TQString imapcachefile = TQString::fromLatin1(".%1.uidcache").arg(fname);
+          TQString imapcachefile = TQString::tqfromLatin1(".%1.uidcache").arg(fname);
           if ( dir.exists( imapcachefile) || dir.exists( maildir ) )
           {
              folder = new KMFolder( this, fname, KMFolderTypeCachedImap );
diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp
index e5c7bd82..c924fa8a 100644
--- a/kmail/kmfolderimap.cpp
+++ b/kmail/kmfolderimap.cpp
@@ -322,7 +322,7 @@ int KMFolderImap::rename( const TQString& newName, KMFolderDir *aParent )
 void KMFolderImap::addMsgQuiet(KMMessage* aMsg)
 {
   KMFolder *aFolder = aMsg->parent();
-  Q_UINT32 serNum = 0;
+  TQ_UINT32 serNum = 0;
   aMsg->setTransferInProgress( false );
   if (aFolder) {
     serNum = aMsg->getMsgSerNum();
@@ -787,7 +787,7 @@ void KMFolderImap::slotListResult( const TQStringList& subfolderNames,
   }
 
   // see if we have a better parent
-  // if you have a prefix that contains a folder (e.g "INBOX.") the folders
+  // if you have a prefix that tqcontains a folder (e.g "INBOX.") the folders
   // need to be created underneath it
   if ( root && !subfolderNames.empty() )
   {
@@ -849,7 +849,7 @@ void KMFolderImap::slotListResult( const TQStringList& subfolderNames,
       // update progress
       account()->listDirProgressItem()->incCompletedItems();
       account()->listDirProgressItem()->updateProgress();
-      account()->listDirProgressItem()->setStatus( folder()->prettyURL() + i18n(" completed") );
+      account()->listDirProgressItem()->seStatus( folder()->prettyURL() + i18n(" completed") );
 
       f->initializeFrom( this, subfolderPaths[i], subfolderMimeTypes[i] );
       f->setChildrenState( subfolderAttributes[i] );
@@ -1073,7 +1073,7 @@ void KMFolderImap::checkValidity()
     mMailCheckProgressItem->setProgress(0);
   }
   if ( account()->mailCheckProgressItem() ) {
-    account()->mailCheckProgressItem()->setStatus( folder()->prettyURL() );
+    account()->mailCheckProgressItem()->seStatus( folder()->prettyURL() );
   }
   ImapAccountBase::jobData jd( url.url() );
   KIO::SimpleJob *job = KIO::get(url, false, false);
@@ -1231,7 +1231,7 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid)
   if (startUid.isEmpty())
   {
     if ( mMailCheckProgressItem )
-      mMailCheckProgressItem->setStatus( i18n("Retrieving message status") );
+      mMailCheckProgressItem->seStatus( i18n("Retrieving message status") );
     url.setPath(imapPath() + ";SECTION=UID FLAGS");
     KIO::SimpleJob *job = KIO::listDir(url, false);
     KIO::Scheduler::assignJobToSlave(account()->slave(), job);
@@ -1246,7 +1246,7 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid)
   } else {
     mContentState = imapDownloadInProgress;
     if ( mMailCheckProgressItem )
-      mMailCheckProgressItem->setStatus( i18n("Retrieving messages") );
+      mMailCheckProgressItem->seStatus( i18n("Retrieving messages") );
     url.setPath(imapPath() + ";UID=" + startUid
       + ":*;SECTION=ENVELOPE");
     KIO::SimpleJob *newJob = KIO::get(url, false, false);
@@ -1341,7 +1341,7 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job)
     mMailCheckProgressItem->setCompletedItems( 0 );
     mMailCheckProgressItem->setTotalItems( jd.total );
     mMailCheckProgressItem->setProgress( 0 );
-    mMailCheckProgressItem->setStatus( i18n("Retrieving messages") );
+    mMailCheckProgressItem->seStatus( i18n("Retrieving messages") );
   }
 
   TQStringList sets;
@@ -1460,7 +1460,7 @@ void KMFolderImap::seenFlagToStatus(KMMsgBase * msg, int flags, bool newMsg)
 
   const KMMsgStatus oldStatus = msg->status();
   if ( (flags & 1) && (oldStatus & KMMsgStatusOld) == 0 )
-    msg->setStatus( KMMsgStatusOld );
+    msg->seStatus( KMMsgStatusOld );
 
   // In case the message does not have the seen flag set, override our local
   // notion that it is read. Otherwise the count of unread messages and the
@@ -1468,10 +1468,10 @@ void KMFolderImap::seenFlagToStatus(KMMsgBase * msg, int flags, bool newMsg)
   if ( msg->isOfUnknownStatus() || (!(flags&1) && !(oldStatus&(KMMsgStatusNew|KMMsgStatusUnread)) ) ) {
     if (newMsg) {
       if ( (oldStatus & KMMsgStatusNew) == 0 )
-        msg->setStatus( KMMsgStatusNew );
+        msg->seStatus( KMMsgStatusNew );
     } else {
       if ( (oldStatus & KMMsgStatusUnread) == 0 )
-        msg->setStatus( KMMsgStatusUnread );
+        msg->seStatus( KMMsgStatusUnread );
     }
   }
 }
@@ -1596,14 +1596,14 @@ void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data)
         }
         // Transfer the status, if it is cached.
         if ( md ) {
-          msg->setStatus( md->status() );
+          msg->seStatus( md->status() );
         } else if ( !account()->hasCapability("uidplus") ) {
           // see if we have cached the msgIdMD5 and get the status +
           // serial number from there
           TQString id = msg->msgIdMD5();
           if ( mMetaDataMap.find( id ) ) {
             md =  mMetaDataMap[id];
-            msg->setStatus( md->status() );
+            msg->seStatus( md->status() );
             if ( md->serNum() != 0 && serNum == 0 ) {
               msg->setMsgSerNum( md->serNum() );
             }
@@ -1880,15 +1880,15 @@ void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList)
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::setStatus(int idx, KMMsgStatus status, bool toggle)
+void KMFolderImap::seStatus(int idx, KMMsgStatus status, bool toggle)
 {
   TQValueList<int> ids; ids.append(idx);
-  setStatus(ids, status, toggle);
+  seStatus(ids, status, toggle);
 }
 
-void KMFolderImap::setStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle)
+void KMFolderImap::seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle)
 {
-  FolderStorage::setStatus(_ids, status, toggle);
+  FolderStorage::seStatus(_ids, status, toggle);
   TQValueList<int> ids;
   if ( mUploadAllFlags ) {
     kdDebug(5006) << k_funcinfo << "Migrating all flags to the server" << endl;
@@ -2345,18 +2345,18 @@ void KMFolderImap::search( const KMSearchPattern* pattern )
   if ( !pattern || pattern->isEmpty() )
   {
     // not much to do here
-    TQValueList<Q_UINT32> serNums;
+    TQValueList<TQ_UINT32> serNums;
     emit searchResult( folder(), serNums, pattern, true );
     return;
   }
   SearchJob* job = new SearchJob( this, account(), pattern );
-  connect( job, TQT_SIGNAL( searchDone( TQValueList<Q_UINT32>, const KMSearchPattern*, bool ) ),
-           this, TQT_SLOT( slotSearchDone( TQValueList<Q_UINT32>, const KMSearchPattern*, bool ) ) );
+  connect( job, TQT_SIGNAL( searchDone( TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ),
+           this, TQT_SLOT( slotSearchDone( TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ) );
   job->start();
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::slotSearchDone( TQValueList<Q_UINT32> serNums,
+void KMFolderImap::slotSearchDone( TQValueList<TQ_UINT32> serNums,
                                    const KMSearchPattern* pattern,
                                    bool complete )
 {
@@ -2364,7 +2364,7 @@ void KMFolderImap::slotSearchDone( TQValueList<Q_UINT32> serNums,
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::search( const KMSearchPattern* pattern, Q_UINT32 serNum )
+void KMFolderImap::search( const KMSearchPattern* pattern, TQ_UINT32 serNum )
 {
   if ( !pattern || pattern->isEmpty() )
   {
@@ -2373,13 +2373,13 @@ void KMFolderImap::search( const KMSearchPattern* pattern, Q_UINT32 serNum )
     return;
   }
   SearchJob* job = new SearchJob( this, account(), pattern, serNum );
-  connect( job, TQT_SIGNAL( searchDone( Q_UINT32, const KMSearchPattern*, bool ) ),
-           this, TQT_SLOT( slotSearchDone( Q_UINT32, const KMSearchPattern*, bool ) ) );
+  connect( job, TQT_SIGNAL( searchDone( TQ_UINT32, const KMSearchPattern*, bool ) ),
+           this, TQT_SLOT( slotSearchDone( TQ_UINT32, const KMSearchPattern*, bool ) ) );
   job->start();
 }
 
 //-----------------------------------------------------------------------------
-void KMFolderImap::slotSearchDone( Q_UINT32 serNum, const KMSearchPattern* pattern,
+void KMFolderImap::slotSearchDone( TQ_UINT32 serNum, const KMSearchPattern* pattern,
                                    bool matches )
 {
   emit searchDone( folder(), serNum, pattern, matches );
@@ -2411,7 +2411,7 @@ void KMFolderImap::saveMsgMetaData( KMMessage* msg, ulong uid )
     uid = msg->UID();
   }
   ulong serNum = msg->getMsgSerNum();
-  mUidMetaDataMap.replace( uid, new KMMsgMetaData(msg->status(), serNum) );
+  mUidMetaDataMap.tqreplace( uid, new KMMsgMetaData(msg->status(), serNum) );
 }
 
 //-----------------------------------------------------------------------------
diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h
index 76a3db98..2f85685b 100644
--- a/kmail/kmfolderimap.h
+++ b/kmail/kmfolderimap.h
@@ -63,14 +63,14 @@ class KMMsgMetaData
 public:
   KMMsgMetaData(KMMsgStatus aStatus)
     :mStatus(aStatus), mSerNum(0) {}
-  KMMsgMetaData(KMMsgStatus aStatus, Q_UINT32 aSerNum)
+  KMMsgMetaData(KMMsgStatus aStatus, TQ_UINT32 aSerNum)
     :mStatus(aStatus), mSerNum(aSerNum) {}
   ~KMMsgMetaData() {};
   KMMsgStatus status() const { return mStatus; }
-  Q_UINT32 serNum() const { return mSerNum; }
+  TQ_UINT32 serNum() const { return mSerNum; }
 private:
   KMMsgStatus mStatus;
-  Q_UINT32 mSerNum;
+  TQ_UINT32 mSerNum;
 };
 
 
@@ -167,7 +167,7 @@ public:
    * Create a new subfolder
    * You may specify the root imap path or this folder will be used
    * If you set askUser to false and the server can only handle folders
-   * that contain messages _or_ folders the new folder is set to "contains messages"
+   * that contain messages _or_ folders the new folder is set to "tqcontains messages"
    * by default
    */
   void createFolder(const TQString &name,
@@ -183,12 +183,12 @@ public:
    * Change the status of the message indicated by @p index
    * Overloaded function for the following one
    */
-  virtual void setStatus(int idx, KMMsgStatus status, bool toggle);
+  virtual void seStatus(int idx, KMMsgStatus status, bool toggle);
 
   /**
    * Change the status of several messages indicated by @p ids
    */
-  virtual void setStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle);
+  virtual void seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle);
 
   /** generates sets of uids */
   static TQStringList makeSets( TQValueList<ulong>&, bool sort = true);
@@ -314,7 +314,7 @@ public:
     * is signaled with searchDone()
     */
   virtual void search( const KMSearchPattern* );
-  virtual void search( const KMSearchPattern*, Q_UINT32 serNum );
+  virtual void search( const KMSearchPattern*, TQ_UINT32 serNum );
 
   /** Returns true if this folder can be moved */
   virtual bool isMoveable() const;
@@ -395,14 +395,14 @@ public slots:
   /**
    * Called from the SearchJob when the folder is done or messages where found
    */
-  void slotSearchDone( TQValueList<Q_UINT32> serNums,
+  void slotSearchDone( TQValueList<TQ_UINT32> serNums,
                        const KMSearchPattern* pattern,
                        bool complete );
 
   /**
    * Called from the SearchJob when the message was searched
    */
-  void slotSearchDone( Q_UINT32 serNum, const KMSearchPattern* pattern, bool matches );
+  void slotSearchDone( TQ_UINT32 serNum, const KMSearchPattern* pattern, bool matches );
 
   /**
    * Connected to ListJob::receivedFolders
diff --git a/kmail/kmfolderindex.cpp b/kmail/kmfolderindex.cpp
index 95746ed1..a6b7f2ce 100644
--- a/kmail/kmfolderindex.cpp
+++ b/kmail/kmfolderindex.cpp
@@ -151,10 +151,10 @@ int KMFolderIndex::writeIndex( bool createEmptyIndex )
   fprintf(tmpIndexStream, "# KMail-Index V%d\n", INDEX_VERSION);
 
   // Header
-  Q_UINT32 byteOrder = 0x12345678;
-  Q_UINT32 sizeOfLong = sizeof(long);
+  TQ_UINT32 byteOrder = 0x12345678;
+  TQ_UINT32 sizeOfLong = sizeof(long);
 
-  Q_UINT32 header_length = sizeof(byteOrder)+sizeof(sizeOfLong);
+  TQ_UINT32 header_length = sizeof(byteOrder)+sizeof(sizeOfLong);
   char pad_char = '\0';
   fwrite(&pad_char, sizeof(pad_char), 1, tmpIndexStream);
   fwrite(&header_length, sizeof(header_length), 1, tmpIndexStream);
@@ -220,7 +220,7 @@ bool KMFolderIndex::readIndex()
   if ( contentsType() != KMail::ContentsTypeMail ) {
     kdDebug(5006) << k_funcinfo << "Reading index for " << label() << endl;
   }
-  Q_INT32 len;
+  TQ_INT32 len;
   KMMsgInfo* mi;
 
   assert(mIndexStream != 0);
@@ -288,7 +288,7 @@ bool KMFolderIndex::readIndex()
 #ifdef OBSOLETE
     else if (mi->isNew())
     {
-      mi->setStatus(KMMsgStatusUnread);
+      mi->seStatus(KMMsgStatusUnread);
       mi->setDirty(false);
     }
 #endif
@@ -377,10 +377,10 @@ bool KMFolderIndex::readIndexHeader(int *gv)
   }
   else {
       // Header
-      Q_UINT32 byteOrder = 0;
-      Q_UINT32 sizeOfLong = sizeof(long); // default
+      TQ_UINT32 byteOrder = 0;
+      TQ_UINT32 sizeOfLong = sizeof(long); // default
 
-      Q_UINT32 header_length = 0;
+      TQ_UINT32 header_length = 0;
       fseek(mIndexStream, sizeof(char), SEEK_CUR );
       fread(&header_length, sizeof(header_length), 1, mIndexStream);
       if (header_length > 0xFFFF)
@@ -562,10 +562,10 @@ void KMFolderIndex::updateInvitationAndAddressFieldsFromContents()
         msg.fromDwString( msgString, false );
         msg.updateInvitationState();
         if ( msg.status() & KMMsgStatusHasInvitation ) {
-          msgInfo->setStatus( msgInfo->status() | KMMsgStatusHasInvitation );
+          msgInfo->seStatus( msgInfo->status() | KMMsgStatusHasInvitation );
         }
         if ( msg.status() & KMMsgStatusHasNoInvitation ) {
-          msgInfo->setStatus( msgInfo->status() | KMMsgStatusHasNoInvitation );
+          msgInfo->seStatus( msgInfo->status() | KMMsgStatusHasNoInvitation );
         }
         msgInfo->setFrom( msg.from() );
         msgInfo->setTo( msg.to() );
diff --git a/kmail/kmfolderindex.h b/kmail/kmfolderindex.h
index 29039765..2762d143 100644
--- a/kmail/kmfolderindex.h
+++ b/kmail/kmfolderindex.h
@@ -112,7 +112,7 @@ protected:
     /** Inserts messages into the message dictionary by iterating over the
      * message list. The messages will get new serial numbers. This is only
      * used on newly appeared folders, where there is no .ids file yet, or
-     * when that has been invalidated. */
+     * when that has been tqinvalidated. */
   virtual void fillMessageDict();
 
   /** table of contents file */
diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp
index 09800a94..2ec8326e 100644
--- a/kmail/kmfoldermaildir.cpp
+++ b/kmail/kmfoldermaildir.cpp
@@ -291,7 +291,7 @@ int KMFolderMaildir::compact( unsigned int startIndex, int nbMessages, const TQS
       continue;
 
     // first, make sure this isn't in the 'new' subdir
-    if ( entryList.contains( filename ) )
+    if ( entryList.tqcontains( filename ) )
       moveInternal(subdirNew + filename, subdirCur + filename, mi);
 
     // construct a valid filename.  if it's already valid, then
@@ -310,7 +310,7 @@ int KMFolderMaildir::compact( unsigned int startIndex, int nbMessages, const TQS
     // we can't have any New messages at this point
     if (mi->isNew())
     {
-      mi->setStatus(KMMsgStatusUnread);
+      mi->seStatus(KMMsgStatusUnread);
       setDirty( true );
     }
 #endif
@@ -385,7 +385,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
     msgParent->getMsg( idx );
   }
 
-  aMsg->setStatusFields();
+  aMsg->seStatusFields();
   if (aMsg->headerField("Content-Type").isEmpty())  // This might be added by
     aMsg->removeHeaderField("Content-Type");        // the line above
 
@@ -404,7 +404,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
 
   if (len <= 0)
   {
-    kdDebug(5006) << "Message added to folder `" << name() << "' contains no data. Ignoring it." << endl;
+    kdDebug(5006) << "Message added to folder `" << name() << "' tqcontains no data. Ignoring it." << endl;
     return 0;
   }
 
@@ -480,7 +480,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
   if (aMsg->getMsgSerNum() <= 0)
     aMsg->setMsgSerNum();
   else
-    replaceMsgSerNum( aMsg->getMsgSerNum(), &aMsg->toMsgBase(), idx );
+    tqreplaceMsgSerNum( aMsg->getMsgSerNum(), &aMsg->toMsgBase(), idx );
 
   // write index entry if desired
   if (mAutoCreateIndex)
@@ -893,13 +893,13 @@ int KMFolderMaildir::createIndexFromContents()
   correctUnreadMsgsCount();
 
   if (kmkernel->outboxFolder() == folder() && count() > 0)
-    KMessageBox::information(0, i18n("Your outbox contains messages which were "
+    KMessageBox::information(0, i18n("Your outbox tqcontains messages which were "
     "most-likely not created by KMail;\nplease remove them from there if you "
     "do not want KMail to send them."));
 
   needsCompact = true;
 
-  invalidateFolder();
+  tqinvalidateFolder();
   return 0;
 }
 
@@ -1106,7 +1106,7 @@ void KMFolderMaildir::msgStatusChanged(const KMMsgStatus oldStatus,
 }
 
 /*virtual*/
-Q_INT64 KMFolderMaildir::doFolderSize() const
+TQ_INT64 KMFolderMaildir::doFolderSize() const
 {
   if ( mCurrentlyCheckingFolderSize )
   {
diff --git a/kmail/kmfoldermaildir.h b/kmail/kmfoldermaildir.h
index 12f24942..d8be0139 100644
--- a/kmail/kmfoldermaildir.h
+++ b/kmail/kmfoldermaildir.h
@@ -55,7 +55,7 @@ public:
   virtual void removeMsg(TQPtrList<KMMessage> msgList, bool imapQuiet = FALSE)
   { return KMFolderIndex::removeMsg(msgList, imapQuiet); }
 
-  // Called by KMMsgBase::setStatus when status of a message has changed
+  // Called by KMMsgBase::seStatus when status of a message has changed
   // required to keep the number unread messages variable current.
   virtual void msgStatusChanged( const KMMsgStatus oldStatus,
                                  const KMMsgStatus newStatus,
@@ -106,7 +106,7 @@ public:
   virtual bool isReadOnly() const { return false; }
  
   /** reimp */
-  virtual Q_INT64 doFolderSize() const;
+  virtual TQ_INT64 doFolderSize() const;
 
 protected:
   virtual FolderJob* doCreateJob( KMMessage *msg, FolderJob::JobType jt, KMFolder *folder,
diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp
index c2e60a09..025a9d71 100644
--- a/kmail/kmfoldermbox.cpp
+++ b/kmail/kmfoldermbox.cpp
@@ -55,7 +55,7 @@
 #include <sys/stat.h>
 #include <sys/file.h>
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 
 #ifndef MAX_LINE
 #define MAX_LINE 4096
@@ -682,7 +682,7 @@ int KMFolderMbox::createIndexFromContents()
                     replyToIdStr, replyToAuxIdStr, msgIdStr,
                     KMMsgEncryptionStateUnknown, KMMsgSignatureStateUnknown,
                     KMMsgMDNStateUnknown, charset, offs, size, sizeServer, uid );
-          mi->setStatus(status, xstatus);
+          mi->seStatus(status, xstatus);
           mi->setDate( dateStr.stripWhiteSpace() );
           mi->setDirty(false);
           mMsgList.append(mi, mExportsSernums );
@@ -805,11 +805,11 @@ int KMFolderMbox::createIndexFromContents()
 
   if (kmkernel->outboxFolder() == folder() && count() > 0)
     KMessageBox::queuedMessageBox(0, KMessageBox::Information,
-                                  i18n("Your outbox contains messages which were "
+                                  i18n("Your outbox tqcontains messages which were "
     "most-likely not created by KMail;\nplease remove them from there if you "
     "do not want KMail to send them."));
 
-  invalidateFolder();
+  tqinvalidateFolder();
   return 0;
 }
 
@@ -852,7 +852,7 @@ static size_t unescapeFrom( char* str, size_t strLen ) {
       *d++ = *s++;  // == '>'
       while ( s < e && *s == '>' )
         *d++ = *s++;
-      if ( qstrncmp( s, "From ", STRDIM("From ") ) == 0 )
+      if ( tqstrncmp( s, "From ", STRDIM("From ") ) == 0 )
         --d;
     }
     *d++ = *s++; // yes, s might be e here, but e is not the end :-)
@@ -887,7 +887,7 @@ TQByteArray KMFolderMbox::escapeFrom( const DwString & str ) {
     case '>':
       break;
     case 'F':
-      if ( onlyAnglesAfterLF && qstrncmp( s+1, "rom ", STRDIM("rom ") ) == 0 )
+      if ( onlyAnglesAfterLF && tqstrncmp( s+1, "rom ", STRDIM("rom ") ) == 0 )
         *d++ = '>';
       // fall through
     default:
@@ -979,7 +979,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
     fileD0.close();  // If data is 0 we just create a zero length file.
 }
 */
-    aMsg->setStatusFields();
+    aMsg->seStatusFields();
 /*
 TQFile fileD1( "testdat_xx-kmfoldermbox-1" );
 if( fileD1.open( IO_WriteOnly ) ) {
@@ -998,7 +998,7 @@ if( fileD1.open( IO_WriteOnly ) ) {
   clearerr(mStream);
   if (len <= 0)
   {
-    kdDebug(5006) << "Message added to folder `" << name() << "' contains no data. Ignoring it." << endl;
+    kdDebug(5006) << "Message added to folder `" << name() << "' tqcontains no data. Ignoring it." << endl;
     return 0;
   }
 
@@ -1085,7 +1085,7 @@ if( fileD1.open( IO_WriteOnly ) ) {
   if ( aMsg->getMsgSerNum() <= 0 )
     aMsg->setMsgSerNum();
   else
-    replaceMsgSerNum( aMsg->getMsgSerNum(), &aMsg->toMsgBase(), idx );
+    tqreplaceMsgSerNum( aMsg->getMsgSerNum(), &aMsg->toMsgBase(), idx );
 
   // change the length of the previous message to encompass white space added
   if ((idx > 0) && (growth > 0)) {
@@ -1175,7 +1175,7 @@ int KMFolderMbox::compact( unsigned int startIndex, int nbMessages, FILE* tmpfil
         mtext.resize(20);
       fread(mtext.data(), 20, 1, mStream);
       if(i <= 0) { //woops we've reached the top of the file, last try..
-        if ( mtext.contains( "from ", false ) ) {
+        if ( mtext.tqcontains( "from ", false ) ) {
           if (mtext.size() < (size_t)folder_offset)
               mtext.resize(folder_offset);
           if(fseek(mStream, chunk_offset, SEEK_SET) == -1 ||
@@ -1238,9 +1238,9 @@ int KMFolderMbox::compact( bool silent )
 
   // If this is the current folder, the changed signal will ultimately call
   // KMHeaders::setFolderInfoStatus which will override the message, so save/restore it
-  TQString statusMsg = BroadcastStatus::instance()->statusMsg();
+  TQString statusMsg = BroadcasStatus::instance()->statusMsg();
   emit changed();
-  BroadcastStatus::instance()->setStatusMsg( statusMsg );
+  BroadcasStatus::instance()->seStatusMsg( statusMsg );
   return rc;
 }
 
@@ -1276,10 +1276,10 @@ int KMFolderMbox::expungeContents()
 
 //-----------------------------------------------------------------------------
 /*virtual*/
-Q_INT64 KMFolderMbox::doFolderSize() const
+TQ_INT64 KMFolderMbox::doFolderSize() const
 {
   TQFileInfo info( location() );
-  return (Q_INT64)(info.size());
+  return (TQ_INT64)(info.size());
 }
 
 //-----------------------------------------------------------------------------
diff --git a/kmail/kmfoldermbox.h b/kmail/kmfoldermbox.h
index 15159b98..7c48324e 100644
--- a/kmail/kmfoldermbox.h
+++ b/kmail/kmfoldermbox.h
@@ -112,7 +112,7 @@ public:
   virtual IndexStatus indexStatus();
 
   /**  reimp */
-  virtual Q_INT64 doFolderSize() const;
+  virtual TQ_INT64 doFolderSize() const;
 
 protected:
   virtual FolderJob* doCreateJob( KMMessage *msg, FolderJob::JobType jt, KMFolder *folder,
diff --git a/kmail/kmfoldermgr.h b/kmail/kmfoldermgr.h
index d4ec786e..587d8525 100644
--- a/kmail/kmfoldermgr.h
+++ b/kmail/kmfoldermgr.h
@@ -150,17 +150,17 @@ signals:
   /** Emitted, when a folder has been added. */
   void folderAdded(KMFolder*);
 
-  /** Emitted, when serial numbers for a folder have been invalidated. */
+  /** Emitted, when serial numbers for a folder have been tqinvalidated. */
   void folderInvalidated(KMFolder*);
 
   /** Emitted, when a message has been appended to a folder */
-  void msgAdded(KMFolder*, Q_UINT32);
+  void msgAdded(KMFolder*, TQ_UINT32);
 
   /** Emitted, when a message has been removed from a folder */
-  void msgRemoved(KMFolder*, Q_UINT32);
+  void msgRemoved(KMFolder*, TQ_UINT32);
 
   /** Emitted, when the status of a message is changed */
-  void msgChanged(KMFolder*, Q_UINT32, int delta);
+  void msgChanged(KMFolder*, TQ_UINT32, int delta);
 
   /** Emitted when a field of the header of a specific message changed. */
   void msgHeaderChanged(KMFolder*, int idx);
diff --git a/kmail/kmfoldernode.h b/kmail/kmfoldernode.h
index 3d0dbadd..2eb197a3 100644
--- a/kmail/kmfoldernode.h
+++ b/kmail/kmfoldernode.h
@@ -35,7 +35,7 @@ public:
   virtual ~KMFolderNode();
 
   /** Is it a directory where mail folders are stored or is it a folder that
-    contains mail ?
+    tqcontains mail ?
     Note that there are some kinds of mail folders like the type mh uses that
     are directories on disk but are handled as folders here. */
   virtual bool isDir(void) const;
diff --git a/kmail/kmfoldersearch.cpp b/kmail/kmfoldersearch.cpp
index 522785d1..471d2f3e 100644
--- a/kmail/kmfoldersearch.cpp
+++ b/kmail/kmfoldersearch.cpp
@@ -262,9 +262,9 @@ void KMSearch::slotProcessNextBatch()
             folder->open("kmsearch");
             mOpenedFolders.append( folder );
             connect( folder->storage(),
-                TQT_SIGNAL( searchResult( KMFolder*, TQValueList<Q_UINT32>, const KMSearchPattern*, bool ) ),
+                TQT_SIGNAL( searchResult( KMFolder*, TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ),
                 this,
-                TQT_SLOT( slotSearchFolderResult( KMFolder*, TQValueList<Q_UINT32>, const KMSearchPattern*, bool ) ) );
+                TQT_SLOT( slotSearchFolderResult( KMFolder*, TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ) );
             folder->storage()->search( mSearchPattern );
         } else
             --mRemainingFolders;
@@ -274,7 +274,7 @@ void KMSearch::slotProcessNextBatch()
 }
 
 void KMSearch::slotSearchFolderResult( KMFolder* folder,
-                                       TQValueList<Q_UINT32> serNums,
+                                       TQValueList<TQ_UINT32> serNums,
                                        const KMSearchPattern* pattern,
                                        bool complete )
 {
@@ -282,7 +282,7 @@ void KMSearch::slotSearchFolderResult( KMFolder* folder,
       return;
     kdDebug(5006) << k_funcinfo << folder->label() << " found " << serNums.count() << endl;
     mLastFolder = folder->label();
-    TQValueListIterator<Q_UINT32> it;
+    TQValueListIterator<TQ_UINT32> it;
     for ( it = serNums.begin(); it != serNums.end(); ++it )
     {
       emit found( *it );
@@ -291,10 +291,10 @@ void KMSearch::slotSearchFolderResult( KMFolder* folder,
     if ( complete )
     {
       disconnect( folder->storage(),
-          TQT_SIGNAL( searchResult( KMFolder*, TQValueList<Q_UINT32>,
+          TQT_SIGNAL( searchResult( KMFolder*, TQValueList<TQ_UINT32>,
                                 const KMSearchPattern*, bool ) ),
           this,
-          TQT_SLOT( slotSearchFolderResult( KMFolder*, TQValueList<Q_UINT32>,
+          TQT_SLOT( slotSearchFolderResult( KMFolder*, TQValueList<TQ_UINT32>,
                                         const KMSearchPattern*, bool ) ) );
       --mRemainingFolders;
       mSearchCount += folder->count();
@@ -325,12 +325,12 @@ KMFolderSearch::KMFolderSearch(KMFolder* folder, const char* name)
 
     //Hook up some slots for live updating of search folders
     //TODO: Optimize folderInvalidated, folderAdded, folderRemoved
-    connect(kmkernel->folderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, Q_UINT32)),
-            this, TQT_SLOT(examineAddedMessage(KMFolder*, Q_UINT32)));
-    connect(kmkernel->folderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, Q_UINT32)),
-            this, TQT_SLOT(examineRemovedMessage(KMFolder*, Q_UINT32)));
-    connect(kmkernel->folderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, Q_UINT32, int)),
-            this, TQT_SLOT(examineChangedMessage(KMFolder*, Q_UINT32, int)));
+    connect(kmkernel->folderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+            this, TQT_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32)));
+    connect(kmkernel->folderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
+            this, TQT_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32)));
+    connect(kmkernel->folderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)),
+            this, TQT_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int)));
     connect(kmkernel->folderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)),
             this, TQT_SLOT(examineInvalidatedFolder(KMFolder*)));
     connect(kmkernel->folderMgr(), TQT_SIGNAL(folderAdded(KMFolder*)),
@@ -340,12 +340,12 @@ KMFolderSearch::KMFolderSearch(KMFolder* folder, const char* name)
     connect(kmkernel->folderMgr(), TQT_SIGNAL(msgHeaderChanged(KMFolder*,int)),
             this, TQT_SLOT(propagateHeaderChanged(KMFolder*,int)));
 
-    connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, Q_UINT32)),
-            this, TQT_SLOT(examineAddedMessage(KMFolder*, Q_UINT32)));
-    connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, Q_UINT32)),
-            this, TQT_SLOT(examineRemovedMessage(KMFolder*, Q_UINT32)));
-    connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, Q_UINT32, int)),
-            this, TQT_SLOT(examineChangedMessage(KMFolder*, Q_UINT32, int)));
+    connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+            this, TQT_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32)));
+    connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
+            this, TQT_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32)));
+    connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)),
+            this, TQT_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int)));
     connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)),
             this, TQT_SLOT(examineInvalidatedFolder(KMFolder*)));
     connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderAdded(KMFolder*)),
@@ -355,12 +355,12 @@ KMFolderSearch::KMFolderSearch(KMFolder* folder, const char* name)
     connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgHeaderChanged(KMFolder*,int)),
             this, TQT_SLOT(propagateHeaderChanged(KMFolder*,int)));
 
-    connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, Q_UINT32)),
-            this, TQT_SLOT(examineAddedMessage(KMFolder*, Q_UINT32)));
-    connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, Q_UINT32)),
-            this, TQT_SLOT(examineRemovedMessage(KMFolder*, Q_UINT32)));
-    connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, Q_UINT32, int)),
-            this, TQT_SLOT(examineChangedMessage(KMFolder*, Q_UINT32, int)));
+    connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)),
+            this, TQT_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32)));
+    connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
+            this, TQT_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32)));
+    connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)),
+            this, TQT_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int)));
     connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)),
             this, TQT_SLOT(examineInvalidatedFolder(KMFolder*)));
     connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderAdded(KMFolder*)),
@@ -399,8 +399,8 @@ void KMFolderSearch::setSearch(KMSearch *search)
         delete mSearch;
         mSearch = search; // take ownership
         if (mSearch) {
-            TQObject::connect(search, TQT_SIGNAL(found(Q_UINT32)),
-                    TQT_SLOT(addSerNum(Q_UINT32)));
+            TQObject::connect(search, TQT_SIGNAL(found(TQ_UINT32)),
+                    TQT_SLOT(addSerNum(TQ_UINT32)));
             TQObject::connect(search, TQT_SIGNAL(finished(bool)),
                     TQT_SLOT(searchFinished(bool)));
         }
@@ -423,7 +423,7 @@ void KMFolderSearch::executeSearch()
     if (mSearch)
         mSearch->stop();
     setSearch(mSearch);
-    invalidateFolder();
+    tqinvalidateFolder();
 }
 
 const KMSearch* KMFolderSearch::search() const
@@ -438,7 +438,7 @@ void KMFolderSearch::searchFinished(bool success)
     close("foldersearch");
 }
 
-void KMFolderSearch::addSerNum(Q_UINT32 serNum)
+void KMFolderSearch::addSerNum(TQ_UINT32 serNum)
 {
     if (mInvalid) // A new search is scheduled don't bother doing anything
         return;
@@ -472,9 +472,9 @@ void KMFolderSearch::addSerNum(Q_UINT32 serNum)
     emitMsgAddedSignals(mSerNums.count()-1);
 }
 
-void KMFolderSearch::removeSerNum(Q_UINT32 serNum)
+void KMFolderSearch::removeSerNum(TQ_UINT32 serNum)
 {
-    TQValueVector<Q_UINT32>::const_iterator it;
+    TQValueVector<TQ_UINT32>::const_iterator it;
     int i = 0;
     for(it = mSerNums.begin(); it != mSerNums.end(); ++it, ++i)
         if ((*it) == serNum) {
@@ -502,7 +502,7 @@ int KMFolderSearch::addMsg(KMMessage*, int* index_return)
 bool KMFolderSearch::readSearch()
 {
     mSearch = new KMSearch;
-    TQObject::connect(mSearch, TQT_SIGNAL(found(Q_UINT32)), TQT_SLOT(addSerNum(Q_UINT32)));
+    TQObject::connect(mSearch, TQT_SIGNAL(found(TQ_UINT32)), TQT_SLOT(addSerNum(TQ_UINT32)));
     TQObject::connect(mSearch, TQT_SIGNAL(finished(bool)), TQT_SLOT(searchFinished(bool)));
     return mSearch->read(location());
 }
@@ -603,7 +603,7 @@ int KMFolderSearch::create()
     clearIndex();
     if (!mSearch) {
         mSearch = new KMSearch();
-        TQObject::connect(mSearch, TQT_SIGNAL(found(Q_UINT32)), TQT_SLOT(addSerNum(Q_UINT32)));
+        TQObject::connect(mSearch, TQT_SIGNAL(found(TQ_UINT32)), TQT_SLOT(addSerNum(TQ_UINT32)));
         TQObject::connect(mSearch, TQT_SIGNAL(finished(bool)), TQT_SLOT(searchFinished(bool)));
     }
     mSearch->write(location());
@@ -645,7 +645,7 @@ const KMMsgBase* KMFolderSearch::getMsgBase(int idx) const
 {
     int folderIdx = -1;
     KMFolder *folder = 0;
-    if (idx < 0 || (Q_UINT32)idx >= mSerNums.count())
+    if (idx < 0 || (TQ_UINT32)idx >= mSerNums.count())
         return 0;
     KMMsgDict::instance()->getLocation(mSerNums[idx], &folder, &folderIdx);
     assert(folder && (folderIdx != -1));
@@ -656,7 +656,7 @@ KMMsgBase* KMFolderSearch::getMsgBase(int idx)
 {
     int folderIdx = -1;
     KMFolder *folder = 0;
-    if (idx < 0 || (Q_UINT32)idx >= mSerNums.count())
+    if (idx < 0 || (TQ_UINT32)idx >= mSerNums.count())
         return 0;
     KMMsgDict::instance()->getLocation(mSerNums[idx], &folder, &folderIdx);
     if (!folder || folderIdx == -1)
@@ -669,7 +669,7 @@ KMMessage* KMFolderSearch::getMsg(int idx)
 {
     int folderIdx = -1;
     KMFolder *folder = 0;
-    if (idx < 0 || (Q_UINT32)idx >= mSerNums.count())
+    if (idx < 0 || (TQ_UINT32)idx >= mSerNums.count())
         return 0;
     KMMsgDict::instance()->getLocation(mSerNums[idx], &folder, &folderIdx);
     assert(folder && (folderIdx != -1));
@@ -701,8 +701,8 @@ KMFolderSearch::ignoreJobsForMessage( KMMessage* msg )
 int KMFolderSearch::find(const KMMsgBase* msg) const
 {
     int pos = 0;
-    Q_UINT32 serNum = msg->getMsgSerNum();
-    TQValueVector<Q_UINT32>::const_iterator it;
+    TQ_UINT32 serNum = msg->getMsgSerNum();
+    TQValueVector<TQ_UINT32>::const_iterator it;
     for(it = mSerNums.begin(); it != mSerNums.end(); ++it) {
         if ((*it) == serNum)
             return pos;
@@ -757,19 +757,19 @@ int KMFolderSearch::writeIndex( bool )
         return -1;
     }
     fprintf(tmpIndexStream, IDS_SEARCH_HEADER, IDS_SEARCH_VERSION);
-    Q_UINT32 byteOrder = 0x12345678;
+    TQ_UINT32 byteOrder = 0x12345678;
     fwrite(&byteOrder, sizeof(byteOrder), 1, tmpIndexStream);
 
-    Q_UINT32 count = mSerNums.count();
+    TQ_UINT32 count = mSerNums.count();
     if (!fwrite(&count, sizeof(count), 1, tmpIndexStream)) {
         fclose(tmpIndexStream);
         truncate(TQFile::encodeName(filename), 0);
         return -1;
     }
 
-    TQValueVector<Q_UINT32>::iterator it;
+    TQValueVector<TQ_UINT32>::iterator it;
     for(it = mSerNums.begin(); it != mSerNums.end(); ++it) {
-        Q_UINT32 serNum = *it;
+        TQ_UINT32 serNum = *it;
         if (!fwrite(&serNum, sizeof(serNum), 1, tmpIndexStream))
             return -1;
     }
@@ -815,7 +815,7 @@ bool KMFolderSearch::readIndex()
         return false;
     }
     bool swapByteOrder;
-    Q_UINT32 byte_order;
+    TQ_UINT32 byte_order;
     if (!fread(&byte_order, sizeof(byte_order), 1, mIdsStream)) {
         fclose(mIdsStream);
         mIdsStream = 0;
@@ -823,7 +823,7 @@ bool KMFolderSearch::readIndex()
     }
     swapByteOrder = (byte_order == 0x78563412);
 
-    Q_UINT32 count;
+    TQ_UINT32 count;
     if (!fread(&count, sizeof(count), 1, mIdsStream)) {
         fclose(mIdsStream);
         mIdsStream = 0;
@@ -835,7 +835,7 @@ bool KMFolderSearch::readIndex()
     mUnreadMsgs = 0;
     mSerNums.reserve(count);
     for (unsigned int index = 0; index < count; index++) {
-        Q_UINT32 serNum;
+        TQ_UINT32 serNum;
         int folderIdx = -1;
         KMFolder *folder = 0;
         bool readOk = fread(&serNum, sizeof(serNum), 1, mIdsStream);
@@ -901,7 +901,7 @@ KMMsgBase* KMFolderSearch::takeIndexEntry(int idx)
 {
     assert(idx >= 0 && idx < (int)mSerNums.count());
     KMMsgBase *msgBase = getMsgBase(idx);
-    TQValueVector<Q_UINT32>::iterator it = mSerNums.begin();
+    TQValueVector<TQ_UINT32>::iterator it = mSerNums.begin();
     mSerNums.erase(&it[idx]);
     return msgBase;
 }
@@ -932,7 +932,7 @@ void KMFolderSearch::truncateIndex()
     truncate(TQFile::encodeName(indexLocation()), IDS_SEARCH_HEADER_LEN);
 }
 
-void KMFolderSearch::examineAddedMessage(KMFolder *aFolder, Q_UINT32 serNum)
+void KMFolderSearch::examineAddedMessage(KMFolder *aFolder, TQ_UINT32 serNum)
 {
     if (!search() && !readSearch())
         return;
@@ -954,14 +954,14 @@ void KMFolderSearch::examineAddedMessage(KMFolder *aFolder, Q_UINT32 serNum)
     KMFolderOpener openFolder(folder, "foldersearch");
 
     // if we are already checking this folder, refcount
-    if ( mFoldersCurrentlyBeingSearched.contains( folder ) ) {
+    if ( mFoldersCurrentlyBeingSearched.tqcontains( folder ) ) {
       unsigned int count = mFoldersCurrentlyBeingSearched[folder];
-      mFoldersCurrentlyBeingSearched.replace( folder, count+1 );
+      mFoldersCurrentlyBeingSearched.tqreplace( folder, count+1 );
     } else {
       connect( folder->storage(),
-              TQT_SIGNAL( searchDone( KMFolder*, Q_UINT32, const KMSearchPattern*, bool ) ),
+              TQT_SIGNAL( searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ),
               this,
-              TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, Q_UINT32,
+              TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32,
                       const KMSearchPattern*, bool ) ) );
       mFoldersCurrentlyBeingSearched.insert( folder, 1 );
     }
@@ -969,7 +969,7 @@ void KMFolderSearch::examineAddedMessage(KMFolder *aFolder, Q_UINT32 serNum)
 }
 
 void KMFolderSearch::slotSearchExamineMsgDone( KMFolder* folder,
-                                               Q_UINT32 serNum,
+                                               TQ_UINT32 serNum,
                                                const KMSearchPattern* pattern,
                                                bool matches )
 {
@@ -978,24 +978,24 @@ void KMFolderSearch::slotSearchExamineMsgDone( KMFolder* folder,
      << " matches?" << matches << endl;
     KMFolderOpener openFolder(folder, "foldersearch");
 
-    Q_ASSERT( mFoldersCurrentlyBeingSearched.contains( folder ) );
+    Q_ASSERT( mFoldersCurrentlyBeingSearched.tqcontains( folder ) );
 
     unsigned int count = mFoldersCurrentlyBeingSearched[folder];
     if ( count == 1 ) {
       disconnect( folder->storage(),
-                  TQT_SIGNAL( searchDone( KMFolder*, Q_UINT32,
+                  TQT_SIGNAL( searchDone( KMFolder*, TQ_UINT32,
                                       const KMSearchPattern*, bool ) ),
                   this,
-                  TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, Q_UINT32,
+                  TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32,
                                                   const KMSearchPattern*, bool ) ) );
       mFoldersCurrentlyBeingSearched.remove( folder );
     } else {
-      mFoldersCurrentlyBeingSearched.replace( folder, count-1 );
+      mFoldersCurrentlyBeingSearched.tqreplace( folder, count-1 );
     }
 
     if ( !matches ) {
-        TQValueVector<Q_UINT32>::const_iterator it;
-        it = qFind( mSerNums.begin(), mSerNums.end(), serNum );
+        TQValueVector<TQ_UINT32>::const_iterator it;
+        it = tqFind( mSerNums.begin(), mSerNums.end(), serNum );
         if (it != mSerNums.end()) {
             removeSerNum( serNum );
         }
@@ -1006,15 +1006,15 @@ void KMFolderSearch::slotSearchExamineMsgDone( KMFolder* folder,
 //        mSearch->stop();
 //        mExecuteSearchTimer->start( 0, true );
 //    } else {
-        TQValueVector<Q_UINT32>::const_iterator it;
-        it = qFind( mSerNums.begin(), mSerNums.end(), serNum );
+        TQValueVector<TQ_UINT32>::const_iterator it;
+        it = tqFind( mSerNums.begin(), mSerNums.end(), serNum );
         if (it == mSerNums.end()) {
             addSerNum( serNum );
         }
 //    }
 }
 
-void KMFolderSearch::examineRemovedMessage(KMFolder *folder, Q_UINT32 serNum)
+void KMFolderSearch::examineRemovedMessage(KMFolder *folder, TQ_UINT32 serNum)
 {
     if (!search() && !readSearch())
         return;
@@ -1032,7 +1032,7 @@ void KMFolderSearch::examineRemovedMessage(KMFolder *folder, Q_UINT32 serNum)
     }
 }
 
-void KMFolderSearch::examineChangedMessage(KMFolder *aFolder, Q_UINT32 serNum, int delta)
+void KMFolderSearch::examineChangedMessage(KMFolder *aFolder, TQ_UINT32 serNum, int delta)
 {
     if (!search() && !readSearch())
         return;
@@ -1042,8 +1042,8 @@ void KMFolderSearch::examineChangedMessage(KMFolder *aFolder, Q_UINT32 serNum, i
         open("foldersearch");
         mTempOpened = true;
     }
-    TQValueVector<Q_UINT32>::const_iterator it;
-    it = qFind( mSerNums.begin(), mSerNums.end(), serNum );
+    TQValueVector<TQ_UINT32>::const_iterator it;
+    it = tqFind( mSerNums.begin(), mSerNums.end(), serNum );
     if (it != mSerNums.end()) {
         mUnreadMsgs += delta;
         emit numUnreadMsgsChanged( folder() );
@@ -1102,8 +1102,8 @@ void KMFolderSearch::propagateHeaderChanged(KMFolder *aFolder, int idx)
         mTempOpened = true;
     }
 
-    Q_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum(aFolder, idx);
-    TQValueVector<Q_UINT32>::const_iterator it;
+    TQ_UINT32 serNum = KMMsgDict::instance()->getMsgSerNum(aFolder, idx);
+    TQValueVector<TQ_UINT32>::const_iterator it;
     for(it = mSerNums.begin(); it != mSerNums.end(); ++it) {
         if ((*it) == serNum) {
             emit msgHeaderChanged(folder(), pos);
@@ -1115,14 +1115,14 @@ void KMFolderSearch::propagateHeaderChanged(KMFolder *aFolder, int idx)
     KMFolderOpener openAFolder(aFolder, "foldersearch");
 
     // if we are already checking this folder, refcount
-    if ( mFoldersCurrentlyBeingSearched.contains( aFolder ) ) {
+    if ( mFoldersCurrentlyBeingSearched.tqcontains( aFolder ) ) {
       unsigned int count = mFoldersCurrentlyBeingSearched[aFolder];
-      mFoldersCurrentlyBeingSearched.replace( aFolder, count+1 );
+      mFoldersCurrentlyBeingSearched.tqreplace( aFolder, count+1 );
     } else {
       connect( aFolder->storage(),
-              TQT_SIGNAL( searchDone( KMFolder*, Q_UINT32, const KMSearchPattern*, bool ) ),
+              TQT_SIGNAL( searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ),
               this,
-              TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, Q_UINT32,
+              TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32,
                       const KMSearchPattern*, bool ) ) );
       mFoldersCurrentlyBeingSearched.insert( aFolder, 1 );
     }
diff --git a/kmail/kmfoldersearch.h b/kmail/kmfoldersearch.h
index 180995da..ced2af35 100644
--- a/kmail/kmfoldersearch.h
+++ b/kmail/kmfoldersearch.h
@@ -37,7 +37,7 @@
     numbers of all messages that currently match the search.
 **/
 
-typedef TQValueList<Q_UINT32> SerNumList;
+typedef TQValueList<TQ_UINT32> SerNumList;
 class KMSearchPattern;
 class KMFolderImap;
 class KMFolderSearchJob;
@@ -78,12 +78,12 @@ public slots:
   void indexFinished();
 
 signals:
-  void found(Q_UINT32 serNum);
+  void found(TQ_UINT32 serNum);
   void finished(bool success);
 
 protected slots:
   void slotProcessNextBatch();
-  void slotSearchFolderResult( KMFolder*, TQValueList<Q_UINT32>,
+  void slotSearchFolderResult( KMFolder*, TQValueList<TQ_UINT32>,
                                const KMSearchPattern*, bool );
 
 protected:
@@ -140,12 +140,12 @@ protected slots:
   // Called when the search is finished
   void searchFinished(bool success);
   // Look at a new message and if it matches search() add it to the cache
-  void examineAddedMessage(KMFolder *folder, Q_UINT32 serNum);
+  void examineAddedMessage(KMFolder *folder, TQ_UINT32 serNum);
   // Look at a removed message and remove it from the cache
-  void examineRemovedMessage(KMFolder *folder, Q_UINT32 serNum);
+  void examineRemovedMessage(KMFolder *folder, TQ_UINT32 serNum);
   // Look at a message whose status has changed
-  void examineChangedMessage(KMFolder *folder, Q_UINT32 serNum, int delta);
-  // The serial numbers for a folder have been invalidated, deal with it
+  void examineChangedMessage(KMFolder *folder, TQ_UINT32 serNum, int delta);
+  // The serial numbers for a folder have been tqinvalidated, deal with it
   void examineInvalidatedFolder(KMFolder *folder);
   // A folder has been deleted, deal with it
   void examineRemovedFolder(KMFolder *folder);
@@ -155,16 +155,16 @@ protected slots:
 public slots:
   // Appends the serial number to the cached list of messages that match
   // the search for this folder
-  void addSerNum(Q_UINT32 serNum);
+  void addSerNum(TQ_UINT32 serNum);
   // Removes the serial number from the cached list of messages that match
   // the search for this folder
-  void removeSerNum(Q_UINT32 serNum);
+  void removeSerNum(TQ_UINT32 serNum);
 
   /** Incrementally update the index if possible else call writeIndex */
   virtual int updateIndex();
 
   // Examine the message
-  void slotSearchExamineMsgDone( KMFolder*, Q_UINT32 serNum,
+  void slotSearchExamineMsgDone( KMFolder*, TQ_UINT32 serNum,
                                  const KMSearchPattern*, bool );
 
 public:
@@ -183,7 +183,7 @@ public:
   virtual TQString indexLocation() const;
   virtual int writeIndex( bool createEmptyIndex = false );
   DwString getDwString(int idx);
-  Q_UINT32 serNum(int idx) { return mSerNums[idx]; }
+  TQ_UINT32 serNum(int idx) { return mSerNums[idx]; }
 
 protected:
   virtual FolderJob* doCreateJob(KMMessage *msg, FolderJob::JobType jt,
@@ -202,9 +202,9 @@ protected:
   virtual void truncateIndex();
 
 private:
-  TQValueVector<Q_UINT32> mSerNums;
+  TQValueVector<TQ_UINT32> mSerNums;
   TQValueList<TQGuardedPtr<KMFolder> > mFolders;
-  TQValueStack<Q_UINT32> mUnexaminedMessages;
+  TQValueStack<TQ_UINT32> mUnexaminedMessages;
   FILE *mIdsStream;
   KMSearch *mSearch;
   bool mInvalid, mUnlinked;
diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp
index d2e098b8..115c638e 100644
--- a/kmail/kmfoldertree.cpp
+++ b/kmail/kmfoldertree.cpp
@@ -267,14 +267,14 @@ void KMFolderTreeItem::slotIconsChanged()
   else
     setPixmap( 0, normalIcon( iconSize() ) );
   emit iconChanged( this );
-  repaint();
+  tqrepaint();
 }
 
 void KMFolderTreeItem::slotNameChanged()
 {
   setText( 0, mFolder->label() );
   emit nameChanged( this );
-  repaint();
+  tqrepaint();
 }
 
 void KMFolderTreeItem::slotNoContentChanged()
@@ -495,7 +495,7 @@ void KMFolderTree::readConfig (void)
       setFont(KGlobalSettings::generalFont());
   }
 
-  // restore the layout
+  // restore the tqlayout
   restoreLayout(conf, "Geometry");
 }
 
@@ -510,7 +510,7 @@ void KMFolderTree::writeConfig()
       writeIsListViewItemOpen(fti);
   }
 
-  // save the current layout
+  // save the current tqlayout
   saveLayout(KMKernel::config(), "Geometry");
 }
 
@@ -556,7 +556,7 @@ void KMFolderTree::reload(bool openFolders)
 
   int top = contentsY();
   mLastItem = 0;
-  // invalidate selected drop item
+  // tqinvalidate selected drop item
   oldSelected = 0;
   // remember last
   KMFolder* last = currentFolder();
@@ -627,9 +627,9 @@ void KMFolderTree::reload(bool openFolders)
              this, TQT_SLOT(slotSyncStateChanged()) );
 
     // we want to be noticed of changes to update the unread/total columns
-    disconnect(fti->folder(), TQT_SIGNAL(msgAdded(KMFolder*,Q_UINT32)),
+    disconnect(fti->folder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)),
         this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*)));
-    connect(fti->folder(), TQT_SIGNAL(msgAdded(KMFolder*,Q_UINT32)),
+    connect(fti->folder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)),
         this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*)));
     //}
 
@@ -737,7 +737,7 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent )
     } else {
       // hide local inbox if unused
       if ( kmkernel->inboxFolder() == folder && hideLocalInbox() ) {
-        connect( kmkernel->inboxFolder(), TQT_SIGNAL(msgAdded(KMFolder*,Q_UINT32)), TQT_SLOT(slotUnhideLocalInbox()) );
+        connect( kmkernel->inboxFolder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), TQT_SLOT(slotUnhideLocalInbox()) );
         continue;
       }
 
@@ -800,7 +800,7 @@ void KMFolderTree::delayedUpdate()
         continue;
 
       if ( fti->needsRepaint() ) {
-        fti->repaint();
+        fti->tqrepaint();
         fti->setNeedsRepaint( false );
       }
     }
@@ -1419,7 +1419,7 @@ void KMFolderTree::openFolder()
     autoopen_timer.stop();
     if ( dropItem && !dropItem->isOpen() ) {
         dropItem->setOpen( true );
-        dropItem->repaint();
+        dropItem->tqrepaint();
     }
 }
 
@@ -1467,7 +1467,7 @@ void KMFolderTree::contentsDragMoveEvent( TQDragMoveEvent *e )
         }
 
         if ( dragAccepted ) {
-            e->accept( itemRect(i) );
+            e->accept( tqitemRect(i) );
 
             switch ( e->action() ) {
                 case TQDropEvent::Copy:
@@ -1634,8 +1634,8 @@ void KMFolderTree::slotRenameFolder(TQListViewItem *item, int col,
   else
           fldName = oldFldName;
 
-  fldName.replace("/", "");
-  fldName.replace(TQRegExp("^\\."), "");
+  fldName.tqreplace("/", "");
+  fldName.tqreplace(TQRegExp("^\\."), "");
 
   if (fldName.isEmpty())
           fldName = i18n("unnamed");
@@ -1648,7 +1648,7 @@ void KMFolderTree::slotRenameFolder(TQListViewItem *item, int col,
 void KMFolderTree::slotUpdateCountsDelayed(KMFolder * folder)
 {
 //  kdDebug(5006) << "KMFolderTree::slotUpdateCountsDelayed()" << endl;
-  if ( !mFolderToUpdateCount.contains( folder->idString() ) )
+  if ( !mFolderToUpdateCount.tqcontains( folder->idString() ) )
   {
 //    kdDebug( 5006 )<< "adding " << folder->idString() << " to updateCountList " << endl;
     mFolderToUpdateCount.insert( folder->idString(),folder );
@@ -1897,7 +1897,7 @@ void KMFolderTree::folderToPopupMenu( MenuAction action, TQObject *receiver,
       continue;
     }
     TQString label = fti->text( 0 );
-    label.replace( "&","&&" );
+    label.tqreplace( "&","&&" );
     if ( fti->firstChild() )
     {
       // new level
@@ -1985,7 +1985,7 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source
     if ( source )
       sourceFolderName = source->label();
 
-    if ( parent->hasNamedFolder( sourceFolderName ) || sourceFolderNames.contains( sourceFolderName ) ) {
+    if ( parent->hasNamedFolder( sourceFolderName ) || sourceFolderNames.tqcontains( sourceFolderName ) ) {
       KMessageBox::error( this, i18n("<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same name already exists.</qt>")
           .arg( sourceFolderName ) );
       setDragEnabled( true );
@@ -2118,7 +2118,7 @@ void KMFolderTree::cutFolder()
 void KMFolderTree::pasteFolder()
 {
   KMFolderTreeItem *item = static_cast<KMFolderTreeItem*>( currentItem() );
-  if ( !mCopySourceFolders.isEmpty() && item && !mCopySourceFolders.contains( item->folder() ) ) {
+  if ( !mCopySourceFolders.isEmpty() && item && !mCopySourceFolders.tqcontains( item->folder() ) ) {
     moveOrCopyFolder( mCopySourceFolders, item->folder(), mCutFolder );
     if ( mCutFolder )
       mCopySourceFolders.clear();
@@ -2176,7 +2176,7 @@ void KMFolderTree::slotAddToFavorites()
 
 void KMFolderTree::slotUnhideLocalInbox()
 {
-  disconnect( kmkernel->inboxFolder(), TQT_SIGNAL(msgAdded(KMFolder*,Q_UINT32)),
+  disconnect( kmkernel->inboxFolder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)),
               this, TQT_SLOT(slotUnhideLocalInbox()) );
   reload();
 }
diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h
index b7244c6c..640da950 100644
--- a/kmail/kmfoldertree.h
+++ b/kmail/kmfoldertree.h
@@ -165,7 +165,7 @@ public:
     MoveFolder
   };
 
-  /** Generate a popup menu that contains all folders that can have content */
+  /** Generate a popup menu that tqcontains all folders that can have content */
   void folderToPopupMenu( MenuAction action, TQObject *receiver, KMMenuToFolder *,
       TQPopupMenu *menu, TQListViewItem *start = 0 );
 
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index bcfc06f3..06fc8936 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -22,7 +22,7 @@ using KMail::ActionScheduler;
 #include "messagecopyhelper.h"
 using KMail::MessageCopyHelper;
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "progressmanager.h"
 using KPIM::ProgressManager;
 using KPIM::ProgressItem;
@@ -409,7 +409,7 @@ void KMHeaders::paintEmptyArea( TQPainter * p, const TQRect & rect )
                         rect.left() + contentsX(),
                         rect.top() + contentsY() );
   else
-    p->fillRect( rect, colorGroup().base() );
+    p->fillRect( rect, tqcolorGroup().base() );
 }
 
 bool KMHeaders::event(TQEvent *e)
@@ -719,7 +719,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread )
       disconnect(mFolder, TQT_SIGNAL(closed()),
                  this, TQT_SLOT(folderClosed()));
       disconnect( mFolder, TQT_SIGNAL( statusMsg( const TQString& ) ),
-                  BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) );
+                  BroadcasStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
       disconnect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset()));
       writeSortOrder();
       mFolder->close("kmheaders");
@@ -752,7 +752,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread )
       connect(mFolder, TQT_SIGNAL(closed()),
                  this, TQT_SLOT(folderClosed()));
       connect(mFolder, TQT_SIGNAL(statusMsg(const TQString&)),
-              BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) );
+              BroadcasStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
       connect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)),
           this, TQT_SLOT(setFolderInfoStatus()));
       connect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset()));
@@ -831,7 +831,7 @@ void KMHeaders::msgChanged()
   const bool scrollbarAtBottom = verticalScrollBar() &&
                                  verticalScrollBar()->value() == verticalScrollBar()->maxValue();
   const HeaderItem * const oldFirstVisibleItem = dynamic_cast<HeaderItem*>( itemAt( TQPoint( 0, 0 ) ) );
-  const int oldOffsetOfFirstVisibleItem = itemRect( oldFirstVisibleItem ).y();
+  const int oldOffsetOfFirstVisibleItem = tqitemRect( oldFirstVisibleItem ).y();
   const uint oldSerNumOfFirstVisibleItem = oldFirstVisibleItem ? oldFirstVisibleItem->msgSerNum() : 0;
 
   TQString msgIdMD5;
@@ -935,9 +935,9 @@ void KMHeaders::msgAdded(int id)
     }
 
     if (parent && mFolder->getMsgBase(parent->id())->isWatched())
-      mFolder->getMsgBase(id)->setStatus( KMMsgStatusWatched );
+      mFolder->getMsgBase(id)->seStatus( KMMsgStatusWatched );
     else if (parent && mFolder->getMsgBase(parent->id())->isIgnored())
-      mFolder->getMsgBase(id)->setStatus( KMMsgStatusIgnored );
+      mFolder->getMsgBase(id)->seStatus( KMMsgStatusIgnored );
     if (parent)
       hi = new HeaderItem( parent->item(), id );
     else
@@ -952,7 +952,7 @@ void KMHeaders::msgAdded(int id)
     mItems[id] = hi;
 
     if ( !msgId.isEmpty() )
-      mSortCacheItems.replace(msgId, sci);
+      mSortCacheItems.tqreplace(msgId, sci);
     /* Add to the list of potential parents for subject threading. But only if
      * we are top level. */
     if (mSubjThreading && parent) {
@@ -1163,11 +1163,11 @@ void KMHeaders::msgRemoved(int id, TQString msgId )
       }
 
       if ((!parent || sci->isImperfectlyThreaded())
-                      && !mImperfectlyThreadedList.containsRef(item))
+                      && !mImperfectlyThreadedList.tqcontainsRef(item))
         mImperfectlyThreadedList.append(item);
 
       if (parent && !sci->isImperfectlyThreaded()
-          && mImperfectlyThreadedList.containsRef(item))
+          && mImperfectlyThreadedList.tqcontainsRef(item))
         mImperfectlyThreadedList.removeRef(item);
     }
   }
@@ -1214,7 +1214,7 @@ void KMHeaders::msgHeaderChanged(KMFolder*, int msgId)
   HeaderItem *item = mItems[msgId];
   if (item) {
     item->irefresh();
-    item->repaint();
+    item->tqrepaint();
   }
 }
 
@@ -1227,7 +1227,7 @@ void KMHeaders::setMsgStatus (KMMsgStatus status, bool toggle)
   if (serNums.empty())
     return;
 
-  KMCommand *command = new KMSetStatusCommand( status, serNums, toggle );
+  KMCommand *command = new KMSeStatusCommand( status, serNums, toggle );
   command->start();
 }
 
@@ -1268,7 +1268,7 @@ void KMHeaders::setThreadStatus(KMMsgStatus status, bool toggle)
         TQListViewItem *top = item;
         while ( top->parent() )
           top = top->parent();
-        if (!topOfThreads.contains(top)) {
+        if (!topOfThreads.tqcontains(top)) {
           topOfThreads.append(top);
         }
       }
@@ -1298,7 +1298,7 @@ void KMHeaders::setThreadStatus(KMMsgStatus status, bool toggle)
   if (serNums.empty())
     return;
 
-  KMCommand *command = new KMSetStatusCommand( status, serNums, toggle );
+  KMCommand *command = new KMSeStatusCommand( status, serNums, toggle );
   command->start();
 }
 
@@ -1372,9 +1372,9 @@ void KMHeaders::setStyleDependantFrameWidth()
   // set the width of the frame to a reasonable value for the current GUI style
   int frameWidth;
   if( style().isA("KeramikStyle") )
-    frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
+    frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
   else
-    frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth );
+    frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth );
   if ( frameWidth < 0 )
     frameWidth = 0;
   if ( frameWidth != lineWidth() )
@@ -1403,7 +1403,7 @@ void KMHeaders::setFolderInfoStatus ()
               : i18n( "0 messages" ); // no need for "0 unread" to be added here
   if ( mFolder->isReadOnly() )
     str = i18n("%1 = n messages, m unread.", "%1 Folder is read-only.").arg( str );
-  BroadcastStatus::instance()->setStatusMsg(str);
+  BroadcasStatus::instance()->seStatusMsg(str);
 }
 
 //-----------------------------------------------------------------------------
@@ -1452,7 +1452,7 @@ void KMHeaders::applyFiltersOnMsg()
         progressItem->updateProgress();
         TQString statusMsg = i18n("Filtering message %1 of %2");
         statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter );
-        KPIM::BroadcastStatus::instance()->setStatusMsg( statusMsg );
+        KPIM::BroadcasStatus::instance()->seStatusMsg( statusMsg );
         KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
       }
 
@@ -1501,7 +1501,7 @@ void KMHeaders::setMsgRead (int msgId)
     serNums.append( msgBase->getMsgSerNum() );
   }
 
-  KMCommand *command = new KMSetStatusCommand( KMMsgStatusRead, serNums );
+  KMCommand *command = new KMSeStatusCommand( KMMsgStatusRead, serNums );
   command->start();
 }
 
@@ -1523,7 +1523,7 @@ void KMHeaders::deleteMsg ()
            this, TQT_SLOT( slotMoveCompleted( KMCommand * ) ) );
   command->start();
 
-  BroadcastStatus::instance()->setStatusMsg("");
+  BroadcasStatus::instance()->seStatusMsg("");
   //  triggerUpdate();
 }
 
@@ -1620,11 +1620,11 @@ void KMHeaders::slotMoveCompleted( KMCommand *command )
   if ( command->result() == KMCommand::OK ) {
     // make sure the current item is shown
     makeHeaderVisible();
-    BroadcastStatus::instance()->setStatusMsg(
+    BroadcasStatus::instance()->seStatusMsg(
        deleted ? i18n("Messages deleted successfully.") : i18n("Messages moved successfully") );
   } else {
     /* The move failed or the user canceled it; reset the state of all
-     * messages involved and repaint.
+     * messages involved and tqrepaint.
      *
      * Note: This potentially resets too many items if there is more than one
      *       move going on. Oh well, I suppose no animals will be harmed.
@@ -1643,10 +1643,10 @@ void KMHeaders::slotMoveCompleted( KMCommand *command )
     }
     triggerUpdate();
     if ( command->result() == KMCommand::Failed )
-      BroadcastStatus::instance()->setStatusMsg(
+      BroadcasStatus::instance()->seStatusMsg(
            deleted ? i18n("Deleting messages failed.") : i18n("Moving messages failed.") );
     else
-      BroadcastStatus::instance()->setStatusMsg(
+      BroadcasStatus::instance()->seStatusMsg(
            deleted ? i18n("Deleting messages canceled.") : i18n("Moving messages canceled.") );
  }
  mOwner->updateMessageActions();
@@ -1736,7 +1736,7 @@ void KMHeaders::setSelectedByIndex( TQValueList<int> items, bool selected )
   }
 }
 
-void KMHeaders::clearSelectableAndAboutToBeDeleted( Q_UINT32 serNum )
+void KMHeaders::clearSelectableAndAboutToBeDeleted( TQ_UINT32 serNum )
 {
   // fugly, but I see no way around it
   for (TQListViewItemIterator it(this); it.current(); it++) {
@@ -1828,7 +1828,7 @@ void KMHeaders::selectNextMessage()
         temp->firstChild();
         temp = temp->parent();
       }
-      lvi->repaint();
+      lvi->tqrepaint();
       /* test to see if we need to unselect messages on back track */
       (below->isSelected() ? setSelected(lvi, false) : setSelected(below, true));
       setCurrentItem(below);
@@ -1866,7 +1866,7 @@ void KMHeaders::selectPrevMessage()
         temp->firstChild();
         temp = temp->parent();
       }
-      lvi->repaint();
+      lvi->tqrepaint();
       /* test to see if we need to unselect messages on back track */
       (above->isSelected() ? setSelected(lvi, false) : setSelected(above, true));
       setCurrentItem(above);
@@ -2135,10 +2135,10 @@ void KMHeaders::highlightMessage(TQListViewItem* lvi, bool markitread)
     return;
   }
 
-  BroadcastStatus::instance()->setStatusMsg("");
+  BroadcasStatus::instance()->seStatusMsg("");
   if (markitread && idx >= 0) setMsgRead(idx);
   mItems[idx]->irefresh();
-  mItems[idx]->repaint();
+  mItems[idx]->tqrepaint();
   emit selected( msg );
   setFolderInfoStatus();
 }
@@ -2151,7 +2151,7 @@ void KMHeaders::highlightCurrentThread()
   for ( it.toFirst() ; it.current() ; ++it ) {
       TQListViewItem *lvi = *it;
       lvi->setSelected( true );
-      lvi->repaint();
+      lvi->tqrepaint();
   }
 }
 
@@ -2192,7 +2192,7 @@ void KMHeaders::updateMessageList( bool set_selection, bool forceJumpToUnread )
   noRepaint = false;
   KListView::setSorting( mSortCol, !mSortDescending );
   if (!mFolder) {
-    repaint();
+    tqrepaint();
     return;
   }
   readSortOrder( set_selection, forceJumpToUnread );
@@ -2326,10 +2326,10 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e)
     /* Explicitely set selection state. This is necessary because we want to
      * also select all children of closed threads when the parent is selected. */
 
-    // unless ctrl mask, set selected if it isn't already
+    // unless ctrl tqmask, set selected if it isn't already
     if ( !( e->state() & ControlButton ) && !wasSelected )
       setSelected( lvi, true );
-    // if ctrl mask, toggle selection
+    // if ctrl tqmask, toggle selection
     if ( e->state() & ControlButton )
       setSelected( lvi, !wasSelected );
 
@@ -2424,7 +2424,7 @@ void KMHeaders::highlightMessage(TQListViewItem* i)
 //-----------------------------------------------------------------------------
 void KMHeaders::slotRMB()
 {
-  if (!topLevelWidget()) return; // safe bet
+  if (!tqtopLevelWidget()) return; // safe bet
   mOwner->updateMessageActions();
 
   // check if the user clicked into a status column and only show the respective menues
@@ -2673,14 +2673,14 @@ static void internalWriteItem(FILE *sortStream, KMFolder *folder, int msgid,
 
   fwrite(&msgSerNum, sizeof(msgSerNum), 1, sortStream);
   fwrite(&parentSerNum, sizeof(parentSerNum), 1, sortStream);
-  Q_INT32 len = key.length() * sizeof(TQChar);
+  TQ_INT32 len = key.length() * sizeof(TQChar);
   fwrite(&len, sizeof(len), 1, sortStream);
   if (len)
-    fwrite(key.unicode(), QMIN(len, KMAIL_MAX_KEY_LEN), 1, sortStream);
+    fwrite(key.tqunicode(), QMIN(len, KMAIL_MAX_KEY_LEN), 1, sortStream);
 
   if (update_discover) {
     //update the discovered change count
-      Q_INT32 discovered_count = 0;
+      TQ_INT32 discovered_count = 0;
       fseek(sortStream, KMAIL_MAGIC_HEADER_OFFSET + 20, SEEK_SET);
       fread(&discovered_count, sizeof(discovered_count), 1, sortStream);
       discovered_count++;
@@ -2734,13 +2734,13 @@ bool KMHeaders::writeSortOrder()
     mSortInfo.column = mSortCol;
     fprintf(sortStream, KMAIL_SORT_HEADER, KMAIL_SORT_VERSION);
     //magic header information
-    Q_INT32 byteOrder = 0x12345678;
-    Q_INT32 column = mSortCol;
-    Q_INT32 ascending= !mSortDescending;
-    Q_INT32 threaded = isThreaded();
-    Q_INT32 appended=0;
-    Q_INT32 discovered_count = 0;
-    Q_INT32 sorted_count=0;
+    TQ_INT32 byteOrder = 0x12345678;
+    TQ_INT32 column = mSortCol;
+    TQ_INT32 ascending= !mSortDescending;
+    TQ_INT32 threaded = isThreaded();
+    TQ_INT32 appended=0;
+    TQ_INT32 discovered_count = 0;
+    TQ_INT32 sorted_count=0;
     fwrite(&byteOrder, sizeof(byteOrder), 1, sortStream);
     fwrite(&column, sizeof(column), 1, sortStream);
     fwrite(&ascending, sizeof(ascending), 1, sortStream);
@@ -2845,7 +2845,7 @@ void KMHeaders::appendItemToSortFile(HeaderItem *khi)
                       khi->key(mSortCol, !mSortDescending), false);
 
     //update the appended flag FIXME obsolete?
-    Q_INT32 appended = 1;
+    TQ_INT32 appended = 1;
     fseek(sortStream, KMAIL_MAGIC_HEADER_OFFSET + 16, SEEK_SET);
     fwrite(&appended, sizeof(appended), 1, sortStream);
     fseek(sortStream, KMAIL_MAGIC_HEADER_OFFSET + 16, SEEK_SET);
@@ -2950,7 +2950,7 @@ void KMHeaders::buildThreadingTree( TQMemArray<SortCacheItem *> sortCache )
         KMMsgBase *mi = mFolder->getMsgBase(x);
         TQString md5 = mi->msgIdMD5();
         if(!md5.isEmpty())
-            mSortCacheItems.replace(md5, sortCache[x]);
+            mSortCacheItems.tqreplace(md5, sortCache[x]);
     }
 }
 
@@ -3014,7 +3014,7 @@ SortCacheItem* KMHeaders::findParent(SortCacheItem *item)
         // if you keep your outgoing messages in an OUTBOX, for
         // example, try the list of references, because the second
         // to last will likely be in this folder. replyToAuxIdMD5
-        // contains the second to last one.
+        // tqcontains the second to last one.
         TQString  ref = msg->replyToAuxIdMD5();
         if (!ref.isEmpty())
             parent = mSortCacheItems[ref];
@@ -3065,8 +3065,8 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
     if (!mFolder->isOpened()) mFolder->open("kmheaders");
 
     //all cases
-    Q_INT32 column, ascending, threaded, discovered_count, sorted_count, appended;
-    Q_INT32 deleted_count = 0;
+    TQ_INT32 column, ascending, threaded, discovered_count, sorted_count, appended;
+    TQ_INT32 deleted_count = 0;
     bool unread_exists = false;
     bool jumpToUnread = (GlobalSettings::self()->actionEnterFolder() ==
                          GlobalSettings::EnumActionEnterFolder::SelectFirstUnreadNew) ||
@@ -3096,7 +3096,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
         if (fscanf(sortStream, KMAIL_SORT_HEADER, &version) != 1)
           version = -1;
         if(version == KMAIL_SORT_VERSION) {
-          Q_INT32 byteOrder = 0;
+          TQ_INT32 byteOrder = 0;
           fread(&byteOrder, sizeof(byteOrder), 1, sortStream);
           if (byteOrder == 0x12345678)
           {
@@ -3321,8 +3321,8 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
             qsort(unsorted, unsorted_count, sizeof(SortCacheItem *), //sort
                   compare_SortCacheItem);
 
-        /* The sorted list now contains all sorted children of this item, while
-         * the (aptly named) unsorted array contains all as of yet unsorted
+        /* The sorted list now tqcontains all sorted children of this item, while
+         * the (aptly named) unsorted array tqcontains all as of yet unsorted
          * ones. It has just been qsorted, so it is in itself sorted. These two
          * sorted lists are now merged into one. */
         for(TQPtrListIterator<SortCacheItem> it(*sorted);
@@ -3355,9 +3355,9 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread )
                 // If the parent is watched or ignored, propagate that to it's
                 // children
                 if (mFolder->getMsgBase(i->id())->isWatched())
-                  mFolder->getMsgBase(new_kci->id())->setStatus(KMMsgStatusWatched);
+                  mFolder->getMsgBase(new_kci->id())->seStatus(KMMsgStatusWatched);
                 if (mFolder->getMsgBase(i->id())->isIgnored())
-                  mFolder->getMsgBase(new_kci->id())->setStatus(KMMsgStatusIgnored);
+                  mFolder->getMsgBase(new_kci->id())->seStatus(KMMsgStatusIgnored);
                 khi = new HeaderItem(i->item(), new_kci->id(), new_kci->key());
             } else {
                 khi = new HeaderItem(this, new_kci->id(), new_kci->key());
@@ -3515,7 +3515,7 @@ void KMHeaders::setCurrentItemBySerialNum( unsigned long serialNum )
 {
   // Linear search == slow. Don't overuse this method.
   // It's currently only used for finding the current item again
-  // after expiry deleted mails (so the index got invalidated).
+  // after expiry deleted mails (so the index got tqinvalidated).
   for (int i = 0; i < (int)mItems.size() - 1; ++i) {
     KMMsgBase *mMsgBase = mFolder->getMsgBase( i );
     if ( mMsgBase->getMsgSerNum() == serialNum ) {
@@ -3587,21 +3587,21 @@ void KMHeaders::updateActions()
     paste->setEnabled( true );
 }
 
-void KMHeaders::setCopiedMessages(const TQValueList< Q_UINT32 > & msgs, bool move)
+void KMHeaders::setCopiedMessages(const TQValueList< TQ_UINT32 > & msgs, bool move)
 {
   mCopiedMessages = msgs;
   mMoveMessages = move;
   updateActions();
 }
 
-bool KMHeaders::isMessageCut(Q_UINT32 serNum) const
+bool KMHeaders::isMessageCut(TQ_UINT32 serNum) const
 {
-  return mMoveMessages && mCopiedMessages.contains( serNum );
+  return mMoveMessages && mCopiedMessages.tqcontains( serNum );
 }
 
-TQValueList< Q_UINT32 > KMHeaders::selectedSernums()
+TQValueList< TQ_UINT32 > KMHeaders::selectedSernums()
 {
-  TQValueList<Q_UINT32> list;
+  TQValueList<TQ_UINT32> list;
   for ( TQListViewItemIterator it(this); it.current(); it++ ) {
     if ( it.current()->isSelected() && it.current()->isVisible() ) {
       HeaderItem* item = static_cast<HeaderItem*>( it.current() );
@@ -3614,9 +3614,9 @@ TQValueList< Q_UINT32 > KMHeaders::selectedSernums()
   return list;
 }
 
-TQValueList< Q_UINT32 > KMHeaders::selectedVisibleSernums()
+TQValueList< TQ_UINT32 > KMHeaders::selectedVisibleSernums()
 {
-  TQValueList<Q_UINT32> list;
+  TQValueList<TQ_UINT32> list;
   TQListViewItemIterator it(this, TQListViewItemIterator::Selected|TQListViewItemIterator::Visible);
   while( it.current() ) {
     if ( it.current()->isSelected() && it.current()->isVisible() ) {
diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h
index 4055e3c3..4eddbdf4 100644
--- a/kmail/kmheaders.h
+++ b/kmail/kmheaders.h
@@ -32,7 +32,7 @@ class TQIconSet;
 class TQDateTime;
 
 typedef TQPtrList<KMMsgBase> KMMessageList;
-typedef TQValueList<Q_UINT32> SerNumList;
+typedef TQValueList<TQ_UINT32> SerNumList;
 typedef TQMap<int,KMFolder*> KMMenuToFolder;
 enum NestingPolicy { AlwaysOpen = 0, DefaultOpen, DefaultClosed, OpenUnread };
 
@@ -102,7 +102,7 @@ public:
                                KMMessage* aMsg = 0);
 
   /** Resets toBeDeleted and selectable status of all selected items. */
-  virtual void clearSelectableAndAboutToBeDeleted(Q_UINT32 serNum);
+  virtual void clearSelectableAndAboutToBeDeleted(TQ_UINT32 serNum);
   /** Returns list of selected messages. Mark the corresponding
       header items to be deleted, if specified. */
   virtual KMMessageList* selectedMsgs(bool toBeDeleted = false);
@@ -111,12 +111,12 @@ public:
   TQValueList<int> selectedItems();
 
   /** Returns the sernums of all selected items. */
-  TQValueList<Q_UINT32> selectedSernums();
+  TQValueList<TQ_UINT32> selectedSernums();
 
   /** Returns the sernums of all visible (ie. items with expanded parent, not hidden by
       eg. the quick search) selected items.
   */
-  TQValueList<Q_UINT32> selectedVisibleSernums();
+  TQValueList<TQ_UINT32> selectedVisibleSernums();
 
   /** Returns index of message returned by last getMsg() call */
   int indexOfGetMsg (void) const { return getMsgIndex; }
@@ -198,13 +198,13 @@ public:
     @param msgs A list of serial numbers.
     @param move if true, the messages were cutted
   */
-  void setCopiedMessages( const TQValueList<Q_UINT32> &msgs, bool move );
+  void setCopiedMessages( const TQValueList<TQ_UINT32> &msgs, bool move );
 
   /**
     Returns true if the message with the given serial number has been cut.
     @param serNum A message serial number.
   */
-  bool isMessageCut( Q_UINT32 serNum ) const;
+  bool isMessageCut( TQ_UINT32 serNum ) const;
 
   /** Write global config options. */
   virtual void writeConfig(void);
@@ -469,7 +469,7 @@ private:
   KPopupMenu* mPopup;
 
   // copied messages
-  TQValueList<Q_UINT32> mCopiedMessages;
+  TQValueList<TQ_UINT32> mCopiedMessages;
   bool mMoveMessages;
 }; // class
 #endif
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index d0e706f9..b464913b 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -11,7 +11,7 @@
 
 #include "globalsettings.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "kmstartup.h"
 #include "index.h"
 #include "kmmainwin.h"
@@ -814,7 +814,7 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl,
   int retval;
   bool readFolderMsgIds = false;
   TQString _foldername = foldername.stripWhiteSpace();
-  _foldername = _foldername.replace('\\',""); //try to prevent ESCAPE Sequences
+  _foldername = _foldername.tqreplace('\\',""); //try to prevent ESCAPE Sequences
 
   if ( foldername != mAddMessageLastFolder ) {
     mAddMessageMsgIds.clear();
@@ -840,7 +840,7 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl,
     msg->fromString( messageText );
 
     if (readFolderMsgIds) {
-      if ( foldername.contains("/")) {
+      if ( foldername.tqcontains("/")) {
         TQString tmp_fname = "";
         KMFolder *folder = NULL;
         KMFolderDir *subfolder;
@@ -947,7 +947,7 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl,
 
         if ( !MsgStatusFlags.isEmpty() ) {
           KMMsgStatus status = strToStatus(MsgStatusFlags);
-          if (status) msg->setStatus(status);
+          if (status) msg->seStatus(status);
         }
 
         int index;
@@ -1000,7 +1000,7 @@ int KMKernel::dcopAddMessage_fastImport( const TQString & foldername,
   bool createNewFolder = false;
 
   TQString _foldername = foldername.stripWhiteSpace();
-  _foldername = _foldername.replace('\\',""); //try to prevent ESCAPE Sequences
+  _foldername = _foldername.tqreplace('\\',""); //try to prevent ESCAPE Sequences
 
   if ( foldername != mAddMessageLastFolder ) {
     createNewFolder = true;
@@ -1018,7 +1018,7 @@ int KMKernel::dcopAddMessage_fastImport( const TQString & foldername,
     msg->fromString( messageText );
 
     if (createNewFolder) {
-      if ( foldername.contains("/")) {
+      if ( foldername.tqcontains("/")) {
         TQString tmp_fname = "";
         KMFolder *folder = NULL;
         KMFolderDir *subfolder;
@@ -1060,7 +1060,7 @@ int KMKernel::dcopAddMessage_fastImport( const TQString & foldername,
 
       if( !MsgStatusFlags.isEmpty() ) {
         KMMsgStatus status = strToStatus(MsgStatusFlags);
-        if (status) msg->setStatus(status);
+        if (status) msg->seStatus(status);
       }
 
       if ( mAddMsgCurrentFolder->addMsg( msg, &index ) == 0 ) {
@@ -1121,7 +1121,7 @@ void KMKernel::raise()
   kmail.call( "newInstance" );
 }
 
-bool KMKernel::showMail( Q_UINT32 serialNumber, TQString /* messageId */ )
+bool KMKernel::showMail( TQ_UINT32 serialNumber, TQString /* messageId */ )
 {
   KMMainWidget *mainWidget = 0;
   if (KMainWindow::memberList) {
@@ -1170,7 +1170,7 @@ bool KMKernel::showMail( Q_UINT32 serialNumber, TQString /* messageId */ )
   return false;
 }
 
-TQString KMKernel::getFrom( Q_UINT32 serialNumber )
+TQString KMKernel::getFrom( TQ_UINT32 serialNumber )
 {
   int idx = -1;
   KMFolder *folder = 0;
@@ -1195,7 +1195,7 @@ TQString KMKernel::debugScheduler()
   return res;
 }
 
-TQString KMKernel::debugSernum( Q_UINT32 serialNumber )
+TQString KMKernel::debugSernum( TQ_UINT32 serialNumber )
 {
   TQString res;
   if (serialNumber != 0) {
@@ -1243,7 +1243,7 @@ void KMKernel::stopNetworkJobs()
     return;
 
   GlobalSettings::setNetworkState( GlobalSettings::EnumNetworkState::Offline );
-  BroadcastStatus::instance()->setStatusMsg( i18n("KMail is set to be offline; all network jobs are suspended"));
+  BroadcasStatus::instance()->seStatusMsg( i18n("KMail is set to be offline; all network jobs are suspended"));
   emit onlineStatusChanged( (GlobalSettings::EnumNetworkState::type)GlobalSettings::networkState() );
 }
 
@@ -1253,7 +1253,7 @@ void KMKernel::resumeNetworkJobs()
     return;
 
   GlobalSettings::setNetworkState( GlobalSettings::EnumNetworkState::Online );
-  BroadcastStatus::instance()->setStatusMsg( i18n("KMail is set to be online; all network jobs resumed"));
+  BroadcasStatus::instance()->seStatusMsg( i18n("KMail is set to be online; all network jobs resumed"));
   emit onlineStatusChanged( (GlobalSettings::EnumNetworkState::type)GlobalSettings::networkState() );
 
   if ( kmkernel->msgSender()->sendImmediate() ) {
@@ -1597,7 +1597,7 @@ void KMKernel::init()
 
 bool KMKernel::isCodecAsciiCompatible( const TQTextCodec *codec )
 {
-  return !mNonAsciiCompatibleCodecs.contains( codec );
+  return !mNonAsciiCompatibleCodecs.tqcontains( codec );
 }
 
 void KMKernel::readConfig()
@@ -1880,7 +1880,7 @@ bool KMKernel::transferMail( TQString & destinationDir )
                 "%1 now uses the <i>%5</i> folder for "
                 "its messages.<p>"
                 "%2 can move the contents of <i>%6<i> into this folder for "
-                "you, though this may replace any existing files with "
+                "you, though this may tqreplace any existing files with "
                 "the same name in <i>%7</i>.<p>"
                 "<strong>Would you like %3 to move the mail "
                 "files now?</strong></qt>" )
@@ -1975,7 +1975,7 @@ void KMKernel::dumpDeadLetters()
       // yes, this is ugly and potentially dangerous, but the alternative is losing
       // currently composed messages...
       while ( win->isComposing() )
-        qApp->processEvents();
+        tqApp->processEvents();
     }
   }
 }
@@ -2046,7 +2046,7 @@ void KMKernel::slotResult(KIO::Job *job)
     if (job->error() == KIO::ERR_FILE_ALREADY_EXIST)
     {
       if (KMessageBox::warningContinueCancel(0,
-        i18n("File %1 exists.\nDo you want to replace it?")
+        i18n("File %1 exists.\nDo you want to tqreplace it?")
         .arg((*it).url.prettyURL()), i18n("Save to File"), i18n("&Replace"))
         == KMessageBox::Continue)
         byteArrayToRemoteFile((*it).data, (*it).url, true);
@@ -2330,13 +2330,13 @@ void KMKernel::selectFolder( TQString folderPath )
 KMMainWidget *KMKernel::getKMMainWidget()
 {
   //This could definitely use a speadup
-  TQWidgetList *l = kapp->topLevelWidgets();
+  TQWidgetList *l = kapp->tqtopLevelWidgets();
   TQWidgetListIt it( *l );
   TQWidget *wid;
 
   while ( ( wid = it.current() ) != 0 ) {
     ++it;
-    TQObjectList *l2 = wid->topLevelWidget()->queryList( "KMMainWidget" );
+    TQObjectList *l2 = wid->tqtopLevelWidget()->queryList( "KMMainWidget" );
     if (l2 && l2->first()) {
       KMMainWidget* kmmw = dynamic_cast<KMMainWidget *>( l2->first() );
       Q_ASSERT( kmmw );
@@ -2466,10 +2466,10 @@ Wallet *KMKernel::wallet() {
 
   // find an appropriate parent window for the wallet dialog
   WId window = 0;
-  if ( qApp->activeWindow() )
-    window = qApp->activeWindow()->winId();
+  if ( tqApp->activeWindow() )
+    window = tqApp->activeWindow()->winId();
   else if ( getKMMainWidget() )
-    window = getKMMainWidget()->topLevelWidget()->winId();
+    window = getKMMainWidget()->tqtopLevelWidget()->winId();
 
   delete mWallet;
   mWallet = Wallet::openWallet( Wallet::NetworkWallet(), window );
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index 455e4233..3eb19f65 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -28,7 +28,7 @@ namespace KWallet {
   class Wallet;
 }
 
-/** The KMail namespace contains classes used for KMail.
+/** The KMail namespace tqcontains classes used for KMail.
 * This is to keep them out of the way from all the other
 * un-namespaced classes in libs and the rest of PIM.
 */
@@ -202,10 +202,10 @@ public:
   DCOPRef getFolder( const TQString& vpath );
   void selectFolder( TQString folder );
   int timeOfLastMessageCountChange() const;
-  virtual bool showMail( Q_UINT32 serialNumber, TQString messageId );
-  virtual TQString getFrom( Q_UINT32 serialNumber );
+  virtual bool showMail( TQ_UINT32 serialNumber, TQString messageId );
+  virtual TQString getFrom( TQ_UINT32 serialNumber );
   virtual TQString debugScheduler();
-  virtual TQString debugSernum( Q_UINT32 serialNumber );
+  virtual TQString debugSernum( TQ_UINT32 serialNumber );
   int viewMessage( const KURL & messageFile );
 
   /**
@@ -262,7 +262,7 @@ public:
   void quit();
   /**
    * Returns true if the transfer was successful, otherwise false. In any case
-   * destinationDir contains the path to the current mail storage when the
+   * destinationDir tqcontains the path to the current mail storage when the
    * method returns.
    */
   bool transferMail( TQString & destinationDir );
diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp
index dde827be..0cd5aec5 100644
--- a/kmail/kmlineeditspell.cpp
+++ b/kmail/kmlineeditspell.cpp
@@ -108,7 +108,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event )
     KABC::Addressee::List list;
     for ( it = urls.begin(); it != urls.end(); ++it ) {
 
-      // First, let's deal with mailto Urls. The path() part contains the
+      // First, let's deal with mailto Urls. The path() part tqcontains the
       // email-address.
       if ( (*it).protocol() == "mailto" ) {
         KABC::Addressee addressee;
@@ -119,7 +119,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event )
       else {
         KABC::VCardConverter converter;
         TQString fileName;
-        if ( KIO::NetAccess::download( (*it), fileName, parentWidget() ) ) {
+        if ( KIO::NetAccess::download( (*it), fileName, tqparentWidget() ) ) {
           TQFile file( fileName );
           file.open( IO_ReadOnly );
           const TQByteArray data = file.readAll();
@@ -133,7 +133,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event )
         } else {
           TQString caption( i18n( "vCard Import Failed" ) );
           TQString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" ).arg( (*it).url() );
-          KMessageBox::error( parentWidget(), text, caption );
+          KMessageBox::error( tqparentWidget(), text, caption );
         }
       }
       // Now, let the user choose which addressee to add.
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 27b04df0..a3363e4f 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -46,7 +46,7 @@
 #include "globalsettings.h"
 #include "kcursorsaver.h"
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "kmfoldermgr.h"
 #include "kmfolderdia.h"
 #include "accountmanager.h"
@@ -246,7 +246,7 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name,
   mStartupDone = true;
 
 
-  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget());
+  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget());
   KStatusBar *sb =  mainWin ? mainWin->statusBar() : 0;
   mVacationScriptIndicator = new KStatusBarLabel( TQString(), 0, sb );
   mVacationScriptIndicator->hide();
@@ -287,13 +287,13 @@ void KMMainWidget::destruct()
 //-----------------------------------------------------------------------------
 void KMMainWidget::readPreConfig(void)
 {
-  const KConfigGroup geometry( KMKernel::config(), "Geometry" );
+  const KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
   const KConfigGroup reader( KMKernel::config(), "Reader" );
 
-  mLongFolderList = geometry.readEntry( "FolderList", "long" ) != "short";
-  mReaderWindowActive = geometry.readEntry( "readerWindowMode", "below" ) != "hide";
-  mReaderWindowBelow = geometry.readEntry( "readerWindowMode", "below" ) == "below";
-  mThreadPref = geometry.readBoolEntry( "nestedMessages", false );
+  mLongFolderList = tqgeometry.readEntry( "FolderList", "long" ) != "short";
+  mReaderWindowActive = tqgeometry.readEntry( "readerWindowMode", "below" ) != "hide";
+  mReaderWindowBelow = tqgeometry.readEntry( "readerWindowMode", "below" ) == "below";
+  mThreadPref = tqgeometry.readBoolEntry( "nestedMessages", false );
 
   mHtmlPref = reader.readBoolEntry( "htmlMail", false );
   mHtmlLoadExtPref = reader.readBoolEntry( "htmlLoadExternal", false );
@@ -351,13 +351,13 @@ void KMMainWidget::readConfig(void)
     readPreConfig();
     mHeaders->refreshNestedState();
 
-    bool layoutChanged = ( oldLongFolderList != mLongFolderList )
+    bool tqlayoutChanged = ( oldLongFolderList != mLongFolderList )
                     || ( oldReaderWindowActive != mReaderWindowActive )
                     || ( oldReaderWindowBelow != mReaderWindowBelow )
                     || ( oldFavoriteFolderView != mEnableFavoriteFolderView );
 
 
-    if( layoutChanged ) {
+    if( tqlayoutChanged ) {
       hide();
       // delete all panners
       delete mPanner1; // will always delete the others
@@ -389,11 +389,11 @@ void KMMainWidget::readConfig(void)
     widths << folderW << headerW;
     heights << headerH << readerH;
 
-    bool layoutChanged = ( oldLongFolderList != mLongFolderList )
+    bool tqlayoutChanged = ( oldLongFolderList != mLongFolderList )
                     || ( oldReaderWindowActive != mReaderWindowActive )
                     || ( oldReaderWindowBelow != mReaderWindowBelow );
 
-    if (!mStartupDone || layoutChanged )
+    if (!mStartupDone || tqlayoutChanged )
     {
       /** unread / total columns
        * as we have some dependencies in this widget
@@ -482,11 +482,11 @@ void KMMainWidget::readConfig(void)
     // Update systray
     toggleSystemTray();
 
-    bool layoutChanged = ( oldLongFolderList != mLongFolderList )
+    bool tqlayoutChanged = ( oldLongFolderList != mLongFolderList )
                     || ( oldReaderWindowActive != mReaderWindowActive )
                     || ( oldReaderWindowBelow != mReaderWindowBelow )
                     || ( oldFavoriteFolderView != mEnableFavoriteFolderView );
-    if ( layoutChanged ) {
+    if ( tqlayoutChanged ) {
       activatePanners();
     }
 
@@ -516,7 +516,7 @@ void KMMainWidget::writeConfig(void)
 {
   TQString s;
   KConfig *config = KMKernel::config();
-  KConfigGroup geometry( config, "Geometry" );
+  KConfigGroup tqgeometry( config, "Geometry" );
 
   if (mMsgView)
     mMsgView->writeConfig();
@@ -527,31 +527,31 @@ void KMMainWidget::writeConfig(void)
   if ( mFavoriteFolderView )
     mFavoriteFolderView->writeConfig();
 
-  geometry.writeEntry( "MainWin", this->geometry().size() );
+  tqgeometry.writeEntry( "MainWin", this->tqgeometry().size() );
 
   const TQValueList<int> widths = ( mLongFolderList ? mPanner1 : mPanner2 )->sizes();
   const TQValueList<int> heights = ( mLongFolderList ? mPanner2 : mPanner1 )->sizes();
 
-  geometry.writeEntry( "FolderPaneWidth", widths[0] );
-  geometry.writeEntry( "HeaderPaneWidth", widths[1] );
+  tqgeometry.writeEntry( "FolderPaneWidth", widths[0] );
+  tqgeometry.writeEntry( "HeaderPaneWidth", widths[1] );
 
   // Only save when the widget is shown (to avoid saving a wrong value)
   if ( mSearchAndHeaders && mSearchAndHeaders->isShown() ) {
-    geometry.writeEntry( "HeaderPaneHeight", heights[0] );
-    geometry.writeEntry( "ReaderPaneHeight", heights[1] );
+    tqgeometry.writeEntry( "HeaderPaneHeight", heights[0] );
+    tqgeometry.writeEntry( "ReaderPaneHeight", heights[1] );
   }
 
   // save the state of the unread/total-columns
-  geometry.writeEntry( "UnreadColumn", mFolderTree->unreadIndex() );
-  geometry.writeEntry( "TotalColumn", mFolderTree->totalIndex() );
-  geometry.writeEntry( "SizeColumn", mFolderTree->sizeIndex() );
+  tqgeometry.writeEntry( "UnreadColumn", mFolderTree->unreadIndex() );
+  tqgeometry.writeEntry( "TotalColumn", mFolderTree->totalIndex() );
+  tqgeometry.writeEntry( "SizeColumn", mFolderTree->sizeIndex() );
 }
 
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::createWidgets(void)
 {
-  // Create the splitters according to the layout settings
+  // Create the splitters according to the tqlayout settings
   TQWidget *headerParent = 0,
             *mimeParent = 0, *messageParent = 0;
 
@@ -587,7 +587,7 @@ void KMMainWidget::createWidgets(void)
   mTopLayout->add( mPanner1 );
 
   // BUG -sanders these accelerators stop working after switching
-  // between long/short folder layout
+  // between long/short folder tqlayout
   // Probably need to disconnect them first.
 
   // create list of messages
@@ -637,7 +637,7 @@ void KMMainWidget::createWidgets(void)
       mMsgActions->setMessageView( mMsgView );
     }
 
-    connect(mMsgView, TQT_SIGNAL(replaceMsgByUnencryptedVersion()),
+    connect(mMsgView, TQT_SIGNAL(tqreplaceMsgByUnencryptedVersion()),
         this, TQT_SLOT(slotReplaceMsgByUnencryptedVersion()));
     connect(mMsgView, TQT_SIGNAL(popupMenu(KMMessage&,const KURL&,const TQPoint&)),
         this, TQT_SLOT(slotMsgPopup(KMMessage&,const KURL&,const TQPoint&)));
@@ -973,11 +973,11 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck,
 
   if(kmkernel->xmlGuiInstance()) {
     KNotifyClient::Instance instance(kmkernel->xmlGuiInstance());
-    KNotifyClient::event( topLevelWidget()->winId(), "new-mail-arrived",
+    KNotifyClient::event( tqtopLevelWidget()->winId(), "new-mail-arrived",
                           summary );
   }
   else
-    KNotifyClient::event( topLevelWidget()->winId(), "new-mail-arrived",
+    KNotifyClient::event( tqtopLevelWidget()->winId(), "new-mail-arrived",
                           summary );
 
   if (mBeepOnNew) {
@@ -1028,7 +1028,7 @@ void KMMainWidget::slotShowNewFromTemplate()
     TQString subj = mb->subject();
     if ( subj.isEmpty() ) subj = i18n("No Subject");
     mTemplateMenu->popupMenu()->insertItem(
-      KStringHandler::rsqueeze( subj.replace( "&", "&&" ) ), idx );
+      KStringHandler::rsqueeze( subj.tqreplace( "&", "&&" ) ), idx );
   }
 }
 
@@ -1170,7 +1170,7 @@ void KMMainWidget::slotEmptyFolder()
   if (mMsgView) mMsgView->clearCache();
 
   if ( !isTrash )
-    BroadcastStatus::instance()->setStatusMsg(i18n("Moved all messages to the trash"));
+    BroadcasStatus::instance()->seStatusMsg(i18n("Moved all messages to the trash"));
 
   updateMessageActions();
 
@@ -1268,9 +1268,9 @@ void KMMainWidget::slotCompactFolder()
     KCursorSaver busy(KBusyPtr::busy());
     mFolder->compact( KMFolder::CompactNow );
     // setCurrentItemByIndex will override the statusbar message, so save/restore it
-    TQString statusMsg = BroadcastStatus::instance()->statusMsg();
+    TQString statusMsg = BroadcasStatus::instance()->statusMsg();
     mHeaders->setCurrentItemByIndex(idx);
-    BroadcastStatus::instance()->setStatusMsg( statusMsg );
+    BroadcasStatus::instance()->seStatusMsg( statusMsg );
   }
 }
 
@@ -1314,7 +1314,7 @@ void KMMainWidget::slotInvalidateIMAPFolders() {
 	       "This will remove all changes that you have done "
 	       "locally to your IMAP folders."),
 	  i18n("Refresh IMAP Cache"), i18n("&Refresh") ) == KMessageBox::Continue )
-    kmkernel->acctMgr()->invalidateIMAPFolders();
+    kmkernel->acctMgr()->tqinvalidateIMAPFolders();
 }
 
 //-----------------------------------------------------------------------------
@@ -1713,12 +1713,12 @@ void KMMainWidget::slotApplyFilters()
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotCheckVacation()
 {
-  updateVactionScriptStatus( false );
+  updateVactionScripStatus( false );
   if ( !kmkernel->askToGoOnline() )
     return;
 
   Vacation *vac = new Vacation( this, true /* check only */ );
-  connect( vac, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScriptStatus(bool)) );
+  connect( vac, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) );
 }
 
 void KMMainWidget::slotEditVacation()
@@ -1731,7 +1731,7 @@ void KMMainWidget::slotEditVacation()
     return;
 
   mVacation = new Vacation( this );
-  connect( mVacation, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScriptStatus(bool)) );
+  connect( mVacation, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) );
   if ( mVacation->isUsable() ) {
     connect( mVacation, TQT_SIGNAL(result(bool)), mVacation, TQT_SLOT(deleteLater()) );
   } else {
@@ -2468,7 +2468,7 @@ void KMMainWidget::getAccountMenu()
   TQStringList::Iterator it;
   int id = 0;
   for(it = actList.begin(); it != actList.end() ; ++it, id++)
-    mActMenu->insertItem((*it).replace("&", "&&"), id);
+    mActMenu->insertItem((*it).tqreplace("&", "&&"), id);
 }
 
 //-----------------------------------------------------------------------------
@@ -2481,7 +2481,7 @@ void KMMainWidget::getTransportMenu()
   TQStringList::Iterator it;
   int id = 0;
   for(it = availTransports.begin(); it != availTransports.end() ; ++it, id++)
-    mSendMenu->insertItem((*it).replace("&", "&&"), id);
+    mSendMenu->insertItem((*it).tqreplace("&", "&&"), id);
 }
 
 //-----------------------------------------------------------------------------
@@ -2545,7 +2545,7 @@ void KMMainWidget::updateCustomTemplateMenus()
     KAction *action;
     switch ( t.type() ) {
     case CustomTemplates::TReply:
-      action = new KAction( (*it).replace( "&", "&&" ),
+      action = new KAction( (*it).tqreplace( "&", "&&" ),
                             KShortcut( t.shortcut() ),
                             mCustomReplyMapper,
                             TQT_SLOT( map() ),
@@ -2557,7 +2557,7 @@ void KMMainWidget::updateCustomTemplateMenus()
       ++replyc;
       break;
     case CustomTemplates::TReplyAll:
-      action = new KAction( (*it).replace( "&", "&&" ),
+      action = new KAction( (*it).tqreplace( "&", "&&" ),
                             KShortcut( t.shortcut() ),
                             mCustomReplyAllMapper,
                             TQT_SLOT( map() ),
@@ -2569,7 +2569,7 @@ void KMMainWidget::updateCustomTemplateMenus()
       ++replyallc;
       break;
     case CustomTemplates::TForward:
-      action = new KAction( (*it).replace( "&", "&&" ),
+      action = new KAction( (*it).tqreplace( "&", "&&" ),
                             KShortcut( t.shortcut() ),
                             mCustomForwardMapper,
                             TQT_SLOT( map() ),
@@ -2581,7 +2581,7 @@ void KMMainWidget::updateCustomTemplateMenus()
       ++forwardc;
       break;
     case CustomTemplates::TUniversal:
-      action = new KAction( (*it).replace( "&", "&&" ),
+      action = new KAction( (*it).tqreplace( "&", "&&" ),
                             KShortcut::null(),
                             mCustomReplyMapper,
                             TQT_SLOT( map() ),
@@ -2591,7 +2591,7 @@ void KMMainWidget::updateCustomTemplateMenus()
       mCustomReplyActionMenu->insert( action, idx );
       mCustomTemplateActions.append( action );
       ++replyc;
-      action = new KAction( (*it).replace( "&", "&&" ),
+      action = new KAction( (*it).tqreplace( "&", "&&" ),
                             KShortcut::null(),
                             mCustomReplyAllMapper,
                             TQT_SLOT( map() ),
@@ -2601,7 +2601,7 @@ void KMMainWidget::updateCustomTemplateMenus()
       mCustomReplyAllActionMenu->insert( action, idx );
       mCustomTemplateActions.append( action );
       ++replyallc;
-      action = new KAction( (*it).replace( "&", "&&" ),
+      action = new KAction( (*it).tqreplace( "&", "&&" ),
                             KShortcut::null(),
                             mCustomForwardMapper,
                             TQT_SLOT( map() ),
@@ -2659,7 +2659,7 @@ void KMMainWidget::setupActions()
 
   (void) new KAction( i18n("&Refresh Local IMAP Cache"), "refresh",
 		      this, TQT_SLOT(slotInvalidateIMAPFolders()),
-		      actionCollection(), "file_invalidate_imap_cache" );
+		      actionCollection(), "file_tqinvalidate_imap_cache" );
 
   (void) new KAction( i18n("Empty All &Trash Folders"), 0,
 		      KMKernel::self(), TQT_SLOT(slotEmptyTrash()),
@@ -3608,7 +3608,7 @@ void KMMainWidget::removeDuplicates()
     if ( !id.isEmpty() ) {
       TQString subjMD5 = (*mFolder)[i]->strippedSubjectMD5();
       int other = -1;
-      if ( idMD5s.contains(id) )
+      if ( idMD5s.tqcontains(id) )
         other = idMD5s[id].first();
       else
         idMD5s[id].append( i );
@@ -3649,7 +3649,7 @@ void KMMainWidget::removeDuplicates()
                "Removed %n duplicate messages.", numDuplicates );
     else
       msg = i18n("No duplicate messages found.");
-  BroadcastStatus::instance()->setStatusMsg( msg );
+  BroadcasStatus::instance()->seStatusMsg( msg );
 }
 
 
@@ -3713,7 +3713,7 @@ void KMMainWidget::initializeFilterActions()
   for ( ;it != kmkernel->filterMgr()->filters().constEnd(); ++it ) {
     if (!(*it)->isEmpty() && (*it)->configureShortcut()) {
       filterName = TQString("Filter %1").arg((*it)->name());
-      normalizedName = filterName.replace(" ", "_");
+      normalizedName = filterName.tqreplace(" ", "_");
       if (action(normalizedName.utf8()))
         continue;
       filterCommand = new KMMetaFilterActionCommand(*it, mHeaders, this);
@@ -3803,7 +3803,7 @@ void KMMainWidget::slotShortcutChanged( KMFolder *folder )
 
   TQString actionlabel = TQString( "FolderShortcut %1").arg( folder->prettyURL() );
   TQString actionname = TQString( "FolderShortcut %1").arg( folder->idString() );
-  TQString normalizedName = actionname.replace(" ", "_");
+  TQString normalizedName = actionname.tqreplace(" ", "_");
   KAction* action =
     new KAction(actionlabel, folder->shortcut(), c, TQT_SLOT(start()),
                 actionCollection(), normalizedName.local8Bit());
@@ -3993,14 +3993,14 @@ void KMMainWidget::slotRequestFullSearchFromQuickSearch()
     assert( mSearchWin );
     KMSearchPattern pattern;
     pattern.append( KMSearchRule::createInstance( "<message>", KMSearchRule::FuncContains, mQuickSearchLine->currentSearchTerm() ) );
-    int status = mQuickSearchLine->currentStatus();
+    int status = mQuickSearchLine->currenStatus();
     if ( status != 0 ) {
         pattern.append( new KMSearchRuleStatus( status ) );
     }
     mSearchWin->setSearchPattern( pattern );
 }
 
-void KMMainWidget::updateVactionScriptStatus(bool active)
+void KMMainWidget::updateVactionScripStatus(bool active)
 {
   mVacationIndicatorActive = active;
   if ( active ) {
diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h
index 20e19a3c..824f2aaa 100644
--- a/kmail/kmmainwidget.h
+++ b/kmail/kmmainwidget.h
@@ -178,7 +178,7 @@ public:
   void setupForwardingActionsList();
 
   KStatusBarLabel* vacationScriptIndicator() const { return mVacationScriptIndicator; }
-  void updateVactionScriptStatus() { updateVactionScriptStatus( mVacationIndicatorActive ); }
+  void updateVactionScripStatus() { updateVactionScripStatus( mVacationIndicatorActive ); }
 
 public slots:
   void slotMoveMsgToFolder( KMFolder *dest);
@@ -446,7 +446,7 @@ private:
 
 private slots:
   void slotRequestFullSearchFromQuickSearch();
-  void updateVactionScriptStatus( bool active );
+  void updateVactionScripStatus( bool active );
 
 private:
   // Message actions
diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp
index 994219b0..503c9a06 100644
--- a/kmail/kmmainwin.cpp
+++ b/kmail/kmmainwin.cpp
@@ -66,7 +66,7 @@ KMMainWin::KMMainWin(TQWidget *)
 
   applyMainWindowSettings(KMKernel::config(), "Main Window");
 
-  connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
+  connect( KPIM::BroadcasStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
            this, TQT_SLOT( displayStatusMsg(const TQString&) ) );
 
   connect(kmkernel, TQT_SIGNAL(configChanged()),
@@ -122,9 +122,9 @@ void KMMainWin::displayStatusMsg(const TQString& aText)
   // ### FIXME: We should disable richtext/HTML (to avoid possible denial of service attacks),
   // but this code would double the size of the satus bar if the user hovers
   // over an <foo@bar.com>-style email address :-(
-//  text.replace("&", "&amp;");
-//  text.replace("<", "&lt;");
-//  text.replace(">", "&gt;");
+//  text.tqreplace("&", "&amp;");
+//  text.tqreplace("<", "&lt;");
+//  text.tqreplace(">", "&gt;");
 
   statusBar()->changeItem(text, mMessageStatusId);
 }
diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp
index 6819d68d..3af9a252 100644
--- a/kmail/kmmessage.cpp
+++ b/kmail/kmmessage.cpp
@@ -246,7 +246,7 @@ bool KMMessage::transferInProgress() const
 void KMMessage::setTransferInProgress(bool value, bool force)
 {
   MessageProperty::setTransferInProgress( getMsgSerNum(), value, force );
-  if ( !transferInProgress() && sPendingDeletes.contains( this ) ) {
+  if ( !transferInProgress() && sPendingDeletes.tqcontains( this ) ) {
     sPendingDeletes.remove( this );
     if ( parent() ) {
       int idx = parent()->find( this );
@@ -260,7 +260,7 @@ void KMMessage::setTransferInProgress(bool value, bool force)
 
 
 bool KMMessage::isUrgent() const {
-  return headerField( "Priority" ).contains( "urgent", false )
+  return headerField( "Priority" ).tqcontains( "urgent", false )
     || headerField( "X-Priority" ).startsWith( "2" );
 }
 
@@ -351,7 +351,7 @@ void KMMessage::removePrivateHeaderFields() {
 }
 
 //-----------------------------------------------------------------------------
-void KMMessage::setStatusFields()
+void KMMessage::seStatusFields()
 {
   char str[2] = { 0, 0 };
 
@@ -384,7 +384,7 @@ TQString KMMessage::headerAsString() const
   header.Assemble();
   if ( header.AsString().empty() )
     return TQString::null;
-  return TQString::fromLatin1( header.AsString().c_str() );
+  return TQString::tqfromLatin1( header.AsString().c_str() );
 }
 
 
@@ -394,23 +394,23 @@ DwMediaType& KMMessage::dwContentType()
   return mMsg->Headers().ContentType();
 }
 
-void KMMessage::fromByteArray( const TQByteArray & ba, bool setStatus ) {
-  return fromDwString( DwString( ba.data(), ba.size() ), setStatus );
+void KMMessage::fromByteArray( const TQByteArray & ba, bool seStatus ) {
+  return fromDwString( DwString( ba.data(), ba.size() ), seStatus );
 }
 
-void KMMessage::fromString( const TQCString & str, bool aSetStatus ) {
-  return fromDwString( KMail::Util::dwString( str ), aSetStatus );
+void KMMessage::fromString( const TQCString & str, bool aSeStatus ) {
+  return fromDwString( KMail::Util::dwString( str ), aSeStatus );
 }
 
-void KMMessage::fromDwString(const DwString& str, bool aSetStatus)
+void KMMessage::fromDwString(const DwString& str, bool aSeStatus)
 {
   delete mMsg;
   mMsg = new DwMessage;
   mMsg->FromString( str );
   mMsg->Parse();
 
-  if (aSetStatus) {
-    setStatus(headerField("Status").latin1(), headerField("X-Status").latin1());
+  if (aSeStatus) {
+    seStatus(headerField("Status").latin1(), headerField("X-Status").latin1());
     setEncryptionStateChar( headerField("X-KMail-EncryptionState").at(0) );
     setSignatureStateChar(  headerField("X-KMail-SignatureState").at(0) );
     setMDNSentState( static_cast<KMMsgMDNSentState>( headerField("X-KMail-MDN-Sent").at(0).latin1() ) );
@@ -852,7 +852,7 @@ TQString KMMessage::asQuotedString( const TQString& aHeaderStr,
 
   const TQString indentStr = formatString( aIndentStr );
 
-  content.replace( '\n', '\n' + indentStr );
+  content.tqreplace( '\n', '\n' + indentStr );
   content.prepend( indentStr );
   content += '\n';
 
@@ -916,7 +916,7 @@ KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy,
     // strip all my addresses from the list of recipients
     TQStringList recipients = KPIM::splitEmailAddrList( toStr );
     toStr = stripMyAddressesFromAddressList( recipients ).join(", ");
-    // ... unless the list contains only my addresses (reply to self)
+    // ... unless the list tqcontains only my addresses (reply to self)
     if ( toStr.isEmpty() && !recipients.isEmpty() )
       toStr = recipients[0];
 
@@ -1081,7 +1081,7 @@ KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy,
        parser.process( this );
      }
   }
-  // setStatus(KMMsgStatusReplied);
+  // seStatus(KMMsgStatusReplied);
   msg->link(this, KMMsgStatusReplied);
 
   if ( parent() && parent()->putRepliesInSameFolder() )
@@ -1216,7 +1216,7 @@ void KMMessage::sanitizeHeaders( const TQStringList& whiteList )
    {
      nextField = field->Next();
      if ( field->FieldNameStr().find( "ontent" ) == DwString::npos
-             && !whiteList.contains( TQString::fromLatin1( field->FieldNameStr().c_str() ) ) )
+             && !whiteList.tqcontains( TQString::tqfromLatin1( field->FieldNameStr().c_str() ) ) )
        header.RemoveField(field);
      field = nextField;
    }
@@ -1276,7 +1276,7 @@ KMMessage* KMMessage::createForward( const TQString &tmpl /* = TQString::null */
     msg->initFromMessage( this );
     msg->removeHeaderField("Content-Type");
     msg->removeHeaderField("Content-Transfer-Encoding");
-    // Modify the ContentType directly (replaces setAutomaticFields(true))
+    // Modify the ContentType directly (tqreplaces setAutomaticFields(true))
     DwHeaders & header = msg->mMsg->Headers();
     header.MimeVersion().FromString("1.0");
     DwMediaType & contentType = msg->dwContentType();
@@ -1328,32 +1328,32 @@ static const struct {
   const char * text;
 } mdnMessageBoxes[] = {
   { "mdnNormalAsk", true,
-    I18N_NOOP("This message contains a request to return a notification "
+    I18N_NOOP("This message tqcontains a request to return a notification "
 	      "about your reception of the message.\n"
 	      "You can either ignore the request or let KMail send a "
 	      "\"denied\" or normal response.") },
   { "mdnUnknownOption", false,
-    I18N_NOOP("This message contains a request to send a notification "
+    I18N_NOOP("This message tqcontains a request to send a notification "
 	      "about your reception of the message.\n"
-	      "It contains a processing instruction that is marked as "
+	      "It tqcontains a processing instruction that is marked as "
 	      "\"required\", but which is unknown to KMail.\n"
 	      "You can either ignore the request or let KMail send a "
 	      "\"failed\" response.") },
   { "mdnMultipleAddressesInReceiptTo", true,
-    I18N_NOOP("This message contains a request to send a notification "
+    I18N_NOOP("This message tqcontains a request to send a notification "
 	      "about your reception of the message,\n"
 	      "but it is requested to send the notification to more "
 	      "than one address.\n"
 	      "You can either ignore the request or let KMail send a "
 	      "\"denied\" or normal response.") },
   { "mdnReturnPathEmpty", true,
-    I18N_NOOP("This message contains a request to send a notification "
+    I18N_NOOP("This message tqcontains a request to send a notification "
 	      "about your reception of the message,\n"
 	      "but there is no return-path set.\n"
 	      "You can either ignore the request or let KMail send a "
 	      "\"denied\" or normal response.") },
   { "mdnReturnPathNotInReceiptTo", true,
-    I18N_NOOP("This message contains a request to send a notification "
+    I18N_NOOP("This message tqcontains a request to send a notification "
 	      "about your reception of the message,\n"
 	      "but the return-path address differs from the address "
 	      "the notification was requested to be sent to.\n"
@@ -1442,7 +1442,7 @@ KMMessage* KMMessage::createMDN( MDN::ActionMode a,
   // an MDN with any disposition type other than "failed" in response
   // to the request.
   TQString notificationOptions = headerField("Disposition-Notification-Options");
-  if ( notificationOptions.contains( "required", false ) ) {
+  if ( notificationOptions.tqcontains( "required", false ) ) {
     // ### hacky; should parse...
     // There is a required option that we don't understand. We need to
     // ask the user what we should do:
@@ -1476,7 +1476,7 @@ KMMessage* KMMessage::createMDN( MDN::ActionMode a,
   TQString returnPath = returnPathList.isEmpty() ? TQString::null
     : returnPathList.front().localPart + '@' + returnPathList.front().domain ;
   kdDebug(5006) << "clean return path: " << returnPath << endl;
-  if ( returnPath.isEmpty() || !receiptTo.contains( returnPath, false ) ) {
+  if ( returnPath.isEmpty() || !receiptTo.tqcontains( returnPath, false ) ) {
     if ( !allowGUI ) return 0; // don't setMDNSentState here!
     mode = requestAdviceOnMDN( returnPath.isEmpty() ?
 			       "mdnReturnPathEmpty" :
@@ -1523,7 +1523,7 @@ KMMessage* KMMessage::createMDN( MDN::ActionMode a,
   receipt->initFromMessage( this );
   receipt->removeHeaderField("Content-Type");
   receipt->removeHeaderField("Content-Transfer-Encoding");
-  // Modify the ContentType directly (replaces setAutomaticFields(true))
+  // Modify the ContentType directly (tqreplaces setAutomaticFields(true))
   DwHeaders & header = receipt->mMsg->Headers();
   header.MimeVersion().FromString("1.0");
   DwMediaType & contentType = receipt->dwContentType();
@@ -1533,7 +1533,7 @@ KMMessage* KMMessage::createMDN( MDN::ActionMode a,
   receipt->mNeedsAssembly = true;
   receipt->setContentTypeParam( "report-type", "disposition-notification" );
 
-  TQString description = replaceHeadersInString( MDN::descriptionFor( d, m ) );
+  TQString description = tqreplaceHeadersInString( MDN::descriptionFor( d, m ) );
 
   // text/plain part:
   KMMessagePart firstMsgPart;
@@ -1605,7 +1605,7 @@ KMMessage* KMMessage::createMDN( MDN::ActionMode a,
   return receipt;
 }
 
-TQString KMMessage::replaceHeadersInString( const TQString & s ) const {
+TQString KMMessage::tqreplaceHeadersInString( const TQString & s ) const {
   TQString result = s;
   TQRegExp rx( "\\$\\{([a-z0-9-]+)\\}", false );
   Q_ASSERT( rx.isValid() );
@@ -1618,14 +1618,14 @@ TQString KMMessage::replaceHeadersInString( const TQString & s ) const {
 
   int idx = 0;
   if( ( idx = rxDate.search( result, idx ) ) != -1  ) {
-    result.replace( idx, rxDate.matchedLength(), sDate );
+    result.tqreplace( idx, rxDate.matchedLength(), sDate );
   }
 
   idx = 0;
   while ( ( idx = rx.search( result, idx ) ) != -1 ) {
-    TQString replacement = headerField( rx.cap(1).latin1() );
-    result.replace( idx, rx.matchedLength(), replacement );
-    idx += replacement.length();
+    TQString tqreplacement = headerField( rx.cap(1).latin1() );
+    result.tqreplace( idx, rx.matchedLength(), tqreplacement );
+    idx += tqreplacement.length();
   }
   return result;
 }
@@ -2144,7 +2144,7 @@ TQString KMMessage::references() const
 TQString KMMessage::replyToAuxIdMD5() const
 {
   TQString result = references();
-  // references contains two items, use the first one
+  // references tqcontains two items, use the first one
   // (the second to last reference)
   const int rightAngle = result.find( '>' );
   if( rightAngle != -1 )
@@ -2666,7 +2666,7 @@ TQValueList<int> KMMessage::determineAllowedCtes( const CharFreq& cf,
   }
 
   // In the following cases only QP and Base64 are allowed:
-  // - the buffer will be OpenPGP/MIME signed and it contains trailing
+  // - the buffer will be OpenPGP/MIME signed and it tqcontains trailing
   //   whitespace (cf. RFC 3156)
   // - a line starts with "From "
   if ( ( willBeSigned && cf.hasTrailingWhitespace() ) ||
@@ -2819,7 +2819,7 @@ int KMMessage::numBodyParts() const
       parts.append( part );
       part = part->Body().FirstBodyPart();
     }
-    // this is where currPart->msgPart contains a leaf message part
+    // this is where currPart->msgPart tqcontains a leaf message part
     count++;
     // go up in the tree until reaching a node with next
     // (or the last top-level node)
@@ -2871,7 +2871,7 @@ int KMMessage::partNumber( DwBodyPart * aDwBodyPart ) const
       parts.append( curpart );
       curpart = curpart->Body().FirstBodyPart();
     }
-    // this is where currPart->msgPart contains a leaf message part
+    // this is where currPart->msgPart tqcontains a leaf message part
     if (curpart == aDwBodyPart)
       idx = curIdx;
     curIdx++;
@@ -2911,7 +2911,7 @@ DwBodyPart * KMMessage::dwBodyPart( int aIdx ) const
       parts.append( curpart );
       curpart = curpart->Body().FirstBodyPart();
     }
-    // this is where currPart->msgPart contains a leaf message part
+    // this is where currPart->msgPart tqcontains a leaf message part
     if (curIdx==aIdx)
         part = curpart;
     curIdx++;
@@ -2949,7 +2949,7 @@ DwBodyPart * KMMessage::findDwBodyPart( int type, int subtype ) const
 	parts.append( curpart );
 	curpart = curpart->Body().FirstBodyPart();
     }
-    // this is where curPart->msgPart contains a leaf message part
+    // this is where curPart->msgPart tqcontains a leaf message part
 
     // pending(khz): Find out WHY this look does not travel down *into* an
     //               embedded "Message/RfF822" message containing a "Multipart/Mixed"
@@ -2998,7 +2998,7 @@ DwBodyPart * KMMessage::findDwBodyPart( const TQCString& type, const TQCString&
 	parts.append( curpart );
 	curpart = curpart->Body().FirstBodyPart();
     }
-    // this is where curPart->msgPart contains a leaf message part
+    // this is where curPart->msgPart tqcontains a leaf message part
 
     // pending(khz): Find out WHY this look does not travel down *into* an
     //               embedded "Message/RfF822" message containing a "Multipart/Mixed"
@@ -3198,7 +3198,7 @@ bool KMMessage::deleteBodyPart( int partIndex )
   dummyPart.setBodyEncodedBinary( TQByteArray() );
   TQCString cd = dummyPart.contentDisposition();
   if ( cd.find( "inline", 0, false ) == 0 ) {
-    cd.replace( 0, 10, "attachment" );
+    cd.tqreplace( 0, 10, "attachment" );
     dummyPart.setContentDisposition( cd );
   } else if ( cd.isEmpty() ) {
     dummyPart.setContentDisposition( "attachment" );
@@ -3358,7 +3358,7 @@ void KMMessage::addBodyPart(const KMMessagePart* aPart)
 //-----------------------------------------------------------------------------
 TQString KMMessage::generateMessageId( const TQString& addr )
 {
-  TQDateTime datetime = TQDateTime::currentDateTime();
+  TQDateTime datetime = TQDateTime::tqcurrentDateTime();
   TQString msgIdStr;
 
   msgIdStr = '<' + datetime.toString( "yyyyMMddhhmm.sszzz" );
@@ -3457,7 +3457,7 @@ TQCString KMMessage::html2source( const TQCString & src )
 TQString KMMessage::encodeMailtoUrl( const TQString& str )
 {
   TQString result;
-  result = TQString::fromLatin1( KMMsgBase::encodeRFC2047String( str,
+  result = TQString::tqfromLatin1( KMMsgBase::encodeRFC2047String( str,
                                                                 "utf-8" ) );
   result = KURL::encode_string( result );
   return result;
@@ -4015,7 +4015,7 @@ TQString KMMessage::guessEmailAddressFromLoginName( const TQString& loginName )
   if ( user.isValid() ) {
     TQString fullName = user.fullName();
     if ( fullName.find( TQRegExp( "[^ 0-9A-Za-z\\x0080-\\xFFFF]" ) ) != -1 )
-      address = '"' + fullName.replace( '\\', "\\" ).replace( '"', "\\" )
+      address = '"' + fullName.tqreplace( '\\', "\\" ).tqreplace( '"', "\\" )
 	      + "\" <" + address + '>';
     else
       address = fullName + " <" + address + '>';
@@ -4145,11 +4145,11 @@ void KMMessage::setCharset( const TQCString &charset, DwEntity *entity )
 
 
 //-----------------------------------------------------------------------------
-void KMMessage::setStatus(const KMMsgStatus aStatus, int idx)
+void KMMessage::seStatus(const KMMsgStatus aStatus, int idx)
 {
   if (mStatus == aStatus)
     return;
-  KMMsgBase::setStatus(aStatus, idx);
+  KMMsgBase::seStatus(aStatus, idx);
 }
 
 void KMMessage::setEncryptionState(const KMMsgEncryptionState s, int idx)
@@ -4208,10 +4208,10 @@ void KMMessage::link( const KMMessage *aMsg, KMMsgStatus aStatus )
 }
 
 //-----------------------------------------------------------------------------
-void KMMessage::getLink(int n, ulong *retMsgSerNum, KMMsgStatus *retStatus) const
+void KMMessage::getLink(int n, ulong *retMsgSerNum, KMMsgStatus *reStatus) const
 {
   *retMsgSerNum = 0;
-  *retStatus = KMMsgStatusUnknown;
+  *reStatus = KMMsgStatusUnknown;
 
   TQString message = headerField("X-KMail-Link-Message");
   TQString type = headerField("X-KMail-Link-Type");
@@ -4221,11 +4221,11 @@ void KMMessage::getLink(int n, ulong *retMsgSerNum, KMMsgStatus *retStatus) cons
   if ( !message.isEmpty() && !type.isEmpty() ) {
     *retMsgSerNum = message.toULong();
     if ( type == "reply" )
-      *retStatus = KMMsgStatusReplied;
+      *reStatus = KMMsgStatusReplied;
     else if ( type == "forward" )
-      *retStatus = KMMsgStatusForwarded;
+      *reStatus = KMMsgStatusForwarded;
     else if ( type == "deleted" )
-      *retStatus = KMMsgStatusDeleted;
+      *reStatus = KMMsgStatusDeleted;
   }
 }
 
@@ -4347,11 +4347,11 @@ void KMMessage::updateInvitationState()
     cntType += '/';
     cntType += mMsg->Headers().ContentType().SubtypeStr().c_str();
     if ( cntType.lower() == "text/calendar" ) {
-      setStatus( KMMsgStatusHasInvitation );
+      seStatus( KMMsgStatusHasInvitation );
       return;
     }
   }
-  setStatus( KMMsgStatusHasNoInvitation );
+  seStatus( KMMsgStatusHasNoInvitation );
   return;
 }
 
@@ -4364,7 +4364,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part )
   if ( !part )
   {
     // kdDebug(5006) << "updateAttachmentState - no part!" << endl;
-    setStatus( KMMsgStatusHasNoAttach );
+    seStatus( KMMsgStatusHasNoAttach );
     return;
   }
 
@@ -4404,7 +4404,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part )
            part->Headers().ContentType().Subtype() != DwMime::kSubtypePgpSignature &&
            part->Headers().ContentType().Subtype() != DwMime::kSubtypePkcs7Signature ) )
     {
-      setStatus( KMMsgStatusHasAttach );
+      seStatus( KMMsgStatusHasAttach );
     }
     return;
   }
@@ -4429,7 +4429,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part )
   if ( part->Next() )
     updateAttachmentState( part->Next() );
   else if ( attachmentState() == KMMsgAttachmentUnknown )
-    setStatus( KMMsgStatusHasNoAttach );
+    seStatus( KMMsgStatusHasNoAttach );
 }
 
 void KMMessage::setBodyFromUnicode( const TQString &str, DwEntity *entity )
diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h
index 958d017e..a063ca1a 100644
--- a/kmail/kmmessage.h
+++ b/kmail/kmmessage.h
@@ -131,7 +131,7 @@ public:
   */
   void setUnencryptedMsg( KMMessage* unencrypted );
 
-  /** Returns TRUE if the message contains an unencrypted copy of itself. */
+  /** Returns TRUE if the message tqcontains an unencrypted copy of itself. */
   bool hasUnencryptedMsg() const { return 0 != mUnencryptedMsg; }
 
   /** Returns an unencrypted copy of this message or 0 if none exists. */
@@ -150,13 +150,13 @@ public:
   }
 
   /** Mark the message as deleted */
-  void del() { setStatus(KMMsgStatusDeleted); }
+  void del() { seStatus(KMMsgStatusDeleted); }
 
   /** Undelete the message. Same as touch */
-  void undel() { setStatus(KMMsgStatusOld); }
+  void undel() { seStatus(KMMsgStatusOld); }
 
   /** Touch the message - mark it as read */
-  void touch() { setStatus(KMMsgStatusOld); }
+  void touch() { seStatus(KMMsgStatusOld); }
 
   /** Create a new message that is a reply to this message, filling all
       required header fields with the proper values. The returned message
@@ -210,9 +210,9 @@ public:
   void sanitizeHeaders( const TQStringList& whiteList = TQStringList() );
 
   /** Parse the string and create this message from it. */
-  void fromDwString(const DwString& str, bool setStatus=false);
-  void fromString(const TQCString& str, bool setStatus=false);
-  void fromByteArray(const TQByteArray & ba, bool setStatus=false);
+  void fromDwString(const DwString& str, bool seStatus=false);
+  void fromString(const TQCString& str, bool seStatus=false);
+  void fromByteArray(const TQByteArray & ba, bool seStatus=false);
 
   /** Return the entire message contents in the DwString. This function
       is *fast* even for large message since it does *not* involve a
@@ -545,7 +545,7 @@ public:
    */
   void setBodyFromUnicode( const TQString & str, DwEntity *entity = 0 );
 
-  /** Returns the body part decoded to unicode.
+  /** Returns the body part decoded to tqunicode.
    **/
   TQString bodyToUnicode(const TQTextCodec* codec=0) const;
 
@@ -663,13 +663,13 @@ public:
 
   /**
    * Delete a body part with the specified part index.
-   * A dummy body part with the text "the attachment foo was deleted" will replace the old part.
+   * A dummy body part with the text "the attachment foo was deleted" will tqreplace the old part.
    */
   bool deleteBodyPart( int partIndex );
 
   /** Set "Status" and "X-Status" fields of the message from the
    * internal message status. */
-  void setStatusFields();
+  void seStatusFields();
 
   /** Generates the Message-Id. It uses either the Message-Id suffix
    * defined by the user or the given email address as suffix. The address
@@ -679,7 +679,7 @@ public:
 
   /** Convert '<' into "&lt;" resp. '>' into "&gt;" in order to
     * prevent their interpretation by KHTML.
-    * Does *not* use the Qt replace function but runs a very fast C code
+    * Does *not* use the Qt tqreplace function but runs a very fast C code
     * the same way as lf2crlf() does.
    */
   static TQCString html2source( const TQCString & src );
@@ -713,7 +713,7 @@ public:
                                  bool removeLineBreaks = false );
 
   /** Converts the email address(es) to (a) nice HTML mailto: anchor(s).
-   * If stripped is TRUE then the visible part of the anchor contains
+   * If stripped is TRUE then the visible part of the anchor tqcontains
    * only the name part and not the given emailAddr.
    */
   static TQString emailAddrAsAnchor(const TQString& emailAddr,
@@ -746,7 +746,7 @@ public:
   static TQString guessEmailAddressFromLoginName( const TQString& userName );
 
   /**
-   *  Given argument msg add quoting characters and relayout for max width maxLength
+   *  Given argument msg add quoting characters and retqlayout for max width maxLength
    *  @param msg the string which it to be quoted
    *  @param maxLineLength reformat text to be this amount of columns at maximum, adding
    *    linefeeds at word boundaries to make it fit.
@@ -760,7 +760,7 @@ public:
   static const TQStringList &preferredCharsets();
 
   /** Replaces every occurrence of "${foo}" in @p s with headerField("foo") */
-  TQString replaceHeadersInString( const TQString & s ) const;
+  TQString tqreplaceHeadersInString( const TQString & s ) const;
 
   /** Get the message charset.*/
   TQCString charset() const;
@@ -825,8 +825,8 @@ public:
   /** Status of the message. */
   KMMsgStatus status() const { return mStatus; }
   /** Set status and mark dirty. */
-  void setStatus(const KMMsgStatus status, int idx = -1);
-  void setStatus(const char* s1, const char* s2=0) { KMMsgBase::setStatus(s1, s2); }
+  void seStatus(const KMMsgStatus status, int idx = -1);
+  void seStatus(const char* s1, const char* s2=0) { KMMsgBase::seStatus(s1, s2); }
 
   /** Set encryption status of the message. */
   void setEncryptionState(const KMMsgEncryptionState, int idx = -1);
@@ -847,8 +847,8 @@ public:
   /** Links this message to @p aMsg, setting link type to @p aStatus. */
   void link(const KMMessage *aMsg, KMMsgStatus aStatus);
   /** Returns the information for the Nth link into @p retMsg
-   * and @p retStatus. */
-  void getLink(int n, ulong *retMsgSerNum, KMMsgStatus *retStatus) const;
+   * and @p reStatus. */
+  void getLink(int n, ulong *retMsgSerNum, KMMsgStatus *reStatus) const;
 
   /** Convert wildcards into normal string */
   TQString formatString(const TQString&) const;
@@ -886,7 +886,7 @@ public:
   /** Returns message body with quoting header and indented by the
     given indentation string. This is suitable for including the message
     in another message of for replies, forwards. The header string is
-    a template where the following fields are replaced with the
+    a template where the following fields are tqreplaced with the
     corresponding values:
     <pre>
         %D: date of this message
@@ -969,7 +969,7 @@ private:
   KMMessage* mUnencryptedMsg;
   DwBodyPart* mLastUpdated;
   int mCursorPos;
-  KMMsgInfo* mMsgInfo; // used to remember the KMMsgInfo object this KMMessage replaced in the KMMsgList
+  KMMsgInfo* mMsgInfo; // used to remember the KMMsgInfo object this KMMessage tqreplaced in the KMMsgList
   static TQValueList<KMMessage*> sPendingDeletes;
 };
 
diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp
index d7fb9541..6e73051f 100644
--- a/kmail/kmmimeparttree.cpp
+++ b/kmail/kmmimeparttree.cpp
@@ -95,7 +95,7 @@ void KMMimePartTree::restoreLayoutIfPresent() {
   header()->setStretchEnabled( true, 0 );
   // rest of the columns:
   if ( KMKernel::config()->hasGroup( configGroup ) ) {
-    // there is a saved layout. use it...
+    // there is a saved tqlayout. use it...
     restoreLayout( KMKernel::config(), configGroup );
     // and disable Maximum mode:
     for ( int i = 1 ; i < 4 ; ++i )
@@ -214,9 +214,9 @@ void KMMimePartTree::setStyleDependantFrameWidth()
   // set the width of the frame to a reasonable value for the current GUI style
   int frameWidth;
   if( style().isA("KeramikStyle") )
-    frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
+    frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
   else
-    frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth );
+    frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth );
   if ( frameWidth < 0 )
     frameWidth = 0;
   if ( frameWidth != lineWidth() )
diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp
index e3d3fec1..71a1731c 100644
--- a/kmail/kmmsgbase.cpp
+++ b/kmail/kmmsgbase.cpp
@@ -150,7 +150,7 @@ void KMMsgBase::toggleStatus(const KMMsgStatus aStatus, int idx)
 }
 
 //-----------------------------------------------------------------------------
-void KMMsgBase::setStatus(const KMMsgStatus aStatus, int idx)
+void KMMsgBase::seStatus(const KMMsgStatus aStatus, int idx)
 {
   mDirty = true;
   KMMsgStatus oldStatus = status();
@@ -267,40 +267,40 @@ void KMMsgBase::setStatus(const KMMsgStatus aStatus, int idx)
 
 
 //-----------------------------------------------------------------------------
-void KMMsgBase::setStatus(const char* aStatusStr, const char* aXStatusStr)
+void KMMsgBase::seStatus(const char* aStatusStr, const char* aXStatusStr)
 {
   // first try to find status from "X-Status" field if given
   if (aXStatusStr) {
-    if (strchr(aXStatusStr, 'N')) setStatus(KMMsgStatusNew);
-    if (strchr(aXStatusStr, 'U')) setStatus(KMMsgStatusUnread);
-    if (strchr(aXStatusStr, 'O')) setStatus(KMMsgStatusOld);
-    if (strchr(aXStatusStr, 'R')) setStatus(KMMsgStatusRead);
-    if (strchr(aXStatusStr, 'D')) setStatus(KMMsgStatusDeleted);
-    if (strchr(aXStatusStr, 'A')) setStatus(KMMsgStatusReplied);
-    if (strchr(aXStatusStr, 'F')) setStatus(KMMsgStatusForwarded);
-    if (strchr(aXStatusStr, 'Q')) setStatus(KMMsgStatusQueued);
-    if (strchr(aXStatusStr, 'K')) setStatus(KMMsgStatusTodo);
-    if (strchr(aXStatusStr, 'S')) setStatus(KMMsgStatusSent);
-    if (strchr(aXStatusStr, 'G')) setStatus(KMMsgStatusFlag);
-    if (strchr(aXStatusStr, 'P')) setStatus(KMMsgStatusSpam);
-    if (strchr(aXStatusStr, 'H')) setStatus(KMMsgStatusHam);
-    if (strchr(aXStatusStr, 'T')) setStatus(KMMsgStatusHasAttach);
-    if (strchr(aXStatusStr, 'C')) setStatus(KMMsgStatusHasNoAttach);
+    if (strchr(aXStatusStr, 'N')) seStatus(KMMsgStatusNew);
+    if (strchr(aXStatusStr, 'U')) seStatus(KMMsgStatusUnread);
+    if (strchr(aXStatusStr, 'O')) seStatus(KMMsgStatusOld);
+    if (strchr(aXStatusStr, 'R')) seStatus(KMMsgStatusRead);
+    if (strchr(aXStatusStr, 'D')) seStatus(KMMsgStatusDeleted);
+    if (strchr(aXStatusStr, 'A')) seStatus(KMMsgStatusReplied);
+    if (strchr(aXStatusStr, 'F')) seStatus(KMMsgStatusForwarded);
+    if (strchr(aXStatusStr, 'Q')) seStatus(KMMsgStatusQueued);
+    if (strchr(aXStatusStr, 'K')) seStatus(KMMsgStatusTodo);
+    if (strchr(aXStatusStr, 'S')) seStatus(KMMsgStatusSent);
+    if (strchr(aXStatusStr, 'G')) seStatus(KMMsgStatusFlag);
+    if (strchr(aXStatusStr, 'P')) seStatus(KMMsgStatusSpam);
+    if (strchr(aXStatusStr, 'H')) seStatus(KMMsgStatusHam);
+    if (strchr(aXStatusStr, 'T')) seStatus(KMMsgStatusHasAttach);
+    if (strchr(aXStatusStr, 'C')) seStatus(KMMsgStatusHasNoAttach);
   }
 
   // Merge the contents of the "Status" field
   if (aStatusStr) {
     if ((aStatusStr[0]== 'R' && aStatusStr[1]== 'O') ||
         (aStatusStr[0]== 'O' && aStatusStr[1]== 'R')) {
-      setStatus( KMMsgStatusOld );
-      setStatus( KMMsgStatusRead );
+      seStatus( KMMsgStatusOld );
+      seStatus( KMMsgStatusRead );
     }
     else if (aStatusStr[0] == 'R')
-      setStatus(KMMsgStatusRead);
+      seStatus(KMMsgStatusRead);
     else if (aStatusStr[0] == 'D')
-      setStatus(KMMsgStatusDeleted);
+      seStatus(KMMsgStatusDeleted);
     else
-      setStatus(KMMsgStatusNew);
+      seStatus(KMMsgStatusNew);
   }
 }
 
@@ -587,7 +587,7 @@ TQCString KMMsgBase::toUsAscii(const TQString& _str, bool *ok)
   TQString result = _str;
   int len = result.length();
   for (int i = 0; i < len; i++)
-    if (result.at(i).unicode() >= 128) {
+    if (result.at(i).tqunicode() >= 128) {
       result.at(i) = '?';
       all_ok = false;
     }
@@ -800,7 +800,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str,
   unsigned int nonAscii = 0;
   unsigned int strLength(_str.length());
   for (unsigned int i = 0; i < strLength; i++)
-    if (_str.at(i).unicode() >= 128) nonAscii++;
+    if (_str.at(i).tqunicode() >= 128) nonAscii++;
   bool useBase64 = (nonAscii * 6 > strLength);
 
   unsigned int start, stop, p, pos = 0, encLength;
@@ -815,7 +815,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str,
     {
       if (!breakLine && (_str.at(p) == ' ' || dontQuote.find(_str.at(p)) != -1))
         start = p + 1;
-      if (_str.at(p).unicode() >= 128 || _str.at(p).unicode() < 32)
+      if (_str.at(p).tqunicode() >= 128 || _str.at(p).tqunicode() < 32)
         break;
       p++;
     }
@@ -1037,7 +1037,7 @@ TQCString KMMsgBase::autoDetectCharset(const TQCString &_encoding, const TQStrin
     TQStringList charsets = encodingList;
     if (!_encoding.isEmpty())
     {
-       TQString currentCharset = TQString::fromLatin1(_encoding);
+       TQString currentCharset = TQString::tqfromLatin1(_encoding);
        charsets.remove(currentCharset);
        charsets.prepend(currentCharset);
     }
@@ -1119,9 +1119,9 @@ static void swapEndian(TQString &str)
 {
   uint len = str.length();
   str = TQDeepCopy<TQString>(str);
-  TQChar *unicode = const_cast<TQChar*>( str.unicode() );
+  TQChar *tqunicode = const_cast<TQChar*>( str.tqunicode() );
   for (uint i = 0; i < len; i++)
-    unicode[i] = kmail_swap_16(unicode[i].unicode());
+    tqunicode[i] = kmail_swap_16(tqunicode[i].tqunicode());
 }
 
 //-----------------------------------------------------------------------------
@@ -1171,9 +1171,9 @@ retry:
   }
 
   MsgPartType type;
-  Q_UINT16 l;
+  TQ_UINT16 l;
   while(g_chunk_offset < mIndexLength) {
-    Q_UINT32 tmp;
+    TQ_UINT32 tmp;
     copy_from_stream(tmp);
     copy_from_stream(l);
     if (swapByteOrder)
@@ -1193,7 +1193,7 @@ retry:
     }
     if(type == t) {
         // This works because the TQString constructor does a memcpy.
-        // Otherwise we would need to be concerned about the alignment.
+        // Otherwise we would need to be concerned about the tqalignment.
 	if(l)
 	    ret = TQString((TQChar *)(g_chunk + g_chunk_offset), l/2);
 	break;
@@ -1248,9 +1248,9 @@ retry:
   }
 
   MsgPartType type;
-  Q_UINT16 l;
+  TQ_UINT16 l;
   while (g_chunk_offset < mIndexLength) {
-    Q_UINT32 tmp;
+    TQ_UINT32 tmp;
     copy_from_stream(tmp);
     copy_from_stream(l);
     if (swapByteOrder)
@@ -1285,7 +1285,7 @@ retry:
       else if (sizeOfLong == 4)
       {
          // Long is stored as 4 bytes in index file, sizeof(long) = 8
-         Q_UINT32 ret_32;
+         TQ_UINT32 ret_32;
          copy_from_stream(ret_32);
          if (swapByteOrder)
             ret_32 = kmail_swap_32(ret_32);
@@ -1294,8 +1294,8 @@ retry:
       else if (sizeOfLong == 8)
       {
          // Long is stored as 8 bytes in index file, sizeof(long) = 4
-         Q_UINT32 ret_1;
-         Q_UINT32 ret_2;
+         TQ_UINT32 ret_1;
+         TQ_UINT32 ret_2;
          copy_from_stream(ret_1);
          copy_from_stream(ret_2);
          if (!swapByteOrder)
@@ -1347,8 +1347,8 @@ retry:
 	int len2 = (len > 256) ? 256 : len; \
 	if(csize < (length + (len2 + sizeof(short) + sizeof(MsgPartType)))) \
     	   ret = (uchar *)realloc(ret, csize += len2+sizeof(short)+sizeof(MsgPartType)); \
-        Q_UINT32 t = (Q_UINT32) type; memcpy(ret+length, &t, sizeof(t)); \
-        Q_UINT16 l = len2; memcpy(ret+length+sizeof(t), &l, sizeof(l)); \
+        TQ_UINT32 t = (TQ_UINT32) type; memcpy(ret+length, &t, sizeof(t)); \
+        TQ_UINT16 l = len2; memcpy(ret+length+sizeof(t), &l, sizeof(l)); \
         if (network_order) \
            memcpy_networkorder(ret+length+sizeof(t)+sizeof(l), x, len2); \
         else \
@@ -1371,23 +1371,23 @@ const uchar *KMMsgBase::asIndexString(int &length) const
 
   //these is at the beginning because it is queried quite often
   tmp_str = msgIdMD5().stripWhiteSpace();
-  STORE_DATA_LEN(MsgIdMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgIdMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true);
   tmp = mLegacyStatus;
   STORE_DATA(MsgLegacyStatusPart, tmp);
 
   //these are completely arbitrary order
   tmp_str = fromStrip().stripWhiteSpace();
-  STORE_DATA_LEN(MsgFromStripPart, tmp_str.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgFromStripPart, tmp_str.tqunicode(), tmp_str.length() * 2, true);
   tmp_str = subject().stripWhiteSpace();
-  STORE_DATA_LEN(MsgSubjectPart, tmp_str.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgSubjectPart, tmp_str.tqunicode(), tmp_str.length() * 2, true);
   tmp_str = toStrip().stripWhiteSpace();
-  STORE_DATA_LEN(MsgToStripPart, tmp_str.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgToStripPart, tmp_str.tqunicode(), tmp_str.length() * 2, true);
   tmp_str = replyToIdMD5().stripWhiteSpace();
-  STORE_DATA_LEN(MsgReplyToIdMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgReplyToIdMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true);
   tmp_str = xmark().stripWhiteSpace();
-  STORE_DATA_LEN(MsgXMarkPart, tmp_str.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgXMarkPart, tmp_str.tqunicode(), tmp_str.length() * 2, true);
   tmp_str = fileName().stripWhiteSpace();
-  STORE_DATA_LEN(MsgFilePart, tmp_str.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgFilePart, tmp_str.tqunicode(), tmp_str.length() * 2, true);
   tmp = msgSize();
   STORE_DATA(MsgSizePart, tmp);
   tmp = folderOffset();
@@ -1400,10 +1400,10 @@ const uchar *KMMsgBase::asIndexString(int &length) const
   STORE_DATA(MsgMDNSentPart, tmp);
 
   tmp_str = replyToAuxIdMD5().stripWhiteSpace();
-  STORE_DATA_LEN(MsgReplyToAuxIdMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgReplyToAuxIdMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true);
 
   tmp_str = strippedSubjectMD5().stripWhiteSpace();
-  STORE_DATA_LEN(MsgStrippedSubjectMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true);
+  STORE_DATA_LEN(MsgStrippedSubjectMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true);
 
   tmp = status();
   STORE_DATA(MsgStatusPart, tmp);
@@ -1414,10 +1414,10 @@ const uchar *KMMsgBase::asIndexString(int &length) const
   STORE_DATA(MsgUIDPart, tmp);
 
   tmp_str = from();
-  STORE_DATA_LEN( MsgFromPart, tmp_str.unicode(), tmp_str.length() * 2, true );
+  STORE_DATA_LEN( MsgFromPart, tmp_str.tqunicode(), tmp_str.length() * 2, true );
 
   tmp_str = to();
-  STORE_DATA_LEN( MsgToPart, tmp_str.unicode(), tmp_str.length() * 2, true );
+  STORE_DATA_LEN( MsgToPart, tmp_str.tqunicode(), tmp_str.length() * 2, true );
 
   return ret;
 }
@@ -1450,37 +1450,37 @@ void KMMsgBase::readConfig()
   sReplySubjPrefixes = composerGroup.readListEntry("reply-prefixes", ',');
   if (sReplySubjPrefixes.isEmpty())
     sReplySubjPrefixes << "Re\\s*:" << "Re\\[\\d+\\]:" << "Re\\d+:";
-  sReplaceSubjPrefix = composerGroup.readBoolEntry("replace-reply-prefix", true);
+  sReplaceSubjPrefix = composerGroup.readBoolEntry("tqreplace-reply-prefix", true);
   sForwardSubjPrefixes = composerGroup.readListEntry("forward-prefixes", ',');
   if (sForwardSubjPrefixes.isEmpty())
     sForwardSubjPrefixes << "Fwd:" << "FW:";
-  sReplaceForwSubjPrefix = composerGroup.readBoolEntry("replace-forward-prefix", true);
+  sReplaceForwSubjPrefix = composerGroup.readBoolEntry("tqreplace-forward-prefix", true);
 }
 
 //-----------------------------------------------------------------------------
 // static
 TQString KMMsgBase::stripOffPrefixes( const TQString& str )
 {
-  return replacePrefixes( str, sReplySubjPrefixes + sForwardSubjPrefixes,
+  return tqreplacePrefixes( str, sReplySubjPrefixes + sForwardSubjPrefixes,
                           true, TQString::null ).stripWhiteSpace();
 }
 
 //-----------------------------------------------------------------------------
 // static
-TQString KMMsgBase::replacePrefixes( const TQString& str,
+TQString KMMsgBase::tqreplacePrefixes( const TQString& str,
                                     const TQStringList& prefixRegExps,
-                                    bool replace,
+                                    bool tqreplace,
                                     const TQString& newPrefix )
 {
   bool recognized = false;
   // construct a big regexp that
   // 1. is anchored to the beginning of str (sans whitespace)
   // 2. matches at least one of the part regexps in prefixRegExps
-  TQString bigRegExp = TQString::fromLatin1("^(?:\\s+|(?:%1))+\\s*")
+  TQString bigRegExp = TQString::tqfromLatin1("^(?:\\s+|(?:%1))+\\s*")
                       .arg( prefixRegExps.join(")|(?:") );
   TQRegExp rx( bigRegExp, false /*case insens.*/ );
   if ( !rx.isValid() ) {
-    kdWarning(5006) << "KMMessage::replacePrefixes(): bigRegExp = \""
+    kdWarning(5006) << "KMMessage::tqreplacePrefixes(): bigRegExp = \""
                     << bigRegExp << "\"\n"
                     << "prefix regexp is invalid!" << endl;
     // try good ole Re/Fwd:
@@ -1489,8 +1489,8 @@ TQString KMMsgBase::replacePrefixes( const TQString& str,
     TQString tmp = str;
     if ( rx.search( tmp ) == 0 ) {
       recognized = true;
-      if ( replace )
-	return tmp.replace( 0, rx.matchedLength(), newPrefix + ' ' );
+      if ( tqreplace )
+	return tmp.tqreplace( 0, rx.matchedLength(), newPrefix + ' ' );
     }
   }
   if ( !recognized )
@@ -1508,10 +1508,10 @@ TQString KMMsgBase::cleanSubject() const
 
 //-----------------------------------------------------------------------------
 TQString KMMsgBase::cleanSubject( const TQStringList & prefixRegExps,
-                                 bool replace,
+                                 bool tqreplace,
                                  const TQString & newPrefix ) const
 {
-  return KMMsgBase::replacePrefixes( subject(), prefixRegExps, replace,
+  return KMMsgBase::tqreplacePrefixes( subject(), prefixRegExps, tqreplace,
                                      newPrefix );
 }
 
diff --git a/kmail/kmmsgbase.h b/kmail/kmmsgbase.h
index 1137bb6e..d5b7107f 100644
--- a/kmail/kmmsgbase.h
+++ b/kmail/kmmsgbase.h
@@ -220,9 +220,9 @@ public:
 
   /** Set status and mark dirty.  Optional optimization: @p idx may
    * specify the index of this message within the parent folder. */
-  virtual void setStatus(const KMMsgStatus status, int idx = -1);
+  virtual void seStatus(const KMMsgStatus status, int idx = -1);
   virtual void toggleStatus(const KMMsgStatus status, int idx = -1);
-  virtual void setStatus(const char* statusField, const char* xstatusField=0);
+  virtual void seStatus(const char* statusField, const char* xstatusField=0);
 
   /** Encryption status of the message. */
   virtual KMMsgEncryptionState encryptionState() const = 0;
@@ -403,18 +403,18 @@ public:
   /** Return if the message has at least one attachment */
   virtual KMMsgAttachmentState attachmentState() const;
 
-  /** Return if the message contains an invitation */
+  /** Return if the message tqcontains an invitation */
   virtual KMMsgInvitationState invitationState() const;
 
   /** Check for prefixes @p prefixRegExps in @p str. If none
       is found, @p newPrefix + ' ' is prepended to @p str and the
-      resulting string is returned. If @p replace is true, any
+      resulting string is returned. If @p tqreplace is true, any
       sequence of whitespace-delimited prefixes at the beginning of
-      @p str is replaced by @p newPrefix.
+      @p str is tqreplaced by @p newPrefix.
   **/
-  static TQString replacePrefixes( const TQString& str,
+  static TQString tqreplacePrefixes( const TQString& str,
                                   const TQStringList& prefixRegExps,
-                                  bool replace,
+                                  bool tqreplace,
                                   const TQString& newPrefix );
 
   /** Returns @p str with all "forward" and "reply" prefixes stripped off.
@@ -423,11 +423,11 @@ public:
 
   /** Check for prefixes @p prefixRegExps in #subject(). If none
       is found, @p newPrefix + ' ' is prepended to the subject and the
-      resulting string is returned. If @p replace is true, any
+      resulting string is returned. If @p tqreplace is true, any
       sequence of whitespace-delimited prefixes at the beginning of
-      #subject() is replaced by @p newPrefix
+      #subject() is tqreplaced by @p newPrefix
   **/
-  TQString cleanSubject(const TQStringList& prefixRegExps, bool replace,
+  TQString cleanSubject(const TQStringList& prefixRegExps, bool tqreplace,
 		       const TQString& newPrefix) const;
 
   /** Return this mails subject, with all "forward" and "reply"
@@ -459,7 +459,7 @@ public:
   enum MsgPartType
   {
     MsgNoPart = 0,
-    //unicode strings
+    //tqunicode strings
     MsgFromStripPart = 1,
     MsgSubjectPart = 2,
     MsgToStripPart = 3,
@@ -474,7 +474,7 @@ public:
     MsgFilePart = 11,
     MsgCryptoStatePart = 12,
     MsgMDNSentPart = 13,
-    //another two unicode strings
+    //another two tqunicode strings
     MsgReplyToAuxIdMD5Part = 14,
     MsgStrippedSubjectMD5Part = 15,
     // and another unsigned long
diff --git a/kmail/kmmsgdict.cpp b/kmail/kmmsgdict.cpp
index 8f9a9551..07f5797d 100644
--- a/kmail/kmmsgdict.cpp
+++ b/kmail/kmmsgdict.cpp
@@ -223,7 +223,7 @@ unsigned long KMMsgDict::insert(unsigned long msgSerNum,
     folder->setDirty( true ); // rewrite id file
   }
 
-  // Insert into the dict. Don't use dict->replace() as we _know_
+  // Insert into the dict. Don't use dict->tqreplace() as we _know_
   // there is no entry with the same msn, we just made sure.
   KMMsgDictEntry *entry = new KMMsgDictEntry(folder->folder(), index);
   dict->insert((long)msn, entry);
@@ -246,12 +246,12 @@ unsigned long KMMsgDict::insert(const KMMsgBase *msg, int index)
 
 //-----------------------------------------------------------------------------
 
-void KMMsgDict::replace(unsigned long msgSerNum,
+void KMMsgDict::tqreplace(unsigned long msgSerNum,
 		       const KMMsgBase *msg, int index)
 {
   KMFolderIndex* folder = static_cast<KMFolderIndex*>( msg->storage() );
   if ( !folder ) {
-    kdDebug(5006) << "KMMsgDict::replace: Cannot replace the message serial "
+    kdDebug(5006) << "KMMsgDict::tqreplace: Cannot tqreplace the message serial "
       << "number, null pointer to storage. Requested serial: " << msgSerNum
       << endl;
     kdDebug(5006) << "  Message info: Subject: " << msg->subject() << ", To: "
@@ -411,14 +411,14 @@ int KMMsgDict::readFolderIds( FolderStorage& storage )
   }
 
   bool swapByteOrder;
-  Q_UINT32 byte_order;
+  TQ_UINT32 byte_order;
   if (!fread(&byte_order, sizeof(byte_order), 1, fp)) {
     fclose(fp);
     return -1;
   }
   swapByteOrder = (byte_order == 0x78563412);
 
-  Q_UINT32 count;
+  TQ_UINT32 count;
   if (!fread(&count, sizeof(count), 1, fp)) {
     fclose(fp);
     return -1;
@@ -434,7 +434,7 @@ int KMMsgDict::readFolderIds( FolderStorage& storage )
   fseek(fp, pos, SEEK_SET);   // back to previous position
 
   // the file must at least contain what we try to read below
-  if ( (fileSize - pos) < (long)(count * sizeof(Q_UINT32)) ) {
+  if ( (fileSize - pos) < (long)(count * sizeof(TQ_UINT32)) ) {
     fclose(fp);
     return -1;
   }
@@ -442,7 +442,7 @@ int KMMsgDict::readFolderIds( FolderStorage& storage )
   KMMsgDictREntry *rentry = new KMMsgDictREntry(count);
 
   for (unsigned int index = 0; index < count; index++) {
-    Q_UINT32 msn;
+    TQ_UINT32 msn;
 
     bool readOk = fread(&msn, sizeof(msn), 1, fp);
     if (swapByteOrder)
@@ -468,7 +468,7 @@ int KMMsgDict::readFolderIds( FolderStorage& storage )
       Q_ASSERT( msn != 0 );
     }
 
-    // Insert into the dict. Don't use dict->replace() as we _know_
+    // Insert into the dict. Don't use dict->tqreplace() as we _know_
     // there is no entry with the same msn, we just made sure.
     KMMsgDictEntry *entry = new KMMsgDictEntry( storage.folder(), index);
     dict->insert((long)msn, entry);
@@ -506,7 +506,7 @@ KMMsgDictREntry *KMMsgDict::openFolderIds( const FolderStorage& storage, bool tr
       fscanf(fp, IDS_HEADER, &version);
       if (version == IDS_VERSION)
       {
-         Q_UINT32 byte_order = 0;
+         TQ_UINT32 byte_order = 0;
          fread(&byte_order, sizeof(byte_order), 1, fp);
          rentry->swapByteOrder = (byte_order == 0x78563412);
       }
@@ -530,7 +530,7 @@ KMMsgDictREntry *KMMsgDict::openFolderIds( const FolderStorage& storage, bool tr
          return 0;
       }
       fprintf(fp, IDS_HEADER, IDS_VERSION);
-      Q_UINT32 byteOrder = 0x12345678;
+      TQ_UINT32 byteOrder = 0x12345678;
       fwrite(&byteOrder, sizeof(byteOrder), 1, fp);
       rentry->swapByteOrder = false;
     }
@@ -552,7 +552,7 @@ int KMMsgDict::writeFolderIds( const FolderStorage &storage )
 
   fseek(fp, rentry->baseOffset, SEEK_SET);
   // kdDebug(5006) << "Dict writing for folder " << storage.label() << endl;
-  Q_UINT32 count = rentry->getRealSize();
+  TQ_UINT32 count = rentry->getRealSize();
   if (!fwrite(&count, sizeof(count), 1, fp)) {
     kdDebug(5006) << "Dict cannot write count with folder " << storage.label() << ": "
                   << strerror(errno) << " (" << errno << ")" << endl;
@@ -560,7 +560,7 @@ int KMMsgDict::writeFolderIds( const FolderStorage &storage )
   }
 
   for (unsigned int index = 0; index < count; index++) {
-    Q_UINT32 msn = rentry->getMsn(index);
+    TQ_UINT32 msn = rentry->getMsn(index);
     if (!fwrite(&msn, sizeof(msn), 1, fp))
       return -1;
     if ( msn == 0 ) {
@@ -605,7 +605,7 @@ int KMMsgDict::appendToFolderIds( FolderStorage& storage, int index)
 //  kdDebug(5006) << "Dict appending for folder " << storage.label() << endl;
 
   fseek(fp, rentry->baseOffset, SEEK_SET);
-  Q_UINT32 count;
+  TQ_UINT32 count;
   if (!fread(&count, sizeof(count), 1, fp)) {
     kdDebug(5006) << "Dict cannot read count for folder " << storage.label() << ": "
                   << strerror(errno) << " (" << errno << ")" << endl;
@@ -629,7 +629,7 @@ int KMMsgDict::appendToFolderIds( FolderStorage& storage, int index)
   if (ofs > 0)
     fseek(fp, ofs, SEEK_CUR);
 
-  Q_UINT32 msn = rentry->getMsn(index);
+  TQ_UINT32 msn = rentry->getMsn(index);
   if (rentry->swapByteOrder)
      msn = kmail_swap_32(msn);
   if (!fwrite(&msn, sizeof(msn), 1, fp)) {
diff --git a/kmail/kmmsgdict.h b/kmail/kmmsgdict.h
index 60fabf6c..a1316534 100644
--- a/kmail/kmmsgdict.h
+++ b/kmail/kmmsgdict.h
@@ -97,7 +97,7 @@ private:
   unsigned long insert(const KMMsgBase *msg, int index = -1);
 
   /** Set the serial number of @p msg to @p msgSerNum */
-  void replace(unsigned long msgSerNum,
+  void tqreplace(unsigned long msgSerNum,
                const KMMsgBase *msg, int index = -1);
 
   /** Removes a message. */
diff --git a/kmail/kmmsginfo.cpp b/kmail/kmmsginfo.cpp
index ece847a3..9a7b1ed8 100644
--- a/kmail/kmmsginfo.cpp
+++ b/kmail/kmmsginfo.cpp
@@ -666,11 +666,11 @@ void KMMsgInfo::setFileName(const TQString& file)
 }
 
 //-----------------------------------------------------------------------------
-void KMMsgInfo::setStatus(const KMMsgStatus aStatus, int idx)
+void KMMsgInfo::seStatus(const KMMsgStatus aStatus, int idx)
 {
     if(aStatus == status())
         return;
-    KMMsgBase::setStatus(aStatus, idx); //base does more "stuff"
+    KMMsgBase::seStatus(aStatus, idx); //base does more "stuff"
 }
 
 //-----------------------------------------------------------------------------
diff --git a/kmail/kmmsginfo.h b/kmail/kmmsginfo.h
index 8f557f25..ce15e312 100644
--- a/kmail/kmmsginfo.h
+++ b/kmail/kmmsginfo.h
@@ -91,7 +91,7 @@ public:
   void setMsgSizeServer(size_t sz);
   void setFolderOffset(off_t offs);
   void setFileName(const TQString& file);
-  virtual void setStatus(const KMMsgStatus status, int idx = -1);
+  virtual void seStatus(const KMMsgStatus status, int idx = -1);
   virtual void setDate(time_t aUnixTime);
   virtual void setSubject(const TQString&);
   virtual void setXMark(const TQString&);
@@ -107,7 +107,7 @@ public:
   virtual void setTo( const TQString &to );
 
   /** Grr.. c++! */
-  virtual void setStatus(const char* s1, const char* s2=0) { KMMsgBase::setStatus(s1, s2); }
+  virtual void seStatus(const char* s1, const char* s2=0) { KMMsgBase::seStatus(s1, s2); }
   virtual void setDate(const char* s1) { KMMsgBase::setDate(s1); }
 
   virtual bool dirty(void) const;
diff --git a/kmail/kmmsgpart.cpp b/kmail/kmmsgpart.cpp
index 112236c0..a96d6aae 100644
--- a/kmail/kmmsgpart.cpp
+++ b/kmail/kmmsgpart.cpp
@@ -406,7 +406,7 @@ TQCString KMMessagePart::bodyDecoded(void) const
   //kdWarning( result.length() != (unsigned int)len, 5006 )
   //  << "KMMessagePart::bodyDecoded(): body is binary but used as text!" << endl;
 
-  result = result.replace( "\r\n", "\n" ); // CRLF -> LF conversion
+  result = result.tqreplace( "\r\n", "\n" ); // CRLF -> LF conversion
 
   assert( mBodyDecodedSize < 0 || mBodyDecodedSize == len );
   if ( mBodyDecodedSize < 0 )
@@ -422,7 +422,7 @@ void KMMessagePart::magicSetType(bool aAutoDecode)
   KMimeMagic::self()->setFollowLinks( true ); // is it necessary ?
 
   const TQByteArray body = ( aAutoDecode ) ? bodyDecodedBinary() : mBody ;
-  KMimeMagicResult * result = KMimeMagic::self()->findBufferType( body );
+  KMimeMagicResult * result = KMimeMagic::self()->tqfindBufferType( body );
 
   TQString mimetype = result->mimeType();
   const int sep = mimetype.find('/');
@@ -445,7 +445,7 @@ TQString KMMessagePart::iconName( int size ) const
     if ( fileName.isEmpty() ) fileName = this->name();
     if ( !fileName.isEmpty() )
     {
-      fileName = KMimeType::findByPath( "/tmp/"+fileName, 0, true )->icon( TQString::null, true );
+      fileName = KMimeType::tqfindByPath( "/tmp/"+fileName, 0, true )->icon( TQString::null, true );
     }
   }
 
@@ -558,7 +558,7 @@ TQString KMMessagePart::fileName(void) const
 
   // Allow for multiple filname*0, filename*1, ... params (defined by RFC 2231)
   // in the Content-Disposision
-  if ( mContentDisposition.contains( "filename*", false ) ) {
+  if ( mContentDisposition.tqcontains( "filename*", false ) ) {
 
     // It's RFC 2231 encoded, so extract the file name with the 2231 method
     str = KMMsgBase::extractRFC2231HeaderField( mContentDisposition, "filename" );
diff --git a/kmail/kmmsgpart.h b/kmail/kmmsgpart.h
index 000837c7..85906af5 100644
--- a/kmail/kmmsgpart.h
+++ b/kmail/kmmsgpart.h
@@ -58,17 +58,17 @@ public:
    **/
   void setBodyFromUnicode( const TQString & str );
 
-  /** Returns the body part decoded to unicode.
+  /** Returns the body part decoded to tqunicode.
    **/
   TQString bodyToUnicode(const TQTextCodec* codec=0) const;
 
   /** Returns body as decoded string. Assumes that content-transfer-encoding
-    contains the correct encoding. This routine is meant for binary data.
+    tqcontains the correct encoding. This routine is meant for binary data.
     No trailing 0 is appended. */
   TQByteArray bodyDecodedBinary(void) const;
 
   /** Returns body as decoded string. Assumes that content-transfer-encoding
-      contains the correct encoding. This routine is meant for text strings! */
+      tqcontains the correct encoding. This routine is meant for text strings! */
   TQCString bodyDecoded(void) const;
 
   /** Sets body, encoded in the best fitting
@@ -209,7 +209,7 @@ public:
   /** Sets the part number */
   void setPartSpecifier( const TQString & part ) { mPartSpecifier = part; }
 
-  /** If this part is complete (contains a body) */
+  /** If this part is complete (tqcontains a body) */
   bool isComplete() { return (!mBody.isNull()); }
 
   /** Returns the parent part */
diff --git a/kmail/kmmsgpartdlg.cpp b/kmail/kmmsgpartdlg.cpp
index 4a897291..e87fbd8a 100644
--- a/kmail/kmmsgpartdlg.cpp
+++ b/kmail/kmmsgpartdlg.cpp
@@ -54,7 +54,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
   TQLabel      * label;
   TQString       msg;
 
-  setHelp( TQString::fromLatin1("attachments") );
+  setHelp( TQString::tqfromLatin1("attachments") );
 
   for ( int i = 0 ; i < numEncodingTypes ; ++i )
     mI18nizedEncodings << i18n( encodingTypes[i].displayName );
@@ -73,14 +73,14 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
   mMimeType->setInsertionPolicy( TQComboBox::NoInsertion );
   mMimeType->setValidator( new KMimeTypeValidator( mMimeType ) );
   mMimeType->insertStringList( TQStringList()
-			       << TQString::fromLatin1("text/html")
-			       << TQString::fromLatin1("text/plain")
-			       << TQString::fromLatin1("image/gif")
-			       << TQString::fromLatin1("image/jpeg")
-			       << TQString::fromLatin1("image/png")
-			       << TQString::fromLatin1("application/octet-stream")
-			       << TQString::fromLatin1("application/x-gunzip")
-			       << TQString::fromLatin1("application/zip") );
+			       << TQString::tqfromLatin1("text/html")
+			       << TQString::tqfromLatin1("text/plain")
+			       << TQString::tqfromLatin1("image/gif")
+			       << TQString::tqfromLatin1("image/jpeg")
+			       << TQString::tqfromLatin1("image/png")
+			       << TQString::tqfromLatin1("application/octet-stream")
+			       << TQString::tqfromLatin1("application/x-gunzip")
+			       << TQString::tqfromLatin1("application/zip") );
   connect( mMimeType, TQT_SIGNAL(textChanged(const TQString&)),
 	   this, TQT_SLOT(slotMimeTypeChanged(const TQString&)) );
   glay->addWidget( mMimeType, 0, 1 );
@@ -210,7 +210,7 @@ void KMMsgPartDialog::setMimeType( const TQString & mimeType ) {
 
 void KMMsgPartDialog::setMimeType( const TQString & type,
 				   const TQString & subtype ) {
-  setMimeType( TQString::fromLatin1("%1/%2").arg(type).arg(subtype) );
+  setMimeType( TQString::tqfromLatin1("%1/%2").arg(type).arg(subtype) );
 }
 
 void KMMsgPartDialog::setMimeTypeList( const TQStringList & mimeTypes ) {
@@ -396,7 +396,7 @@ void KMMsgPartDialogCompat::applyChanges()
     if ( name != TQString( encName ) )
       cDisp += "*=" + encName;
     else
-      cDisp += "=\"" + encName.replace( '\\', "\\\\" ).replace( '"', "\\\"" ) + '"';
+      cDisp += "=\"" + encName.tqreplace( '\\', "\\\\" ).tqreplace( '"', "\\\"" ) + '"';
     mMsgPart->setContentDisposition( cDisp );
   }
 
diff --git a/kmail/kmpopfiltercnfrmdlg.cpp b/kmail/kmpopfiltercnfrmdlg.cpp
index 2654f52c..3139aa32 100644
--- a/kmail/kmpopfiltercnfrmdlg.cpp
+++ b/kmail/kmpopfiltercnfrmdlg.cpp
@@ -464,7 +464,7 @@ void KMPopFilterCnfrmDlg::slotToggled(bool aOn)
 
 void KMPopFilterCnfrmDlg::slotUpdateMinimumSize()
 {
-  mainWidget()->setMinimumSize(mainWidget()->sizeHint());
+  mainWidget()->setMinimumSize(mainWidget()->tqsizeHint());
 }
 
 #include "kmpopfiltercnfrmdlg.moc"
diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp
index 2f5227cd..375234c0 100644
--- a/kmail/kmreadermainwin.cpp
+++ b/kmail/kmreadermainwin.cpp
@@ -363,7 +363,7 @@ void KMReaderMainWin::setupAccel()
   KStdAction::copy( this, TQT_SLOT( slotCopy() ), actionCollection() );
   KStdAction::selectAll( this, TQT_SLOT( slotMarkAll() ), actionCollection() );
   KStdAction::find( this, TQT_SLOT(slotFind()), actionCollection() );
-  KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), actionCollection() );
+  KStdAction::tqfindNext( this, TQT_SLOT( slotFindNext() ), actionCollection() );
   mTrashAction = new KAction( KGuiItem( i18n( "&Move to Trash" ), "edittrash",
                               i18n( "Move message to trashcan" ) ),
                               Key_Delete, this, TQT_SLOT( slotTrashMsg() ),
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 21be5a44..0fce722d 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -161,7 +161,7 @@ NewByteArray& NewByteArray::operator+=( const char * newData )
         return *this;
     TQByteArray::detach();
     uint len1 = size();
-    uint len2 = qstrlen( newData );
+    uint len2 = tqstrlen( newData );
     if ( !TQByteArray::resize( len1 + len2 ) )
         return *this;
     memcpy( data() + len1, newData, len2 );
@@ -281,14 +281,14 @@ void KMReaderWin::objectTreeToDecryptedMsg( partNode* node,
 kdDebug(5006) << "dataNode == curNode:  Save curNode without replacing it." << endl;
 
       // A) Store the headers of this part IF curNode is not the root node
-      //    AND we are not replacing a node that already *has* replaced
+      //    AND we are not replacing a node that already *has* tqreplaced
       //    the root node in previous recursion steps of this function...
       if( headers ) {
         if( dataNode->parentNode() && !weAreReplacingTheRootNode ) {
 kdDebug(5006) << "dataNode is NOT replacing the root node:  Store the headers." << endl;
           resultingData += headers->AsString().c_str();
         } else if( weAreReplacingTheRootNode && part && part->hasHeaders() ){
-kdDebug(5006) << "dataNode replace the root node:  Do NOT store the headers but change" << endl;
+kdDebug(5006) << "dataNode tqreplace the root node:  Do NOT store the headers but change" << endl;
 kdDebug(5006) << "                                 the Message's headers accordingly." << endl;
 kdDebug(5006) << "              old Content-Type = " << rootHeaders.ContentType().AsString().c_str() << endl;
 kdDebug(5006) << "              new Content-Type = " << headers->ContentType(   ).AsString().c_str() << endl;
@@ -323,7 +323,7 @@ kdDebug(5006) << "--boundary" << endl;
           resultingData += boundary;
           resultingData += "\n";
           // note: We are processing a harmless multipart that is *not*
-          //       to be replaced by one of it's children, therefor
+          //       to be tqreplaced by one of it's children, therefor
           //       we set their doStoreHeaders to true.
           objectTreeToDecryptedMsg( curNode,
                                     resultingData,
@@ -347,11 +347,11 @@ kdDebug(5006) << "is Simple part or invalid Multipart, storing body data .. DONE
 kdDebug(5006) << "dataNode != curNode:  Replace curNode by dataNode." << endl;
       bool rootNodeReplaceFlag = weAreReplacingTheRootNode || !curNode->parentNode();
       if( rootNodeReplaceFlag ) {
-kdDebug(5006) << "                      Root node will be replaced." << endl;
+kdDebug(5006) << "                      Root node will be tqreplaced." << endl;
       } else {
-kdDebug(5006) << "                      Root node will NOT be replaced." << endl;
+kdDebug(5006) << "                      Root node will NOT be tqreplaced." << endl;
       }
-      // store special data to replace the current part
+      // store special data to tqreplace the current part
       // (e.g. decrypted data or embedded RfC 822 data)
       objectTreeToDecryptedMsg( dataNode,
                                 resultingData,
@@ -1017,24 +1017,24 @@ void KMReaderWin::initHtmlWidget(void)
   connect(mViewer,TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)),
           TQT_SLOT(slotUrlPopup(const TQString &, const TQPoint &)));
   connect( kmkernel->imProxy(), TQT_SIGNAL( sigContactPresenceChanged( const TQString & ) ),
-          this, TQT_SLOT( contactStatusChanged( const TQString & ) ) );
+          this, TQT_SLOT( contacStatusChanged( const TQString & ) ) );
   connect( kmkernel->imProxy(), TQT_SIGNAL( sigPresenceInfoExpired() ),
           this, TQT_SLOT( updateReaderWin() ) );
 }
 
-void KMReaderWin::contactStatusChanged( const TQString &uid)
+void KMReaderWin::contacStatusChanged( const TQString &uid)
 {
 //  kdDebug( 5006 ) << k_funcinfo << " got a presence change for " << uid << endl;
   // get the list of nodes for this contact from the htmlView
   DOM::NodeList presenceNodes = mViewer->htmlDocument()
-    .getElementsByName( DOM::DOMString( TQString::fromLatin1("presence-") + uid ) );
+    .getElementsByName( DOM::DOMString( TQString::tqfromLatin1("presence-") + uid ) );
   for ( unsigned int i = 0; i < presenceNodes.length(); ++i ) {
     DOM::Node n =  presenceNodes.item( i );
     kdDebug( 5006 ) << "name is " << n.nodeName().string() << endl;
     kdDebug( 5006 ) << "value of content was " << n.firstChild().nodeValue().string() << endl;
     TQString newPresence = kmkernel->imProxy()->presenceString( uid );
     if ( newPresence.isNull() ) // KHTML crashes if you setNodeValue( TQString::null )
-      newPresence = TQString::fromLatin1( "ENOIMRUNNING" );
+      newPresence = TQString::tqfromLatin1( "ENOIMRUNNING" );
     n.firstChild().setNodeValue( newPresence );
 //    kdDebug( 5006 ) << "value of content is now " << n.firstChild().nodeValue().string() << endl;
   }
@@ -1423,7 +1423,7 @@ void KMReaderWin::updateReaderWin()
   {
     TQScrollView * scrollview = static_cast<TQScrollView *>(mViewer->widget());
     scrollview->setContentsPos( 0,
-      qRound( scrollview->contentsHeight() * mSavedRelativePosition ) );
+      tqRound( scrollview->contentsHeight() * mSavedRelativePosition ) );
     mSavedRelativePosition = 0;
   }
 }
@@ -1653,7 +1653,7 @@ kdDebug(5006) << "KMReaderWin  -  composing unencrypted message" << endl;
 
   if( emitReplaceMsgByUnencryptedVersion ) {
     kdDebug(5006) << "KMReaderWin  -  invoce saving in decrypted form:" << endl;
-    emit replaceMsgByUnencryptedVersion();
+    emit tqreplaceMsgByUnencryptedVersion();
   } else {
     kdDebug(5006) << "KMReaderWin  -  finished parsing and displaying of message." << endl;
     showHideMimeTree( rootNodeCntType == DwMime::kTypeText &&
@@ -1805,7 +1805,7 @@ void KMReaderWin::slotTouchMessage()
 
   SerNumList serNums;
   serNums.append( message()->getMsgSerNum() );
-  KMCommand *command = new KMSetStatusCommand( KMMsgStatusRead, serNums );
+  KMCommand *command = new KMSeStatusCommand( KMMsgStatusRead, serNums );
   command->start();
 
   // should we send an MDN?
@@ -1892,7 +1892,7 @@ void KMReaderWin::slotUrlOn(const TQString &aUrl)
   }
 
   if ( aUrl.stripWhiteSpace().isEmpty() ) {
-    KPIM::BroadcastStatus::instance()->reset();
+    KPIM::BroadcasStatus::instance()->reset();
     mHoveredUrl = KURL();
     mLastClickImagePath = TQString();
     return;
@@ -1903,7 +1903,7 @@ void KMReaderWin::slotUrlOn(const TQString &aUrl)
   const TQString msg = URLHandlerManager::instance()->statusBarMessage( url, this );
 
   kdWarning( msg.isEmpty(), 5006 ) << "KMReaderWin::slotUrlOn(): Unhandled URL hover!" << endl;
-  KPIM::BroadcastStatus::instance()->setTransientStatusMsg( msg );
+  KPIM::BroadcasStatus::instance()->setTransienStatusMsg( msg );
 }
 
 
@@ -2000,9 +2000,9 @@ void KMReaderWin::setStyleDependantFrameWidth()
   // set the width of the frame to a reasonable value for the current GUI style
   int frameWidth;
   if( style().isA("KeramikStyle") )
-    frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
+    frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
   else
-    frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth );
+    frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth );
   if ( frameWidth < 0 )
     frameWidth = 0;
   if ( frameWidth != mBox->lineWidth() )
@@ -2050,13 +2050,13 @@ void KMReaderWin::slotHandleAttachment( int choice )
 //-----------------------------------------------------------------------------
 void KMReaderWin::slotFind()
 {
-  mViewer->findText();
+  mViewer->tqfindText();
 }
 
 //-----------------------------------------------------------------------------
 void KMReaderWin::slotFindNext()
 {
-  mViewer->findTextNext();
+  mViewer->tqfindTextNext();
 }
 
 //-----------------------------------------------------------------------------
@@ -2190,8 +2190,8 @@ void KMReaderWin::setMsgPart( KMMessagePart* aMsgPart, bool aHTML,
     // A TQString cannot handle binary data. So if it's shorter than the
     // attachment, we assume the attachment is binary:
     if( str.length() < (unsigned) aMsgPart->decodedSize() ) {
-      str.prepend( i18n("[KMail: Attachment contains binary data. Trying to show first character.]",
-          "[KMail: Attachment contains binary data. Trying to show first %n characters.]",
+      str.prepend( i18n("[KMail: Attachment tqcontains binary data. Trying to show first character.]",
+          "[KMail: Attachment tqcontains binary data. Trying to show first %n characters.]",
           str.length()) + TQChar('\n') );
     }
     htmlWriter()->queue( TQStyleSheet::escape( str ) );
@@ -2267,16 +2267,16 @@ void KMReaderWin::openAttachment( int id, const TQString & name )
   // determine the MIME type of the attachment
   KMimeType::Ptr mimetype;
   // prefer the value of the Content-Type header
-  mimetype = KMimeType::mimeType( TQString::fromLatin1( contentTypeStr ) );
+  mimetype = KMimeType::mimeType( TQString::tqfromLatin1( contentTypeStr ) );
   if ( mimetype->name() == "application/octet-stream" ) {
     // consider the filename if Content-Type is application/octet-stream
-    mimetype = KMimeType::findByPath( name, 0, true /* no disk access */ );
+    mimetype = KMimeType::tqfindByPath( name, 0, true /* no disk access */ );
   }
   if ( ( mimetype->name() == "application/octet-stream" )
        && msgPart.isComplete() ) {
     // consider the attachment's contents if neither the Content-Type header
     // nor the filename give us a clue
-    mimetype = KMimeType::findByFileContent( name );
+    mimetype = KMimeType::tqfindByFileContent( name );
   }
 
   KService::Ptr offer =
@@ -2297,7 +2297,7 @@ void KMReaderWin::openAttachment( int id, const TQString & name )
                        .arg( filenameText );
   const int choice = KMessageBox::questionYesNoCancel( this, text,
       i18n("Open Attachment?"), KStdGuiItem::saveAs(), open_text,
-      TQString::fromLatin1("askSave") + mimetype->name() ); // dontAskAgainName
+      TQString::tqfromLatin1("askSave") + mimetype->name() ); // dontAskAgainName
 
   if( choice == KMessageBox::Yes ) {		// Save
     mAtmUpdate = true;
@@ -2738,7 +2738,7 @@ void KMReaderWin::fillCommandInfo( partNode *node, KMMessage **msg, int *nodeId
 void KMReaderWin::slotDeleteAttachment(partNode * node)
 {
   if ( KMessageBox::warningContinueCancel( this,
-       i18n("Deleting an attachment might invalidate any digital signature on this message."),
+       i18n("Deleting an attachment might tqinvalidate any digital signature on this message."),
        i18n("Delete Attachment"), KStdGuiItem::del(), "DeleteAttachmentSignatureWarning" )
      != KMessageBox::Continue ) {
     return;
@@ -2794,7 +2794,7 @@ void KMReaderWin::disconnectMsgAdded()
 void KMReaderWin::slotEditAttachment(partNode * node)
 {
   if ( KMessageBox::warningContinueCancel( this,
-        i18n("Modifying an attachment might invalidate any digital signature on this message."),
+        i18n("Modifying an attachment might tqinvalidate any digital signature on this message."),
         i18n("Edit Attachment"), KGuiItem( i18n("Edit"), "edit" ), "EditAttachmentSignatureWarning" )
         != KMessageBox::Continue ) {
     return;
@@ -2828,7 +2828,7 @@ void KMReaderWin::scrollToAttachment( const partNode *node )
   DOM::Document doc = mViewer->htmlDocument();
 
   // The anchors for this are created in ObjectTreeParser::parseObjectTree()
-  mViewer->gotoAnchor( TQString::fromLatin1( "att%1" ).arg( node->nodeId() ) );
+  mViewer->gotoAnchor( TQString::tqfromLatin1( "att%1" ).arg( node->nodeId() ) );
 
   // Remove any old color markings which might be there
   const partNode *root = node->topLevelParent();
@@ -2889,7 +2889,7 @@ void KMReaderWin::injectAttachments()
     link += "<div style=\"text-align: left;\"><a href=\"" + urlHandle + "\"><img src=\"" +
             imgpath + imgSrc + "\"/></a></div>";
     html.prepend( link );
-    html.prepend( TQString::fromLatin1( "<div style=\"float:left;\">%1&nbsp;</div>" ).
+    html.prepend( TQString::tqfromLatin1( "<div style=\"float:left;\">%1&nbsp;</div>" ).
                   arg( i18n( "Attachments:" ) ) );
   } else {
     link += "<div style=\"text-align: right;\"><a href=\"" + urlHandle + "\"><img src=\"" +
@@ -2930,7 +2930,7 @@ TQString KMReaderWin::renderAttachments(partNode * node, const TQColor &bgColor
       if ( headerStyle() == HeaderStyle::enterprise() )
         align = "right";
       if ( node->msgPart().typeStr().lower() == "message" || node == mRootNode )
-        html += TQString::fromLatin1("<div style=\"background:%1; %2"
+        html += TQString::tqfromLatin1("<div style=\"background:%1; %2"
                 "vertical-align:middle; float:%3; %4\">").arg( bgColor.name() ).arg( margin )
                                                          .arg( align ).arg( visibility );
       html += subHtml;
@@ -2941,11 +2941,11 @@ TQString KMReaderWin::renderAttachments(partNode * node, const TQColor &bgColor
     partNode::AttachmentDisplayInfo info = node->attachmentDisplayInfo();
     if ( info.displayInHeader ) {
       html += "<div style=\"float:left;\">";
-      html += TQString::fromLatin1( "<span style=\"white-space:nowrap; border-width: 0px; border-left-width: 5px; border-color: %1; 2px; border-left-style: solid;\">" ).arg( bgColor.name() );
+      html += TQString::tqfromLatin1( "<span style=\"white-space:nowrap; border-width: 0px; border-left-width: 5px; border-color: %1; 2px; border-left-style: solid;\">" ).arg( bgColor.name() );
       TQString fileName = writeMessagePartToTempFile( &node->msgPart(), node->nodeId() );
       TQString href = node->asHREF( "header" );
-      html += TQString::fromLatin1( "<a href=\"" ) + href +
-              TQString::fromLatin1( "\">" );
+      html += TQString::tqfromLatin1( "<a href=\"" ) + href +
+              TQString::tqfromLatin1( "\">" );
       html += "<img style=\"vertical-align:middle;\" src=\"" + info.icon + "\"/>&nbsp;";
       if ( headerStyle() == HeaderStyle::enterprise() ) {
         TQFont bodyFont = mCSSHelper->bodyFont( isFixedFont() );
diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h
index 32c7abdf..27bc33b0 100644
--- a/kmail/kmreaderwin.h
+++ b/kmail/kmreaderwin.h
@@ -323,7 +323,7 @@ public:
   /* show or hide the list that points to the attachments */
   void setShowAttachmentQuicklist( bool showAttachmentQuicklist = true ) { mShowAttachmentQuicklist = showAttachmentQuicklist; }
 
-  // This controls whether a Toltec invitation is shown in its raw form or as a replacement text.
+  // This controls whether a Toltec invitation is shown in its raw form or as a tqreplacement text.
   // This can be toggled with the "kmail:showRawToltecMail" link.
   bool showRawToltecMail() const { return mShowRawToltecMail; }
   void setShowRawToltecMail( bool showRawToltecMail ) { mShowRawToltecMail = showRawToltecMail; }
@@ -331,9 +331,9 @@ public:
   /* retrieve BodyPartMemento of id \a which for partNode \a node */
   KMail::Interface::BodyPartMemento * bodyPartMemento( const partNode * node, const TQCString & which ) const;
 
-  /* set/replace BodyPartMemento \a memento of id \a which for
+  /* set/tqreplace BodyPartMemento \a memento of id \a which for
      partNode \a node. If there was a BodyPartMemento registered
-     already, replaces (deletes) that one. */
+     already, tqreplaces (deletes) that one. */
   void setBodyPartMemento( const partNode * node, const TQCString & which, KMail::Interface::BodyPartMemento * memento );
 
   /// Scrolls to the given attachment and marks it with a yellow border
@@ -347,7 +347,7 @@ private:
 signals:
   /** Emitted after parsing of a message to have it stored
       in unencrypted state in it's folder. */
-  void replaceMsgByUnencryptedVersion();
+  void tqreplaceMsgByUnencryptedVersion();
 
   /** The user presses the right mouse button. 'url' may be 0. */
   void popupMenu(KMMessage &msg, const KURL &url, const TQPoint& mousePos);
@@ -369,7 +369,7 @@ public slots:
   /** Refresh the reader window */
   void updateReaderWin();
 
-  /** HTML Widget scrollbar and layout handling. */
+  /** HTML Widget scrollbar and tqlayout handling. */
   void slotScrollUp();
   void slotScrollDown();
   void slotScrollPrior();
@@ -420,7 +420,7 @@ public slots:
   void slotMessageArrived( KMMessage *msg );
   /** start IM Chat with addressee */
   void slotIMChat();
-  void contactStatusChanged( const TQString &uid);
+  void contacStatusChanged( const TQString &uid);
 
   void slotLevelQuote( int l );
   void slotTouchMessage();
diff --git a/kmail/kmsearchpattern.cpp b/kmail/kmsearchpattern.cpp
index 3d97a2b3..dc2cc4a1 100644
--- a/kmail/kmsearchpattern.cpp
+++ b/kmail/kmsearchpattern.cpp
@@ -33,7 +33,7 @@ using KMail::FilterLog;
 #include <assert.h>
 
 static const char* funcConfigNames[] =
-  { "contains", "contains-not", "equals", "not-equal", "regexp",
+  { "tqcontains", "tqcontains-not", "equals", "not-equal", "regexp",
     "not-regexp", "greater", "less-or-equal", "less", "greater-or-equal",
     "is-in-addressbook", "is-not-in-addressbook" , "is-in-category", "is-not-in-category",
     "has-attachment", "has-no-attachment"};
@@ -294,11 +294,11 @@ bool KMSearchRuleString::matches( const DwString & aStr, KMMessage & msg,
     static const DwBoyerMoore to("\nTo: ");
     static const DwBoyerMoore cc("\nCc: ");
     static const DwBoyerMoore bcc("\nBcc: ");
-    // <recipients> "contains" "foo" is true if any of the fields contains
+    // <recipients> "tqcontains" "foo" is true if any of the fields tqcontains
     // "foo", while <recipients> "does not contain" "foo" is true if none
-    // of the fields contains "foo"
+    // of the fields tqcontains "foo"
     if ( ( function() & 1 ) == 0 ) {
-      // positive function, e.g. "contains"
+      // positive function, e.g. "tqcontains"
       rc = ( matches( aStr, msg, &to, 2 ) ||
              matches( aStr, msg, &cc, 2 ) ||
              matches( aStr, msg, &bcc, 3 ) );
@@ -357,7 +357,7 @@ bool KMSearchRuleString::matches( const KMMessage * msg ) const
     msgContents = msg->headerAsString();
     logContents = false;
   } else if ( field() == "<recipients>" ) {
-    // (mmutz 2001-11-05) hack to fix "<recipients> !contains foo" to
+    // (mmutz 2001-11-05) hack to fix "<recipients> !tqcontains foo" to
     // meet user's expectations. See FAQ entry in KDE 2.2.2's KMail
     // handbook
     if ( function() == FuncEquals || function() == FuncNotEqual )
@@ -455,7 +455,7 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const
     for( TQStringList::ConstIterator it = addressList.begin();
          ( it != addressList.end() );
          ++it ) {
-      if ( !stdAb->findByEmail( KPIM::getEmailAddress( *it ) ).isEmpty() )
+      if ( !stdAb->tqfindByEmail( KPIM::getEmailAddress( *it ) ).isEmpty() )
         return true;
     }
     return false;
@@ -468,7 +468,7 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const
     for( TQStringList::ConstIterator it = addressList.begin();
          ( it != addressList.end() );
          ++it ) {
-      if ( stdAb->findByEmail( KPIM::getEmailAddress( *it ) ).isEmpty() )
+      if ( stdAb->tqfindByEmail( KPIM::getEmailAddress( *it ) ).isEmpty() )
         return true;
     }
     return false;
@@ -481,7 +481,7 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const
 
     for( TQStringList::ConstIterator it = addressList.begin();
       it != addressList.end(); ++it ) {
-        KABC::Addressee::List addresses = stdAb->findByEmail( KPIM::getEmailAddress( *it ) );
+        KABC::Addressee::List addresses = stdAb->tqfindByEmail( KPIM::getEmailAddress( *it ) );
 
           for ( KABC::Addressee::List::Iterator itAd = addresses.begin(); itAd != addresses.end(); ++itAd )
               if ( (*itAd).hasCategory(category) )
@@ -498,7 +498,7 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const
 
       for( TQStringList::ConstIterator it = addressList.begin();
         it != addressList.end(); ++it ) {
-          KABC::Addressee::List addresses = stdAb->findByEmail( KPIM::getEmailAddress( *it ) );
+          KABC::Addressee::List addresses = stdAb->tqfindByEmail( KPIM::getEmailAddress( *it ) );
 
             for ( KABC::Addressee::List::Iterator itAd = addresses.begin(); itAd != addresses.end(); ++itAd )
                 if ( (*itAd).hasCategory(category) )
@@ -550,7 +550,7 @@ bool KMSearchRuleNumerical::matches( const KMMessage * msg ) const
   } else if ( field() == "<age in days>" ) {
     TQDateTime msgDateTime;
     msgDateTime.setTime_t( msg->date() );
-    numericalMsgContents = msgDateTime.daysTo( TQDateTime::currentDateTime() );
+    numericalMsgContents = msgDateTime.daysTo( TQDateTime::tqcurrentDateTime() );
     numericalValue = contents().toInt();
     msgContents.setNum( numericalMsgContents );
   }
@@ -775,7 +775,7 @@ bool KMSearchPattern::matches( const DwString & aStr, bool ignoreBody ) const
   }
 }
 
-bool KMSearchPattern::matches( Q_UINT32 serNum, bool ignoreBody ) const
+bool KMSearchPattern::matches( TQ_UINT32 serNum, bool ignoreBody ) const
 {
   if ( isEmpty() )
     return true;
diff --git a/kmail/kmsearchpattern.h b/kmail/kmsearchpattern.h
index 45ffe680..a79b6122 100644
--- a/kmail/kmsearchpattern.h
+++ b/kmail/kmsearchpattern.h
@@ -90,7 +90,7 @@ public:
 
   /** Determine whether the rule is worth considering. It isn't if
       either the field is not set or the contents is empty.
-      KFilter should make sure that it's rule list contains
+      KFilter should make sure that it's rule list tqcontains
       only non-empty rules, as matches doesn't check this. */
   virtual bool isEmpty() const = 0;
 
@@ -299,7 +299,7 @@ public:
     under which it could be stored in the config file.
 
     As a TQPtrList with autoDelete enabled, it assumes that it is the
-    central repository for the rules it contains. So if you want to
+    central repository for the rules it tqcontains. So if you want to
     reuse a rule in another pattern, make a deep copy of that rule.
 
     @short An abstraction of a search over messages.
@@ -339,7 +339,7 @@ public:
   */
   bool matches( const KMMessage * msg, bool ignoreBody = false ) const;
   bool matches( const DwString & str, bool ignoreBody = false ) const;
-  bool matches( Q_UINT32 sernum, bool ignoreBody = false ) const;
+  bool matches( TQ_UINT32 sernum, bool ignoreBody = false ) const;
 
   /** Returns true if the pattern only depends the DwString that backs
       a message */
diff --git a/kmail/kmsearchpatternedit.cpp b/kmail/kmsearchpatternedit.cpp
index 399bc0e1..5f7c96cb 100644
--- a/kmail/kmsearchpatternedit.cpp
+++ b/kmail/kmsearchpatternedit.cpp
@@ -106,12 +106,12 @@ void KMSearchRuleWidget::initWidget()
   // initialize the function/value widget stack
   mFunctionStack = new TQWidgetStack( this, "mFunctionStack" );
   //Don't expand the widget in vertical direction
-  mFunctionStack->setSizePolicy( TQSizePolicy::Preferred,TQSizePolicy::Fixed );
+  mFunctionStack->tqsetSizePolicy( TQSizePolicy::Preferred,TQSizePolicy::Fixed );
 
   hlay->addWidget( mFunctionStack );
 
   mValueStack = new TQWidgetStack( this, "mValueStack" );
-  mValueStack->setSizePolicy( TQSizePolicy::Preferred,TQSizePolicy::Fixed );
+  mValueStack->tqsetSizePolicy( TQSizePolicy::Preferred,TQSizePolicy::Fixed );
   hlay->addWidget( mValueStack );
   hlay->setStretchFactor( mValueStack, 10 );
 
@@ -143,7 +143,7 @@ void KMSearchRuleWidget::setRule( KMSearchRule *aRule )
   mRuleField->blockSignals( true );
 
   if ( i < 0 ) { // not found -> user defined field
-    mRuleField->changeItem( TQString::fromLatin1( aRule->field() ), 0 );
+    mRuleField->changeItem( TQString::tqfromLatin1( aRule->field() ), 0 );
     i = 0;
   } else { // found in the list of predefined fields
     mRuleField->changeItem( TQString::null, 0 );
diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp
index 7f7730da..208bf574 100644
--- a/kmail/kmsender.cpp
+++ b/kmail/kmsender.cpp
@@ -77,10 +77,10 @@ KMSender::~KMSender()
 }
 
 //-----------------------------------------------------------------------------
-void KMSender::setStatusMsg(const TQString &msg)
+void KMSender::seStatusMsg(const TQString &msg)
 {
   if ( mProgressItem )
-    mProgressItem->setStatus(msg);
+    mProgressItem->seStatus(msg);
 }
 
 //-----------------------------------------------------------------------------
@@ -164,7 +164,7 @@ bool KMSender::doSend(KMMessage* aMsg, short sendNow)
   KMFolder * const outbox = kmkernel->outboxFolder();
   const KMFolderOpener openOutbox( outbox, "outbox" );
 
-  aMsg->setStatus(KMMsgStatusQueued);
+  aMsg->seStatus(KMMsgStatusQueued);
 
   if ( const int err = outbox->addMsg(aMsg) ) {
     Q_UNUSED( err );
@@ -178,7 +178,7 @@ bool KMSender::doSend(KMMessage* aMsg, short sendNow)
    * the mail is in a sane state before sending. The unGet makes the
    * attached unencrypted version of the mail (if there is one ) disappear.
    * though, so we need to make sure to keep it around and restore it
-   * afterwards. The real fix would be to replace the unGet with
+   * afterwards. The real fix would be to tqreplace the unGet with
    * whatever parsing is triggered by it, but I'm too chicken to do that,
    * in this branch.
    * Note that the unencrypted mail will be lost if the mail remains in
@@ -293,7 +293,7 @@ void KMSender::doSendMsg()
   {
     mCurrentMsg->setTransferInProgress( false );
     if( mCurrentMsg->hasUnencryptedMsg() ) {
-      kdDebug(5006) << "KMSender::doSendMsg() post-processing: replace mCurrentMsg body by unencryptedMsg data" << endl;
+      kdDebug(5006) << "KMSender::doSendMsg() post-processing: tqreplace mCurrentMsg body by unencryptedMsg data" << endl;
       // delete all current body parts
       mCurrentMsg->deleteBodyParts();
       // copy Content-[..] headers from unencrypted message to current one
@@ -314,8 +314,8 @@ void KMSender::doSendMsg()
         mCurrentMsg->addBodyPart( &msgPart );
       }
     }
-    mCurrentMsg->setStatus(KMMsgStatusSent);
-    mCurrentMsg->setStatus(KMMsgStatusRead); // otherwise it defaults to new on imap
+    mCurrentMsg->seStatus(KMMsgStatusSent);
+    mCurrentMsg->seStatus(KMMsgStatusRead); // otherwise it defaults to new on imap
     mCurrentMsg->updateAttachmentState();
     mCurrentMsg->updateInvitationState();
 
@@ -400,7 +400,7 @@ void KMSender::doSendMsg()
     default:
       break;
     }
-    setStatusByLink( mCurrentMsg );
+    seStatusByLink( mCurrentMsg );
     if (mCurrentMsg->parent() && !imapSentFolder) {
       // for speed optimization, this code assumes that mCurrentMsg is the
       // last one in it's parent folder; make sure that's really the case:
@@ -450,11 +450,11 @@ void KMSender::doSendMsg()
         sentFolder->close("sentFolder");
     if ( someSent ) {
       if ( mSentMessages == mTotalMessages ) {
-        setStatusMsg(i18n("%n queued message successfully sent.",
+        seStatusMsg(i18n("%n queued message successfully sent.",
                           "%n queued messages successfully sent.",
                           mSentMessages));
       } else {
-        setStatusMsg(i18n("%1 of %2 queued messages successfully sent.")
+        seStatusMsg(i18n("%1 of %2 queued messages successfully sent.")
             .arg(mSentMessages).arg( mTotalMessages ));
       }
     }
@@ -536,7 +536,7 @@ void KMSender::doSendMsg()
 }
 
 bool KMSender::runPrecommand( const TQString & cmd ) {
-  setStatusMsg( i18n("Executing precommand %1").arg( cmd ) );
+  seStatusMsg( i18n("Executing precommand %1").arg( cmd ) );
   mPrecommand = new KMPrecommand( cmd );
   connect( mPrecommand, TQT_SIGNAL(finished(bool)),
            TQT_SLOT(slotPrecommandFinished(bool)) );
@@ -554,7 +554,7 @@ void KMSender::sendProcStarted(bool success)
     if (mSendProc)
        mSendProc->finish();
     else
-      setStatusMsg(i18n("Unrecognized transport protocol. Unable to send message."));
+      seStatusMsg(i18n("Unrecognized transport protocol. Unable to send message."));
     mSendProc = 0;
     mSendProcStarted = false;
     cleanup();
@@ -595,7 +595,7 @@ void KMSender::doSendMsgAux()
 
   // start sending the current message
 
-  setStatusMsg(i18n("%3: subject of message","Sending message %1 of %2: %3")
+  seStatusMsg(i18n("%3: subject of message","Sending message %1 of %2: %3")
 	       .arg(mSentMessages+mFailedMessages+1).arg(mTotalMessages)
 	       .arg(mCurrentMsg->subject()));
   TQStringList to, cc, bcc;
@@ -614,7 +614,7 @@ void KMSender::doSendMsgAux()
       mOutboxFolder->unGetMsg( mFailedMessages );
     mCurrentMsg = 0;
     cleanup();
-    setStatusMsg(i18n("Failed to send (some) queued messages."));
+    seStatusMsg(i18n("Failed to send (some) queued messages."));
     return;
   }
   // Do *not* add code here, after send(). It can happen that this method
@@ -699,7 +699,7 @@ void KMSender::slotIdle()
       .arg(errString)
       .arg(mMethodStr);
     if (!errString.isEmpty()) KMessageBox::error(0,msg);
-    setStatusMsg( i18n( "Sending aborted." ) );
+    seStatusMsg( i18n( "Sending aborted." ) );
   } else {
     if (!mSendProc->sendOk()) {
       if ( mCurrentMsg )
@@ -744,7 +744,7 @@ void KMSender::slotIdle()
           doSendMsg();
           return;
         } else {
-          setStatusMsg( i18n( "Sending aborted." ) );
+          seStatusMsg( i18n( "Sending aborted." ) );
         }
       }
     } else {
@@ -845,7 +845,7 @@ KMSendProc* KMSender::createSendProcFromString( const TQString & transport )
 }
 
 //-----------------------------------------------------------------------------
-void KMSender::setStatusByLink(const KMMessage *aMsg)
+void KMSender::seStatusByLink(const KMMessage *aMsg)
 {
   int n = 0;
   while (1) {
@@ -867,7 +867,7 @@ void KMSender::setStatusByLink(const KMMessage *aMsg)
           new KMDeleteMsgCommand( folder, folder->getMsg( index ) );
         cmd->start();
       } else {
-        folder->setStatus(index, status);
+        folder->seStatus(index, status);
       }
     } else {
       kdWarning(5006) << k_funcinfo << "Cannot update linked message, it could not be found!" << endl;
@@ -905,7 +905,7 @@ void KMSendProc::failed(const TQString &aMsg)
 //-----------------------------------------------------------------------------
 void KMSendProc::statusMsg(const TQString& aMsg)
 {
-  if (mSender) mSender->setStatusMsg(aMsg);
+  if (mSender) mSender->seStatusMsg(aMsg);
 }
 
 //=============================================================================
@@ -1019,7 +1019,7 @@ void KMSendSendmail::receivedStderr(KProcess *proc, char *buffer, int buflen)
 {
   assert(proc!=0);
   Q_UNUSED( proc );
-  mLastErrorMessage.replace(mLastErrorMessage.length(), buflen, buffer);
+  mLastErrorMessage.tqreplace(mLastErrorMessage.length(), buflen, buffer);
 }
 
 
@@ -1139,7 +1139,7 @@ bool KMSendSMTP::doSend( const TQString & sender, const TQStringList & to, const
   if ( mMessageLength )
     // allow +5% for subsequent LF->CRLF and dotstuffing (an average
     // over 2G-lines gives an average line length of 42-43):
-    query += "&size=" + TQString::number( qRound( mMessageLength * 1.05 ) );
+    query += "&size=" + TQString::number( tqRound( mMessageLength * 1.05 ) );
 
   destination.setPath("/send");
   destination.setQuery( query );
diff --git a/kmail/kmsender.h b/kmail/kmsender.h
index 9771e992..600737fe 100644
--- a/kmail/kmsender.h
+++ b/kmail/kmsender.h
@@ -104,10 +104,10 @@ public:
 
 private:
   /** sets a status msg and emits statusMsg() */
-  void setStatusMsg(const TQString&);
+  void seStatusMsg(const TQString&);
 
   /** sets replied/forwarded status in the linked message for @p aMsg. */
-  void setStatusByLink(const KMMessage *aMsg);
+  void seStatusByLink(const KMMessage *aMsg);
 
   /** Emit progress info - calculates a percent value based on the amount of bytes sent */
   void emitProgressInfo( int currentFileProgress );
diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp
index f0a560e5..9007fe1a 100644
--- a/kmail/kmstartup.cpp
+++ b/kmail/kmstartup.cpp
@@ -200,8 +200,8 @@ void lockOrDie() {
                    "can cause the loss of mail. You should not start %1 "
                    "unless you are sure that it is not already running.")
               .arg( programName, programName );
-              // TQString::arg( st ) only replaces the first occurrence of %1
-              // with st while TQString::arg( s1, s2 ) replacess all occurrences
+              // TQString::arg( st ) only tqreplaces the first occurrence of %1
+              // with st while TQString::arg( s1, s2 ) tqreplacess all occurrences
               // of %1 with s1 and all occurrences of %2 with s2. So don't
               // even think about changing the above to .arg( programName ).
       else
diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
index 8dc4eee9..f10faabe 100644
--- a/kmail/kmsystemtray.cpp
+++ b/kmail/kmsystemtray.cpp
@@ -67,7 +67,7 @@ KMSystemTray::KMSystemTray(TQWidget *parent, const char *name)
     mNewMessagePopupId(-1),
     mPopupMenu(0)
 {
-  setAlignment( AlignCenter );
+  tqsetAlignment( AlignCenter );
   kdDebug(5006) << "Initting systray" << endl;
 
   mLastUpdate = time( 0 );
@@ -81,7 +81,7 @@ KMSystemTray::KMSystemTray(TQWidget *parent, const char *name)
 
   KMMainWidget * mainWidget = kmkernel->getKMMainWidget();
   if ( mainWidget ) {
-    TQWidget * mainWin = mainWidget->topLevelWidget();
+    TQWidget * mainWin = mainWidget->tqtopLevelWidget();
     if ( mainWin ) {
       mDesktopOfMainWin = KWin::windowInfo( mainWin->winId(),
                                             NET::WMDesktop ).desktop();
@@ -133,7 +133,7 @@ void KMSystemTray::buildPopupMenu()
     action->plug( mPopupMenu );
   mPopupMenu->insertSeparator();
 
-  KMainWindow *mainWin = ::qt_cast<KMainWindow*>(kmkernel->getKMMainWidget()->topLevelWidget());
+  KMainWindow *mainWin = ::qt_cast<KMainWindow*>(kmkernel->getKMMainWidget()->tqtopLevelWidget());
   mPopupMenu->insertItem( SmallIcon("exit"), i18n("&Quit"), this, TQT_SLOT(maybeQuit()) );
 }
 
@@ -385,7 +385,7 @@ bool KMSystemTray::mainWindowIsOnCurrentDesktop()
   if ( !mainWidget )
     return false;
 
-  TQWidget *mainWin = kmkernel->getKMMainWidget()->topLevelWidget();
+  TQWidget *mainWin = kmkernel->getKMMainWidget()->tqtopLevelWidget();
   if ( !mainWin )
     return false;
 
@@ -401,7 +401,7 @@ void KMSystemTray::showKMail()
 {
   if (!kmkernel->getKMMainWidget())
     return;
-  TQWidget *mainWin = kmkernel->getKMMainWidget()->topLevelWidget();
+  TQWidget *mainWin = kmkernel->getKMMainWidget()->tqtopLevelWidget();
   assert(mainWin);
   if(mainWin)
   {
@@ -429,7 +429,7 @@ void KMSystemTray::hideKMail()
 {
   if (!kmkernel->getKMMainWidget())
     return;
-  TQWidget *mainWin = kmkernel->getKMMainWidget()->topLevelWidget();
+  TQWidget *mainWin = kmkernel->getKMMainWidget()->tqtopLevelWidget();
   assert(mainWin);
   if(mainWin)
   {
diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp
index a5bf6b9c..dce1ccf0 100644
--- a/kmail/kmtransport.cpp
+++ b/kmail/kmtransport.cpp
@@ -291,7 +291,7 @@ KMTransportDialog::KMTransportDialog( const TQString & caption,
 {
   assert(transportInfo != 0);
 
-  if( transportInfo->type == TQString::fromLatin1("sendmail") )
+  if( transportInfo->type == TQString::tqfromLatin1("sendmail") )
   {
     makeSendmailPage();
   } else {
@@ -479,7 +479,7 @@ void KMTransportDialog::makeSmtpPage()
                        "a custom hostname when identifying itself "
                        "to the mail server."
                        "<p>This is useful when your system's hostname "
-                       "may not be set correctly or to mask your "
+                       "may not be set correctly or to tqmask your "
                        "system's true hostname."));
 
   mSmtp.localHostnameLabel = new TQLabel( i18n("Hos&tname:"), page1 );
@@ -522,7 +522,7 @@ void KMTransportDialog::makeSmtpPage()
   mSmtp.authDigestMd5 = new TQRadioButton( i18n("&DIGEST-MD5"), mSmtp.authGroup );
   mSmtp.authNTLM = new TQRadioButton( i18n("&NTLM"), mSmtp.authGroup );
   mSmtp.authGSSAPI = new TQRadioButton( i18n("&GSSAPI"), mSmtp.authGroup );
-  if ( KProtocolInfo::capabilities("smtp").contains("SASL") == 0 ) {
+  if ( KProtocolInfo::capabilities("smtp").tqcontains("SASL") == 0 ) {
     mSmtp.authNTLM->hide();
     mSmtp.authGSSAPI->hide();
   }
diff --git a/kmail/korghelper.cpp b/kmail/korghelper.cpp
index 789d85ea..adec1399 100644
--- a/kmail/korghelper.cpp
+++ b/kmail/korghelper.cpp
@@ -29,18 +29,18 @@ void KMail::KorgHelper::ensureRunning()
 {
   TQString error;
   TQCString dcopService;
-  int result = KDCOPServiceStarter::self()->findServiceFor( "DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService );
+  int result = KDCOPServiceStarter::self()->tqfindServiceFor( "DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService );
   if ( result == 0 ) {
     // OK, so korganizer (or kontact) is running. Now ensure the object we want is available
     // [that's not the case when kontact was already running, but korganizer not loaded into it...]
     static const char* const dcopObjectId = "KOrganizerIface";
     TQCString dummy;
-    if ( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
+    if ( !kapp->dcopClient()->tqfindObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
       DCOPRef ref( dcopService, dcopService ); // talk to the KUniqueApplication or its kontact wrapper
       DCOPReply reply = ref.call( "load()" );
       if ( reply.isValid() && (bool)reply ) {
         kdDebug() << "Loaded " << dcopService << " successfully" << endl;
-        Q_ASSERT( kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
+        Q_ASSERT( kapp->dcopClient()->tqfindObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
       } else
         kdWarning() << "Error loading " << dcopService << endl;
     }
diff --git a/kmail/kwindowpositioner.cpp b/kmail/kwindowpositioner.cpp
index fefbdde2..4fb39947 100644
--- a/kmail/kwindowpositioner.cpp
+++ b/kmail/kwindowpositioner.cpp
@@ -29,7 +29,7 @@ KWindowPositioner::KWindowPositioner( TQWidget *master, TQWidget *slave,
   Mode mode )
   : TQObject( master ), mMaster( master ), mSlave( slave ), mMode( mode )
 {
-  master->topLevelWidget()->installEventFilter( this );
+  master->tqtopLevelWidget()->installEventFilter( this );
 }
 
 bool KWindowPositioner::eventFilter( TQObject *, TQEvent *e )
diff --git a/kmail/listjob.cpp b/kmail/listjob.cpp
index f51a04ee..07d118b2 100644
--- a/kmail/listjob.cpp
+++ b/kmail/listjob.cpp
@@ -118,7 +118,7 @@ void ListJob::execute()
         i18n("retrieving folders"),
         false,
         mAccount->useSSL() || mAccount->useTLS() );
-    mParentProgressItem->setStatus( escapedStatus );
+    mParentProgressItem->seStatus( escapedStatus );
   }
 
   // make the URL
diff --git a/kmail/localsubscriptiondialog.cpp b/kmail/localsubscriptiondialog.cpp
index 0816ba40..a020fa57 100644
--- a/kmail/localsubscriptiondialog.cpp
+++ b/kmail/localsubscriptiondialog.cpp
@@ -72,7 +72,7 @@ void LocalSubscriptionDialog::processFolderListing()
   uint done = 0;
   for (uint i = mCount; i < mFolderNames.count(); ++i)
   {
-    // give the dialog a chance to repaint
+    // give the dialog a chance to tqrepaint
     if (done == 1000)
     {
       emit listChanged();
diff --git a/kmail/mailinglistpropertiesdialog.cpp b/kmail/mailinglistpropertiesdialog.cpp
index 8a9487b0..525faf3d 100644
--- a/kmail/mailinglistpropertiesdialog.cpp
+++ b/kmail/mailinglistpropertiesdialog.cpp
@@ -55,12 +55,12 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget*
   TQLabel* label;
   mLastItem = 0;
 
-  TQVBoxLayout *topLayout = new TQVBoxLayout( layout(), spacingHint(),
+  TQVBoxLayout *topLayout = new TQVBoxLayout( tqlayout(), spacingHint(),
                                             "topLayout" );
 
   TQGroupBox *mlGroup = new TQGroupBox( i18n("Associated Mailing List" ), this );
   mlGroup->setColumnLayout( 0,  Qt::Vertical );
-  TQGridLayout *groupLayout = new TQGridLayout( mlGroup->layout(), 6, 3, spacingHint() );
+  TQGridLayout *groupLayout = new TQGridLayout( mlGroup->tqlayout(), 6, 3, spacingHint() );
   topLayout->addWidget( mlGroup );
   setMainWidget( mlGroup );
 
@@ -144,7 +144,7 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget*
                     TQT_SLOT(slotAddressChanged(int)) );
 
   load();
-  resize( TQSize(295, 204).expandedTo(minimumSizeHint()) );
+  resize( TQSize(295, 204).expandedTo(tqminimumSizeHint()) );
   clearWState( WState_Polished );
 }
 
diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp
index 3bec7132..dc8e42f4 100644
--- a/kmail/managesievescriptsdialog.cpp
+++ b/kmail/managesievescriptsdialog.cpp
@@ -54,7 +54,7 @@ KMail::ManageSieveScriptsDialog::ManageSieveScriptsDialog( TQWidget * parent, co
            this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) );
   vlay->addWidget( mListView );
 
-  resize( 2 * sizeHint().width(), sizeHint().height() );
+  resize( 2 * tqsizeHint().width(), tqsizeHint().height() );
 
   slotRefresh();
 }
@@ -322,7 +322,7 @@ KMail::SieveEditor::SieveEditor( TQWidget * parent, const char * name )
   mTextEdit->setWordWrap( TQTextEdit::NoWrap );
   mTextEdit->setFont( KGlobalSettings::fixedFont() );
   connect( mTextEdit, TQT_SIGNAL( textChanged () ), TQT_SLOT( slotTextChanged() ) );
-  resize( 3 * sizeHint() );
+  resize( 3 * tqsizeHint() );
 }
 
 KMail::SieveEditor::~SieveEditor() {}
diff --git a/kmail/messageactions.cpp b/kmail/messageactions.cpp
index cc543195..c1f56992 100644
--- a/kmail/messageactions.cpp
+++ b/kmail/messageactions.cpp
@@ -124,13 +124,13 @@ void MessageActions::setCurrentMessage(KMMessage * msg)
   updateActions();
 }
 
-void MessageActions::setSelectedSernums(const TQValueList< Q_UINT32 > & sernums)
+void MessageActions::setSelectedSernums(const TQValueList< TQ_UINT32 > & sernums)
 {
   mSelectedSernums = sernums;
   updateActions();
 }
 
-void MessageActions::setSelectedVisibleSernums(const TQValueList< Q_UINT32 > & sernums)
+void MessageActions::setSelectedVisibleSernums(const TQValueList< TQ_UINT32 > & sernums)
 {
   mVisibleSernums = sernums;
   updateActions();
@@ -248,12 +248,12 @@ void MessageActions::slotSetMsgStatusTodo()
 
 void MessageActions::setMessageStatus( KMMsgStatus status, bool toggle )
 {
-  TQValueList<Q_UINT32> serNums = mVisibleSernums;
+  TQValueList<TQ_UINT32> serNums = mVisibleSernums;
   if ( serNums.isEmpty() && mCurrentMessage )
     serNums.append( mCurrentMessage->getMsgSerNum() );
   if ( serNums.empty() )
     return;
-  KMCommand *command = new KMSetStatusCommand( status, serNums, toggle );
+  KMCommand *command = new KMSeStatusCommand( status, serNums, toggle );
   command->start();
 }
 
diff --git a/kmail/messageactions.h b/kmail/messageactions.h
index 41279c55..fe040c2c 100644
--- a/kmail/messageactions.h
+++ b/kmail/messageactions.h
@@ -44,8 +44,8 @@ class MessageActions : public QObject
     void setMessageView( KMReaderWin *msgView );
 
     void setCurrentMessage( KMMessage *msg );
-    void setSelectedSernums( const TQValueList<Q_UINT32> &sernums );
-    void setSelectedVisibleSernums( const TQValueList<Q_UINT32> &sernums );
+    void setSelectedSernums( const TQValueList<TQ_UINT32> &sernums );
+    void setSelectedVisibleSernums( const TQValueList<TQ_UINT32> &sernums );
 
     KActionMenu* replyMenu() const { return mReplyActionMenu; }
     KAction* replyListAction() const { return mReplyListAction; }
@@ -88,8 +88,8 @@ class MessageActions : public QObject
     TQWidget *mParent;
     KActionCollection *mActionCollection;
     KMMessage* mCurrentMessage;
-    TQValueList<Q_UINT32> mSelectedSernums;
-    TQValueList<Q_UINT32> mVisibleSernums;
+    TQValueList<TQ_UINT32> mSelectedSernums;
+    TQValueList<TQ_UINT32> mVisibleSernums;
     KMReaderWin *mMessageView;
 
     KActionMenu *mReplyActionMenu;
diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp
index 8b3f1c5c..2ff7cd6a 100644
--- a/kmail/messagecomposer.cpp
+++ b/kmail/messagecomposer.cpp
@@ -1000,7 +1000,7 @@ void MessageComposer::composeMessage()
 }
 
 //
-// These are replacements for StructuringInfo(Wrapper):
+// These are tqreplacements for StructuringInfo(Wrapper):
 //
 
 // check whether to use multipart/{signed,encrypted}
@@ -1137,7 +1137,7 @@ static inline GpgME::Context::SignatureMode signingMode( Kleo::CryptoMessageForm
 }
 
 //
-// END replacements for StructuringInfo(Wrapper)
+// END tqreplacements for StructuringInfo(Wrapper)
 //
 
 class EncryptMessageJob : public MessageComposerJob {
@@ -1600,7 +1600,7 @@ void MessageComposer::composeMessage( KMMessage& theMessage,
       }
     }
 
-    // replace simple LFs by CRLFs for all MIME supporting CryptPlugs
+    // tqreplace simple LFs by CRLFs for all MIME supporting CryptPlugs
     // according to RfC 2633, 3.1.1 Canonicalization
     //kdDebug(5006) << "Converting LF to CRLF (see RfC 2633, 3.1.1 Canonicalization)" << endl;
     mEncodedBody = KMail::Util::lf2crlf( mEncodedBody );
@@ -1700,7 +1700,7 @@ void MessageComposer::encryptMessage( KMMessage* msg,
     }
 
     // now do the encrypting:
-    // replace simple LFs by CRLFs for all MIME supporting CryptPlugs
+    // tqreplace simple LFs by CRLFs for all MIME supporting CryptPlugs
     // according to RfC 2633, 3.1.1 Canonicalization
     //kdDebug(5006) << "Converting LF to CRLF (see RfC 2633, 3.1.1 Canonicalization)" << endl;
     innerContent = KMail::Util::lf2crlf( innerContent );
@@ -1792,7 +1792,7 @@ void MessageComposer::addBodyAndAttachments( KMMessage* msg,
       delete innerDwPart;
       innerDwPart = 0;
 
-      // replace simple LFs by CRLFs for all MIME supporting CryptPlugs
+      // tqreplace simple LFs by CRLFs for all MIME supporting CryptPlugs
       // according to RfC 2633, 3.1.1 Canonicalization
       //kdDebug(5006) << "Converting LF to CRLF (see RfC 2633, 3.1.1 Canonicalization)" << endl;
       encodedAttachment = KMail::Util::lf2crlf( encodedAttachment );
@@ -1928,7 +1928,7 @@ bool MessageComposer::processStructuringInfo( const TQString bugURL,
     const TQCString boundaryCStr = KMime::multiPartBoundary();
     // add "boundary" parameter
     if ( makeMultiMime( format, signing ) )
-      mainHeader.replace( "%boundary", boundaryCStr );
+      mainHeader.tqreplace( "%boundary", boundaryCStr );
 
     if ( toplevelCT ) {
       if ( const char * str = toplevelContentDisposition( format, signing ) ) {
@@ -2092,7 +2092,7 @@ TQByteArray MessageComposer::breakLinesAndApplyCodec()
 
   if( mCharset == "us-ascii" ) {
     cText = KMMsgBase::toUsAscii( text );
-    newText = TQString::fromLatin1( cText );
+    newText = TQString::tqfromLatin1( cText );
   } else if( codec == 0 ) {
     kdDebug(5006) << "Something is wrong and I can not get a codec." << endl;
     cText = text.local8Bit();
diff --git a/kmail/messagecopyhelper.cpp b/kmail/messagecopyhelper.cpp
index e0a27fc3..4d998330 100644
--- a/kmail/messagecopyhelper.cpp
+++ b/kmail/messagecopyhelper.cpp
@@ -26,7 +26,7 @@
 using namespace KMail;
 using namespace KPIM;
 
-MessageCopyHelper::MessageCopyHelper( const TQValueList< Q_UINT32 > & msgs,
+MessageCopyHelper::MessageCopyHelper( const TQValueList< TQ_UINT32 > & msgs,
                                       KMFolder * dest, bool move, TQObject * parent ) :
     TQObject( parent )
 {
@@ -37,13 +37,13 @@ MessageCopyHelper::MessageCopyHelper( const TQValueList< Q_UINT32 > & msgs,
   int index;
   TQPtrList<KMMsgBase> list;
 
-  for ( TQValueList<Q_UINT32>::ConstIterator it = msgs.constBegin(); it != msgs.constEnd(); ++it ) {
+  for ( TQValueList<TQ_UINT32>::ConstIterator it = msgs.constBegin(); it != msgs.constEnd(); ++it ) {
     KMMsgDict::instance()->getLocation( *it, &f, &index );
     if ( !f ) // not found
       continue;
     if ( f == dest )
       continue; // already there
-    if ( !mOpenFolders.contains( f ) ) {// not yet opened
+    if ( !mOpenFolders.tqcontains( f ) ) {// not yet opened
       f->open( "messagecopyhelper" );
       mOpenFolders.insert( f, 0 );
     }
@@ -79,17 +79,17 @@ void MessageCopyHelper::copyCompleted(KMCommand * cmd)
   deleteLater();
 }
 
-TQValueList< Q_UINT32 > MessageCopyHelper::serNumListFromMailList(const KPIM::MailList & list)
+TQValueList< TQ_UINT32 > MessageCopyHelper::serNumListFromMailList(const KPIM::MailList & list)
 {
-  TQValueList<Q_UINT32> rv;
+  TQValueList<TQ_UINT32> rv;
   for ( MailList::ConstIterator it = list.constBegin(); it != list.constEnd(); ++it )
     rv.append( (*it).serialNumber() );
   return rv;
 }
 
-TQValueList< Q_UINT32 > MessageCopyHelper::serNumListFromMsgList(TQPtrList< KMMsgBase > list)
+TQValueList< TQ_UINT32 > MessageCopyHelper::serNumListFromMsgList(TQPtrList< KMMsgBase > list)
 {
-  TQValueList<Q_UINT32> rv;
+  TQValueList<TQ_UINT32> rv;
   KMMsgBase* msg = list.first();
   while( msg ) {
     rv.append( msg->getMsgSerNum() );
@@ -98,11 +98,11 @@ TQValueList< Q_UINT32 > MessageCopyHelper::serNumListFromMsgList(TQPtrList< KMMs
   return rv;
 }
 
-bool MessageCopyHelper::inReadOnlyFolder(const TQValueList< Q_UINT32 > & sernums)
+bool MessageCopyHelper::inReadOnlyFolder(const TQValueList< TQ_UINT32 > & sernums)
 {
   KMFolder *f = 0;
   int index;
-  for ( TQValueList<Q_UINT32>::ConstIterator it = sernums.begin(); it != sernums.end(); ++it ) {
+  for ( TQValueList<TQ_UINT32>::ConstIterator it = sernums.begin(); it != sernums.end(); ++it ) {
     KMMsgDict::instance()->getLocation( *it, &f, &index );
     if ( !f ) // not found
       continue;
diff --git a/kmail/messagecopyhelper.h b/kmail/messagecopyhelper.h
index 22a718dc..419382cf 100644
--- a/kmail/messagecopyhelper.h
+++ b/kmail/messagecopyhelper.h
@@ -49,23 +49,23 @@ class MessageCopyHelper : public QObject
       @param move If set to true, messages will be moved instead of copied
       @param parent The parent object.
     */
-    MessageCopyHelper( const TQValueList<Q_UINT32> &msgs, KMFolder *dest,
+    MessageCopyHelper( const TQValueList<TQ_UINT32> &msgs, KMFolder *dest,
                        bool move, TQObject *parent = 0 );
 
     /**
       Converts a MailList into a serial number list.
     */
-    static TQValueList<Q_UINT32> serNumListFromMailList( const KPIM::MailList &list );
+    static TQValueList<TQ_UINT32> serNumListFromMailList( const KPIM::MailList &list );
 
     /**
       Converts a KMMsgsBase* list into a serial number list.
     */
-    static TQValueList<Q_UINT32> serNumListFromMsgList( TQPtrList<KMMsgBase> list );
+    static TQValueList<TQ_UINT32> serNumListFromMsgList( TQPtrList<KMMsgBase> list );
 
     /**
       Checks of any of the given messages comes from a read-only source.
     */
-    static bool inReadOnlyFolder( const TQValueList<Q_UINT32> &sernums );
+    static bool inReadOnlyFolder( const TQValueList<TQ_UINT32> &sernums );
 
   private slots:
     void copyCompleted( KMCommand *cmd );
diff --git a/kmail/messageproperty.cpp b/kmail/messageproperty.cpp
index b1e02161..e9897cd6 100644
--- a/kmail/messageproperty.cpp
+++ b/kmail/messageproperty.cpp
@@ -35,21 +35,21 @@
 #include "messageproperty.h"
 using namespace KMail;
 
-TQMap<Q_UINT32, TQGuardedPtr<KMFolder> > MessageProperty::sFolders;
-TQMap<Q_UINT32, TQGuardedPtr<ActionScheduler> > MessageProperty::sHandlers;
-TQMap<Q_UINT32, int > MessageProperty::sTransfers;
+TQMap<TQ_UINT32, TQGuardedPtr<KMFolder> > MessageProperty::sFolders;
+TQMap<TQ_UINT32, TQGuardedPtr<ActionScheduler> > MessageProperty::sHandlers;
+TQMap<TQ_UINT32, int > MessageProperty::sTransfers;
 TQMap<const KMMsgBase*, long > MessageProperty::sSerialCache;
 
-bool MessageProperty::filtering( Q_UINT32 serNum )
+bool MessageProperty::filtering( TQ_UINT32 serNum )
 {
-  return sFolders.contains( serNum );
+  return sFolders.tqcontains( serNum );
 }
 
-void MessageProperty::setFiltering( Q_UINT32 serNum, bool filter )
+void MessageProperty::setFiltering( TQ_UINT32 serNum, bool filter )
 {
   assert(!filtering(serNum) || !filter);
   if (filter && !filtering(serNum))
-    sFolders.replace(serNum, TQGuardedPtr<KMFolder>(0) );
+    sFolders.tqreplace(serNum, TQGuardedPtr<KMFolder>(0) );
   else if (!filter)
     sFolders.remove(serNum);
 }
@@ -64,13 +64,13 @@ void MessageProperty::setFiltering( const KMMsgBase *msgBase, bool filter )
   setFiltering( msgBase->getMsgSerNum(), filter );
 }
 
-KMFolder* MessageProperty::filterFolder( Q_UINT32 serNum )
+KMFolder* MessageProperty::filterFolder( TQ_UINT32 serNum )
 {
-  TQMap<Q_UINT32, TQGuardedPtr<KMFolder> >::const_iterator it = sFolders.find( serNum );
+  TQMap<TQ_UINT32, TQGuardedPtr<KMFolder> >::const_iterator it = sFolders.find( serNum );
   return it == sFolders.constEnd() ? 0 : (*it).operator->();
 }
 
-void MessageProperty::setFilterFolder( Q_UINT32 serNum, KMFolder* folder )
+void MessageProperty::setFilterFolder( TQ_UINT32 serNum, KMFolder* folder )
 {
   sFolders.insert(serNum, TQGuardedPtr<KMFolder>(folder) );
 }
@@ -85,13 +85,13 @@ void MessageProperty::setFilterFolder( const KMMsgBase *msgBase, KMFolder* folde
   setFilterFolder( msgBase->getMsgSerNum(), folder );
 }
 
-ActionScheduler* MessageProperty::filterHandler( Q_UINT32 serNum )
+ActionScheduler* MessageProperty::filterHandler( TQ_UINT32 serNum )
 {
-  TQMap<Q_UINT32, TQGuardedPtr<ActionScheduler> >::const_iterator it = sHandlers.find( serNum );
+  TQMap<TQ_UINT32, TQGuardedPtr<ActionScheduler> >::const_iterator it = sHandlers.find( serNum );
   return it == sHandlers.constEnd() ? 0 : (*it).operator->();
 }
 
-void MessageProperty::setFilterHandler( Q_UINT32 serNum, ActionScheduler* handler )
+void MessageProperty::setFilterHandler( TQ_UINT32 serNum, ActionScheduler* handler )
 {
   if (handler)
     sHandlers.insert( serNum, TQGuardedPtr<ActionScheduler>(handler) );
@@ -109,16 +109,16 @@ void MessageProperty::setFilterHandler( const KMMsgBase *msgBase, ActionSchedule
   setFilterHandler( msgBase->getMsgSerNum(), handler );
 }
 
-bool MessageProperty::transferInProgress( Q_UINT32 serNum )
+bool MessageProperty::transferInProgress( TQ_UINT32 serNum )
 {
-  TQMap<Q_UINT32, int >::const_iterator it = sTransfers.find( serNum );
+  TQMap<TQ_UINT32, int >::const_iterator it = sTransfers.find( serNum );
   return it == sTransfers.constEnd() ? false : *it;
 }
 
-void MessageProperty::setTransferInProgress( Q_UINT32 serNum, bool transfer, bool force )
+void MessageProperty::setTransferInProgress( TQ_UINT32 serNum, bool transfer, bool force )
 {
   int transferInProgress = 0;
-  TQMap<Q_UINT32, int >::const_iterator it = sTransfers.find( serNum );
+  TQMap<TQ_UINT32, int >::const_iterator it = sTransfers.find( serNum );
   if (it != sTransfers.constEnd())
     transferInProgress = *it;
   if ( force && !transfer )
@@ -143,13 +143,13 @@ void MessageProperty::setTransferInProgress( const KMMsgBase *msgBase, bool tran
   setTransferInProgress( msgBase->getMsgSerNum(), transfer, force );
 }
 
-Q_UINT32 MessageProperty::serialCache( const KMMsgBase *msgBase )
+TQ_UINT32 MessageProperty::serialCache( const KMMsgBase *msgBase )
 {
   TQMap<const KMMsgBase*, long >::const_iterator it = sSerialCache.find( msgBase );
   return it == sSerialCache.constEnd() ? 0 : *it;
 }
 
-void MessageProperty::setSerialCache( const KMMsgBase *msgBase, Q_UINT32 serNum )
+void MessageProperty::setSerialCache( const KMMsgBase *msgBase, TQ_UINT32 serNum )
 {
   if (serNum)
     sSerialCache.insert( msgBase, serNum );
@@ -159,7 +159,7 @@ void MessageProperty::setSerialCache( const KMMsgBase *msgBase, Q_UINT32 serNum
 
 void MessageProperty::forget( const KMMsgBase *msgBase )
 {
-  Q_UINT32 serNum = serialCache( msgBase );
+  TQ_UINT32 serNum = serialCache( msgBase );
   if (serNum) {
     Q_ASSERT( !transferInProgress( serNum ) );
     sTransfers.remove( serNum );
diff --git a/kmail/messageproperty.h b/kmail/messageproperty.h
index 91168e6f..0dd3f3b2 100644
--- a/kmail/messageproperty.h
+++ b/kmail/messageproperty.h
@@ -60,20 +60,20 @@ class MessageProperty : public QObject
 
 public:
   /** If the message is being filtered  */
-  static bool filtering( Q_UINT32 );
-  static void setFiltering( Q_UINT32, bool filtering );
+  static bool filtering( TQ_UINT32 );
+  static void setFiltering( TQ_UINT32, bool filtering );
   static bool filtering( const KMMsgBase* );
   static void setFiltering( const KMMsgBase*, bool filtering );
   /** The folder this message is to be moved into once
       filtering is finished, or null if the message is not
       scheduled to be moved */
-  static KMFolder* filterFolder( Q_UINT32 );
-  static void setFilterFolder( Q_UINT32, KMFolder* folder );
+  static KMFolder* filterFolder( TQ_UINT32 );
+  static void setFilterFolder( TQ_UINT32, KMFolder* folder );
   static KMFolder* filterFolder( const KMMsgBase* );
   static void setFilterFolder( const KMMsgBase*, KMFolder* folder );
   /* Set the filterHandler for a message */
-  static ActionScheduler* filterHandler( Q_UINT32 );
-  static void setFilterHandler( Q_UINT32, ActionScheduler* filterHandler );
+  static ActionScheduler* filterHandler( TQ_UINT32 );
+  static void setFilterHandler( TQ_UINT32, ActionScheduler* filterHandler );
   static ActionScheduler* filterHandler( const KMMsgBase* );
   static void setFilterHandler( const KMMsgBase*, ActionScheduler* filterHandler );
 
@@ -81,16 +81,16 @@ public:
      KMMsgBase based instance representing a message.
      This property becomes invalid when the message is destructed or
      assigned a new value */
-  static void setSerialCache( const KMMsgBase*, Q_UINT32 );
-  static Q_UINT32 serialCache( const KMMsgBase* );
+  static void setSerialCache( const KMMsgBase*, TQ_UINT32 );
+  static TQ_UINT32 serialCache( const KMMsgBase* );
 
   /* Set the transferInProgress for a message
      This property becomes invalid when the message is destructed or
      assigned a new value */
   static void setTransferInProgress( const KMMsgBase*, bool, bool = false );
   static bool transferInProgress( const KMMsgBase* );
-  static void setTransferInProgress( Q_UINT32, bool, bool = false );
-  static bool transferInProgress( Q_UINT32 );
+  static void setTransferInProgress( TQ_UINT32, bool, bool = false );
+  static bool transferInProgress( TQ_UINT32 );
 
   /** Some properties, namely complete, transferInProgress, and
       serialCache must be forgotten when a message class instance is
@@ -99,13 +99,13 @@ public:
 
 private:
   // The folder a message is to be moved into once filtering is finished if any
-  static TQMap<Q_UINT32, TQGuardedPtr<KMFolder> > sFolders;
+  static TQMap<TQ_UINT32, TQGuardedPtr<KMFolder> > sFolders;
 
   // The action scheduler currently processing a message if any
-  static TQMap<Q_UINT32, TQGuardedPtr<ActionScheduler> > sHandlers;
+  static TQMap<TQ_UINT32, TQGuardedPtr<ActionScheduler> > sHandlers;
 
   // The transferInProgres state of a message if any.
-  static TQMap<Q_UINT32, int > sTransfers;
+  static TQMap<TQ_UINT32, int > sTransfers;
 
   // The cached serial number of a message if any.
   static TQMap<const KMMsgBase*, long > sSerialCache;
diff --git a/kmail/newfolderdialog.cpp b/kmail/newfolderdialog.cpp
index 99051222..acd5b332 100644
--- a/kmail/newfolderdialog.cpp
+++ b/kmail/newfolderdialog.cpp
@@ -121,7 +121,7 @@ NewFolderDialog::NewFolderDialog( TQWidget* parent, KMFolder *folder )
     mContentsHBox = new TQHBoxLayout( 0, 0, 6, "mContentsHBox");
 
     mContentsLabel = new TQLabel( privateLayoutWidget, "mContentsLabel" );
-    mContentsLabel->setText( i18n( "Folder &contains:" ) );
+    mContentsLabel->setText( i18n( "Folder &tqcontains:" ) );
     mContentsHBox->addWidget( mContentsLabel );
 
     mContentsComboBox = new TQComboBox( false, privateLayoutWidget, "mContentsComboBox" );
@@ -176,7 +176,7 @@ NewFolderDialog::NewFolderDialog( TQWidget* parent, KMFolder *folder )
     }
   }
 
-  resize( TQSize(282, 108).expandedTo(minimumSizeHint()) );
+  resize( TQSize(282, 108).expandedTo(tqminimumSizeHint()) );
   clearWState( WState_Polished );
   slotFolderNameChanged( mNameLineEdit->text());
 }
diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp
index d8b98f24..132dc058 100644
--- a/kmail/objecttreeparser.cpp
+++ b/kmail/objecttreeparser.cpp
@@ -272,7 +272,7 @@ namespace KMail {
       ProcessResult processResult;
 
       if ( mReader ) {
-        htmlWriter()->queue( TQString::fromLatin1("<a name=\"att%1\"/>").arg( node->nodeId() ) );
+        htmlWriter()->queue( TQString::tqfromLatin1("<a name=\"att%1\"/>").arg( node->nodeId() ) );
       }
 
       if ( const Interface::BodyPartFormatter * formatter
@@ -461,7 +461,7 @@ namespace KMail {
         dumpToFile( "dat_01_reader_signedtext_before_canonicalization",
                     cleartext.data(), cleartext.length() );
 
-        // replace simple LFs by CRLSs
+        // tqreplace simple LFs by CRLSs
         // according to RfC 2633, 3.1.1 Canonicalization
         //kdDebug(5006) << "Converting LF to CRLF (see RfC 2633, 3.1.1 Canonicalization)" << endl;
         cleartext = Util::lf2crlf( cleartext );
@@ -829,7 +829,7 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data,
     if ( mReader )
       emit mReader->noDrag(); // in case pineentry pops up, don't let kmheaders start a drag afterwards
 
-    // Check whether the memento contains a result from last time:
+    // Check whether the memento tqcontains a result from last time:
     const DecryptVerifyBodyPartMemento * m
       = dynamic_cast<DecryptVerifyBodyPartMemento*>( data.bodyPartMemento( "decryptverify" ) );
     if ( !m ) {
@@ -936,7 +936,7 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data,
 }
 
   //static
-  bool ObjectTreeParser::containsExternalReferences( const TQCString & str )
+  bool ObjectTreeParser::tqcontainsExternalReferences( const TQCString & str )
   {
     TQRegExp httpRegExp("(\\\"|\\\'|url\\s*\\(\\s*)http[s]?:");
     int httpPos = str.find( httpRegExp, 0 );
@@ -990,12 +990,12 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data,
         // ---Sven's strip </BODY> and </HTML> from end of attachment end-
         // Show the "external references" warning (with possibility to load
         // external references only if loading external references is disabled
-        // and the HTML code contains obvious external references). For
+        // and the HTML code tqcontains obvious external references). For
         // messages where the external references are obfuscated the user won't
         // have an easy way to load them but that shouldn't be a problem
-        // because only spam contains obfuscated external references.
+        // because only spam tqcontains obfuscated external references.
         if ( !mReader->htmlLoadExternal() &&
-             containsExternalReferences( cstr ) ) {
+             tqcontainsExternalReferences( cstr ) ) {
           htmlWriter()->queue( "<div class=\"htmlWarn\">\n" );
           htmlWriter()->queue( i18n("<b>Note:</b> This HTML message may contain external "
                                     "references to images etc. For security/privacy reasons "
@@ -1357,7 +1357,7 @@ namespace KMail {
     const Kleo::CryptoBackend::Protocol * useThisCryptProto = 0;
 
     /*
-      ATTENTION: This code is to be replaced by the new 'auto-detect' feature. --------------------------------------
+      ATTENTION: This code is to be tqreplaced by the new 'auto-detect' feature. --------------------------------------
     */
     partNode * data = child->findType( DwMime::kTypeApplication,
                                        DwMime::kSubtypeOctetStream, false, true );
@@ -1559,7 +1559,7 @@ namespace KMail {
         writeDeferredDecryptionBlock();
       } else {
         /*
-          ATTENTION: This code is to be replaced by the planned 'auto-detect' feature.
+          ATTENTION: This code is to be tqreplaced by the planned 'auto-detect' feature.
         */
         PartMetaData messagePart;
         setCryptoProtocol( Kleo::CryptoBackendFactory::instance()->openpgp() );
@@ -2795,7 +2795,7 @@ void ObjectTreeParser::writeBodyStr( const TQCString& aStr, const TQTextCodec *a
   bool goodSignature = false;
   Kpgp::Module* pgp = Kpgp::Module::getKpgp();
   assert(pgp != 0);
-  bool isPgpMessage = false; // true if the message contains at least one
+  bool isPgpMessage = false; // true if the message tqcontains at least one
                              // PGP MESSAGE or one PGP SIGNED MESSAGE block
   TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" );
   TQString headerStr = TQString("<div dir=\"%1\">").arg(dir);
@@ -3083,7 +3083,7 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate )
     {
       // don't write empty <div ...></div> blocks (they have zero height)
       // ignore ^M DOS linebreaks
-      if( !line.replace('\015', "").isEmpty() )
+      if( !line.tqreplace('\015', "").isEmpty() )
       {
          htmlStr +=TQString( "<div dir=\"%1\">" ).arg( line.isRightToLeft() ? "rtl":"ltr" );
          htmlStr += LinkLocator::convertToHtml( line, convertFlags );
diff --git a/kmail/objecttreeparser.h b/kmail/objecttreeparser.h
index ad980eda..5cfe1d0e 100644
--- a/kmail/objecttreeparser.h
+++ b/kmail/objecttreeparser.h
@@ -151,7 +151,7 @@ namespace KMail {
       mIncludeSignatures = include;
     }
 
-    // Controls whether Toltec invitations are displayed in their raw form or as a replacement text,
+    // Controls whether Toltec invitations are displayed in their raw form or as a tqreplacement text,
     // which is used in processToltecMail().
     void setShowRawToltecMail( bool showRawToltecMail ) { mShowRawToltecMail = showRawToltecMail; }
     bool showRawToltecMail() const { return mShowRawToltecMail; }
@@ -171,7 +171,7 @@ namespace KMail {
     /** Parse beginning at a given node and recursively parsing
         the children of that node and it's next sibling. */
     //  Function is called internally by "parseMsg(KMMessage* msg)"
-    //  and it will be replaced once KMime is alive.
+    //  and it will be tqreplaced once KMime is alive.
     void parseObjectTree( partNode * node );
 
   private:
@@ -193,7 +193,7 @@ namespace KMail {
      *                            Setting this to false is useful for encapsulated messages, as we
      *                            do not want the text in those to appear in the editor
      */
-    //  Function will be replaced once KMime is alive.
+    //  Function will be tqreplaced once KMime is alive.
     void insertAndParseNewChildNode( partNode & node,
                                      const char * content,
                                      const char * cntDesc,
@@ -252,11 +252,11 @@ namespace KMail {
      */
     bool processToltecMail( partNode * node );
 
-    /** Checks whether @p str contains external references. To be precise,
-        we only check whether @p str contains 'xxx="http[s]:' where xxx is
+    /** Checks whether @p str tqcontains external references. To be precise,
+        we only check whether @p str tqcontains 'xxx="http[s]:' where xxx is
         not href. Obfuscated external references are ignored on purpose.
     */
-    static bool containsExternalReferences( const TQCString & str );
+    static bool tqcontainsExternalReferences( const TQCString & str );
 
   public:// (during refactoring)
 
diff --git a/kmail/objecttreeparser_p.cpp b/kmail/objecttreeparser_p.cpp
index a645b398..947c76ae 100644
--- a/kmail/objecttreeparser_p.cpp
+++ b/kmail/objecttreeparser_p.cpp
@@ -190,7 +190,7 @@ bool VerifyDetachedBodyPartMemento::canStartKeyListJob() const
 TQStringList VerifyDetachedBodyPartMemento::keyListPattern() const
 {
   assert( canStartKeyListJob() );
-  return TQStringList( TQString::fromLatin1( m_vr.signature( 0 ).fingerprint() ) );
+  return TQStringList( TQString::tqfromLatin1( m_vr.signature( 0 ).fingerprint() ) );
 }
 
 void VerifyDetachedBodyPartMemento::saveResult( const VerificationResult & vr )
@@ -297,7 +297,7 @@ bool VerifyOpaqueBodyPartMemento::canStartKeyListJob() const
 TQStringList VerifyOpaqueBodyPartMemento::keyListPattern() const
 {
   assert( canStartKeyListJob() );
-  return TQStringList( TQString::fromLatin1( m_vr.signature( 0 ).fingerprint() ) );
+  return TQStringList( TQString::tqfromLatin1( m_vr.signature( 0 ).fingerprint() ) );
 }
 
 void VerifyOpaqueBodyPartMemento::saveResult( const VerificationResult & vr,
diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp
index dbd5442c..b75c54e4 100644
--- a/kmail/partNode.cpp
+++ b/kmail/partNode.cpp
@@ -50,7 +50,7 @@
 
 
   ===========================================================================
-  N O T E :   The partNode structure will most likely be replaced by KMime.
+  N O T E :   The partNode structure will most likely be tqreplaced by KMime.
   It's purpose: Speed optimization for KDE 3.   (khz, 28.11.01)
   ===========================================================================
 */
@@ -269,7 +269,7 @@ TQString partNode::contentTypeParameter( const char * name ) const {
     DwString this_attr = param->Attribute();
     this_attr.ConvertToLowerCase(); // what a braindead design!
     if ( this_attr == attr )
-      return TQString::fromLatin1( param->Value().data(), param->Value().size() );
+      return TQString::tqfromLatin1( param->Value().data(), param->Value().size() );
     // warning: misses rfc2231 handling!
   }
   return TQString::null;
@@ -516,7 +516,7 @@ void partNode::fillMimePartTree( KMMimePartTreeItem* parentItem,
         cntSize = size;
     }
     // remove linebreak+whitespace from folded Content-Description
-    cntDesc.replace( TQRegExp("\\n\\s*"), " " );
+    cntDesc.tqreplace( TQRegExp("\\n\\s*"), " " );
 
     if( parentItem )
       mMimePartTreeItem = new KMMimePartTreeItem( parentItem,
diff --git a/kmail/partNode.h b/kmail/partNode.h
index ddc76aa6..6459a0a6 100644
--- a/kmail/partNode.h
+++ b/kmail/partNode.h
@@ -60,7 +60,7 @@ class KMReaderWin;
 
 
  ===========================================================================
-  N O T E :   The partNode structure will most likely be replaced by KMime.
+  N O T E :   The partNode structure will most likely be tqreplaced by KMime.
               It's purpose: Speed optimization for KDE 3.   (khz, 28.11.01)
  ===========================================================================
 */
diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp
index 94dbf8a5..7bb830bc 100644
--- a/kmail/popaccount.cpp
+++ b/kmail/popaccount.cpp
@@ -27,7 +27,7 @@
 #include "popaccount.h"
 
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 #include "progressmanager.h"
 #include "kmfoldermgr.h"
 #include "kmfiltermgr.h"
@@ -514,13 +514,13 @@ void PopAccount::slotJobFinished() {
                                                      mUidForIdMap[hids.key()],
                                                      Later));//TODO
             //set Action if already known
-            if( mHeaderDeleteUids.contains( headersOnServer.current()->uid() ) ) {
+            if( mHeaderDeleteUids.tqcontains( headersOnServer.current()->uid() ) ) {
               headersOnServer.current()->setAction(Delete);
             }
-            else if( mHeaderDownUids.contains( headersOnServer.current()->uid() ) ) {
+            else if( mHeaderDownUids.tqcontains( headersOnServer.current()->uid() ) ) {
               headersOnServer.current()->setAction(Down);
             }
-            else if( mHeaderLaterUids.contains( headersOnServer.current()->uid() ) ) {
+            else if( mHeaderLaterUids.tqcontains( headersOnServer.current()->uid() ) ) {
               headersOnServer.current()->setAction(Later);
             }
           }
@@ -625,7 +625,7 @@ void PopAccount::slotJobFinished() {
           headersOnServer.current()->action() == Later) {
         //remove entries from the lists when the mails should not be downloaded
         //(deleted or downloaded later)
-        if ( mMsgsPendingDownload.contains( headersOnServer.current()->id() ) ) {
+        if ( mMsgsPendingDownload.tqcontains( headersOnServer.current()->id() ) ) {
           mMsgsPendingDownload.remove( headersOnServer.current()->id() );
         }
         if (headersOnServer.current()->action() == Delete) {
@@ -747,7 +747,7 @@ void PopAccount::slotJobFinished() {
     if ( !idsOfMsgsToDelete.isEmpty() ) {
       stage = Dele;
       if ( mMailCheckProgressItem )
-        mMailCheckProgressItem->setStatus(
+        mMailCheckProgressItem->seStatus(
           i18n( "Fetched 1 message from %1. Deleting messages from server...",
                 "Fetched %n messages from %1. Deleting messages from server...",
                 numMsgs )
@@ -757,7 +757,7 @@ void PopAccount::slotJobFinished() {
     } else {
       stage = Quit;
       if ( mMailCheckProgressItem )
-        mMailCheckProgressItem->setStatus(
+        mMailCheckProgressItem->seStatus(
           i18n( "Fetched 1 message from %1. Terminating transmission...",
                 "Fetched %n messages from %1. Terminating transmission...",
                 numMsgs )
@@ -777,7 +777,7 @@ void PopAccount::slotJobFinished() {
     }
     idsOfMsgsToDelete.clear();
     if ( mMailCheckProgressItem )
-      mMailCheckProgressItem->setStatus(
+      mMailCheckProgressItem->seStatus(
         i18n( "Fetched 1 message from %1. Terminating transmission...",
               "Fetched %n messages from %1. Terminating transmission...",
               numMsgs )
@@ -798,7 +798,7 @@ void PopAccount::slotJobFinished() {
     if( mMailCheckProgressItem ) { // do this only once...
       bool canceled = !kmkernel || kmkernel->mailCheckAborted() || mMailCheckProgressItem->canceled();
       int numMessages = canceled ? indexOfCurrentMsg : idsOfMsgs.count();
-      BroadcastStatus::instance()->setStatusMsgTransmissionCompleted(
+      BroadcasStatus::instance()->seStatusMsgTransmissionCompleted(
         this->name(), numMessages, numBytes, numBytesRead, numBytesToRead, mLeaveOnServer, mMailCheckProgressItem );
       // set mMailCheckProgressItem = 0 before calling setComplete() to prevent
       // a race condition
@@ -913,7 +913,7 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data)
           .arg(indexOfCurrentMsg+1).arg(numMsgs).arg(numBytesRead/1024)
           .arg(numBytesToRead/1024).arg(mLogin).arg(mHost);
       }
-      mMailCheckProgressItem->setStatus( msg );
+      mMailCheckProgressItem->seStatus( msg );
       mMailCheckProgressItem->setProgress(
         (numBytesToRead <= 100) ? 50  // We never know what the server tells us
         // This way of dividing is required for > 21MB of mail
@@ -990,7 +990,7 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data)
     *size = mMsgsPendingDownload[id];
     mSizeOfNextSeenMsgsDict.insert( uid, size );
     if ( mUidsOfSeenMsgsDict.find( uid ) != 0 ) {
-      if ( mMsgsPendingDownload.contains( id ) ) {
+      if ( mMsgsPendingDownload.tqcontains( id ) ) {
         mMsgsPendingDownload.remove( id );
       }
       else
diff --git a/kmail/quotajobs.h b/kmail/quotajobs.h
index a27e70f8..31bd1ef5 100644
--- a/kmail/quotajobs.h
+++ b/kmail/quotajobs.h
@@ -109,7 +109,7 @@ class QuotaInfo {
 typedef TQValueVector<QuotaInfo> QuotaInfoList;
 
 /**
- * This namespace contains functions that return jobs for quota operations.
+ * This namespace tqcontains functions that return jobs for quota operations.
  *
  * The current implementation is tied to IMAP.
  * If someone wants to extend this to other protocols, turn the namespace into a class
diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp
index fe7b85ca..9f33a501 100644
--- a/kmail/recipientseditor.cpp
+++ b/kmail/recipientseditor.cpp
@@ -288,10 +288,10 @@ void RecipientLine::keyPressEvent( TQKeyEvent *ev )
 
 int RecipientLine::setComboWidth( int w )
 {
-  w = QMAX( w, mCombo->sizeHint().width() );
+  w = QMAX( w, mCombo->tqsizeHint().width() );
   mCombo->setFixedWidth( w );
   mCombo->updateGeometry();
-  parentWidget()->updateGeometry();
+  tqparentWidget()->updateGeometry();
   return w;
 }
 
@@ -331,7 +331,7 @@ RecipientsView::RecipientsView( TQWidget *parent )
 
   addLine();
   setResizePolicy( TQScrollView::Manual );
-  setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
+  tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
 
   viewport()->setPaletteBackgroundColor( paletteBackgroundColor() );
 }
@@ -400,7 +400,7 @@ RecipientLine *RecipientsView::addLine()
 
   mFirstColumnWidth = line->setComboWidth( mFirstColumnWidth );
 
-  mLineHeight = line->minimumSizeHint().height();
+  mLineHeight = line->tqminimumSizeHint().height();
 
   line->resize( viewport()->width(), mLineHeight );
 
@@ -536,8 +536,8 @@ void RecipientsView::resizeView()
 //    setFixedHeight( mLineHeight * mLines.count() );
   }
 
-  parentWidget()->layout()->activate();
-  emit sizeHintChanged();
+  tqparentWidget()->tqlayout()->activate();
+  emit tqsizeHintChanged();
   TQTimer::singleShot( 0, this, TQT_SLOT(moveCompletionPopup()) );
 }
 
@@ -555,12 +555,12 @@ void RecipientsView::viewportResizeEvent ( TQResizeEvent *ev )
   ensureVisible( 0, mLines.count() * mLineHeight );
 }
 
-TQSize RecipientsView::sizeHint() const
+TQSize RecipientsView::tqsizeHint() const
 {
   return TQSize( 200, mLineHeight * mLines.count() );
 }
 
-TQSize RecipientsView::minimumSizeHint() const
+TQSize RecipientsView::tqminimumSizeHint() const
 {
   int height;
   uint numLines = 5;
@@ -742,9 +742,9 @@ void RecipientsToolTip::maybeTip( const TQPoint & p )
 
   text.append( "</qt>" );
 
-  TQRect geometry( p + TQPoint( 2, 2 ), TQPoint( 400, 100 ) );
+  TQRect tqgeometry( p + TQPoint( 2, 2 ), TQPoint( 400, 100 ) );
 
-  tip( TQRect( p.x() - 20, p.y() - 20, 40, 40 ), text, geometry );
+  tip( TQRect( p.x() - 20, p.y() - 20, 40, 40 ), text, tqgeometry );
 }
 
 
@@ -757,7 +757,7 @@ SideWidget::SideWidget( RecipientsView *view, TQWidget *parent )
   topLayout->addStretch( 1 );
 
   mTotalLabel = new TQLabel( this );
-  mTotalLabel->setAlignment( AlignCenter );
+  mTotalLabel->tqsetAlignment( AlignCenter );
   topLayout->addWidget( mTotalLabel );
   mTotalLabel->hide();
 
@@ -862,8 +862,8 @@ RecipientsEditor::RecipientsEditor( TQWidget *parent )
   connect( mRecipientsView, TQT_SIGNAL( focusRight() ),
     mSideWidget, TQT_SLOT( setFocus() ) );
 
-  connect( mRecipientsView, TQT_SIGNAL(sizeHintChanged()),
-           TQT_SIGNAL(sizeHintChanged()) );
+  connect( mRecipientsView, TQT_SIGNAL(tqsizeHintChanged()),
+           TQT_SIGNAL(tqsizeHintChanged()) );
 }
 
 RecipientsEditor::~RecipientsEditor()
diff --git a/kmail/recipientseditor.h b/kmail/recipientseditor.h
index 6f5ffb8e..e6b7718b 100644
--- a/kmail/recipientseditor.h
+++ b/kmail/recipientseditor.h
@@ -173,8 +173,8 @@ class RecipientsView : public QScrollView
   public:
     RecipientsView( TQWidget *parent );
 
-    TQSize minimumSizeHint() const;
-    TQSize sizeHint() const;
+    TQSize tqminimumSizeHint() const;
+    TQSize tqsizeHint() const;
 
     RecipientLine *activeLine();
 
@@ -221,7 +221,7 @@ class RecipientsView : public QScrollView
     void focusDown();
     void focusRight();
     void completionModeChanged( KGlobalSettings::Completion );
-    void sizeHintChanged();
+    void tqsizeHintChanged();
 
   protected:
     void viewportResizeEvent( TQResizeEvent * );
@@ -352,7 +352,7 @@ class RecipientsEditor : public QWidget
     void focusUp();
     void focusDown();
     void completionModeChanged( KGlobalSettings::Completion );
-    void sizeHintChanged();
+    void tqsizeHintChanged();
 
   protected slots:
     void slotPickedRecipient( const Recipient & );
diff --git a/kmail/recipientseditortest.cpp b/kmail/recipientseditortest.cpp
index 44df528c..adbf4c4a 100644
--- a/kmail/recipientseditortest.cpp
+++ b/kmail/recipientseditortest.cpp
@@ -54,7 +54,7 @@ Composer::Composer( TQWidget *parent )
   mRecipients = new RecipientsEditor( this );
   topLayout->addMultiCellWidget( mRecipients, 1, 1, 0, 1 );
 
-  kdDebug() << "SIZEHINT: " << mRecipients->sizeHint() << endl;
+  kdDebug() << "SIZEHINT: " << mRecipients->tqsizeHint() << endl;
 
 //  mRecipients->setFixedHeight( 10 );
   
diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp
index c1d2b3ae..a45a7683 100644
--- a/kmail/recipientspicker.cpp
+++ b/kmail/recipientspicker.cpp
@@ -241,7 +241,7 @@ void RecipientsListToolTip::maybeTip( const TQPoint & pos )
   RecipientViewItem *i = static_cast<RecipientViewItem *>( item );
 
   if( item ) {
-    r = mListView->itemRect( item );
+    r = mListView->tqitemRect( item );
     TQString tipText( i->recipientItem()->tooltip() );
     if ( !tipText.isEmpty() ) {
       tip( r, tipText );
diff --git a/kmail/recipientspicker.h b/kmail/recipientspicker.h
index 74df3b13..2d25a87b 100644
--- a/kmail/recipientspicker.h
+++ b/kmail/recipientspicker.h
@@ -152,7 +152,7 @@ class RecipientsCollection
     TQString id() const;
 
   private:
-    // flag to indicate if this collection contains just references
+    // flag to indicate if this collection tqcontains just references
     // or should manage memory (de)allocation as well.
     bool mIsReferenceContainer;
     TQString mId;
diff --git a/kmail/redirectdialog.cpp b/kmail/redirectdialog.cpp
index bf8fe51c..275e623b 100644
--- a/kmail/redirectdialog.cpp
+++ b/kmail/redirectdialog.cpp
@@ -68,7 +68,7 @@ RedirectDialog::RedirectDialog( TQWidget *parent, const char *name,
 
   mBtnTo = new TQPushButton( TQString::null, hbox, "toBtn" );
   mBtnTo->setPixmap( BarIcon( "contents", KIcon::SizeSmall ) );
-  mBtnTo->setMinimumSize( mBtnTo->sizeHint() * 1.2 );
+  mBtnTo->setMinimumSize( mBtnTo->tqsizeHint() * 1.2 );
   TQToolTip::add( mBtnTo, i18n("Use the Address-Selection Dialog") );
   TQWhatsThis::add( mBtnTo, i18n("This button opens a separate dialog "
                                  "where you can select recipients out "
diff --git a/kmail/regexplineedit.cpp b/kmail/regexplineedit.cpp
index 81748c22..86e8df2d 100644
--- a/kmail/regexplineedit.cpp
+++ b/kmail/regexplineedit.cpp
@@ -82,7 +82,7 @@ namespace KMail {
     if( !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) {
       mRegExpEditButton = new TQPushButton( i18n("Edit..."), this,
                                            "mRegExpEditButton" );
-      mRegExpEditButton->setSizePolicy( TQSizePolicy::Minimum,
+      mRegExpEditButton->tqsetSizePolicy( TQSizePolicy::Minimum,
                                         TQSizePolicy::Fixed );
       hlay->addWidget( mRegExpEditButton );
 
diff --git a/kmail/renamejob.cpp b/kmail/renamejob.cpp
index 09966cf9..0c220cf9 100644
--- a/kmail/renamejob.cpp
+++ b/kmail/renamejob.cpp
@@ -138,7 +138,7 @@ void RenameJob::execute()
     ImapAccountBase* account = static_cast<KMFolderImap*>(mStorage)->account();
     // first rename it on the server
     mNewImapPath = mOldImapPath;
-    mNewImapPath = mNewImapPath.replace( mOldName, mNewName );
+    mNewImapPath = mNewImapPath.tqreplace( mOldName, mNewName );
     KURL src( account->getUrl() );
     src.setPath( mOldImapPath );
     KURL dst( account->getUrl() );
diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp
index 016b8a57..75940e4c 100644
--- a/kmail/rulewidgethandlermanager.cpp
+++ b/kmail/rulewidgethandlermanager.cpp
@@ -159,7 +159,7 @@ namespace {
 
   private:
     KMSearchRule::Function currentFunction( const TQWidgetStack *functionStack ) const;
-    int currentStatusValue( const TQWidgetStack *valueStack ) const;
+    int currenStatusValue( const TQWidgetStack *valueStack ) const;
   };
 
   class NumericRuleWidgetHandler : public KMail::RuleWidgetHandler {
@@ -403,7 +403,7 @@ namespace {
     const KMSearchRule::Function id;
     const char *displayName;
   } TextFunctions[] = {
-    { KMSearchRule::FuncContains,           I18N_NOOP( "contains" )          },
+    { KMSearchRule::FuncContains,           I18N_NOOP( "tqcontains" )          },
     { KMSearchRule::FuncContainsNot,        I18N_NOOP( "does not contain" )   },
     { KMSearchRule::FuncEquals,             I18N_NOOP( "equals" )            },
     { KMSearchRule::FuncNotEqual,           I18N_NOOP( "does not equal" )     },
@@ -499,7 +499,7 @@ namespace {
   TQString TextRuleWidgetHandler::currentValue( const TQWidgetStack *valueStack,
                                                KMSearchRule::Function func ) const
   {
-    // here we gotta check the combobox which contains the categories
+    // here we gotta check the combobox which tqcontains the categories
     if ( func  == KMSearchRule::FuncIsInCategory ||
          func  == KMSearchRule::FuncIsNotInCategory ) {
       const TQComboBox *combo=
@@ -738,7 +738,7 @@ namespace {
     const KMSearchRule::Function id;
     const char *displayName;
   } MessageFunctions[] = {
-    { KMSearchRule::FuncContains,        I18N_NOOP( "contains" )          },
+    { KMSearchRule::FuncContains,        I18N_NOOP( "tqcontains" )          },
     { KMSearchRule::FuncContainsNot,     I18N_NOOP( "does not contain" )  },
     { KMSearchRule::FuncRegExp,          I18N_NOOP( "matches regular expr." ) },
     { KMSearchRule::FuncNotRegExp,       I18N_NOOP( "does not match reg. expr." ) },
@@ -1095,7 +1095,7 @@ namespace {
 
   //---------------------------------------------------------------------------
 
-  int StatusRuleWidgetHandler::currentStatusValue( const TQWidgetStack *valueStack ) const
+  int StatusRuleWidgetHandler::currenStatusValue( const TQWidgetStack *valueStack ) const
   {
     const TQComboBox *statusCombo =
       dynamic_cast<TQComboBox*>( QObject_child_const( valueStack,
@@ -1107,7 +1107,7 @@ namespace {
       return statusCombo->currentItem();
     }
     else
-      kdDebug(5006) << "StatusRuleWidgetHandler::currentStatusValue: "
+      kdDebug(5006) << "StatusRuleWidgetHandler::currenStatusValue: "
                        "statusRuleValueCombo not found." << endl;
     return -1;
   }
@@ -1121,9 +1121,9 @@ namespace {
     if ( !handlesField( field ) )
       return TQString::null;
 
-    const int status = currentStatusValue( valueStack );
+    const int status = currenStatusValue( valueStack );
     if ( status != -1 )
-      return TQString::fromLatin1( KMail::StatusValues[ status ].text );
+      return TQString::tqfromLatin1( KMail::StatusValues[ status ].text );
     else
       return TQString::null;
   }
@@ -1137,7 +1137,7 @@ namespace {
     if ( !handlesField( field ) )
       return TQString::null;
 
-    const int status = currentStatusValue( valueStack );
+    const int status = currenStatusValue( valueStack );
     if ( status != -1 )
       return i18n( KMail::StatusValues[ status ].text );
     else
@@ -1215,7 +1215,7 @@ namespace {
     const TQString value = rule->contents();
     int valueIndex = 0;
     for ( ; valueIndex < KMail::StatusValueCountWithoutHidden; ++valueIndex )
-      if ( value == TQString::fromLatin1(
+      if ( value == TQString::tqfromLatin1(
                KMail::StatusValues[ valueIndex ].text ) )
         break;
     TQComboBox *statusCombo =
diff --git a/kmail/scalix.cpp b/kmail/scalix.cpp
index 4910119d..5db8a168 100644
--- a/kmail/scalix.cpp
+++ b/kmail/scalix.cpp
@@ -60,7 +60,7 @@ KMFolder* Utils::findStandardResourceFolder( KMFolderDir* folderParentDir,
   typeMap.insert( KMail::ContentsTypeNote, "IPF.StickyNote" );
   typeMap.insert( KMail::ContentsTypeTask, "IPF.Task" );
 
-  if ( !typeMap.contains( contentsType ) )
+  if ( !typeMap.tqcontains( contentsType ) )
     return 0;
 
   for ( uint i = 0; i < attributes.count(); ++i ) {
diff --git a/kmail/scalix.h b/kmail/scalix.h
index ac07f504..66f78e79 100644
--- a/kmail/scalix.h
+++ b/kmail/scalix.h
@@ -19,9 +19,9 @@
  */
 
 /**
- * This file contains helper classes for Scalix groupware support.
+ * This file tqcontains helper classes for Scalix groupware support.
  * As the storage system of Scalix is quite similiar to Kolab we reuse some of
- * the exsiting code and replace other code by our own.
+ * the exsiting code and tqreplace other code by our own.
  *
  * Differences between Kolab and Scalix:
  *
diff --git a/kmail/searchjob.cpp b/kmail/searchjob.cpp
index 89dde821..50bf287d 100644
--- a/kmail/searchjob.cpp
+++ b/kmail/searchjob.cpp
@@ -51,7 +51,7 @@ using KPIM::ProgressManager;
 namespace KMail {
 
 SearchJob::SearchJob( KMFolderImap* folder, ImapAccountBase* account,
-                      const KMSearchPattern* pattern, Q_UINT32 serNum )
+                      const KMSearchPattern* pattern, TQ_UINT32 serNum )
  : FolderJob( 0, tOther, (folder ? folder->folder() : 0) ),
    mFolder( folder ), mAccount( account ), mSearchPattern( pattern ),
    mSerNum( serNum ), mRemainingMsgs( 0 ), mProgress( 0 ),
@@ -186,7 +186,7 @@ void SearchJob::slotSearchData( KIO::Job* job, const TQString& data )
   if ( mLocalSearchPattern->isEmpty() && data.isEmpty() )
   {
     // no local search and the server found nothing
-    TQValueList<Q_UINT32> serNums;
+    TQValueList<TQ_UINT32> serNums;
     emit searchDone( serNums, mSearchPattern, true );
   } else
   {
@@ -226,7 +226,7 @@ void SearchJob::slotSearchFolder()
 
   if ( mLocalSearchPattern->isEmpty() ) {
     // pure imap search - now get the serial number for the UIDs
-    TQValueList<Q_UINT32> serNums;
+    TQValueList<TQ_UINT32> serNums;
     for ( TQStringList::Iterator it = mImapSearchHits.begin(); 
         it != mImapSearchHits.end(); ++it ) 
     {
@@ -257,7 +257,7 @@ void SearchJob::slotSearchFolder()
             i18n("Continue Search"), i18n("&Search"), 
             "continuedownloadingforsearch" ) != KMessageBox::Continue ) 
       {
-        TQValueList<Q_UINT32> serNums;
+        TQValueList<TQ_UINT32> serNums;
         emit searchDone( serNums, mSearchPattern, true );
         return;
       }
@@ -306,7 +306,7 @@ void SearchJob::slotSearchMessageArrived( KMMessage* msg )
       if ( mLocalSearchPattern->matches( msg ) &&
           ( mImapSearchHits.isEmpty() ||
            mImapSearchHits.find( TQString::number(msg->UID() ) ) != mImapSearchHits.end() ) ) {
-        Q_UINT32 serNum = msg->getMsgSerNum();
+        TQ_UINT32 serNum = msg->getMsgSerNum();
         mSearchSerNums.append( serNum );
         matches = true;
       }
@@ -314,7 +314,7 @@ void SearchJob::slotSearchMessageArrived( KMMessage* msg )
       // imap or local search have to match
       if ( mLocalSearchPattern->matches( msg ) ||
           mImapSearchHits.find( TQString::number(msg->UID()) ) != mImapSearchHits.end() ) {
-        Q_UINT32 serNum = msg->getMsgSerNum();
+        TQ_UINT32 serNum = msg->getMsgSerNum();
         mSearchSerNums.append( serNum );
         matches = true;
       }
@@ -352,7 +352,7 @@ void SearchJob::slotSearchResult( KIO::Job *job )
     if ( mSerNum == 0 )
     {
       // folder
-      TQValueList<Q_UINT32> serNums;
+      TQValueList<TQ_UINT32> serNums;
       emit searchDone( serNums, mSearchPattern, true );
     } else {
       // message
@@ -434,7 +434,7 @@ void SearchJob::slotAbortSearch( KPIM::ProgressItem* item )
   if ( item )
     item->setComplete();
   mAccount->killAllJobs();
-  TQValueList<Q_UINT32> serNums;
+  TQValueList<TQ_UINT32> serNums;
   emit searchDone( serNums, mSearchPattern, true );
 }
 
diff --git a/kmail/searchjob.h b/kmail/searchjob.h
index d48d96b6..0fe6bdf8 100644
--- a/kmail/searchjob.h
+++ b/kmail/searchjob.h
@@ -62,7 +62,7 @@ public:
    * @param serNum if you specify the serNum only this is checked
    */
   SearchJob( KMFolderImap* folder, ImapAccountBase* account,
-             const KMSearchPattern* pattern, Q_UINT32 serNum = 0 );
+             const KMSearchPattern* pattern, TQ_UINT32 serNum = 0 );
 
   virtual ~SearchJob();
 
@@ -107,21 +107,21 @@ protected slots:
 
 signals:
   // emitted when a list of matching serial numbers was found
-  void searchDone( TQValueList<Q_UINT32>, const KMSearchPattern*, bool complete );
+  void searchDone( TQValueList<TQ_UINT32>, const KMSearchPattern*, bool complete );
 
   // emitted when a single message (identified by the serial number) was checked
-  void searchDone( Q_UINT32, const KMSearchPattern*, bool matches );
+  void searchDone( TQ_UINT32, const KMSearchPattern*, bool matches );
 
 protected:
   KMFolderImap* mFolder;
   ImapAccountBase* mAccount;
   const KMSearchPattern* mSearchPattern;
   KMSearchPattern* mLocalSearchPattern;
-  Q_UINT32 mSerNum;
+  TQ_UINT32 mSerNum;
     // saves the results of the imap search
   TQStringList mImapSearchHits;
   // collects the serial numbers from imap and local search
-  TQValueList<Q_UINT32> mSearchSerNums;
+  TQValueList<TQ_UINT32> mSearchSerNums;
   // the remaining messages that have to be downloaded for local search
   uint mRemainingMsgs;
   // progress item for local searches
diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index b32dd96e..2f4b3565 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -466,7 +466,7 @@ void SearchWindow::activateFolder(KMFolder *curFolder)
 //-----------------------------------------------------------------------------
 void SearchWindow::slotSearch()
 {
-    mLastFocus = focusWidget();
+    mLastFocus = tqfocusWidget();
     mBtnSearch->setFocus();     // set focus so we don't miss key event
 
     mStopped = false;
@@ -509,12 +509,12 @@ void SearchWindow::slotSearch()
     mFolder->stopSearch();
     disconnect(mFolder, TQT_SIGNAL(msgAdded(int)),
             this, TQT_SLOT(slotAddMsg(int)));
-    disconnect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, Q_UINT32)),
-            this, TQT_SLOT(slotRemoveMsg(KMFolder*, Q_UINT32)));
+    disconnect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
+            this, TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32)));
     connect(mFolder, TQT_SIGNAL(msgAdded(int)),
             this, TQT_SLOT(slotAddMsg(int)));
-    connect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, Q_UINT32)),
-            this, TQT_SLOT(slotRemoveMsg(KMFolder*, Q_UINT32)));
+    connect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
+            this, TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32)));
     mSearchFolderEdt->setEnabled(false);
     KMSearch *search = new KMSearch();
     connect(search, TQT_SIGNAL(finished(bool)),
@@ -563,7 +563,7 @@ void SearchWindow::slotAddMsg(int idx)
     KMMessage *msg = mFolder->getMsg(idx);
     TQString from, fName;
     KMFolder *pFolder = msg->parent();
-    if (!mFolders.contains(pFolder)) {
+    if (!mFolders.tqcontains(pFolder)) {
         mFolders.append(pFolder);
         pFolder->open("searchwindow");
     }
@@ -584,7 +584,7 @@ void SearchWindow::slotAddMsg(int idx)
         mFolder->unGetMsg(idx);
 }
 
-void SearchWindow::slotRemoveMsg(KMFolder *, Q_UINT32 serNum)
+void SearchWindow::slotRemoveMsg(KMFolder *, TQ_UINT32 serNum)
 {
     if (!mFolder)
         return;
@@ -948,13 +948,13 @@ void SearchWindow::slotPrintMsg()
 
 void SearchWindow::slotCopyMsgs()
 {
-  TQValueList<Q_UINT32> list = MessageCopyHelper::serNumListFromMsgList( selectedMessages() );
+  TQValueList<TQ_UINT32> list = MessageCopyHelper::serNumListFromMsgList( selectedMessages() );
   mKMMainWidget->headers()->setCopiedMessages( list, false );
 }
 
 void SearchWindow::slotCutMsgs()
 {
-  TQValueList<Q_UINT32> list = MessageCopyHelper::serNumListFromMsgList( selectedMessages() );
+  TQValueList<TQ_UINT32> list = MessageCopyHelper::serNumListFromMsgList( selectedMessages() );
   mKMMainWidget->headers()->setCopiedMessages( list, true );
 }
 
diff --git a/kmail/searchwindow.h b/kmail/searchwindow.h
index 836553ae..c3c8cf85 100644
--- a/kmail/searchwindow.h
+++ b/kmail/searchwindow.h
@@ -139,7 +139,7 @@ protected slots:
   /** GUI cleanup after search */
   virtual void searchDone();
   virtual void slotAddMsg(int idx);
-  virtual void slotRemoveMsg(KMFolder *, Q_UINT32 serNum);
+  virtual void slotRemoveMsg(KMFolder *, TQ_UINT32 serNum);
   void enableGUI();
 
   void setEnabledSearchButton(bool);
diff --git a/kmail/sievejob.cpp b/kmail/sievejob.cpp
index 0ce073d9..fa32dea6 100644
--- a/kmail/sievejob.cpp
+++ b/kmail/sievejob.cpp
@@ -149,7 +149,7 @@ namespace KMail {
     // Convert mScript into UTF-8:
     data = mScript.utf8();
 
-    // "data" contains a trailing NUL, remove:
+    // "data" tqcontains a trailing NUL, remove:
     if ( data.size() > 0 && data[(int)data.size() - 1] == '\0' )
       data.resize( data.size() - 1 );
 
diff --git a/kmail/signatureconfigurator.cpp b/kmail/signatureconfigurator.cpp
index 606d460d..c566da00 100644
--- a/kmail/signatureconfigurator.cpp
+++ b/kmail/signatureconfigurator.cpp
@@ -52,7 +52,7 @@ namespace KMail {
     TQVBoxLayout * vlay;
     TQVBoxLayout * page_vlay;
 
-    vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main layout" );
+    vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main tqlayout" );
 
     // "enable signatue" checkbox:
     mEnableCheck = new TQCheckBox( i18n("&Enable signature"), this );
@@ -119,7 +119,7 @@ namespace KMail {
     hlay = new TQHBoxLayout( page_vlay ); // inherits spacing
     mFileRequester = new KURLRequester( page );
     TQWhatsThis::add(mFileRequester,
-        i18n("Use this requester to specify a text file that contains your "
+        i18n("Use this requester to specify a text file that tqcontains your "
              "signature. It will be read every time you create a new mail or "
              "append a new signature."));
     hlay->addWidget( new TQLabel( mFileRequester,
@@ -260,7 +260,7 @@ namespace KMail {
     // slotEnableEditButton should prevent this assert from being hit:
     assert( !url.isEmpty() );
 
-    (void)KRun::runURL( KURL( url ), TQString::fromLatin1("text/plain") );
+    (void)KRun::runURL( KURL( url ), TQString::tqfromLatin1("text/plain") );
   }
 
 } // namespace KMail
diff --git a/kmail/simplestringlisteditor.cpp b/kmail/simplestringlisteditor.cpp
index 4be67e6e..4d42f4d4 100644
--- a/kmail/simplestringlisteditor.cpp
+++ b/kmail/simplestringlisteditor.cpp
@@ -166,7 +166,7 @@ TQStringList SimpleStringListEditor::stringList() const {
   return result;
 }
 
-bool SimpleStringListEditor::containsString( const TQString & str ) {
+bool SimpleStringListEditor::tqcontainsString( const TQString & str ) {
   for ( TQListBoxItem * item = mListBox->firstItem() ;
 	item ; item = item->next() ) {
     if ( item->text() == str )
@@ -193,7 +193,7 @@ void SimpleStringListEditor::setButtonText( ButtonCode button,
   case Up:
   case Down:
     kdDebug(5006) << "SimpleStringListEditor: Cannot change text of "
-      "Up and Down buttons: they don't contains text!" << endl;
+      "Up and Down buttons: they don't tqcontains text!" << endl;
     return;
   default:
     if ( button & All )
@@ -216,7 +216,7 @@ void SimpleStringListEditor::slotAdd() {
 					    &ok, this );
   // let the user verify the string before adding
   emit aboutToAdd( newEntry );
-  if ( ok && !newEntry.isEmpty() && !containsString( newEntry )) {
+  if ( ok && !newEntry.isEmpty() && !tqcontainsString( newEntry )) {
       mListBox->insertItem( newEntry );
       emit changed();
   }
diff --git a/kmail/simplestringlisteditor.h b/kmail/simplestringlisteditor.h
index 115a9a05..afa8593c 100644
--- a/kmail/simplestringlisteditor.h
+++ b/kmail/simplestringlisteditor.h
@@ -91,7 +91,7 @@ protected slots:
   void slotSelectionChanged();
 
 protected:
-  bool containsString( const TQString & str );
+  bool tqcontainsString( const TQString & str );
   TQListBox      *mListBox;
   TQPushButton   *mAddButton;
   TQPushButton   *mRemoveButton;
diff --git a/kmail/smimeconfiguration.ui b/kmail/smimeconfiguration.ui
index c1f2ca40..d82d06a3 100644
--- a/kmail/smimeconfiguration.ui
+++ b/kmail/smimeconfiguration.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>SMimeConfiguration</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -54,7 +54,7 @@
                 </property>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -80,7 +80,7 @@
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -109,7 +109,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>150</width>
                                     <height>20</height>
@@ -202,7 +202,7 @@
                         </property>
                         <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
                             <property name="name">
-                                <cstring>layout5</cstring>
+                                <cstring>tqlayout5</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -253,7 +253,7 @@
                                 <string>Ignore HTTP CRL distribution point of certificates</string>
                             </property>
                             <property name="whatsThis" stdset="0">
-                                <string>When looking for the location of a CRL, the to-be-tested certificate usually contains what are known as "CRL Distribution Point" (DP) entries, which are URLs describing the way to access the URL. The first found DP entry is used.  With this option all entries using the HTTP scheme are ignored when looking for a suitable DP.</string>
+                                <string>When looking for the location of a CRL, the to-be-tested certificate usually tqcontains what are known as "CRL Distribution Point" (DP) entries, which are URLs describing the way to access the URL. The first found DP entry is used.  With this option all entries using the HTTP scheme are ignored when looking for a suitable DP.</string>
                             </property>
                         </widget>
                     </grid>
@@ -307,12 +307,12 @@
                                 <string>Ignore LDAP CRL distribution point of certificates</string>
                             </property>
                             <property name="whatsThis" stdset="0">
-                                <string>When looking for the location of a CRL, the to-be-tested certificate usually contains what are known as "CRL Distribution Point" (DP) entries, which are URLs describing the way to access the URL. The first found DP entry is used.  With this option all entries using the LDAP scheme are ignored when looking for a suitable DP.</string>
+                                <string>When looking for the location of a CRL, the to-be-tested certificate usually tqcontains what are known as "CRL Distribution Point" (DP) entries, which are URLs describing the way to access the URL. The first found DP entry is used.  With this option all entries using the LDAP scheme are ignored when looking for a suitable DP.</string>
                             </property>
                         </widget>
                         <widget class="QLayoutWidget">
                             <property name="name">
-                                <cstring>layout5</cstring>
+                                <cstring>tqlayout5</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -351,7 +351,7 @@ The syntax is "HOST" or "HOST:PORT". If PORT is omitted, port 389 (standard LDAP
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>73</height>
@@ -409,5 +409,5 @@ The syntax is "HOST" or "HOST:PORT". If PORT is omitted, port 389 (standard LDAP
         <slot>setDisabled(bool)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmail/snippetdlg.cpp b/kmail/snippetdlg.cpp
index 93478d13..5e26319f 100644
--- a/kmail/snippetdlg.cpp
+++ b/kmail/snippetdlg.cpp
@@ -49,8 +49,8 @@ SnippetDlg::SnippetDlg( KActionCollection* ac, TQWidget* parent, const char* nam
     connect( snippetName, TQT_SIGNAL(returnPressed()),
              this, TQT_SLOT(slotReturnPressed()) );
 
-    layout3->addWidget( textLabel3, 7, 0 );
-    layout3->addWidget( keyButton, 7, 1 );
+    tqlayout3->addWidget( textLabel3, 7, 0 );
+    tqlayout3->addWidget( keyButton, 7, 1 );
 
     // tab order
     setTabOrder( snippetText, keyButton );
diff --git a/kmail/snippetdlgbase.ui b/kmail/snippetdlgbase.ui
index a5a28a72..0df0e226 100644
--- a/kmail/snippetdlgbase.ui
+++ b/kmail/snippetdlgbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>SnippetDlgBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -21,7 +21,7 @@
         </property>
         <widget class="QLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -37,7 +37,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -64,7 +64,7 @@
         </widget>
         <widget class="QLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -85,7 +85,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>80</height>
@@ -110,7 +110,7 @@
                     <property name="text">
                         <string>&amp;Snippet:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignTop</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -169,7 +169,7 @@
     <tabstop>btnAdd</tabstop>
     <tabstop>btnCancel</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kmail/snippetsettingsbase.ui b/kmail/snippetsettingsbase.ui
index 9c5461fe..62ca4a48 100644
--- a/kmail/snippetsettingsbase.ui
+++ b/kmail/snippetsettingsbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>SnippetSettingsBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -56,7 +56,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>70</height>
@@ -123,7 +123,7 @@
                 </widget>
                 <widget class="QLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -144,7 +144,7 @@
                             <property name="name">
                                 <cstring>leDelimiter</cstring>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>40</width>
                                     <height>32767</height>
@@ -164,7 +164,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
@@ -177,7 +177,7 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp
index 800a98e5..ef0e0793 100644
--- a/kmail/snippetwidget.cpp
+++ b/kmail/snippetwidget.cpp
@@ -146,7 +146,7 @@ SnippetItem* SnippetWidget::makeItem( SnippetItem* parent, const TQString& name,
 {
     SnippetItem * item = new SnippetItem(parent, name, text);
     const TQString actionName = i18n("Snippet %1").arg(name);
-    const TQString normalizedName = TQString(actionName).replace(" ", "_");
+    const TQString normalizedName = TQString(actionName).tqreplace(" ", "_");
     if ( !mActionCollection->action(normalizedName.utf8() ) ) {
         KAction * action = new KAction( actionName, shortcut, item,
                                         TQT_SLOT( slotExecute() ), mActionCollection,
@@ -521,7 +521,7 @@ void SnippetWidget::maybeTip( const TQPoint & p )
 	if (!item)
 	  return;
 
-	TQRect r = itemRect( item );
+	TQRect r = tqitemRect( item );
 
 	if (r.isValid() &&
         _SnippetConfig.useToolTips() )
@@ -562,7 +562,7 @@ void SnippetWidget::showPopupMenu( TQListViewItem * item, const TQPoint & p, int
 //  fn SnippetWidget::parseText(TQString text, TQString del)
 /*!
     This function is used to parse the given TQString for variables. If found the user will be prompted
-    for a replacement value. It returns the string text with all replacements made
+    for a tqreplacement value. It returns the string text with all tqreplacements made
  */
 TQString SnippetWidget::parseText(TQString text, TQString del)
 {
@@ -597,11 +597,11 @@ TQString SnippetWidget::parseText(TQString text, TQString del)
           strNew = ""; //for inputmode "multi" just reset new valaue
         }
       } else {
-        strNew = del; //if double-delimiter -> replace by single character
+        strNew = del; //if double-delimiter -> tqreplace by single character
       }
 
       if (iInMeth == 0) {  //if input-method "single" is selected
-        str.replace(strName, strNew);
+        str.tqreplace(strName, strNew);
       }
 
       mapVar[strName] = strNew;
@@ -615,8 +615,8 @@ TQString SnippetWidget::parseText(TQString text, TQString del)
     oh = rMulti.top();
     if (showMultiVarDialog( &mapVar, &_mapSaved, w, bh, oh )) {  //generate and show the dialog
       TQMap<TQString, TQString>::Iterator it;
-      for ( it = mapVar.begin(); it != mapVar.end(); ++it ) {  //walk through the map and do the replacement
-        str.replace(it.key(), it.data());
+      for ( it = mapVar.begin(); it != mapVar.end(); ++it ) {  //walk through the map and do the tqreplacement
+        str.tqreplace(it.key(), it.data());
       }
     } else {
       return "";
@@ -637,7 +637,7 @@ TQString SnippetWidget::parseText(TQString text, TQString del)
 
 //  fn SnippetWidget::showMultiVarDialog()
 /*!
-    This function constructs a dialog which contains a label and a linedit for every
+    This function constructs a dialog which tqcontains a label and a linedit for every
     variable that is stored in the given map except the double-delimiter entry
     It return true if everything was ok and false if the user hit cancel
  */
@@ -660,35 +660,35 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
   TQDialog dlg(this);
   dlg.setCaption(i18n("Enter Values for Variables"));
 
-  TQGridLayout * layout = new TQGridLayout( &dlg, 1, 1, 11, 6, "layout");
-  TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop");
-  TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar");
-  TQGridLayout * layoutBtn = new TQGridLayout( 0, 1, 1, 0, 6, "layoutBtn");
+  TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout");
+  TQGridLayout * tqlayoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutTop");
+  TQGridLayout * tqlayoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutVar");
+  TQGridLayout * tqlayoutBtn = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutBtn");
 
   KTextEdit *te = NULL;
   TQLabel * labTop = NULL;
   TQCheckBox * cb = NULL;
 
   labTop = new TQLabel( &dlg, "label" );
-  labTop->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
+  labTop->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
                          labTop->sizePolicy().hasHeightForWidth() ) );
-  labTop->setText(i18n("Enter the replacement values for these variables:"));
-  layoutTop->addWidget(labTop, 0, 0);
-  layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
+  labTop->setText(i18n("Enter the tqreplacement values for these variables:"));
+  tqlayoutTop->addWidget(labTop, 0, 0);
+  tqlayout->addMultiCellLayout( tqlayoutTop, 0, 0, 0, 1 );
 
 
   int i = 0;                                           //walk through the variable map and add
-  for ( it = map->begin(); it != map->end(); ++it ) {  //a checkbox, a lable and a lineedit to the main layout
+  for ( it = map->begin(); it != map->end(); ++it ) {  //a checkbox, a lable and a lineedit to the main tqlayout
     if (it.key() == _SnippetConfig.getDelimiter() + _SnippetConfig.getDelimiter())
       continue;
 
     cb = new TQCheckBox( &dlg, "cbVar" );
     cb->setChecked( FALSE );
     cb->setText(it.key());
-    layoutVar->addWidget( cb, i ,0, Qt::AlignTop );
+    tqlayoutVar->addWidget( cb, i ,0, Qt::AlignTop );
 
     te = new KTextEdit( &dlg, "teVar" );
-    layoutVar->addWidget( te, i, 1, Qt::AlignTop );
+    tqlayoutVar->addWidget( te, i, 1, Qt::AlignTop );
 
     if ((*mapSave)[it.key()].length() > 0) {
       cb->setChecked( TRUE );
@@ -705,20 +705,20 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
 
     i++;
   }
-  layout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
+  tqlayout->addMultiCellLayout( tqlayoutVar, 1, 1, 0, 1 );
 
   KPushButton * btn1 = new KPushButton( KStdGuiItem::cancel(), &dlg, "pushButton1" );
-  btn1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
+  btn1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
                          btn1->sizePolicy().hasHeightForWidth() ) );
-  layoutBtn->addWidget( btn1, 0, 0 );
+  tqlayoutBtn->addWidget( btn1, 0, 0 );
 
   KPushButton * btn2 = new KPushButton( KStdGuiItem::apply(), &dlg, "pushButton2" );
   btn2->setDefault( TRUE );
-  btn2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
+  btn2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
                          btn2->sizePolicy().hasHeightForWidth() ) );
-  layoutBtn->addWidget( btn2, 0, 1 );
+  tqlayoutBtn->addWidget( btn2, 0, 1 );
 
-  layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
+  tqlayout->addMultiCellLayout( tqlayoutBtn, 2, 2, 0, 1 );
   // --END-- building a dynamic dialog
 
   //connect the buttons to the TQDialog default slots
@@ -729,7 +729,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
   bool bReturn = false;
   //resize the textedits
   if (iWidth > 1) {
-    TQRect r = dlg.geometry();
+    TQRect r = dlg.tqgeometry();
     r.setHeight(iBasicHeight + iOneHeight*mapVar2Te.count());
     r.setWidth(iWidth);
     dlg.setGeometry(r);
@@ -750,9 +750,9 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
     }
     bReturn = true;
 
-    iBasicHeight = dlg.geometry().height() - layoutVar->geometry().height();
-    iOneHeight = layoutVar->geometry().height() / mapVar2Te.count();
-    iWidth = dlg.geometry().width();
+    iBasicHeight = dlg.tqgeometry().height() - tqlayoutVar->tqgeometry().height();
+    iOneHeight = tqlayoutVar->tqgeometry().height() / mapVar2Te.count();
+    iWidth = dlg.tqgeometry().width();
   }
 
   //do some cleanup
@@ -764,10 +764,10 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
   for (it2 = mapVar2Cb.begin(); it2 != mapVar2Cb.end(); ++it2)
     delete it2.data();
   mapVar2Cb.clear();
-  delete layoutTop;
-  delete layoutVar;
-  delete layoutBtn;
-  delete layout;
+  delete tqlayoutTop;
+  delete tqlayoutVar;
+  delete tqlayoutBtn;
+  delete tqlayout;
 
   if (i==0) //if nothing happened this means, that there are no variables to translate
     return true; //.. so just return OK
@@ -779,7 +779,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
 
 //  fn SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQString> * mapSave)
 /*!
-    This function constructs a dialog which contains a label and a linedit for the given variable
+    This function constructs a dialog which tqcontains a label and a linedit for the given variable
     It return either the entered value or an empty string if the user hit cancel
  */
 TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQString> * mapSave, TQRect & dlgSize)
@@ -788,19 +788,19 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
   TQDialog dlg(this);
   dlg.setCaption(i18n("Enter Values for Variables"));
 
-  TQGridLayout * layout = new TQGridLayout( &dlg, 1, 1, 11, 6, "layout");
-  TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop");
-  TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar");
-  TQGridLayout * layoutBtn = new TQGridLayout( 0, 2, 1, 0, 6, "layoutBtn");
+  TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout");
+  TQGridLayout * tqlayoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutTop");
+  TQGridLayout * tqlayoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutVar");
+  TQGridLayout * tqlayoutBtn = new TQGridLayout( 0, 2, 1, 0, 6, "tqlayoutBtn");
 
   KTextEdit *te = NULL;
   TQLabel * labTop = NULL;
   TQCheckBox * cb = NULL;
 
   labTop = new TQLabel( &dlg, "label" );
-  layoutTop->addWidget(labTop, 0, 0);
-  labTop->setText(i18n("Enter the replacement values for %1:").arg( var ));
-  layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
+  tqlayoutTop->addWidget(labTop, 0, 0);
+  labTop->setText(i18n("Enter the tqreplacement values for %1:").arg( var ));
+  tqlayout->addMultiCellLayout( tqlayoutTop, 0, 0, 0, 1 );
 
 
   cb = new TQCheckBox( &dlg, "cbVar" );
@@ -808,8 +808,8 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
   cb->setText(i18n( "Make value &default" ));
 
   te = new KTextEdit( &dlg, "teVar" );
-  layoutVar->addWidget( te, 0, 1, Qt::AlignTop);
-  layoutVar->addWidget( cb, 1, 1, Qt::AlignTop);
+  tqlayoutVar->addWidget( te, 0, 1, Qt::AlignTop);
+  tqlayoutVar->addWidget( cb, 1, 1, Qt::AlignTop);
   if ((*mapSave)[var].length() > 0) {
     cb->setChecked( TRUE );
     te->setText((*mapSave)[var]);
@@ -820,16 +820,16 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
                             "If you use the same variable later, even in another snippet, the value entered to the right "
                             "will be the default value for that variable.") );
 
-  layout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
+  tqlayout->addMultiCellLayout( tqlayoutVar, 1, 1, 0, 1 );
 
   KPushButton * btn1 = new KPushButton( KStdGuiItem::cancel(), &dlg, "pushButton1" );
-  layoutBtn->addWidget( btn1, 0, 0 );
+  tqlayoutBtn->addWidget( btn1, 0, 0 );
 
   KPushButton * btn2 = new KPushButton( KStdGuiItem::apply(), &dlg, "pushButton2" );
   btn2->setDefault( TRUE );
-  layoutBtn->addWidget( btn2, 0, 1 );
+  tqlayoutBtn->addWidget( btn2, 0, 1 );
 
-  layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
+  tqlayout->addMultiCellLayout( tqlayoutBtn, 2, 2, 0, 1 );
   te->setFocus();
   // --END-- building a dynamic dialog
 
@@ -849,7 +849,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
 
     strReturn = te->text();    //copy the entered values back the the given map
 
-    dlgSize = dlg.geometry();
+    dlgSize = dlg.tqgeometry();
   }
 
   //do some cleanup
@@ -858,10 +858,10 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
   delete labTop;
   delete btn1;
   delete btn2;
-  delete layoutTop;
-  delete layoutVar;
-  delete layoutBtn;
-  delete layout;
+  delete tqlayoutTop;
+  delete tqlayoutVar;
+  delete tqlayoutBtn;
+  delete tqlayout;
 
   return strReturn;
 }
@@ -912,7 +912,7 @@ void SnippetWidget::slotDropped(TQDropEvent *e, TQListViewItem *)
     group = dynamic_cast<SnippetGroup *>(item2->parent());
 
   TQCString dropped;
-  TQByteArray data = e->encodedData("text/plain");
+  TQByteArray data = e->tqencodedData("text/plain");
   if ( e->provides("text/plain") && data.size()>0 ) {
     //get the data from the event...
     TQString encData(data.data());
diff --git a/kmail/snippetwidget.h b/kmail/snippetwidget.h
index 79dd258d..cd7d09d3 100644
--- a/kmail/snippetwidget.h
+++ b/kmail/snippetwidget.h
@@ -39,7 +39,7 @@ class KActionCollection;
 /**
 This is the widget which gets added to the right TreeToolView.
 It inherits KListView and TQToolTip which is needed for showing the
-tooltips which contains the text of the snippet
+tooltips which tqcontains the text of the snippet
 @author Robert Gruber
 */
 class SnippetWidget : public KListView, public QToolTip
diff --git a/kmail/stringutil.cpp b/kmail/stringutil.cpp
index 907c5e1f..e3a2243c 100644
--- a/kmail/stringutil.cpp
+++ b/kmail/stringutil.cpp
@@ -29,7 +29,7 @@ namespace StringUtil
 TQString encodeMailtoUrl( const TQString& str )
 {
   TQString result;
-  result = TQString::fromLatin1( KMMsgBase::encodeRFC2047String( str,
+  result = TQString::tqfromLatin1( KMMsgBase::encodeRFC2047String( str,
                                 "utf-8" ) );
   result = KURL::encode_string( result );
   return result;
diff --git a/kmail/subscriptiondialog.cpp b/kmail/subscriptiondialog.cpp
index 58d00b24..bb9c5c6c 100644
--- a/kmail/subscriptiondialog.cpp
+++ b/kmail/subscriptiondialog.cpp
@@ -414,7 +414,7 @@ void SubscriptionDialog::processItems()
   uint done = 0;
   for (uint i = mCount; i < mFolderNames.count(); ++i)
   {
-    // give the dialog a chance to repaint
+    // give the dialog a chance to tqrepaint
     if (done == 1000)
     {
       emit listChanged();
diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp
index 79df8509..26355ac5 100644
--- a/kmail/templateparser.cpp
+++ b/kmail/templateparser.cpp
@@ -693,7 +693,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
       } else if ( cmd.startsWith( "DATEEN" ) ) {
         kdDebug() << "Command: DATEEN" << endl;
         i += strlen( "DATEEN" );
-        TQDateTime date = TQDateTime::currentDateTime();
+        TQDateTime date = TQDateTime::tqcurrentDateTime();
         KLocale locale( "C" );
         TQString str = locale.formatDate( date.date(), false );
         body.append( str );
@@ -701,28 +701,28 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
       } else if ( cmd.startsWith( "DATESHORT" ) ) {
         kdDebug() << "Command: DATESHORT" << endl;
         i += strlen( "DATESHORT" );
-        TQDateTime date = TQDateTime::currentDateTime();
+        TQDateTime date = TQDateTime::tqcurrentDateTime();
         TQString str = KGlobal::locale()->formatDate( date.date(), true );
         body.append( str );
 
       } else if ( cmd.startsWith( "DATE" ) ) {
         kdDebug() << "Command: DATE" << endl;
         i += strlen( "DATE" );
-        TQDateTime date = TQDateTime::currentDateTime();
+        TQDateTime date = TQDateTime::tqcurrentDateTime();
         TQString str = KGlobal::locale()->formatDate( date.date(), false );
         body.append( str );
 
       } else if ( cmd.startsWith( "DOW" ) ) {
         kdDebug() << "Command: DOW" << endl;
         i += strlen( "DOW" );
-        TQDateTime date = TQDateTime::currentDateTime();
+        TQDateTime date = TQDateTime::tqcurrentDateTime();
         TQString str = KGlobal::locale()->calendar()->weekDayName( date.date(), false );
         body.append( str );
 
       } else if ( cmd.startsWith( "TIMELONGEN" ) ) {
         kdDebug() << "Command: TIMELONGEN" << endl;
         i += strlen( "TIMELONGEN" );
-        TQDateTime date = TQDateTime::currentDateTime();
+        TQDateTime date = TQDateTime::tqcurrentDateTime();
         KLocale locale( "C");
         TQString str = locale.formatTime( date.time(), true );
         body.append( str );
@@ -730,14 +730,14 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
       } else if ( cmd.startsWith( "TIMELONG" ) ) {
         kdDebug() << "Command: TIMELONG" << endl;
         i += strlen( "TIMELONG" );
-        TQDateTime date = TQDateTime::currentDateTime();
+        TQDateTime date = TQDateTime::tqcurrentDateTime();
         TQString str = KGlobal::locale()->formatTime( date.time(), true );
         body.append( str );
 
       } else if ( cmd.startsWith( "TIME" ) ) {
         kdDebug() << "Command: TIME" << endl;
         i += strlen( "TIME" );
-        TQDateTime date = TQDateTime::currentDateTime();
+        TQDateTime date = TQDateTime::tqcurrentDateTime();
         TQString str = KGlobal::locale()->formatTime( date.time(), false );
         body.append( str );
 
@@ -963,7 +963,7 @@ void TemplateParser::addProcessedBodyToMessage( const TQString &body )
 
           // Converting to a string here, since DwMediaType does not have a HasParameter() function
           TQString ctStr = ct.AsString().c_str();
-          if ( !ctStr.lower().contains( "name=" ) && !ctStr.lower().contains( "filename=" ) ) {
+          if ( !ctStr.lower().tqcontains( "name=" ) && !ctStr.lower().tqcontains( "filename=" ) ) {
             DwParameter *nameParameter = new DwParameter;
             nameParameter->SetAttribute( "name" );
             nameParameter->SetValue( Util::dwString( KMMsgBase::encodeRFC2231StringAutoDetectCharset(
diff --git a/kmail/templateparser.h b/kmail/templateparser.h
index 3cb53ac1..48bdbf57 100644
--- a/kmail/templateparser.h
+++ b/kmail/templateparser.h
@@ -32,11 +32,11 @@ class KProcess;
 /**
  * The TemplateParser transforms a message with a given template.
  *
- * A template contains text and commands, such as %QUOTE or %ODATE, which will be
- * replaced with the real values in process().
+ * A template tqcontains text and commands, such as %QUOTE or %ODATE, which will be
+ * tqreplaced with the real values in process().
  *
  * The message given in the constructor is the message that is being transformed.
- * The message text will be replaced by the processed text of the template, but other
+ * The message text will be tqreplaced by the processed text of the template, but other
  * properties, such as the attachments or the subject, are preserved.
  *
  * There are two different kind of commands: Those that work on the message that is
@@ -147,7 +147,7 @@ class TemplateParser : public TQObject
      *
      * In append mode, this will simply append the text to the body.
      *
-     * Otherwise, the content of the old message is deleted and replaced with @p body.
+     * Otherwise, the content of the old message is deleted and tqreplaced with @p body.
      * Attachments of the original message are also added back to the new message. 
      */
     void addProcessedBodyToMessage( const TQString &body );
diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp
index 8b4f37e8..70dd926b 100644
--- a/kmail/templatesconfiguration.cpp
+++ b/kmail/templatesconfiguration.cpp
@@ -47,8 +47,8 @@ TemplatesConfiguration::TemplatesConfiguration( TQWidget *parent, const char *na
   textEdit_reply_all->setFont( f );
   textEdit_forward->setFont( f );
 
-  setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
-  sizeHint();
+  tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
+  tqsizeHint();
 
   connect( textEdit_new, TQT_SIGNAL( textChanged() ),
            this, TQT_SLOT( slotTextChanged( void ) ) );
diff --git a/kmail/templatesconfiguration_base.ui b/kmail/templatesconfiguration_base.ui
index 20345e57..69c451b4 100644
--- a/kmail/templatesconfiguration_base.ui
+++ b/kmail/templatesconfiguration_base.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>TemplatesConfigurationBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -20,7 +20,7 @@
             <verstretch>3</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>400</width>
             <height>300</height>
@@ -45,7 +45,7 @@
                     <verstretch>3</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>0</height>
@@ -86,7 +86,7 @@
                                 <verstretch>3</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>0</width>
                                 <height>0</height>
@@ -258,7 +258,7 @@
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -284,7 +284,7 @@
                     <property name="text">
                         <string>&amp;Quote indicator:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -324,7 +324,7 @@
         <data format="PNG" length="807">89504e470d0a1a0a0000000d49484452000000100000001008060000001ff3ff61000002ee49444154388d7d93cd6b5c6514c67fe7bdef9d8f24d349c66412a203b1b4282d21140918824816418a0b454d75e1a28ab8c8dfe1c25d70e34e0812ea4644d13610c43a1121b5d84cab6943486227499d869ae6633e32f7de79ef71d58644f0593dabdf39cf7938a2aa4c4f4f9b300c0b954ae56ca55249876128aa2a9c90738eadadada0542afd954ea7cb636363a19d9f9f4755cff6f4a53e4d67ed78f7b37ebb8b05e3810818017d0a68f1dcc36463a7ea8a4b8bdb9fcccdcdddf6eaf5bae4f3f9f7bb7a773faee94fed81b983a6d6d9ab6eb2f5f73affec6de1a536c9e4d7497696c9f63cf237d66b85b5e570cf3977c7aeaeae9a42a130d03d506bdbaddda3d1805faec6dc5a68e2a208e30124187a39c9ebefa6c8f544f84949a9ea69e75cd60641c0e1e1a1b8b849142ac51f226ece1f32fc4a86f31732f86db076178ad70e20765cfae8142207009eaafac639270022c2fd15a1b470c8f81b59defed0637024c44596c269cb3b1fe4585c68f2c76f0e23064000639e5c5804caab2d8c24187ed5c3265adc5bf4b9f2f91e377eae73fe254b6fbfc7ea7283588f9a314756089b31ed5925dd61b87b2bc5d75fd4a91d843c7fa68d5caf23fb4c8246fdc9f01300e3412e9f60f7313c285b6edf0c696bf338f3620773df3de2ea15d8de0ce92f2448f8472bd8a700515e18146e5c3714afd5197f3343ae3b463ce1cbcf94efbf7a48b6cb303462595c3801505514280c182ebed5ce37333bec3f8e387721859f80da7e8c114714097b3be65804eb799e562a95e641358e4d47cb8cbc66c9f5f6f1eb8f55967eafa140bedfe7e27b7dac2c4588a7ec6cb7622004629b4c2629954a7fda6c6b3f5f08baac1f61bd2683c3867a358931865339c8e69a9c1b323cb87fc0fa72d81091351189646262426667677b620e2fabea25942e504144fef34d80735a752daeab9a6f7ddf5f9162b1c8e4e4a45f2e974f0541d0a3aa19c03f16f4b862a061adddc96432bba2aaccccccc8d4d494b7b1b1910c8220a1aae6ff00d6da56676767303a3a1afd0b29d2596f22d0b7b20000000049454e44ae426082</data>
     </image>
 </images>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
     <includehint>templatesinsertcommand.h</includehint>
diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp
index 45bd81fc..c2f794dd 100644
--- a/kmail/templatesinsertcommand.cpp
+++ b/kmail/templatesinsertcommand.cpp
@@ -325,7 +325,7 @@ TemplatesInsertCommand::~TemplatesInsertCommand()
 
 void TemplatesInsertCommand::slotClicked()
 {
-  TQSize ps = mMenu->popupMenu()->sizeHint();
+  TQSize ps = mMenu->popupMenu()->tqsizeHint();
   mMenu->popup( mapToGlobal( TQPoint( 0, -(ps.height()) ) ) );
 }
 
diff --git a/kmail/tests/messagedicttests.cpp b/kmail/tests/messagedicttests.cpp
index cdb24f6d..e6b4b899 100644
--- a/kmail/tests/messagedicttests.cpp
+++ b/kmail/tests/messagedicttests.cpp
@@ -65,12 +65,12 @@ void MessageDictTester::testKMDictClear()
 
 void MessageDictTester::testKMDictReplace()
 {
-  p("Check replace: ");
+  p("Check tqreplace: ");
   m_dict->init( 31 );
   KMDictItem *oldItem = new KMDictItem();
   KMDictItem *newItem = new KMDictItem();
   m_dict->insert( 12345, oldItem );
-  m_dict->replace( 12345, newItem );
+  m_dict->tqreplace( 12345, newItem );
   KMDictItem *found = m_dict->find( 12345 );
   CHECK( found, newItem );
 }
diff --git a/kmail/tests/mimelibtests.cpp b/kmail/tests/mimelibtests.cpp
index b152fdcf..34a4f469 100644
--- a/kmail/tests/mimelibtests.cpp
+++ b/kmail/tests/mimelibtests.cpp
@@ -39,8 +39,8 @@ KUNITTEST_MODULE_REGISTER_TESTER( MimeLibTester );
 static TQString makePrintable( const TQCString& str )
 {
   TQString a = str;
-  a = a.replace( '\r', "\\r" );
-  a = a.replace( '\n', "\\n" );
+  a = a.tqreplace( '\r', "\\r" );
+  a = a.tqreplace( '\n', "\\n" );
   return a;
 }
 #endif
@@ -48,8 +48,8 @@ static TQString makePrintable( const TQCString& str )
 static TQString makePrintable( const DwString& str )
 {
   TQString a = KMail::Util::CString( str ); // ## we assume latin1
-  a = a.replace( '\r', "\\r" );
-  a = a.replace( '\n', "\\n" );
+  a = a.tqreplace( '\r', "\\r" );
+  a = a.tqreplace( '\n', "\\n" );
   return a;
 }
 
diff --git a/kmail/tests/utiltests.cpp b/kmail/tests/utiltests.cpp
index 22c14166..195758b8 100644
--- a/kmail/tests/utiltests.cpp
+++ b/kmail/tests/utiltests.cpp
@@ -30,8 +30,8 @@ void UtilTester::tearDown()
 static TQString makePrintable( const TQCString& str )
 {
   TQString a = str;
-  a = a.replace( '\r', "\\r" );
-  a = a.replace( '\n', "\\n" );
+  a = a.tqreplace( '\r', "\\r" );
+  a = a.tqreplace( '\n', "\\n" );
   return a;
 }
 static TQString makePrintable( const TQByteArray& arr )
diff --git a/kmail/textsource.cpp b/kmail/textsource.cpp
index ab31dc42..6649565a 100644
--- a/kmail/textsource.cpp
+++ b/kmail/textsource.cpp
@@ -44,7 +44,7 @@ KMTextSource::~KMTextSource() {
 }
 
 
-TQCString KMTextSource::text(Q_UINT32 serialNumber) const {
+TQCString KMTextSource::text(TQ_UINT32 serialNumber) const {
     TQCString rc;
     KMFolder *folder = 0;
     int idx;
diff --git a/kmail/textsource.h b/kmail/textsource.h
index 8251a09c..e0250920 100644
--- a/kmail/textsource.h
+++ b/kmail/textsource.h
@@ -40,7 +40,7 @@ public:
     KMTextSource();
     ~KMTextSource();
 
-    TQCString text(Q_UINT32 serialNumber) const;
+    TQCString text(TQ_UINT32 serialNumber) const;
 };
 
 #endif
diff --git a/kmail/treebase.cpp b/kmail/treebase.cpp
index 19aff315..74afe85b 100644
--- a/kmail/treebase.cpp
+++ b/kmail/treebase.cpp
@@ -73,7 +73,7 @@ void TreeBase::addChildFolder()
 
       const KMFolder *fld = folder();
       if ( fld ) {
-         mFolderTree->addChildFolder( (KMFolder *) fld, parentWidget() );
+         mFolderTree->addChildFolder( (KMFolder *) fld, tqparentWidget() );
 	reload( mLastMustBeReadWrite, mLastShowOutbox, mLastShowImapFolders );
 	setFolder( (KMFolder *) fld );
       }
diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp
index 8ab2a25f..d788add0 100644
--- a/kmail/urlhandlermanager.cpp
+++ b/kmail/urlhandlermanager.cpp
@@ -732,7 +732,7 @@ namespace {
     Q_UNUSED( window );
     Q_UNUSED( url );
     const TQString kmailImagePath = locate( "data", "kmail/pics/" );
-    if ( imagePath.contains( kmailImagePath ) ) {
+    if ( imagePath.tqcontains( kmailImagePath ) ) {
       // Do nothing, don't start a drag
       return true;
     }
@@ -745,7 +745,7 @@ namespace {
     Q_UNUSED( window );
     Q_UNUSED( url );
     const TQString kmailImagePath = locate( "data", "kmail/pics/" );
-    return imagePath.contains( kmailImagePath );
+    return imagePath.tqcontains( kmailImagePath );
   }
 }
 
diff --git a/kmail/util.cpp b/kmail/util.cpp
index 5d7173d2..ca1b54b6 100644
--- a/kmail/util.cpp
+++ b/kmail/util.cpp
@@ -60,7 +60,7 @@ size_t KMail::Util::crlf2lf( char* str, const size_t strLen )
         return strLen;
     }
 
-    // replace all occurrences of "\r\n" with "\n" (in place)
+    // tqreplace all occurrences of "\r\n" with "\n" (in place)
     char* target = const_cast<char*>( source ); // target points to '\r'
     ++source; // source points to '\n'
     for ( ; source < sourceEnd; ++source ) {
@@ -156,7 +156,7 @@ void KMail::Util::append( TQByteArray& that, const char* str )
     return; // nothing to append
   that.detach();
   uint len1 = that.size();
-  uint len2 = qstrlen(str);
+  uint len2 = tqstrlen(str);
   if ( that.resize( len1 + len2, TQByteArray::SpeedOptim ) )
     memcpy( that.data() + len1, str, len2 );
 }
@@ -173,7 +173,7 @@ void KMail::Util::append( TQByteArray& that, const TQCString& str )
 // Code taken from TQCString::insert, but trailing nul removed
 void KMail::Util::insert( TQByteArray& that, uint index, const char* s )
 {
-  int len = qstrlen(s);
+  int len = tqstrlen(s);
   if ( len == 0 )
     return;
   uint olen = that.size();
diff --git a/kmail/util.h b/kmail/util.h
index d0e37821..341f65df 100644
--- a/kmail/util.h
+++ b/kmail/util.h
@@ -54,7 +54,7 @@ class TQWidget;
 namespace KMail
 {
     /**
-     * The Util namespace contains a collection of helper functions use in
+     * The Util namespace tqcontains a collection of helper functions use in
      * various places.
      */
 namespace Util {
diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp
index 0b9222f4..e706243c 100644
--- a/kmail/vacation.cpp
+++ b/kmail/vacation.cpp
@@ -212,7 +212,7 @@ namespace {
   static const GenericInformationExtractor::StateNode spamNodes[] = {
     { 0, GIE::CommandStart, "if",  1, 0, 0 },              // 0
     { 0,   GIE::TestStart, "header", 2, 0, 0 },            // 1
-    { 0,     GIE::TaggedArgument, "contains", 3, 0, 0 },   // 2
+    { 0,     GIE::TaggedArgument, "tqcontains", 3, 0, 0 },   // 2
 
     // accept both string and string-list:
     { 0,     GIE::StringArgument, "x-spam-flag", 9, 4, "x-spam-flag" },    // 3
@@ -259,16 +259,16 @@ namespace {
 
   // to understand this table, study the output of
   // libksieve/tests/parsertest
-  //   'if not address :domain :contains ["from"] ["mydomain.org"] { keep; stop; }'
+  //   'if not address :domain :tqcontains ["from"] ["mydomain.org"] { keep; stop; }'
   static const GenericInformationExtractor::StateNode domainNodes[] = {
     { 0, GIE::CommandStart, "if", 1, 0, 0 },       // 0
     { 0,   GIE::TestStart, "not", 2, 0, 0, },      // 1
     { 0,     GIE::TestStart, "address", 3, 0, 0 }, // 2
 
-    // :domain and :contains in arbitrary order:
+    // :domain and :tqcontains in arbitrary order:
     { 0,       GIE::TaggedArgument, "domain", 4, 5, 0 },     // 3
-    { 0,       GIE::TaggedArgument, "contains", 7, 0, 0 },   // 4
-    { 0,       GIE::TaggedArgument, "contains", 6, 0, 0 },   // 5
+    { 0,       GIE::TaggedArgument, "tqcontains", 7, 0, 0 },   // 4
+    { 0,       GIE::TaggedArgument, "tqcontains", 6, 0, 0 },   // 5
     { 0,       GIE::TaggedArgument, "domain", 7, 0, 0 },     // 6
 
     // accept both string and string-list:
@@ -448,9 +448,9 @@ namespace KMail {
 
   static inline TQString dotstuff( TQString s ) {
     if ( s.startsWith( "." ) )
-      return '.' + s.replace( "\n.", "\n.." );
+      return '.' + s.tqreplace( "\n.", "\n.." );
     else
-      return s.replace( "\n.", "\n.." );
+      return s.tqreplace( "\n.", "\n.." );
   }
 
   TQString Vacation::composeScript( const TQString & messageText,
@@ -464,26 +464,26 @@ namespace KMail {
       addressesArgument += ":addresses [ ";
       TQStringList sl;
       for ( AddrSpecList::const_iterator it = addrSpecs.begin() ; it != addrSpecs.end() ; ++it ) {
-	sl.push_back( '"' + (*it).asString().replace( '\\', "\\\\" ).replace( '"', "\\\"" ) + '"' );
+	sl.push_back( '"' + (*it).asString().tqreplace( '\\', "\\\\" ).tqreplace( '"', "\\\"" ) + '"' );
 	aliases.push_back( (*it).asString() );
       }
       addressesArgument += sl.join( ", " ) + " ] ";
     }
-    TQString script = TQString::fromLatin1("require \"vacation\";\n\n" );
+    TQString script = TQString::tqfromLatin1("require \"vacation\";\n\n" );
     if ( !sendForSpam )
-      script += TQString::fromLatin1( "if header :contains \"X-Spam-Flag\" \"YES\""
+      script += TQString::tqfromLatin1( "if header :tqcontains \"X-Spam-Flag\" \"YES\""
                                      " { keep; stop; }\n" ); // FIXME?
 
     if ( !domain.isEmpty() ) // FIXME
-      script += TQString::fromLatin1( "if not address :domain :contains \"from\" \"%1\" { keep; stop; }\n" ).arg( domain );
+      script += TQString::tqfromLatin1( "if not address :domain :tqcontains \"from\" \"%1\" { keep; stop; }\n" ).arg( domain );
 
     script += "vacation ";
     script += addressesArgument;
     if ( notificationInterval > 0 )
-      script += TQString::fromLatin1(":days %1 ").arg( notificationInterval );
-    script += TQString::fromLatin1("text:\n");
+      script += TQString::tqfromLatin1(":days %1 ").arg( notificationInterval );
+    script += TQString::tqfromLatin1("text:\n");
     script += dotstuff( messageText.isEmpty() ? defaultMessageText() : messageText );
-    script += TQString::fromLatin1( "\n.\n;\n" );
+    script += TQString::tqfromLatin1( "\n.\n;\n" );
     return script;
   }
 
@@ -565,15 +565,15 @@ namespace KMail {
   TQString Vacation::defaultMessageText() {
     return i18n("I am out of office till %1.\n"
 		"\n"
-		"In urgent cases, please contact Mrs. <vacation replacement>\n"
+		"In urgent cases, please contact Mrs. <vacation tqreplacement>\n"
 		"\n"
-		"email: <email address of vacation replacement>\n"
+		"email: <email address of vacation tqreplacement>\n"
 		"phone: +49 711 1111 11\n"
 		"fax.:  +49 711 1111 12\n"
 		"\n"
 		"Yours sincerely,\n"
 		"-- <enter your name and email address here>\n")
-      .arg( KGlobal::locale()->formatDate( TQDate::currentDate().addDays( 1 ) ) );
+      .arg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate().addDays( 1 ) ) );
   }
 
   int Vacation::defaultNotificationInterval() {
@@ -608,7 +608,7 @@ namespace KMail {
     mSieveJob = 0; // job deletes itself after returning from this slot!
 
     if ( !mCheckOnly && mUrl.protocol() == "sieve" && !job->sieveCapabilities().isEmpty() &&
-	 !job->sieveCapabilities().contains("vacation") ) {
+	 !job->sieveCapabilities().tqcontains("vacation") ) {
       KMessageBox::sorry( 0, i18n("Your server did not list \"vacation\" in "
 				  "its list of supported Sieve extensions;\n"
 				  "without it, KMail cannot install out-of-"
diff --git a/kmail/warningconfiguration.ui b/kmail/warningconfiguration.ui
index 7ed3ec92..c2a4deb0 100644
--- a/kmail/warningconfiguration.ui
+++ b/kmail/warningconfiguration.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>WarningConfiguration</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -103,7 +103,7 @@ It is recommended to leave this option turned on for maximum security.
                     <property name="text">
                         <string>For signing</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
@@ -114,7 +114,7 @@ It is recommended to leave this option turned on for maximum security.
                     <property name="text">
                         <string>For encryption</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
@@ -329,7 +329,7 @@ The recommended SPHINX setting is 14 days.
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -348,7 +348,7 @@ The recommended SPHINX setting is 14 days.
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>90</height>
@@ -357,7 +357,7 @@ The recommended SPHINX setting is 14 days.
         </spacer>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -373,7 +373,7 @@ The recommended SPHINX setting is 14 days.
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -404,5 +404,5 @@ The recommended SPHINX setting is 14 days.
     <tabstop>mWarnEncrRootCertExpiresSB</tabstop>
     <tabstop>enableAllWarningsPB</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp
index f88a3cd7..fee9b269 100644
--- a/kmail/xfaceconfigurator.cpp
+++ b/kmail/xfaceconfigurator.cpp
@@ -84,7 +84,7 @@ namespace KMail {
     TQPushButton * mFromFileBtn;
     TQPushButton * mFromAddrbkBtn;
 
-    vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main layout" );
+    vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main tqlayout" );
     hlay = new TQHBoxLayout( vlay );
 
     // "enable X-Face" checkbox:
@@ -147,7 +147,7 @@ namespace KMail {
     mFromFileBtn = new TQPushButton( i18n("Select File..."), page );
     TQWhatsThis::add( mFromFileBtn,
                      i18n("Use this to select an image file to create the picture from. "
-                         "The image should be of high contrast and nearly quadratic shape. "
+                         "The image should be of high contrast and nearly quadratic tqshape. "
                          "A light background helps improve the result." ) );
     mFromFileBtn->setAutoDefault( false );
     page_vlay->addWidget( mFromFileBtn, 1 );
@@ -165,7 +165,7 @@ namespace KMail {
         "monochrome picture with every message. "
         "For example, this could be a picture of you or a glyph. "
         "It is shown in the recipient's mail client (if supported)." ), page );
-    label1->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
+    label1->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
     page_vlay->addWidget( label1 );
 
     widgetStack->raiseWidget( 0 ); // since mSourceCombo->currentItem() == 0
diff --git a/kmailcvt/filter_evolution.cxx b/kmailcvt/filter_evolution.cxx
index a07a6f08..121171af 100644
--- a/kmailcvt/filter_evolution.cxx
+++ b/kmailcvt/filter_evolution.cxx
@@ -128,14 +128,14 @@ void FilterEvolution::importMBox(FilterInfo *info, const TQString& mboxName, con
         info->setCurrent(0);
         if( mboxName.length() > 20 ) {
             TQString tmp_info = mboxName;
-            tmp_info = tmp_info.replace( mailDir, ".." );
-            if (tmp_info.contains("subfolders/"))
+            tmp_info = tmp_info.tqreplace( mailDir, ".." );
+            if (tmp_info.tqcontains("subfolders/"))
                 tmp_info.remove("subfolders/");
             info->setFrom( tmp_info );
             tmp_from = tmp_info;
         } else
             info->setFrom(mboxName);
-        if(targetDir.contains("subfolders/")) {
+        if(targetDir.tqcontains("subfolders/")) {
             TQString tmp_info = targetDir;
             tmp_info.remove("subfolders/");
             info->setTo(tmp_info);
diff --git a/kmailcvt/filter_evolution_v2.cxx b/kmailcvt/filter_evolution_v2.cxx
index dd69ee7b..959a4b46 100644
--- a/kmailcvt/filter_evolution_v2.cxx
+++ b/kmailcvt/filter_evolution_v2.cxx
@@ -164,13 +164,13 @@ void FilterEvolution_v2::importMBox(FilterInfo *info, const TQString& mboxName,
         info->setCurrent(0);
         if( mboxName.length() > 20 ) {
             TQString tmp_info = mboxName;
-            tmp_info = tmp_info.replace( mailDir, "../" );
-            if (tmp_info.contains(".sbd"))
+            tmp_info = tmp_info.tqreplace( mailDir, "../" );
+            if (tmp_info.tqcontains(".sbd"))
                 tmp_info.remove(".sbd");
             info->setFrom( tmp_info );
         } else
             info->setFrom(mboxName);
-        if(targetDir.contains(".sbd")) {
+        if(targetDir.tqcontains(".sbd")) {
             TQString tmp_info = targetDir;
             tmp_info.remove(".sbd");
             info->setTo(tmp_info);
@@ -206,12 +206,12 @@ void FilterEvolution_v2::importMBox(FilterInfo *info, const TQString& mboxName,
             TQString destFolder;
             TQString _targetDir = targetDir;
             if(!targetDir.isNull()) {
-                if(_targetDir.contains(".sbd"))
+                if(_targetDir.tqcontains(".sbd"))
                     _targetDir.remove(".sbd");
                 destFolder += "Evolution-Import/" + _targetDir + "/" + filenameInfo.baseName(TRUE); // mboxName;
             } else {
                 destFolder = "Evolution-Import/" + rootDir;
-                if(destFolder.contains(".sbd"))
+                if(destFolder.tqcontains(".sbd"))
                     destFolder.remove(".sbd");
             }
 
diff --git a/kmailcvt/filter_mbox.cxx b/kmailcvt/filter_mbox.cxx
index 76b37668..61f31339 100644
--- a/kmailcvt/filter_mbox.cxx
+++ b/kmailcvt/filter_mbox.cxx
@@ -98,7 +98,7 @@ void FilterMBox::import(FilterInfo *info)
 				// qDebug("x_status_flag: %s", x_status_flag.latin1() );		
 			}
 
-			// workaround to fix hang if a corrupted mbox contains some 
+			// workaround to fix hang if a corrupted mbox tqcontains some 
 			// binary data, for more see bug #106796
 			if (mbox.at() == filepos)
 			   mbox.at(mbox.size());
diff --git a/kmailcvt/filter_oe.cxx b/kmailcvt/filter_oe.cxx
index bde399b6..c60eced6 100644
--- a/kmailcvt/filter_oe.cxx
+++ b/kmailcvt/filter_oe.cxx
@@ -123,7 +123,7 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName)
     mailbox.setByteOrder(TQDataStream::LittleEndian);
 
     // Parse magic
-    Q_UINT32 sig_block1, sig_block2;
+    TQ_UINT32 sig_block1, sig_block2;
     mailbox >> sig_block1 >> sig_block2;
     if (sig_block1 == OE4_SIG_1 && sig_block2 == OE4_SIG_2) {
         folderName = "OE-Import/" + mailfileinfo.baseName(TRUE);
@@ -132,7 +132,7 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName)
         mbxImport(info, mailbox);
         return;
     } else {
-        Q_UINT32 sig_block3, sig_block4;
+        TQ_UINT32 sig_block3, sig_block4;
         mailbox >> sig_block3 >> sig_block4;
         if (sig_block1 == OE5_SIG_1 && sig_block3 == OE5_SIG_3 && sig_block4 == OE5_SIG_4) {
             if (sig_block2 == OE5_EMAIL_SIG_2) {
@@ -163,7 +163,7 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName)
 
 void FilterOE::mbxImport( FilterInfo *info, TQDataStream& ds)
 {
-    Q_UINT32 msgCount, lastMsgNum, fileSize;
+    TQ_UINT32 msgCount, lastMsgNum, fileSize;
 
     // Read the header
     ds >> msgCount >> lastMsgNum >> fileSize;
@@ -172,11 +172,11 @@ void FilterOE::mbxImport( FilterInfo *info, TQDataStream& ds)
     if (msgCount == 0)
         return; // Don't import empty mailbox
 
-    Q_UINT32 msgMagic;
+    TQ_UINT32 msgMagic;
     ds >> msgMagic; // Read first magic
 
     while (!ds.atEnd()) {
-        Q_UINT32 msgNumber, msgSize, msgTextSize;
+        TQ_UINT32 msgNumber, msgSize, msgTextSize;
         KTempFile tmp;
         tmp.dataStream()->setByteOrder(TQDataStream::LittleEndian);
 
@@ -211,7 +211,7 @@ void FilterOE::mbxImport( FilterInfo *info, TQDataStream& ds)
 void FilterOE::dbxImport( FilterInfo *info, TQDataStream& ds)
 {
     // Get item count & offset of index
-    Q_UINT32 itemCount, indexPtr;
+    TQ_UINT32 itemCount, indexPtr;
     ds.device()->at(0xc4);
     ds >> itemCount;
     ds.device()->at(0xe4);
@@ -231,9 +231,9 @@ void FilterOE::dbxReadIndex( FilterInfo *info, TQDataStream& ds, int filePos)
 {
     
     if(info->shouldTerminate()) return;
-    Q_UINT32 self, unknown, nextIndexPtr, parent, indexCount;
-    Q_UINT8 unknown2, ptrCount;
-    Q_UINT16 unknown3;
+    TQ_UINT32 self, unknown, nextIndexPtr, parent, indexCount;
+    TQ_UINT8 unknown2, ptrCount;
+    TQ_UINT16 unknown3;
     int wasAt = ds.device()->at();
     ds.device()->at(filePos);
 
@@ -244,7 +244,7 @@ void FilterOE::dbxReadIndex( FilterInfo *info, TQDataStream& ds, int filePos)
     kdDebug() << "This index has " << (int) ptrCount << " data pointers" << endl;
     for (int count = 0; count < ptrCount; count++) {
         if(info->shouldTerminate()) return;
-        Q_UINT32 dataIndexPtr, anotherIndexPtr, anotherIndexCount; // _dbx_indexstruct
+        TQ_UINT32 dataIndexPtr, anotherIndexPtr, anotherIndexCount; // _dbx_indexstruct
         ds >> dataIndexPtr >> anotherIndexPtr >> anotherIndexCount;
 
         if (anotherIndexCount > 0) {
@@ -265,9 +265,9 @@ void FilterOE::dbxReadIndex( FilterInfo *info, TQDataStream& ds, int filePos)
 
 void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos)
 {
-    Q_UINT32 curOffset, blockSize;
-    Q_UINT16 unknown;
-    Q_UINT8 count, unknown2;
+    TQ_UINT32 curOffset, blockSize;
+    TQ_UINT16 unknown;
+    TQ_UINT8 count, unknown2;
     int wasAt = ds.device()->at();
     
     TQString folderEntry[4];
@@ -279,8 +279,8 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos
 
     for (int c = 0; c < count; c++) {
         if(info->shouldTerminate()) return;
-        Q_UINT8 type;  // _dbx_email_pointerstruct
-        Q_UINT32 value; // Actually 24 bit
+        TQ_UINT8 type;  // _dbx_email_pointerstruct
+        TQ_UINT32 value; // Actually 24 bit
 
         ds >> type >> value;
         value &= 0xffffff;
@@ -294,7 +294,7 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos
             } else if( type == 0x04) {
                 int currentFilePos = ds.device()->at();
                 ds.device()->at(filePos + 12 + value + (count*4) );
-                Q_UINT32 newOFF;
+                TQ_UINT32 newOFF;
                 ds >> newOFF;
                 kdDebug() << "**** Offset of emaildata (0x04) " <<  newOFF << endl;
                 ds.device()->at(currentFilePos);
@@ -330,9 +330,9 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos
 void FilterOE::dbxReadEmail( FilterInfo *info, TQDataStream& ds, int filePos)
 {
     if(info->shouldTerminate()) return;
-    Q_UINT32 self, nextAddressOffset, nextAddress=0;
-    Q_UINT16 blockSize;
-    Q_UINT8 intCount, unknown;
+    TQ_UINT32 self, nextAddressOffset, nextAddress=0;
+    TQ_UINT16 blockSize;
+    TQ_UINT8 intCount, unknown;
     KTempFile tmp;
     bool _break = false;
     int wasAt = ds.device()->at();
@@ -404,7 +404,7 @@ TQString FilterOE::getFolderName(TQString filename)
                 TQString _tmpFileName = tmp[1];
                 _tmpFileName = _tmpFileName.lower();
                 if(_tmpFileName == search) {
-                    folder.prepend( tmp[0] + TQString::fromLatin1("/") );
+                    folder.prepend( tmp[0] + TQString::tqfromLatin1("/") );
                     search = tmp[3];
                     foundFilename = true;
                 }
@@ -416,7 +416,7 @@ TQString FilterOE::getFolderName(TQString filename)
                         found = true;
                         break;
                     } else {
-                        folder.prepend( tmp[0] + TQString::fromLatin1("/") );
+                        folder.prepend( tmp[0] + TQString::tqfromLatin1("/") );
                         search = tmp[3];
                     }
                 }
diff --git a/kmailcvt/filter_pmail.cxx b/kmailcvt/filter_pmail.cxx
index 23617f91..126a6365 100644
--- a/kmailcvt/filter_pmail.cxx
+++ b/kmailcvt/filter_pmail.cxx
@@ -81,13 +81,13 @@ void FilterPMail::import(FilterInfo *info)
     info->setOverall(100);
 }
 
-/** this looks for all files with the filemask 'mask' and calls the 'workFunc' on each of them */
-void FilterPMail::processFiles(const TQString& mask, void(FilterPMail::* workFunc)(const TQString&) )
+/** this looks for all files with the filetqmask 'tqmask' and calls the 'workFunc' on each of them */
+void FilterPMail::processFiles(const TQString& tqmask, void(FilterPMail::* workFunc)(const TQString&) )
 {
     if (inf->shouldTerminate()) return;
     
-    TQStringList files = dir.entryList(mask, TQDir::Files, TQDir::Name);
-    //kdDebug() << "Mask is " << mask << " count is " << files.count() << endl;
+    TQStringList files = dir.entryList(tqmask, TQDir::Files, TQDir::Name);
+    //kdDebug() << "Mask is " << tqmask << " count is " << files.count() << endl;
     for ( TQStringList::Iterator mailFile = files.begin(); mailFile != files.end(); ++mailFile ) {
         // Notify current file
         TQFileInfo mailfileinfo(*mailFile);
@@ -186,7 +186,7 @@ void FilterPMail::importMailFolder(const TQString& file)
                 f.at(f.at() - l + 1); 
             }
             
-            // no problem to loose the last line in file. This only contains a seperate char
+            // no problem to loose the last line in file. This only tqcontains a seperate char
             while ( ! f.atEnd() &&  (l = f.readLine(input.data(),MAX_LINE))) {
                     if (inf->shouldTerminate()){
                         tempfile.close();
@@ -228,8 +228,8 @@ void FilterPMail::importUnixMailFolder(const TQString& file)
     int n = 0, l = 0;
 
     /** Get the folder name */
-    s.replace( TQRegExp("mbx$"), "pmg");
-    s.replace( TQRegExp("MBX$"), "PMG");
+    s.tqreplace( TQRegExp("mbx$"), "pmg");
+    s.tqreplace( TQRegExp("MBX$"), "PMG");
     f.setName(s);
     if (! f.open( IO_ReadOnly ) ) {
         inf->alert( i18n("Unable to open %1, skipping").arg( s ) );
diff --git a/kmailcvt/filter_pmail.hxx b/kmailcvt/filter_pmail.hxx
index 664fdcc1..d3ac1e60 100644
--- a/kmailcvt/filter_pmail.hxx
+++ b/kmailcvt/filter_pmail.hxx
@@ -32,8 +32,8 @@ public:
     void import(FilterInfo *info);
 
 protected:
-    /** this looks for all files with the filemask 'mask' and calls the 'workFunc' on each of them */
-    void processFiles(const TQString& mask,  void(FilterPMail::* workFunc)(const TQString&) );
+    /** this looks for all files with the filetqmask 'tqmask' and calls the 'workFunc' on each of them */
+    void processFiles(const TQString& tqmask,  void(FilterPMail::* workFunc)(const TQString&) );
     /** this function imports one *.CNM message */
     void importNewMessage(const TQString& file);
     /** this function imports one mail folder file (*.PMM) */
@@ -53,7 +53,7 @@ private:
 
     /** Folder structure here has 5 entries. */
     typedef FolderStructureBase<5> FolderStructure;
-    /** List with the folder matrix, which contains following strings:
+    /** List with the folder matrix, which tqcontains following strings:
 	1. type (2 for root-folder, 1 for folder, 0 for mailarchiv)
 	2. type (1 for root-folder, 3 for folder, 0 for mailarchiv)  
 	3. "ID:flag:filename" of folder/archiv   
diff --git a/kmailcvt/filter_sylpheed.cxx b/kmailcvt/filter_sylpheed.cxx
index 489083f0..63345f01 100644
--- a/kmailcvt/filter_sylpheed.cxx
+++ b/kmailcvt/filter_sylpheed.cxx
@@ -166,8 +166,8 @@ void FilterSylpheed::importFiles( FilterInfo *info, const TQString& dirName)
 
 void FilterSylpheed::readMarkFile( FilterInfo *info, const TQString &path, TQDict<unsigned long> &dict )
 {
-    /* Each sylpheed mail directory contains a .sylpheed_mark file which
-     * contains all the flags for each messages. The layout of this file
+    /* Each sylpheed mail directory tqcontains a .sylpheed_mark file which
+     * tqcontains all the flags for each messages. The tqlayout of this file
      * is documented in the source code of sylpheed: in procmsg.h for
      * the flag bits, and procmsg.c.
      *
@@ -179,7 +179,7 @@ void FilterSylpheed::readMarkFile( FilterInfo *info, const TQString &path, TQDic
      * the first one with the message file name (which is a number), 
      * and the second one with the actual message flags */
 
-    Q_UINT32 in, flags;
+    TQ_UINT32 in, flags;
     TQFile file(path);
 
     if (!file.open(IO_ReadOnly)) 
@@ -196,7 +196,7 @@ void FilterSylpheed::readMarkFile( FilterInfo *info, const TQString &path, TQDic
      * at a file created on another platform. I don't have any test 
      * marks/folders, so just ignoring this case */
     stream >> in;
-    if (in > (Q_UINT32) 0xffff) 
+    if (in > (TQ_UINT32) 0xffff) 
         return;
 
     while (!stream.atEnd()) {
diff --git a/kmailcvt/filter_thebat.cxx b/kmailcvt/filter_thebat.cxx
index de6e5c6b..98d23cb6 100644
--- a/kmailcvt/filter_thebat.cxx
+++ b/kmailcvt/filter_thebat.cxx
@@ -169,7 +169,7 @@ void FilterTheBat::importFiles( FilterInfo *info, const TQString& FileName)
 	    if (tbb.atEnd())
  		break;
 
-            iFound = _tmp.contains(regexp);
+            iFound = _tmp.tqcontains(regexp);
             if(!iFound) {
                 iFound = _tmp.findRev("!");
                 if (iFound >= 0 && ((l-iFound) < 5) ) {
diff --git a/kmailcvt/filter_thunderbird.cxx b/kmailcvt/filter_thunderbird.cxx
index 6ada6809..c6f3cd09 100644
--- a/kmailcvt/filter_thunderbird.cxx
+++ b/kmailcvt/filter_thunderbird.cxx
@@ -165,13 +165,13 @@ void FilterThunderbird::importMBox(FilterInfo *info, const TQString& mboxName, c
         info->setCurrent(0);
         if( mboxName.length() > 20 ) {
             TQString tmp_info = mboxName;
-            tmp_info = tmp_info.replace( mailDir, "../" );
-            if (tmp_info.contains(".sbd"))
+            tmp_info = tmp_info.tqreplace( mailDir, "../" );
+            if (tmp_info.tqcontains(".sbd"))
                 tmp_info.remove(".sbd");
             info->setFrom( tmp_info );
         } else
             info->setFrom(mboxName);
-        if(targetDir.contains(".sbd")) {
+        if(targetDir.tqcontains(".sbd")) {
             TQString tmp_info = targetDir;
             tmp_info.remove(".sbd");
             info->setTo(tmp_info);
@@ -207,12 +207,12 @@ void FilterThunderbird::importMBox(FilterInfo *info, const TQString& mboxName, c
             TQString destFolder;
             TQString _targetDir = targetDir;
             if(!targetDir.isNull()) {
-                if(_targetDir.contains(".sbd"))
+                if(_targetDir.tqcontains(".sbd"))
                     _targetDir.remove(".sbd");
                 destFolder += "Thunderbird-Import/" + _targetDir + "/" + filenameInfo.baseName(TRUE);// mboxName;
             } else {
                 destFolder = "Thunderbird-Import/" + rootDir;
-                if(destFolder.contains(".sbd"))
+                if(destFolder.tqcontains(".sbd"))
                     destFolder.remove(".sbd");
             }
 
diff --git a/kmailcvt/filters.cxx b/kmailcvt/filters.cxx
index 56e69d37..1028e69c 100644
--- a/kmailcvt/filters.cxx
+++ b/kmailcvt/filters.cxx
@@ -47,9 +47,9 @@ FilterInfo::~FilterInfo()
 {
 }
 
-void FilterInfo::setStatusMsg( const TQString& status )
+void FilterInfo::seStatusMsg( const TQString& status )
 {
-  m_dlg->_textStatus->setText( status );
+  m_dlg->_texStatus->setText( status );
 }
 
 void FilterInfo::setFrom( const TQString& from )
diff --git a/kmailcvt/filters.hxx b/kmailcvt/filters.hxx
index dc51f8c9..b680ab5e 100644
--- a/kmailcvt/filters.hxx
+++ b/kmailcvt/filters.hxx
@@ -36,7 +36,7 @@ class FilterInfo
     FilterInfo(KImportPageDlg *dlg, TQWidget *parent, bool _removeDupMsg);
    ~FilterInfo();
 
-    void setStatusMsg( const TQString& status );
+    void seStatusMsg( const TQString& status );
     void setFrom( const TQString& from );
     void setTo( const TQString& to );
     void setCurrent( const TQString& current );
diff --git a/kmailcvt/kimportpagedlg.ui b/kmailcvt/kimportpagedlg.ui
index 4a90be53..88366d6b 100644
--- a/kmailcvt/kimportpagedlg.ui
+++ b/kmailcvt/kimportpagedlg.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KImportPageDlg</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -28,7 +28,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>170</width>
                     <height>430</height>
@@ -60,7 +60,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>10</width>
                     <height>10</height>
@@ -69,7 +69,7 @@
         </spacer>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>layout16</cstring>
+                <cstring>tqlayout16</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -77,7 +77,7 @@
                 </property>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout90</cstring>
+                        <cstring>tqlayout90</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -109,12 +109,12 @@
                         </widget>
                         <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
                             <property name="name">
-                                <cstring>_textStatus</cstring>
+                                <cstring>_texStatus</cstring>
                             </property>
                             <property name="text">
                                 <string>Importing in progress...</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignTop</set>
                             </property>
                         </widget>
@@ -203,5 +203,5 @@
         </widget>
     </hbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmailcvt/kmailcvt.cpp b/kmailcvt/kmailcvt.cpp
index d56577f4..9d5ddbb9 100644
--- a/kmailcvt/kmailcvt.cpp
+++ b/kmailcvt/kmailcvt.cpp
@@ -73,10 +73,10 @@ void KMailCVT::next() {
       setFinishEnabled( currentPage(), false );
       // Start import
       FilterInfo *info = new FilterInfo(importpage, this, selfilterpage->removeDupMsg_checked());
-      info->setStatusMsg(i18n("Import in progress"));
+      info->seStatusMsg(i18n("Import in progress"));
       info->clear(); // Clear info from last time
       selectedFilter->import(info);
-      info->setStatusMsg(i18n("Import finished"));
+      info->seStatusMsg(i18n("Import finished"));
       // Cleanup
       delete info;
       // Enable finish & back buttons
diff --git a/kmailcvt/kselfilterpagedlg.ui b/kmailcvt/kselfilterpagedlg.ui
index 3b483645..80e2eafe 100644
--- a/kmailcvt/kselfilterpagedlg.ui
+++ b/kmailcvt/kselfilterpagedlg.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KSelFilterPageDlg</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -28,7 +28,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>170</width>
                     <height>430</height>
@@ -60,7 +60,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>10</width>
                     <height>10</height>
@@ -69,7 +69,7 @@
         </spacer>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>layout19</cstring>
+                <cstring>tqlayout19</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -96,7 +96,7 @@ This program will help you import your email from your previous email program in
                     <property name="textFormat">
                         <enum>RichText</enum>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignTop|AlignLeft</set>
                     </property>
                     <property name="vAlign" stdset="0">
@@ -140,5 +140,5 @@ This program will help you import your email from your previous email program in
         </widget>
     </hbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp
index 7061493a..0b2889a6 100644
--- a/kmobile/devices/gnokii/gnokii_mobile.cpp
+++ b/kmobile/devices/gnokii/gnokii_mobile.cpp
@@ -403,7 +403,7 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt
   // evaluate timestamp (ignore timezone)
   TQDateTime datetime;
   if (entry.date.year<1998)
-	datetime = TQDateTime::currentDateTime();
+	datetime = TQDateTime::tqcurrentDateTime();
   else
 	datetime = TQDateTime( TQDate(entry.date.year, entry.date.month, entry.date.day), 
 			  TQTime(entry.date.hour, entry.date.minute, entry.date.second) );
diff --git a/kmobile/devices/gnokii/gnokiiconfigui.ui b/kmobile/devices/gnokii/gnokiiconfigui.ui
index 5b2893a3..24b663f8 100644
--- a/kmobile/devices/gnokii/gnokiiconfigui.ui
+++ b/kmobile/devices/gnokii/gnokiiconfigui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>GnokiiConfigUI</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -66,7 +66,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -140,7 +140,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>140</height>
@@ -199,7 +199,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>41</width>
                                     <height>0</height>
@@ -269,5 +269,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmobile/kioslave/kio_mobile.cpp b/kmobile/kioslave/kio_mobile.cpp
index d32c11cb..5cf5bed5 100644
--- a/kmobile/kioslave/kio_mobile.cpp
+++ b/kmobile/kioslave/kio_mobile.cpp
@@ -536,7 +536,7 @@ int KMobileProtocol::getFileStorage(const TQString &devName, TQCString &result,
 
 
 /**
- * Test if the url contains a directory or a file.
+ * Test if the url tqcontains a directory or a file.
  */
 void KMobileProtocol::stat( const KURL &url )
 {
diff --git a/kmobile/kmobile_selectiondialog.ui b/kmobile/kmobile_selectiondialog.ui
index 907e35b9..f637ca9f 100644
--- a/kmobile/kmobile_selectiondialog.ui
+++ b/kmobile/kmobile_selectiondialog.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KMobile_SelectionDialog</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -21,7 +21,7 @@
         </property>
         <widget class="QLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -86,7 +86,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>181</width>
                             <height>41</height>
@@ -105,7 +105,7 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kdialog.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kmobile/kmobileclient.cpp b/kmobile/kmobileclient.cpp
index 63910fba..05bcff55 100644
--- a/kmobile/kmobileclient.cpp
+++ b/kmobile/kmobileclient.cpp
@@ -126,7 +126,7 @@ TQStringList KMobileClient::deviceNames()
 {
   if (!isKMobileAvailable())
 	return TQStringList();
-  RETURN_TYPE( "deviceNames()", TQString::fromLatin1(""), TQStringList );
+  RETURN_TYPE( "deviceNames()", TQString::tqfromLatin1(""), TQStringList );
 }
 
 void KMobileClient::removeDevice( TQString deviceName )
diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h
index 8d1e69a0..04bd10d2 100644
--- a/kmobile/kmobiledevice.h
+++ b/kmobile/kmobiledevice.h
@@ -316,7 +316,7 @@ public:
 signals:
     /**
      * Call this from stat() to express details about an object, the
-     * UDSEntry customarily contains the atoms describing file name, size,
+     * UDSEntry customarily tqcontains the atoms describing file name, size,
      * mimetype, etc.
      * @param _entry The UDSEntry containing all of the object attributes.
      */
@@ -351,10 +351,10 @@ signals:
      * KIO::AuthInfo authInfo;
      * if ( openPassDlg( authInfo ) )
      * {
-     *    kdDebug() << TQString::fromLatin1("User: ")
+     *    kdDebug() << TQString::tqfromLatin1("User: ")
      *              << authInfo.username << endl;
-     *    kdDebug() << TQString::fromLatin1("Password: ")
-     *              << TQString::fromLatin1("Not displayed here!") << endl;
+     *    kdDebug() << TQString::tqfromLatin1("Password: ")
+     *              << TQString::tqfromLatin1("Not displayed here!") << endl;
      * }
      * </pre>
      *
@@ -368,10 +368,10 @@ signals:
      * TQString errorMsg = "You entered an incorrect password.";
      * if ( openPassDlg( authInfo, errorMsg ) )
      * {
-     *    kdDebug() << TQString::fromLatin1("User: ")
+     *    kdDebug() << TQString::tqfromLatin1("User: ")
      *              << authInfo.username << endl;
-     *    kdDebug() << TQString::fromLatin1("Password: ")
-     *              << TQString::fromLatin1("Not displayed here!") << endl;
+     *    kdDebug() << TQString::tqfromLatin1("Password: ")
+     *              << TQString::tqfromLatin1("Not displayed here!") << endl;
      * }
      * </pre>
      *
diff --git a/kmobile/kmobileitem.cpp b/kmobile/kmobileitem.cpp
index 0e4705c5..3780c980 100644
--- a/kmobile/kmobileitem.cpp
+++ b/kmobile/kmobileitem.cpp
@@ -39,7 +39,7 @@ KMobileItem::KMobileItem(TQIconView *parent, KConfig *_config, KService::Ptr ser
 	setText(service->name());
 	m_deviceDesktopFile = service->desktopEntryName();
 	m_deviceConfigFile = TQString("kmobile_%1_rc").arg(text());
-	m_deviceConfigFile = m_deviceConfigFile.replace(' ', "");
+	m_deviceConfigFile = m_deviceConfigFile.tqreplace(' ', "");
 	m_iconName = service->icon();
    };
 
diff --git a/kmobile/pref.cpp b/kmobile/pref.cpp
index 6b5a0230..2bb90744 100644
--- a/kmobile/pref.cpp
+++ b/kmobile/pref.cpp
@@ -27,8 +27,8 @@ KMobilePreferences::KMobilePreferences()
 KMobilePrefPageOne::KMobilePrefPageOne(TQWidget *parent)
     : TQFrame(parent)
 {
-    TQHBoxLayout *layout = new TQHBoxLayout(this);
-    layout->setAutoAdd(true);
+    TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
+    tqlayout->setAutoAdd(true);
 
     new TQLabel(i18n("Add something here"), this);
 }
@@ -36,8 +36,8 @@ KMobilePrefPageOne::KMobilePrefPageOne(TQWidget *parent)
 KMobilePrefPageTwo::KMobilePrefPageTwo(TQWidget *parent)
     : TQFrame(parent)
 {
-    TQHBoxLayout *layout = new TQHBoxLayout(this);
-    layout->setAutoAdd(true);
+    TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
+    tqlayout->setAutoAdd(true);
 
     new TQLabel(i18n("Add something here"), this);
 }
diff --git a/knode/Makefile.am b/knode/Makefile.am
index f1763145..57b6481e 100644
--- a/knode/Makefile.am
+++ b/knode/Makefile.am
@@ -11,7 +11,7 @@ lib_LTLIBRARIES = libknodecommon.la
 
 kde_module_LTLIBRARIES = kcm_knode.la libknodepart.la
 libknodepart_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_RPATH) $(KDE_PLUGIN)
-libknodepart_la_LIBADD	= libknodecommon.la
+libknodepart_la_LIBADD	= libknodecommon.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libkdepim -lkdepim
 
 SUBDIRS = pics filters
 
diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp
index 357a9c00..491d2c9b 100644
--- a/knode/articlewidget.cpp
+++ b/knode/articlewidget.cpp
@@ -374,7 +374,7 @@ void ArticleWidget::displayArticle()
   mViewer->view()->ensureVisible( 0, 0 );
 
   if ( !mArticle->hasContent() ) {
-    displayErrorMessage( i18n("The article contains no data.") );
+    displayErrorMessage( i18n("The article tqcontains no data.") );
     return;
   }
 
@@ -410,12 +410,12 @@ void ArticleWidget::displayArticle()
   // signature, we show a nice header:
   TQPtrList<Kpgp::Block> pgpBlocks;
   TQStrList nonPgpBlocks;
-  bool containsPGP = Kpgp::Module::prepareMessageForDecryption( mArticle->body(), pgpBlocks, nonPgpBlocks );
+  bool tqcontainsPGP = Kpgp::Module::prepareMessageForDecryption( mArticle->body(), pgpBlocks, nonPgpBlocks );
 
   mViewer->write ( html );
   html = TQString();
 
-  if ( containsPGP ) {
+  if ( tqcontainsPGP ) {
     TQPtrListIterator<Kpgp::Block> pbit( pgpBlocks );
     TQStrListIterator npbit( nonPgpBlocks );
     TQTextCodec *codec;
@@ -490,7 +490,7 @@ void ArticleWidget::displayArticle()
       }
     }
     else {
-      if ( !containsPGP ) {
+      if ( !tqcontainsPGP ) {
         TQStringList lines;
         text->decodedText( lines, true, cfgMgr->readNewsViewer()->removeTrailingNewlines() );
         displayBodyBlock( lines );
@@ -527,7 +527,7 @@ void ArticleWidget::displayErrorMessage( const TQString &msg )
   mViewer->write( "<b><font size=\"+1\" color=\"red\">" );
   mViewer->write( i18n("An error occurred.") );
   mViewer->write( "</font></b><hr/><br/>" );
-  mViewer->write( errMsg.replace( "\n", "<br/>" ) );
+  mViewer->write( errMsg.tqreplace( "\n", "<br/>" ) );
   mViewer->write( "</body></html>");
   mViewer->end();
 
@@ -610,7 +610,7 @@ void ArticleWidget::displayHeader()
       headerHtml += toHtmlString( KGlobal::locale()->formatDateTime(date->qdt(), false, true), None );
     } else if ( hb->is("Newsgroups") ) {
       TQString groups = hb->asUnicodeString();
-      groups.replace( ',', ", " );
+      groups.tqreplace( ',', ", " );
       headerHtml += toHtmlString( groups, ParseURL );
     } else
       headerHtml += toHtmlString( hb->asUnicodeString(), ParseURL );
@@ -635,7 +635,7 @@ void ArticleWidget::displayHeader()
   TQString xface = "";
   if ( !xfhead.isEmpty() ) {
     KPIM::KXFace xf;
-    xface = TQString::fromLatin1( "<div class=\"senderpic\"><img src=\"%1\" width=\"48\" height=\"48\"/></div>" )
+    xface = TQString::tqfromLatin1( "<div class=\"senderpic\"><img src=\"%1\" width=\"48\" height=\"48\"/></div>" )
       .arg( imgToDataUrl( xf.toImage( xfhead ), "PNG" ) );
   }
 
@@ -663,7 +663,7 @@ void ArticleWidget::displayHeader()
     html += TQString( "<b>%1</b>" ).arg( i18n("References:") );
 
     while ( i <= refCnt ) {
-      html += " <a href=\"news:" + TQString::fromLatin1( id ) + "\">" + TQString::number( i ) + "</a>";
+      html += " <a href=\"news:" + TQString::tqfromLatin1( id ) + "\">" + TQString::number( i ) + "</a>";
       id = refs->next();
       id = id.mid( 1, id.length() - 2 );  // remove <>
       i++;
@@ -836,9 +836,9 @@ void ArticleWidget::displayAttachment( KMime::Content *att, int partNum )
   TQString label = ct->name();
   if ( label.isEmpty() )
     label = i18n("unnamed" );
-  // if label consists of only whitespace replace them by underscores
-  if ( (uint)label.contains( ' ' ) == label.length() )
-    label.replace( TQRegExp( " ", true, true ), "_" );
+  // if label consists of only whitespace tqreplace them by underscores
+  if ( (uint)label.tqcontains( ' ' ) == label.length() )
+    label.tqreplace( TQRegExp( " ", true, true ), "_" );
   label = toHtmlString( label, None );
 
   // attachment comment
@@ -915,7 +915,7 @@ TQString ArticleWidget::imgToDataUrl( const TQImage &image, const char* fmt  )
   TQBuffer buffer( ba );
   buffer.open( IO_WriteOnly );
   image.save( &buffer, fmt );
-  return TQString::fromLatin1("data:image/%1;base64,%2")
+  return TQString::tqfromLatin1("data:image/%1;base64,%2")
     .arg( fmt, KCodecs::base64Encode( ba ) );
 }
 
@@ -964,7 +964,7 @@ void ArticleWidget::updateContents()
   else
     clear();
   // restore scrollbar position
-  mViewer->view()->setContentsPos( 0, qRound(  mViewer->view()->contentsHeight() * savedPosition ) );
+  mViewer->view()->setContentsPos( 0, tqRound(  mViewer->view()->contentsHeight() * savedPosition ) );
 }
 
 
@@ -1158,7 +1158,7 @@ void ArticleWidget::slotURLClicked( const KURL &url, bool forceOpen)
   int partNum = 0;
   if ( url.protocol() == "file" || url.protocol() == "part" ) {
     if ( url.protocol() == "file" ) {
-      if ( !mAttachementMap.contains( url.path() ) )
+      if ( !mAttachementMap.tqcontains( url.path() ) )
         return;
       partNum = mAttachementMap[url.path()];
     }
@@ -1167,7 +1167,7 @@ void ArticleWidget::slotURLClicked( const KURL &url, bool forceOpen)
     KMime::Content *c = mAttachments.at( partNum );
     if ( !c )
       return;
-    // TODO: replace with message box as done in KMail
+    // TODO: tqreplace with message box as done in KMail
     KNConfigManager *cfgMgr = knGlobals.configManager();
     if ( forceOpen || cfgMgr->readNewsViewer()->openAttachmentsOnClick() )
       knGlobals.articleManager()->openContent( c );
@@ -1240,7 +1240,7 @@ void ArticleWidget::slotSelectAll()
 
 void ArticleWidget::slotFind()
 {
-  mViewer->findText();
+  mViewer->tqfindText();
 }
 
 
@@ -1416,7 +1416,7 @@ void ArticleWidget::slotAddBookmark()
 {
   if ( mCurrentURL.isEmpty() )
     return;
-  TQString filename = locateLocal( "data", TQString::fromLatin1("konqueror/bookmarks.xml") );
+  TQString filename = locateLocal( "data", TQString::tqfromLatin1("konqueror/bookmarks.xml") );
   KBookmarkManager *bookManager = KBookmarkManager::managerForFile( filename, false );
   KBookmarkGroup group = bookManager->root();
   group.addBookmark( bookManager, mCurrentURL.url(), mCurrentURL );
@@ -1444,7 +1444,7 @@ void ArticleWidget::slotSaveAttachment()
     return;
   int partNum = 0;
   if ( mCurrentURL.protocol() == "file" ) {
-    if ( !mAttachementMap.contains( mCurrentURL.path() ) )
+    if ( !mAttachementMap.tqcontains( mCurrentURL.path() ) )
       return;
     partNum = mAttachementMap[mCurrentURL.path()];
   }
diff --git a/knode/articlewidget.h b/knode/articlewidget.h
index 2571642d..2d44fdfc 100644
--- a/knode/articlewidget.h
+++ b/knode/articlewidget.h
@@ -125,7 +125,7 @@ class ArticleWidget : public TQWidget, public KNJobConsumer {
     /// displays the given error message in the viewer
     void displayErrorMessage( const TQString &msg );
 
-    /// display the message header (should be replaced by KMail's HeaderStyle class)
+    /// display the message header (should be tqreplaced by KMail's HeaderStyle class)
     void displayHeader();
     /** displays the given text block, including quote and signature handling
      *  @param lines A list of lines to display.
diff --git a/knode/headerview.cpp b/knode/headerview.cpp
index ede75bb6..0c2e0622 100644
--- a/knode/headerview.cpp
+++ b/knode/headerview.cpp
@@ -64,7 +64,7 @@ KNHeaderView::KNHeaderView(TQWidget *parent, const char *name) :
   setColumnAlignment( mPaintInfo.sizeCol, Qt::AlignRight );
   setColumnAlignment( mPaintInfo.scoreCol, Qt::AlignRight );
 
-  // due to our own column text squeezing we need to repaint on column resizing
+  // due to our own column text squeezing we need to tqrepaint on column resizing
   disconnect( header(), TQT_SIGNAL(sizeChange(int, int, int)) );
   connect( header(), TQT_SIGNAL(sizeChange(int, int, int)),
            TQT_SLOT(slotSizeChanged(int, int, int)) );
@@ -146,7 +146,7 @@ void KNHeaderView::setActive( TQListViewItem *i )
 
   if ( mActiveItem ) {
     mActiveItem->setActive( false );
-    repaintItem( mActiveItem );
+    tqrepaintItem( mActiveItem );
     mActiveItem = 0;
   }
 
@@ -534,7 +534,7 @@ TQDragObject* KNHeaderView::dragObject()
 
 void KNHeaderView::slotSizeChanged( int section, int, int newSize )
 {
-  viewport()->repaint( header()->sectionPos(section), 0, newSize, visibleHeight(), false);
+  viewport()->tqrepaint( header()->sectionPos(section), 0, newSize, visibleHeight(), false);
 }
 
 
@@ -601,14 +601,14 @@ void KNHeaderViewToolTip::maybeTip( const TQPoint &p )
   if ( !item->showToolTip( column ) )
     return;
 
-  const TQRect itemRect = listView->itemRect( item );
-  if ( !itemRect.isValid() )
+  const TQRect tqitemRect = listView->tqitemRect( item );
+  if ( !tqitemRect.isValid() )
     return;
   const TQRect headerRect = listView->header()->sectionRect( column );
   if ( !headerRect.isValid() )
     return;
 
-  tip( TQRect( headerRect.left(), itemRect.top(), headerRect.width(), itemRect.height() ),
+  tip( TQRect( headerRect.left(), tqitemRect.top(), headerRect.width(), tqitemRect.height() ),
        TQStyleSheet::escape( item->text( column ) ) );
 }
 
diff --git a/knode/knaccountmanager.cpp b/knode/knaccountmanager.cpp
index 167a49c6..76466ddb 100644
--- a/knode/knaccountmanager.cpp
+++ b/knode/knaccountmanager.cpp
@@ -223,7 +223,7 @@ void KNAccountManager::loadPasswordsAsync()
   if ( !mWallet && !mWalletOpenFailed ) {
     if ( knGlobals.top )
       mWallet = Wallet::openWallet( Wallet::NetworkWallet(),
-                                    knGlobals.topWidget->topLevelWidget()->winId(),
+                                    knGlobals.topWidget->tqtopLevelWidget()->winId(),
                                     Wallet::Asynchronous );
     else
       mWallet = Wallet::openWallet( Wallet::NetworkWallet(), 0, Wallet::Asynchronous );
@@ -263,7 +263,7 @@ KWallet::Wallet* KNAccountManager::wallet()
   delete mWallet;
   if ( knGlobals.top )
     mWallet = Wallet::openWallet( Wallet::NetworkWallet(),
-                                  knGlobals.topWidget->topLevelWidget()->winId() );
+                                  knGlobals.topWidget->tqtopLevelWidget()->winId() );
   else
     mWallet = Wallet::openWallet( Wallet::NetworkWallet() );
 
diff --git a/knode/knarticle.cpp b/knode/knarticle.cpp
index fe475b1b..437639d1 100644
--- a/knode/knarticle.cpp
+++ b/knode/knarticle.cpp
@@ -209,7 +209,7 @@ void KNRemoteArticle::updateListItem()
 
   i_tem->setExpandable( (threadMode() && hasVisibleFollowUps()) );
 
-  i_tem->repaint(); //force repaint
+  i_tem->tqrepaint(); //force tqrepaint
 }
 
 
@@ -435,7 +435,7 @@ KNAttachment::KNAttachment(Content *c)
 KNAttachment::KNAttachment(KNLoadHelper *helper)
   : c_ontent(0), l_oadHelper(helper), f_ile(helper->getFile()), i_sAttached(false), h_asChanged(true)
 {
-  setMimeType((KMimeMagic::self()->findFileType(f_ile->name()))->mimeType());
+  setMimeType((KMimeMagic::self()->tqfindFileType(f_ile->name()))->mimeType());
   n_ame=helper->getURL().fileName();
 }
 
diff --git a/knode/knarticle.h b/knode/knarticle.h
index 798742e1..e36bfdfe 100644
--- a/knode/knarticle.h
+++ b/knode/knarticle.h
@@ -35,7 +35,7 @@ class KNHdrViewItem;
 class KNArticleCollection;
 
 /** This class encapsulates a generic article. It provides all the
-    usual headers of a RFC822-message. Further more it contains an
+    usual headers of a RFC822-message. Further more it tqcontains an
     unique id and can store a pointer to a @ref TQListViewItem. It is
     used as a base class for all visible articles. */
 
diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp
index 410c2bf4..493e2e22 100644
--- a/knode/knarticlefactory.cpp
+++ b/knode/knarticlefactory.cpp
@@ -209,13 +209,13 @@ void KNArticleFactory::createReply(KNRemoteArticle *a, TQString selectedText, bo
   TQString attribution=knGlobals.configManager()->postNewsComposer()->intro();
   TQString name(a->from()->name());
   if (name.isEmpty())
-    name = TQString::fromLatin1(a->from()->email());
-  attribution.replace(TQRegExp("%NAME"),name);
-  attribution.replace(TQRegExp("%EMAIL"),TQString::fromLatin1(a->from()->email()));
-  attribution.replace(TQRegExp("%DATE"),KGlobal::locale()->formatDateTime(a->date()->qdt(),false));
-  attribution.replace(TQRegExp("%MSID"),a->messageID()->asUnicodeString());
-  attribution.replace(TQRegExp("%GROUP"),g->groupname());
-  attribution.replace(TQRegExp("%L"),"\n");
+    name = TQString::tqfromLatin1(a->from()->email());
+  attribution.tqreplace(TQRegExp("%NAME"),name);
+  attribution.tqreplace(TQRegExp("%EMAIL"),TQString::tqfromLatin1(a->from()->email()));
+  attribution.tqreplace(TQRegExp("%DATE"),KGlobal::locale()->formatDateTime(a->date()->qdt(),false));
+  attribution.tqreplace(TQRegExp("%MSID"),a->messageID()->asUnicodeString());
+  attribution.tqreplace(TQRegExp("%GROUP"),g->groupname());
+  attribution.tqreplace(TQRegExp("%L"),"\n");
   attribution+="\n\n";
 
   TQString quoted=attribution;
@@ -279,7 +279,7 @@ void KNArticleFactory::createForward(KNArticle *a)
   bool incAtt = ( !knGlobals.configManager()->postNewsTechnical()->useExternalMailer() &&
                   ct->isMultipart() && ct->isSubtype("mixed") &&
                   KMessageBox::Yes == KMessageBox::questionYesNo(knGlobals.topWidget,
-                  i18n("This article contains attachments. Do you want them to be forwarded as well?"), TQString::null, i18n("Forward"), i18n("Do Not Forward"))
+                  i18n("This article tqcontains attachments. Do you want them to be forwarded as well?"), TQString::null, i18n("Forward"), i18n("Do Not Forward"))
                 );
 
   if (knGlobals.configManager()->postNewsTechnical()->useOwnCharset())
@@ -419,7 +419,7 @@ void KNArticleFactory::createCancel(KNArticle *a)
   art->lines()->setNumberOfLines(1);
 
   //body
-  art->fromUnicodeString(TQString::fromLatin1("cancel by original author\n"));
+  art->fromUnicodeString(TQString::tqfromLatin1("cancel by original author\n"));
 
   //assemble
   art->assemble();
@@ -875,9 +875,9 @@ KNLocalArticle* KNArticleFactory::newArticle(KNCollection *col, TQString &sig, T
       if(origPost) {
         TQString name(origPost->from()->name());
         if (name.isEmpty())
-          name = TQString::fromLatin1(origPost->from()->email());
-        value.replace(TQRegExp("%NAME"), name);
-        value.replace(TQRegExp("%EMAIL"), TQString::fromLatin1(origPost->from()->email()));
+          name = TQString::tqfromLatin1(origPost->from()->email());
+        value.tqreplace(TQRegExp("%NAME"), name);
+        value.tqreplace(TQRegExp("%EMAIL"), TQString::tqfromLatin1(origPost->from()->email()));
       }
       else
         if(value.find("%NAME") != -1 || value.find("%EMAIL") != -1)
diff --git a/knode/knarticlefilter.cpp b/knode/knarticlefilter.cpp
index 60d0e032..bb2f2338 100644
--- a/knode/knarticlefilter.cpp
+++ b/knode/knarticlefilter.cpp
@@ -189,7 +189,7 @@ void KNArticleFilter::doFilter(KNGroup *g)
 
   if(!l_oaded) load();
 
-  subject.expand(g);  // replace placeholders
+  subject.expand(g);  // tqreplace placeholders
   from.expand(g);
   messageId.expand(g);
   references.expand(g);
@@ -287,7 +287,7 @@ void KNArticleFilter::doFilter(KNFolder *f)
 
   if(!l_oaded) load();
 
-  subject.expand(0);  // replace placeholders
+  subject.expand(0);  // tqreplace placeholders
   from.expand(0);
   messageId.expand(0);
   references.expand(0);
@@ -324,7 +324,7 @@ void KNArticleFilter::setTranslatedName(const TQString &s)
   bool retranslated = false;
   for (const char **c=defFil;(*c)!=0;c++)   // ok, try if it matches any of the standard filter names
     if (s==i18n("default filter name",*c)) {
-      n_ame = TQString::fromLatin1(*c);
+      n_ame = TQString::tqfromLatin1(*c);
       retranslated = true;
       break;
     }
diff --git a/knode/knarticlemanager.cpp b/knode/knarticlemanager.cpp
index 86bcd8df..d1aec96a 100644
--- a/knode/knarticlemanager.cpp
+++ b/knode/knarticlemanager.cpp
@@ -99,7 +99,7 @@ void KNArticleManager::saveArticleToFile(KNArticle *a, TQWidget *parent)
     else
       s.append(' ');
   fName = s.simplifyWhiteSpace();
-  fName.replace(TQRegExp("[\\s]"),"_");
+  fName.tqreplace(TQRegExp("[\\s]"),"_");
 
   KNSaveHelper helper(fName,parent);
   TQFile *file = helper.getFile(i18n("Save Article"));
@@ -186,7 +186,7 @@ void KNArticleManager::showHdrs(bool clear)
     v_iew->clear();
 
   knGlobals.top->setCursorBusy(true);
-  knGlobals.setStatusMsg(i18n(" Creating list..."));
+  knGlobals.seStatusMsg(i18n(" Creating list..."));
   knGlobals.top->secureProcessEvents();
 
   if(g_roup) {
@@ -324,7 +324,7 @@ void KNArticleManager::showHdrs(bool clear)
     knGlobals.top->articleViewer()->setArticle( 0 );
   }
 
-  knGlobals.setStatusMsg(TQString::null);
+  knGlobals.seStatusMsg(TQString::null);
   updateStatusString();
   knGlobals.top->setCursorBusy(false);
 }
@@ -991,25 +991,25 @@ void KNArticleManager::updateStatusString()
     if (g_roup->status()==KNGroup::moderated)
       name += i18n(" (moderated)");
 
-    knGlobals.setStatusMsg(i18n(" %1: %2 new , %3 displayed")
+    knGlobals.seStatusMsg(i18n(" %1: %2 new , %3 displayed")
                         .arg(name).arg(g_roup->newCount()).arg(displCnt),SB_GROUP);
 
     if(f_ilter)
-      knGlobals.setStatusMsg(i18n(" Filter: %1").arg(f_ilter->translatedName()), SB_FILTER);
+      knGlobals.seStatusMsg(i18n(" Filter: %1").arg(f_ilter->translatedName()), SB_FILTER);
     else
-      knGlobals.setStatusMsg(TQString::null, SB_FILTER);
+      knGlobals.seStatusMsg(TQString::null, SB_FILTER);
   }
   else if(f_older) {
     if(f_ilter)
       displCnt=f_ilter->count();
     else
       displCnt=f_older->count();
-    knGlobals.setStatusMsg(i18n(" %1: %2 displayed")
+    knGlobals.seStatusMsg(i18n(" %1: %2 displayed")
       .arg(f_older->name()).arg(displCnt), SB_GROUP);
-    knGlobals.setStatusMsg(TQString::null, SB_FILTER);
+    knGlobals.seStatusMsg(TQString::null, SB_FILTER);
   } else {
-    knGlobals.setStatusMsg(TQString::null, SB_GROUP);
-    knGlobals.setStatusMsg(TQString::null, SB_FILTER);
+    knGlobals.seStatusMsg(TQString::null, SB_GROUP);
+    knGlobals.seStatusMsg(TQString::null, SB_FILTER);
   }
 }
 
diff --git a/knode/kncollectionview.cpp b/knode/kncollectionview.cpp
index 63542cad..3bbb5237 100644
--- a/knode/kncollectionview.cpp
+++ b/knode/kncollectionview.cpp
@@ -93,7 +93,7 @@ void KNCollectionView::readConfig()
   KConfig *conf = knGlobals.config();
   conf->setGroup( "GroupView" );
 
-  // execute the listview layout stuff only once
+  // execute the listview tqlayout stuff only once
   static bool initDone = false;
   if (!initDone) {
     initDone = true;
diff --git a/knode/kncollectionviewitem.cpp b/knode/kncollectionviewitem.cpp
index 8fed1f96..35f2ae2c 100644
--- a/knode/kncollectionviewitem.cpp
+++ b/knode/kncollectionviewitem.cpp
@@ -160,7 +160,7 @@ TQString KNCollectionViewItem::squeezeFolderName( const TQString &text,
       nextPos = t.find('.', curPos);
       if ( nextPos != -1 ) {
         temp = t[curPos];
-        t.replace( curPos, nextPos - curPos, temp );
+        t.tqreplace( curPos, nextPos - curPos, temp );
         curPos += 2;
       }
     }
diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp
index 53520e29..533ad356 100644
--- a/knode/kncomposer.cpp
+++ b/knode/kncomposer.cpp
@@ -236,9 +236,9 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString &
   KStdAction::selectAll(this, TQT_SLOT(slotSelectAll()), actionCollection());
 
   KStdAction::find(v_iew->e_dit, TQT_SLOT(slotFind()), actionCollection());
-  KStdAction::findNext(v_iew->e_dit, TQT_SLOT(slotSearchAgain()), actionCollection());
+  KStdAction::tqfindNext(v_iew->e_dit, TQT_SLOT(slotSearchAgain()), actionCollection());
 
-  KStdAction::replace(v_iew->e_dit, TQT_SLOT(slotReplace()), actionCollection());
+  KStdAction::tqreplace(v_iew->e_dit, TQT_SLOT(slotReplace()), actionCollection());
 
   //attach menu
   new KAction(i18n("Append &Signature"), 0 , this, TQT_SLOT(slotAppendSig()),
@@ -343,7 +343,7 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString &
 
   if (firstEdit) {   // now we place the cursor at the end of the quoted text / below the attribution line
     if (knGlobals.configManager()->postNewsComposer()->cursorOnTop()) {
-      int numLines = knGlobals.configManager()->postNewsComposer()->intro().contains("%L");
+      int numLines = knGlobals.configManager()->postNewsComposer()->intro().tqcontains("%L");
       v_iew->e_dit->setCursorPosition(numLines+1,0);
     }
     else
@@ -411,7 +411,7 @@ int KNComposer::listOfResultOfCheckWord( const TQStringList & lst , const TQStri
     createGUI("kncomposerui.rc",  false);
     unplugActionList("spell_result" );
     m_listAction.clear();
-    if ( !lst.contains( selectWord ) )
+    if ( !lst.tqcontains( selectWord ) )
     {
         TQStringList::ConstIterator it = lst.begin();
         for ( ; it != lst.end() ; ++it )
@@ -432,7 +432,7 @@ int KNComposer::listOfResultOfCheckWord( const TQStringList & lst , const TQStri
 
 void KNComposer::slotUndo()
 {
-    TQWidget* fw = focusWidget();
+    TQWidget* fw = tqfocusWidget();
     if (!fw) return;
 
     if (fw->inherits("KEdit"))
@@ -443,7 +443,7 @@ void KNComposer::slotUndo()
 
 void KNComposer::slotRedo()
 {
-    TQWidget* fw = focusWidget();
+    TQWidget* fw = tqfocusWidget();
     if (!fw) return;
 
     if (fw->inherits("KEdit"))
@@ -454,7 +454,7 @@ void KNComposer::slotRedo()
 
 void KNComposer::slotCut()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   if (fw->inherits("KEdit"))
@@ -466,7 +466,7 @@ void KNComposer::slotCut()
 
 void KNComposer::slotCopy()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   if (fw->inherits("KEdit"))
@@ -480,7 +480,7 @@ void KNComposer::slotCopy()
 
 void KNComposer::slotPaste()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   if (fw->inherits("KEdit"))
@@ -492,7 +492,7 @@ void KNComposer::slotPaste()
 
 void KNComposer::slotSelectAll()
 {
-  TQWidget* fw = focusWidget();
+  TQWidget* fw = tqfocusWidget();
   if (!fw) return;
 
   if (fw->inherits("TQLineEdit"))
@@ -534,7 +534,7 @@ void KNComposer::setMessageMode(MessageMode mode)
 
   if (m_ode == news_mail) {
     TQString s = v_iew->e_dit->textLine(0);
-    if (!s.contains(i18n("<posted & mailed>")))
+    if (!s.tqcontains(i18n("<posted & mailed>")))
       v_iew->e_dit->insertAt(i18n("<posted & mailed>\n\n"),0,0);
   } else {
     if (v_iew->e_dit->textLine(0)==i18n("<posted & mailed>")) {
@@ -658,7 +658,7 @@ bool KNComposer::hasValidData()
   }
 
   if (n_eeds8Bit && (c_harset.lower()=="us-ascii")) {
-    KMessageBox::sorry(this, i18n("Your message contains characters which are not included\nin the \"us-ascii\" character set; please choose\na suitable character set from the \"Options\" menu."));
+    KMessageBox::sorry(this, i18n("Your message tqcontains characters which are not included\nin the \"us-ascii\" character set; please choose\na suitable character set from the \"Options\" menu."));
     return false;
   }
 
@@ -682,7 +682,7 @@ bool KNComposer::hasValidData()
 
   if (longLine)
     if (!(KMessageBox::warningYesNo( this,
-          i18n("Your article contains lines longer than 80 characters.\n"
+          i18n("Your article tqcontains lines longer than 80 characters.\n"
 	       "Do you want to re-edit the article or send it anyway?"),
           TQString::null, i18n("&Send"),
 	  i18n("edit article","&Edit")) == KMessageBox::Yes))
@@ -957,7 +957,7 @@ void KNComposer::initData(const TQString &text)
 }
 
 
-// inserts at cursor position if clear is false, replaces content otherwise
+// inserts at cursor position if clear is false, tqreplaces content otherwise
 // puts the file content into a box if box==true
 // "file" is already open for reading
 void KNComposer::insertFile(TQFile *file, bool clear, bool box, TQString boxTitle)
@@ -969,7 +969,7 @@ void KNComposer::insertFile(TQFile *file, bool clear, bool box, TQString boxTitl
   ts.setCodec(codec);
 
   if (box)
-    temp = TQString::fromLatin1(",----[ %1 ]\n").arg(boxTitle);
+    temp = TQString::tqfromLatin1(",----[ %1 ]\n").arg(boxTitle);
 
   if (box && (v_iew->e_dit->wordWrap()!=TQMultiLineEdit::NoWrap)) {
     int wrapAt = v_iew->e_dit->wrapColumnOrWidth();
@@ -993,7 +993,7 @@ void KNComposer::insertFile(TQFile *file, bool clear, bool box, TQString boxTitl
   }
 
   if (box)
-    temp += TQString::fromLatin1("`----");
+    temp += TQString::tqfromLatin1("`----");
 
   if(clear)
     v_iew->e_dit->setText(temp);
@@ -1173,7 +1173,7 @@ void KNComposer::slotToggleDoMail()
 
     if (knGlobals.configManager()->postNewsTechnical()->useExternalMailer()) {
       TQString s = v_iew->e_dit->textLine(0);
-      if (!s.contains(i18n("<posted & mailed>")))
+      if (!s.tqcontains(i18n("<posted & mailed>")))
         v_iew->e_dit->insertAt(i18n("<posted & mailed>\n\n"),0,0);
       TQString tmp;
       TQStringList textLines = v_iew->e_dit->processedText();
@@ -1231,7 +1231,7 @@ void KNComposer::slotToggleWordWrap()
 
 void KNComposer::slotUndoRewrap()
 {
-  if (KMessageBox::warningContinueCancel( this, i18n("This will replace all text you have written.")) == KMessageBox::Continue) {
+  if (KMessageBox::warningContinueCancel( this, i18n("This will tqreplace all text you have written.")) == KMessageBox::Continue) {
     v_iew->e_dit->setText(u_nwraped);
     slotAppendSig();
   }
@@ -1293,8 +1293,8 @@ void KNComposer::slotExternalEditor()
   TQStringList command = TQStringList::split(' ',editorCommand);
   bool filenameAdded=false;
   for ( TQStringList::Iterator it = command.begin(); it != command.end(); ++it ) {
-    if ((*it).contains("%f")) {
-      (*it).replace(TQRegExp("%f"),e_ditorTempfile->name());
+    if ((*it).tqcontains("%f")) {
+      (*it).tqreplace(TQRegExp("%f"),e_ditorTempfile->name());
       filenameAdded=true;
     }
     (*e_xternalEditor) << (*it);
@@ -1422,10 +1422,10 @@ void KNComposer::slotNewToolbarConfig()
 
 void KNComposer::slotSubjectChanged(const TQString &t)
 {
-  // replace newlines
+  // tqreplace newlines
   TQString subject = t;
-  subject.replace( '\n', ' ' );
-  subject.replace( '\r', ' ' );
+  subject.tqreplace( '\n', ' ' );
+  subject.tqreplace( '\r', ' ' );
   if ( subject != t ) // setText() sets the cursor to the end
     v_iew->s_ubject->setText( subject );
   // update caption
@@ -1447,7 +1447,7 @@ void KNComposer::slotGroupsChanged(const TQString &t)
   split.init(t.latin1(), ",");
   splitOk=split.first();
   while(splitOk) {
-    v_iew->f_up2->insertItem(TQString::fromLatin1(split.string()));
+    v_iew->f_up2->insertItem(TQString::tqfromLatin1(split.string()));
     splitOk=split.next();
   }
   v_iew->f_up2->insertItem("");
@@ -1643,7 +1643,7 @@ void KNComposer::slotSpellFinished()
 {
   a_ctExternalEditor->setEnabled(true);
   a_ctSpellCheck->setEnabled(true);
-  KSpell::spellStatus status=s_pellChecker->status();
+  KSpell::spelltqStatus status=s_pellChecker->status();
   delete s_pellChecker;
   s_pellChecker=0;
 
@@ -1998,7 +1998,7 @@ KNComposer::Editor::Editor(KNComposer::ComposerView *_composerView, KNComposer *
   spell = 0L;
   installEventFilter(this);
   KCursor::setAutoHideCursor( this, true, true );
-  m_bound = TQRegExp( TQString::fromLatin1("[\\s\\W]") );
+  m_bound = TQRegExp( TQString::tqfromLatin1("[\\s\\W]") );
 }
 
 
@@ -2052,13 +2052,13 @@ bool KNComposer::Editor::eventFilter(TQObject*o, TQEvent* e)
         lastSpace = paraText.length();
       TQString word = paraText.mid( firstSpace, lastSpace - firstSpace );
       //Continue if this word was misspelled
-      if( !word.isEmpty() && m_replacements.contains( word ) )
+      if( !word.isEmpty() && m_tqreplacements.tqcontains( word ) )
       {
         KPopupMenu p;
         p.insertTitle( i18n("Suggestions") );
 
         //Add the suggestions to the popup menu
-        TQStringList reps = m_replacements[word];
+        TQStringList reps = m_tqreplacements[word];
         if( reps.count() > 0 )
         {
           int listPos = 0;
@@ -2081,11 +2081,11 @@ bool KNComposer::Editor::eventFilter(TQObject*o, TQEvent* e)
           int parIdx = 1, txtIdx = 1;
           getCursorPosition(&parIdx, &txtIdx);
           setSelection(para, firstSpace, para, lastSpace);
-          insert(m_replacements[word][id]);
+          insert(m_tqreplacements[word][id]);
           // Restore the cursor position; if the cursor was behind the
           // misspelled word then adjust the cursor position
           if ( para == parIdx && txtIdx >= lastSpace )
-            txtIdx += m_replacements[word][id].length() - word.length();
+            txtIdx += m_tqreplacements[word][id].length() - word.length();
           setCursorPosition(parIdx, txtIdx);
         }
         //Cancel original event
@@ -2099,7 +2099,7 @@ bool KNComposer::Editor::eventFilter(TQObject*o, TQEvent* e)
 
 void KNComposer::Editor::slotAddSuggestion( const TQString &text, const TQStringList &lst, unsigned int )
 {
-  m_replacements[text] = lst;
+  m_tqreplacements[text] = lst;
 }
 
 // expand tabs to avoid the "tab-damage",
@@ -2137,12 +2137,12 @@ TQStringList KNComposer::Editor::processedText()
     }
   }
 
-  TQString replacement;
+  TQString tqreplacement;
   int tabPos;
   for (TQStringList::Iterator it = ret.begin(); it != ret.end(); ++it ) {
     while ((tabPos=(*it).find('\t'))!=-1) {
-      replacement.fill(TQChar(' '), 8-(tabPos%8));
-      (*it).replace(tabPos, 1, replacement);
+      tqreplacement.fill(TQChar(' '), 8-(tabPos%8));
+      (*it).tqreplace(tabPos, 1, tqreplacement);
     }
   }
 
@@ -2159,7 +2159,7 @@ void KNComposer::Editor::slotPasteAsQuotation()
         s[i] = ' ';
     }
     s.prepend("> ");
-    s.replace(TQRegExp("\n"),"\n> ");
+    s.tqreplace(TQRegExp("\n"),"\n> ");
     insert(s);
   }
 }
@@ -2177,7 +2177,7 @@ void KNComposer::Editor::slotSearchAgain()
 
 void KNComposer::Editor::slotReplace()
 {
-  replace();
+  tqreplace();
 }
 
 
@@ -2186,7 +2186,7 @@ void KNComposer::Editor::slotAddQuotes()
   if (hasMarkedText()) {
     TQString s = markedText();
     s.prepend("> ");
-    s.replace(TQRegExp("\n"),"\n> ");
+    s.tqreplace(TQRegExp("\n"),"\n> ");
     insert(s);
   } else {
     int l = currentLine();
@@ -2206,7 +2206,7 @@ void KNComposer::Editor::slotRemoveQuotes()
     TQString s = markedText();
     if (s.left(2) == "> ")
       s.remove(0,2);
-    s.replace(TQRegExp("\n> "),"\n");
+    s.tqreplace(TQRegExp("\n> "),"\n");
     insert(s);
   } else {
     int l = currentLine();
@@ -2227,13 +2227,13 @@ void KNComposer::Editor::slotAddBox()
     if (hasMarkedText()) {
     TQString s = markedText();
     s.prepend(",----[  ]\n");
-    s.replace(TQRegExp("\n"),"\n| ");
+    s.tqreplace(TQRegExp("\n"),"\n| ");
     s.append("\n`----");
     insert(s);
   } else {
     int l = currentLine();
     int c = currentColumn();
-    TQString s = TQString::fromLatin1(",----[  ]\n| %1\n`----").arg(textLine(l));
+    TQString s = TQString::tqfromLatin1(",----[  ]\n| %1\n`----").arg(textLine(l));
     insertLine(s,l);
     removeLine(l+3);
     setCursorPosition(l+1,c+2);
@@ -2244,10 +2244,10 @@ void KNComposer::Editor::slotAddBox()
 void KNComposer::Editor::slotRemoveBox()
 {
   if (hasMarkedText()) {
-    TQString s = TQString::fromLatin1("\n") + markedText() + TQString::fromLatin1("\n");
-    s.replace(TQRegExp("\n,----[^\n]*\n"),"\n");
-    s.replace(TQRegExp("\n| "),"\n");
-    s.replace(TQRegExp("\n`----[^\n]*\n"),"\n");
+    TQString s = TQString::tqfromLatin1("\n") + markedText() + TQString::tqfromLatin1("\n");
+    s.tqreplace(TQRegExp("\n,----[^\n]*\n"),"\n");
+    s.tqreplace(TQRegExp("\n| "),"\n");
+    s.tqreplace(TQRegExp("\n`----[^\n]*\n"),"\n");
     s.remove(0,1);
     s.truncate(s.length()-1);
     insert(s);
@@ -2297,7 +2297,7 @@ void KNComposer::Editor::slotRemoveBox()
     setCursorPosition(l,c-2);
 
     setAutoUpdate(true);
-    repaint(false);
+    tqrepaint(false);
   }
 }
 
@@ -2368,7 +2368,7 @@ void KNComposer::Editor::keyPressEvent ( TQKeyEvent *e)
                        && newLine[leadingWhiteSpaceCount].isSpace() ) {
                     ++leadingWhiteSpaceCount;
                 }
-                newLine = newLine.replace( 0, leadingWhiteSpaceCount,
+                newLine = newLine.tqreplace( 0, leadingWhiteSpaceCount,
                                            lineText.left( bot ) );
                 removeParagraph( line + 1 );
                 insertParagraph( newLine, line + 1 );
@@ -2423,7 +2423,7 @@ void KNComposer::Editor::slotSpellDone(const TQString &/*newtext*/)
 
 void KNComposer::Editor::slotSpellFinished()
 {
-  KSpell::spellStatus status=spell->status();
+  KSpell::spelltqStatus status=spell->status();
   delete spell;
   spell=0;
 
@@ -2604,7 +2604,7 @@ KNComposer::AttachmentPropertiesDlg::AttachmentPropertiesDlg(KNAttachment *a, TQ
     this, TQT_SLOT(slotMimeTypeTextChanged(const TQString&)));
 
   //finish GUI
-  setFixedHeight(sizeHint().height());
+  setFixedHeight(tqsizeHint().height());
   KNHelper::restoreWindowSize("attProperties", this, TQSize(300,250));
   setHelp("anc-knode-editor-advanced");
 }
diff --git a/knode/kncomposer.h b/knode/kncomposer.h
index b1c1c12a..05d6de0a 100644
--- a/knode/kncomposer.h
+++ b/knode/kncomposer.h
@@ -68,7 +68,7 @@ class KNComposer : public KMainWindow , virtual public KNodeComposerIface {
     //set data from the given article
     void initData(const TQString &text);
 
-    // inserts at cursor position if clear is false, replaces content otherwise
+    // inserts at cursor position if clear is false, tqreplaces content otherwise
     // puts the file content into a box if box==true
     // "file" is already open for reading
     void insertFile(TQFile *file, bool clear=false, bool box=false, TQString boxTitle=TQString::null);
@@ -295,7 +295,7 @@ private:
     KNComposer *m_composer;
     KNComposer::ComposerView *m_composerView;
     KSpell *spell;
-    TQMap<TQString,TQStringList> m_replacements;
+    TQMap<TQString,TQStringList> m_tqreplacements;
     TQRegExp m_bound;
 };
 
diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp
index 85606d89..cfeb8f00 100644
--- a/knode/knconfig.cpp
+++ b/knode/knconfig.cpp
@@ -149,7 +149,7 @@ TQString KNConfig::Identity::getSignature()
   else
     s_igContents = s_igText;
 
-  if (!s_igContents.isEmpty() && !s_igContents.contains("\n-- \n") && !(s_igContents.left(4) == "-- \n"))
+  if (!s_igContents.isEmpty() && !s_igContents.tqcontains("\n-- \n") && !(s_igContents.left(4) == "-- \n"))
     s_igContents.prepend("-- \n");
 
   return s_igContents;
@@ -942,11 +942,11 @@ void KNConfig::PostNewsTechnical::save()
   conf->setGroup("POSTNEWS");
 
   conf->writeEntry("ComposerCharsets", c_omposerCharsets);
-  conf->writeEntry("Charset", TQString::fromLatin1(c_harset));
+  conf->writeEntry("Charset", TQString::tqfromLatin1(c_harset));
   conf->writeEntry("8BitEncoding", a_llow8BitBody);
   conf->writeEntry("UseOwnCharset", u_seOwnCharset);
   conf->writeEntry("generateMId", g_enerateMID);
-  conf->writeEntry("MIdhost", TQString::fromLatin1(h_ostname));
+  conf->writeEntry("MIdhost", TQString::tqfromLatin1(h_ostname));
   conf->writeEntry("dontIncludeUA", d_ontIncludeUA);
   conf->writeEntry("useExternalMailer", u_seExternalMailer);
 
@@ -1100,7 +1100,7 @@ KNConfig::Cleanup::Cleanup( bool global ) :
   // default values for new accounts / groups
   d_oExpire( true ), r_emoveUnavailable( true ), p_reserveThr( true ),
   e_xpireInterval( 5 ), r_eadMaxAge( 10 ), u_nreadMaxAge( 15 ),
-  mGlobal(global), mDefault(!global), mLastExpDate( TQDate::currentDate() )
+  mGlobal(global), mDefault(!global), mLastExpDate( TQDate::tqcurrentDate() )
 {
   if (mGlobal) {
     KConfig *conf = knGlobals.config();
@@ -1174,7 +1174,7 @@ bool KNConfig::Cleanup::expireToday()
   if (!d_oExpire)
     return false;
 
-  TQDate today = TQDate::currentDate();
+  TQDate today = TQDate::tqcurrentDate();
   if (mLastExpDate == today)
     return false;
 
@@ -1184,7 +1184,7 @@ bool KNConfig::Cleanup::expireToday()
 
 void KNConfig::Cleanup::setLastExpireDate()
 {
-  mLastExpDate = TQDateTime::currentDateTime();
+  mLastExpDate = TQDateTime::tqcurrentDateTime();
 }
 
 
@@ -1193,7 +1193,7 @@ bool KNConfig::Cleanup::compactToday()
   if (!d_oCompact)
     return false;
 
-  TQDate today = TQDate::currentDate();
+  TQDate today = TQDate::tqcurrentDate();
   if (mLastCompDate == today)
     return false;
 
@@ -1203,7 +1203,7 @@ bool KNConfig::Cleanup::compactToday()
 
 void KNConfig::Cleanup::setLastCompactDate()
 {
-  mLastCompDate = TQDateTime::currentDateTime();
+  mLastCompDate = TQDateTime::tqcurrentDateTime();
 }
 
 
diff --git a/knode/knconfig.h b/knode/knconfig.h
index e2aa682b..6bca3ab1 100644
--- a/knode/knconfig.h
+++ b/knode/knconfig.h
@@ -390,7 +390,7 @@ class KDE_EXPORT XHeader {
 
     TQCString name()   { return n_ame; }
     TQString value()   { return v_alue; }
-    TQString header()  { return (TQString::fromLatin1(("X-"+n_ame+": "))+v_alue); }
+    TQString header()  { return (TQString::tqfromLatin1(("X-"+n_ame+": "))+v_alue); }
 
   protected:
     TQCString n_ame;
diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp
index 91fba601..d70ebfa4 100644
--- a/knode/knconfigwidgets.cpp
+++ b/knode/knconfigwidgets.cpp
@@ -213,7 +213,7 @@ void KNConfig::IdentityWidget::save()
   d_ata->s_igningKey = s_igningKey->keyIDs().first();
   d_ata->u_seSigFile=s_igFile->isChecked();
   d_ata->u_seSigGenerator=s_igGenerator->isChecked();
-  d_ata->s_igPath=c_ompletion->replacedPath(s_ig->text());
+  d_ata->s_igPath=c_ompletion->tqreplacedPath(s_ig->text());
   d_ata->s_igText=s_igEditor->text();
 
   if(d_ata->isGlobal())
@@ -242,7 +242,7 @@ void KNConfig::IdentityWidget::slotSignatureType(int type)
 
 void KNConfig::IdentityWidget::slotSignatureChoose()
 {
-  TQString tmp=KFileDialog::getOpenFileName(c_ompletion->replacedPath(s_ig->text()),TQString::null,this,i18n("Choose Signature"));
+  TQString tmp=KFileDialog::getOpenFileName(c_ompletion->tqreplacedPath(s_ig->text()),TQString::null,this,i18n("Choose Signature"));
   if(!tmp.isEmpty()) s_ig->setText(tmp);
   emit changed( true );
 }
@@ -250,7 +250,7 @@ void KNConfig::IdentityWidget::slotSignatureChoose()
 
 void KNConfig::IdentityWidget::slotSignatureEdit()
 {
-  TQString fileName = c_ompletion->replacedPath(s_ig->text()).stripWhiteSpace();
+  TQString fileName = c_ompletion->tqreplacedPath(s_ig->text()).stripWhiteSpace();
 
   if (fileName.isEmpty()) {
     KMessageBox::sorry(this, i18n("You must specify a filename."));
@@ -561,7 +561,7 @@ KNConfig::NntpAccountConfDialog::NntpAccountConfDialog(KNNntpAccount *a, TQWidge
 
   connect( knGlobals.accountManager(), TQT_SIGNAL(passwordsChanged()), TQT_SLOT(slotPasswordChanged()) );
 
-  KNHelper::restoreWindowSize("accNewsPropDLG", this, sizeHint());
+  KNHelper::restoreWindowSize("accNewsPropDLG", this, tqsizeHint());
 
   setHelp("anc-setting-the-news-account");
 }
@@ -896,7 +896,7 @@ void KNConfig::AppearanceWidget::defaults()
     colorItem->setColor(d_ata->defaultColor(i));
   }
   c_List->triggerUpdate(true);
-  c_List->repaint(true);
+  c_List->tqrepaint(true);
 
   // default fonts
   FontListItem *fontItem;
@@ -1548,8 +1548,8 @@ KNConfig::DisplayedHeaderConfDialog::DisplayedHeaderConfDialog(KNDisplayedHeader
     v_alueCB[i]->setChecked(h->flag(i+4));
   }
 
-  setFixedHeight(sizeHint().height());
-  KNHelper::restoreWindowSize("accReadHdrPropDLG", this, sizeHint());
+  setFixedHeight(tqsizeHint().height());
+  KNHelper::restoreWindowSize("accReadHdrPropDLG", this, tqsizeHint());
 
   connect(n_ameE, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotNameChanged(const TQString&)));
 
@@ -2138,8 +2138,8 @@ KNConfig::XHeaderConfDialog::XHeaderConfDialog(const TQString &h, TQWidget *p, c
     v_alue->setText(h.mid(pos, h.length()-pos));
   }
 
-  setFixedHeight(sizeHint().height());
-  KNHelper::restoreWindowSize("XHeaderDlg", this, sizeHint());
+  setFixedHeight(tqsizeHint().height());
+  KNHelper::restoreWindowSize("XHeaderDlg", this, tqsizeHint());
 
   n_ame->setFocus();
 }
@@ -2157,7 +2157,7 @@ TQString KNConfig::XHeaderConfDialog::result()
 {
   TQString value = v_alue->text();
   // just in case someone pastes a newline
-  value.replace( '\n', ' ' );
+  value.tqreplace( '\n', ' ' );
   return TQString( "X-%1: %2" ).arg( n_ame->text() ).arg( value );
 }
 
@@ -2237,7 +2237,7 @@ KNConfig::PostNewsComposerWidget::PostNewsComposerWidget( PostNewsComposer *d, T
   connect(e_ditor, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()));
   editorL->addWidget(btn,1,2);
 
-  editorL->addMultiCellWidget(new TQLabel(i18n("%f will be replaced with the filename to edit."), editorB),2,2,0,2);
+  editorL->addMultiCellWidget(new TQLabel(i18n("%f will be tqreplaced with the filename to edit."), editorB),2,2,0,2);
 
   e_xternCB=new TQCheckBox(i18n("Start exte&rnal editor automatically"), editorB);
   editorL->addMultiCellWidget(e_xternCB, 3,3,0,2);
@@ -2373,10 +2373,10 @@ KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *paren
 
   mExpGroup = new TQGroupBox( i18n("Newsgroup Cleanup Settings"), this );
   mExpGroup->setColumnLayout(0, Qt::Vertical );
-  mExpGroup->layout()->setSpacing( KDialog::spacingHint() );
-  mExpGroup->layout()->setMargin( KDialog::marginHint() );
+  mExpGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
+  mExpGroup->tqlayout()->setMargin( KDialog::marginHint() );
   top->addWidget( mExpGroup );
-  TQGridLayout *grid = new TQGridLayout( mExpGroup->layout(), 7, 2 );
+  TQGridLayout *grid = new TQGridLayout( mExpGroup->tqlayout(), 7, 2 );
 
   grid->setRowSpacing( 0, KDialog::spacingHint() );
 
@@ -2482,11 +2482,11 @@ KNConfig::CleanupWidget::CleanupWidget( TQWidget *p, const char *n ) :
 
   TQGroupBox *foldersB=new TQGroupBox(i18n("Folders"), this);
   foldersB->setColumnLayout(0, Qt::Vertical );
-  foldersB->layout()->setSpacing( KDialog::spacingHint() );
-  foldersB->layout()->setMargin( KDialog::marginHint() );
+  foldersB->tqlayout()->setSpacing( KDialog::spacingHint() );
+  foldersB->tqlayout()->setMargin( KDialog::marginHint() );
 
   topL->addWidget(foldersB);
-  TQGridLayout *foldersL=new TQGridLayout(foldersB->layout(), 3,2);
+  TQGridLayout *foldersL=new TQGridLayout(foldersB->tqlayout(), 3,2);
 
   foldersL->setRowSpacing( 0, KDialog::spacingHint() );
 
diff --git a/knode/knconvert.cpp b/knode/knconvert.cpp
index 8fdb4890..ce25167e 100644
--- a/knode/knconvert.cpp
+++ b/knode/knconvert.cpp
@@ -96,7 +96,7 @@ will be created before the conversion starts.").arg(KNODE_VERSION), w_1);
 
   w_2=new TQLabel(s_tack);
   w_2->setText(i18n("<b>Converting, please wait...</b>"));
-  w_2->setAlignment(AlignCenter);
+  w_2->tqsetAlignment(AlignCenter);
   s_tack->addWidget(w_2, 2);
 
   w_3=new TQWidget(s_tack);
diff --git a/knode/kndisplayedheader.cpp b/knode/kndisplayedheader.cpp
index cf25d57e..da8b1a2c 100644
--- a/knode/kndisplayedheader.cpp
+++ b/knode/kndisplayedheader.cpp
@@ -107,7 +107,7 @@ void KNDisplayedHeader::setTranslatedName(const TQString &s)
   bool retranslated = false;
   for (const char **c=predef;(*c)!=0;c++) {  // ok, first the standard header names
     if (s==i18n("collection of article headers",*c)) {
-      n_ame = TQString::fromLatin1(*c);
+      n_ame = TQString::tqfromLatin1(*c);
       retranslated = true;
       break;
     }
@@ -116,7 +116,7 @@ void KNDisplayedHeader::setTranslatedName(const TQString &s)
   if (!retranslated) {
     for (const char **c=disp;(*c)!=0;c++)   // now our standard display names
       if (s==i18n("collection of article headers",*c)) {
-        n_ame = TQString::fromLatin1(*c);
+        n_ame = TQString::tqfromLatin1(*c);
         retranslated = true;
         break;
       }
diff --git a/knode/knfilterdialog.cpp b/knode/knfilterdialog.cpp
index e9ebf66e..f0151766 100644
--- a/knode/knfilterdialog.cpp
+++ b/knode/knfilterdialog.cpp
@@ -74,8 +74,8 @@ KNFilterDialog::KNFilterDialog(KNArticleFilter *f, TQWidget *parent, const char
   fw->messageId->setFilter(f->messageId);
   fw->references->setFilter(f->references);
 
-  setFixedHeight(sizeHint().height());
-  KNHelper::restoreWindowSize("filterDLG", this, sizeHint());
+  setFixedHeight(tqsizeHint().height());
+  KNHelper::restoreWindowSize("filterDLG", this, tqsizeHint());
 
   setHelp("anc-using-filters");
   connect( fname,  TQT_SIGNAL( textChanged ( const TQString & )), this, TQT_SLOT( slotTextChanged( const TQString & )));
diff --git a/knode/knfiltermanager.cpp b/knode/knfiltermanager.cpp
index be57996f..9ea8d7ac 100644
--- a/knode/knfiltermanager.cpp
+++ b/knode/knfiltermanager.cpp
@@ -205,7 +205,7 @@ void KNFilterManager::addFilter(KNArticleFilter *f)
     for ( TQValueList<KNArticleFilter*>::Iterator it = mFilterList.begin(); it != mFilterList.end(); ++it )
       activeFilters << (*it)->id();
     int newId = 1;
-    while ( activeFilters.contains( newId ) > 0 )
+    while ( activeFilters.tqcontains( newId ) > 0 )
       newId++;
     f->setId( newId );
   }
diff --git a/knode/knfolder.cpp b/knode/knfolder.cpp
index 01855d5b..81f4f01a 100644
--- a/knode/knfolder.cpp
+++ b/knode/knfolder.cpp
@@ -193,7 +193,7 @@ bool KNFolder::loadHdrs()
   int pos1=0, pos2=0, cnt=0, byteCount;
 
   knGlobals.top->setCursorBusy(true);
-  knGlobals.setStatusMsg(i18n(" Loading folder..."));
+  knGlobals.seStatusMsg(i18n(" Loading folder..."));
   knGlobals.top->secureProcessEvents();
 
   while(!i_ndexFile.atEnd()) {
@@ -284,7 +284,7 @@ bool KNFolder::loadHdrs()
       clear();
       closeFiles();
 
-      knGlobals.setStatusMsg(TQString::null);
+      knGlobals.seStatusMsg(TQString::null);
       knGlobals.top->setCursorBusy(false);
       return false;
     }
@@ -297,7 +297,7 @@ bool KNFolder::loadHdrs()
   c_ount=cnt;
   updateListItem();
 
-  knGlobals.setStatusMsg(TQString::null);
+  knGlobals.seStatusMsg(TQString::null);
   knGlobals.top->setCursorBusy(false);
 
   return true;
diff --git a/knode/knfoldermanager.cpp b/knode/knfoldermanager.cpp
index 7e3465bf..e857f4bb 100644
--- a/knode/knfoldermanager.cpp
+++ b/knode/knfoldermanager.cpp
@@ -294,7 +294,7 @@ void KNFolderManager::importFromMBox(KNFolder *f)
 
   if (file) {
     knGlobals.top->setCursorBusy(true);
-    knGlobals.setStatusMsg(i18n(" Importing articles..."));
+    knGlobals.seStatusMsg(i18n(" Importing articles..."));
     knGlobals.top->secureProcessEvents();
 
     if (!file->atEnd()) {                // search for the first article...
@@ -360,13 +360,13 @@ void KNFolderManager::importFromMBox(KNFolder *f)
       }
     }
 
-    knGlobals.setStatusMsg(i18n(" Storing articles..."));
+    knGlobals.seStatusMsg(i18n(" Storing articles..."));
     knGlobals.top->secureProcessEvents();
 
     if (!list.isEmpty())
       knGlobals.articleManager()->moveIntoFolder(list, f);
 
-    knGlobals.setStatusMsg(TQString::null);
+    knGlobals.seStatusMsg(TQString::null);
     knGlobals.top->setCursorBusy(false);
   }
 
@@ -391,7 +391,7 @@ void KNFolderManager::exportToMBox(KNFolder *f)
 
   if (file) {
     knGlobals.top->setCursorBusy(true);
-    knGlobals.setStatusMsg(i18n(" Exporting articles..."));
+    knGlobals.seStatusMsg(i18n(" Exporting articles..."));
     knGlobals.top->secureProcessEvents();
 
     TQTextStream ts(file);
@@ -415,7 +415,7 @@ void KNFolderManager::exportToMBox(KNFolder *f)
         knGlobals.top->secureProcessEvents();
     }
 
-    knGlobals.setStatusMsg(TQString::null);
+    knGlobals.seStatusMsg(TQString::null);
     knGlobals.top->setCursorBusy(false);
   }
 }
diff --git a/knode/knglobals.cpp b/knode/knglobals.cpp
index eaf026e8..7a6f0c22 100644
--- a/knode/knglobals.cpp
+++ b/knode/knglobals.cpp
@@ -134,8 +134,8 @@ KNMemoryManager* KNGlobals::memoryManager()
 }
 
 
-void KNGlobals::setStatusMsg(const TQString &text, int id)
+void KNGlobals::seStatusMsg(const TQString &text, int id)
 {
   if(top)
-    top->setStatusMsg(text, id);
+    top->seStatusMsg(text, id);
 }
diff --git a/knode/knglobals.h b/knode/knglobals.h
index 605f956c..72ffa1f0 100644
--- a/knode/knglobals.h
+++ b/knode/knglobals.h
@@ -75,8 +75,8 @@ class KDE_EXPORT KNGlobals {
     KNScoringManager      *scoringManager();
     KNMemoryManager       *memoryManager();
 
-    /** forwarded to top->setStatusMsg() if available */
-    void setStatusMsg(const TQString& text = TQString::null, int id = SB_MAIN);
+    /** forwarded to top->seStatusMsg() if available */
+    void seStatusMsg(const TQString& text = TQString::null, int id = SB_MAIN);
 
 private:
     KSharedConfig::Ptr c_onfig;
diff --git a/knode/kngroup.cpp b/knode/kngroup.cpp
index e55bee10..3584e744 100644
--- a/knode/kngroup.cpp
+++ b/knode/kngroup.cpp
@@ -71,7 +71,7 @@ void KNGroup::updateListItem()
   if(!l_istItem) return;
   l_istItem->setTotalCount( c_ount );
   l_istItem->setUnreadCount( c_ount - r_eadCount - i_gnoreCount );
-  l_istItem->repaint();
+  l_istItem->tqrepaint();
 }
 
 
@@ -133,7 +133,7 @@ void KNGroup::saveInfo()
     info.writeEntry("dynDataFormat", d_ynDataFormat);
     info.writeEntry("name", n_ame);
     info.writeEntry("useCharset", u_seCharset);
-    info.writeEntry("defaultChSet", TQString::fromLatin1(d_efaultChSet));
+    info.writeEntry("defaultChSet", TQString::tqfromLatin1(d_efaultChSet));
     switch (s_tatus) {
       case unknown: info.writeEntry("status","unknown");
                     break;
@@ -492,7 +492,7 @@ void KNGroup::insortNewHeaders(TQStrList *hdrs, TQStrList *hdrfmt, KNProtocolCli
   }
 
   // now we build the threads
-  syncSearchIndex(); // recreate the msgId-index so it contains the appended headers
+  syncSearchIndex(); // recreate the msgId-index so it tqcontains the appended headers
   buildThreads(added_cnt, client);
   updateThreadInfo();
 
@@ -904,7 +904,7 @@ void KNGroup::scoreArticles(bool onlynew)
     kdDebug(5003) << "scoring " << newCount() << " articles" << endl;
     kdDebug(5003) << "(total " << length() << " article in group)" << endl;
     knGlobals.top->setCursorBusy(true);
-    knGlobals.setStatusMsg(i18n(" Scoring..."));
+    knGlobals.seStatusMsg(i18n(" Scoring..."));
 
     int defScore;
     KScoringManager *sm = knGlobals.scoringManager();
@@ -936,7 +936,7 @@ void KNGroup::scoreArticles(bool onlynew)
         incReadCount();
     }
 
-    knGlobals.setStatusMsg(TQString::null);
+    knGlobals.seStatusMsg(TQString::null);
     knGlobals.top->setCursorBusy(false);
 
     //kdDebug(5003) << KNScorableArticle::notifyC->collection() << endl;
@@ -951,7 +951,7 @@ void KNGroup::reorganize()
   kdDebug(5003) << "KNGroup::reorganize()" << endl;
 
   knGlobals.top->setCursorBusy(true);
-  knGlobals.setStatusMsg(i18n(" Reorganizing headers..."));
+  knGlobals.seStatusMsg(i18n(" Reorganizing headers..."));
 
   for(int idx=0; idx<length(); idx++) {
     KNRemoteArticle *a = at(idx);
@@ -964,8 +964,8 @@ void KNGroup::reorganize()
   buildThreads(length());
   saveStaticData(length(), true);
   saveDynamicData(length(), true);
-  knGlobals.top->headerView()->repaint();
-  knGlobals.setStatusMsg(TQString::null);
+  knGlobals.top->headerView()->tqrepaint();
+  knGlobals.seStatusMsg(TQString::null);
   knGlobals.top->setCursorBusy(false);
 }
 
diff --git a/knode/kngroup.h b/knode/kngroup.h
index fef5c6d6..76a9d0dd 100644
--- a/knode/kngroup.h
+++ b/knode/kngroup.h
@@ -124,7 +124,7 @@ class KNGroup : public KNArticleCollection , public KNJobItem  {
     KNConfig::Identity* identity()const          { return i_dentity; }
     void setIdentity(KNConfig::Identity *i) { i_dentity=i; }
     Status status()const                         { return s_tatus; }
-    void setStatus(Status s)                { s_tatus=s; }
+    void seStatus(Status s)                { s_tatus=s; }
     void showProperties();
 
     // cleanup configuration
diff --git a/knode/kngroupbrowser.cpp b/knode/kngroupbrowser.cpp
index be91593a..d8e3f835 100644
--- a/knode/kngroupbrowser.cpp
+++ b/knode/kngroupbrowser.cpp
@@ -92,7 +92,7 @@ KNGroupBrowser::KNGroupBrowser(TQWidget *parent, const TQString &caption, KNNntp
   connect(groupView, TQT_SIGNAL(doubleClicked(TQListViewItem*)),
           this, TQT_SLOT(slotItemDoubleClicked(TQListViewItem*)));
 
-  //layout
+  //tqlayout
   TQGridLayout *topL=new TQGridLayout(page,3,1,0,5);
   TQHBoxLayout *filterL=new TQHBoxLayout(10);
   TQVBoxLayout *arrL=new TQVBoxLayout(10);
@@ -316,7 +316,7 @@ void KNGroupBrowser::slotFilter(const TQString &txt)
   bool notCheckNew = !newCB->isChecked();
   bool notCheckStr = (filtertxt.isEmpty());
 
-  bool isRegexp = filtertxt.contains(TQRegExp("[^a-z0-9\\-\\+.]"));
+  bool isRegexp = filtertxt.tqcontains(TQRegExp("[^a-z0-9\\-\\+.]"));
 
   bool doIncrementalUpdate = (!isRegexp && incrementalFilter && (filtertxt.left(lastFilter.length())==lastFilter));
 
@@ -411,7 +411,7 @@ KNGroupBrowser::CheckItem::CheckItem(TQListView *v, const KNGroupInfo &gi, KNGro
   TQString des(gi.description);
   if (gi.status == KNGroup::moderated) {
     setText(0,gi.name+" (m)");
-    if (!des.upper().contains(i18n("moderated").upper()))
+    if (!des.upper().tqcontains(i18n("moderated").upper()))
       des+=i18n(" (moderated)");
   }
   setText(1,des);
@@ -424,7 +424,7 @@ KNGroupBrowser::CheckItem::CheckItem(TQListViewItem *i, const KNGroupInfo &gi, K
   TQString des(gi.description);
   if (gi.status == KNGroup::moderated) {
     setText(0,gi.name+" (m)");
-    if (!des.upper().contains(i18n("moderated").upper()))
+    if (!des.upper().tqcontains(i18n("moderated").upper()))
       des+=i18n(" (moderated)");
   }
   setText(1,des);
diff --git a/knode/kngroupdialog.cpp b/knode/kngroupdialog.cpp
index 64deea4f..bff6dfd5 100644
--- a/knode/kngroupdialog.cpp
+++ b/knode/kngroupdialog.cpp
@@ -300,7 +300,7 @@ void KNGroupDialog::slotUser2()
   topL->addMultiCellWidget(takeCustom, 2, 2, 0, 1);
 
   KDatePicker *dateSel = new KDatePicker(btnGrp, lastDate);
-  dateSel->setMinimumSize(dateSel->sizeHint());
+  dateSel->setMinimumSize(dateSel->tqsizeHint());
   topL->addWidget(dateSel, 3, 1, Qt::AlignLeft);
 
   connect(takeCustom, TQT_SIGNAL(toggled(bool)), dateSel, TQT_SLOT(setEnabled(bool)));
@@ -314,7 +314,7 @@ void KNGroupDialog::slotUser2()
   if (dlg->exec()) {
     if (takeCustom->isChecked())
       lastDate = dateSel->date();
-    a_ccount->setLastNewFetch(TQDate::currentDate());
+    a_ccount->setLastNewFetch(TQDate::tqcurrentDate());
     leftLabel->setText(i18n("Checking for new groups..."));
     enableButton(User1,false);
     enableButton(User2,false);
diff --git a/knode/kngroupmanager.cpp b/knode/kngroupmanager.cpp
index 429b93bc..2bece357 100644
--- a/knode/kngroupmanager.cpp
+++ b/knode/kngroupmanager.cpp
@@ -139,7 +139,7 @@ bool KNGroupListData::readIn(KNProtocolClient *client)
         }
       }
 
-      if (subscribed.contains(name)) {
+      if (subscribed.tqcontains(name)) {
         subscribed.remove(name);    // group names are unique, we wont find it again anyway...
         sub = true;
       } else
@@ -435,7 +435,7 @@ void KNGroupManager::subscribeGroup(const KNGroupInfo *gi, KNNntpAccount *a)
   grp=new KNGroup(a);
   grp->setGroupname(gi->name);
   grp->setDescription(gi->description);
-  grp->setStatus(gi->status);
+  grp->seStatus(gi->status);
   grp->saveInfo();
   mGroupList.append( grp );
   emit groupAdded(grp);
@@ -596,7 +596,7 @@ void KNGroupManager::processJob(KNJobData *j)
               for ( KNGroupInfo* inf = d->groups->first(); inf; inf = d->groups->next() )
                 if ( inf->name == (*it)->groupname() ) {
                   (*it)->setDescription( inf->description );
-                  (*it)->setStatus( inf->status );
+                  (*it)->seStatus( inf->status );
                   break;
                 }
             }
diff --git a/knode/kngroupmanager.h b/knode/kngroupmanager.h
index f4240712..f93b5704 100644
--- a/knode/kngroupmanager.h
+++ b/knode/kngroupmanager.h
@@ -31,7 +31,7 @@ class KNCleanUp;
 //=================================================================================
 
 /** helper classes for the group selection dialog
-    contains info about a newsgroup (name, description) */
+    tqcontains info about a newsgroup (name, description) */
 
 class KNGroupInfo {
 
diff --git a/knode/kngrouppropdlg.cpp b/knode/kngrouppropdlg.cpp
index 3ad2fee7..4983b428 100644
--- a/knode/kngrouppropdlg.cpp
+++ b/knode/kngrouppropdlg.cpp
@@ -152,7 +152,7 @@ KNGroupPropDlg::KNGroupPropDlg(KNGroup *group, TQWidget *parent, const char *nam
   cleanupLayout->addWidget( mCleanupWidget );
   cleanupLayout->addStretch( 1 );
 
-  KNHelper::restoreWindowSize("groupPropDLG", this, sizeHint());
+  KNHelper::restoreWindowSize("groupPropDLG", this, tqsizeHint());
 }
 
 
diff --git a/knode/kngroupselectdialog.cpp b/knode/kngroupselectdialog.cpp
index 2cb02401..199abce8 100644
--- a/knode/kngroupselectdialog.cpp
+++ b/knode/kngroupselectdialog.cpp
@@ -104,7 +104,7 @@ TQString KNGroupSelectDialog::selectedGroups()const
   }
 
   if (moderated && (count>=2))   // warn the user
-     KMessageBox::information(parentWidget(),i18n("You are crossposting to a moderated newsgroup.\nPlease be aware that your article will not appear in any group\nuntil it has been approved by the moderators of the moderated group."),
+     KMessageBox::information(tqparentWidget(),i18n("You are crossposting to a moderated newsgroup.\nPlease be aware that your article will not appear in any group\nuntil it has been approved by the moderators of the moderated group."),
                               TQString::null,"crosspostModeratedWarning");
 
   return ret;
diff --git a/knode/knhdrviewitem.cpp b/knode/knhdrviewitem.cpp
index e547b11d..c7f500a0 100644
--- a/knode/knhdrviewitem.cpp
+++ b/knode/knhdrviewitem.cpp
@@ -114,7 +114,7 @@ int KNHdrViewItem::compare( TQListViewItem *i, int col, bool ) const
 }
 
 
-void KNHdrViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment )
+void KNHdrViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment )
 {
   int xText = 0, xPM = 3, yPM = 0;
   TQColor base;
@@ -172,7 +172,7 @@ void KNHdrViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column,
     else
       mShowToolTip[column] = false;
 
-    p->drawText( xText, 0, width - xText - 5, height(), alignment | AlignVCenter,  t );
+    p->drawText( xText, 0, width - xText - 5, height(), tqalignment | AlignVCenter,  t );
     if (cntWidth) {
       TQFont orig = p->font();
       p->setFont( f2 );
@@ -183,7 +183,7 @@ void KNHdrViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column,
         pen.setColor( cg.link() );
       }
       p->setPen( pen );
-      p->drawText( xText + TQFontMetrics( orig ).width( t, -1 ), 0, width - xText - 5, height(), alignment | AlignVCenter,  t2 );
+      p->drawText( xText + TQFontMetrics( orig ).width( t, -1 ), 0, width - xText - 5, height(), tqalignment | AlignVCenter,  t2 );
     }
   }
 }
diff --git a/knode/knhdrviewitem.h b/knode/knhdrviewitem.h
index 476c6d53..163a4507 100644
--- a/knode/knhdrviewitem.h
+++ b/knode/knhdrviewitem.h
@@ -33,7 +33,7 @@ class KNHdrViewItem : public KListViewItem  {
 
     virtual int compare(TQListViewItem *i, int col, bool ascending) const;
 
-    void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment);
+    void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment);
     int width(const TQFontMetrics &fm, const TQListView *lv, int column);
 
     virtual TQString text( int col ) const;
diff --git a/knode/knjobdata.cpp b/knode/knjobdata.cpp
index 5d46c29d..a0def5d1 100644
--- a/knode/knjobdata.cpp
+++ b/knode/knjobdata.cpp
@@ -95,7 +95,7 @@ void KNJobData::cancel()
     mJob = 0;
   }
   if ( mProgressItem ) {
-    mProgressItem->setStatus( "Canceled" );
+    mProgressItem->seStatus( "Canceled" );
     mProgressItem->setComplete();
     mProgressItem = 0;
   }
@@ -140,7 +140,7 @@ void KNJobData::slotJobPercent( KIO::Job*, unsigned long percent )
 void KNJobData::slotJobInfoMessage( KIO::Job*, const TQString &msg )
 {
   kdDebug(5003) << k_funcinfo << "Status: " << msg << endl;
-  setStatus( msg );
+  seStatus( msg );
 }
 
 
diff --git a/knode/knjobdata.h b/knode/knjobdata.h
index 35b54e93..14b1bca7 100644
--- a/knode/knjobdata.h
+++ b/knode/knjobdata.h
@@ -114,7 +114,7 @@ class KNJobData : public QObject
     void createProgressItem();
 
     // safe forwards to the progress item
-    void setStatus( const TQString &msg ) { if ( mProgressItem ) mProgressItem->setStatus( msg ); }
+    void seStatus( const TQString &msg ) { if ( mProgressItem ) mProgressItem->seStatus( msg ); }
     void setProgress( unsigned int progress ) { if ( mProgressItem ) mProgressItem->setProgress( progress ); }
     void setComplete() { if ( mProgressItem ) { mProgressItem->setComplete(); mProgressItem = 0; } }
 
diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp
index 0697a919..6686d3f0 100644
--- a/knode/knmainwidget.cpp
+++ b/knode/knmainwidget.cpp
@@ -34,7 +34,7 @@
 #include "broadcaststatus.h"
 #include "krsqueezedtextlabel.h"
 #include "recentaddresses.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 using KRecentAddress::RecentAddresses;
 
 //GUI
@@ -85,7 +85,7 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa
 
   //-------------------------------- <GUI> ------------------------------------
   TQAccel *accel = new TQAccel( this );
-  initStatusBar();
+  iniStatusBar();
 
   //setup splitter behavior
   manager()->setSplitterHighResolution(true);
@@ -253,7 +253,7 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa
 
   c_olView->setFocus();
 
-  setStatusMsg();
+  seStatusMsg();
 
   if( firstStart() ) {  // open the config dialog on the first start
     show();              // the settings dialog must appear in front of the main window!
@@ -302,35 +302,35 @@ KNMainWidget::~KNMainWidget()
   delete a_rtDock;
 }
 
-void KNMainWidget::initStatusBar()
+void KNMainWidget::iniStatusBar()
 {
   //statusbar
-  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget());
+  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget());
   KStatusBar *sb =  mainWin ? mainWin->statusBar() : 0;
   s_tatusFilter = new KRSqueezedTextLabel( TQString::null, sb );
-  s_tatusFilter->setAlignment( AlignLeft | AlignVCenter );
+  s_tatusFilter->tqsetAlignment( AlignLeft | AlignVCenter );
   s_tatusGroup = new KRSqueezedTextLabel( TQString::null, sb );
-  s_tatusGroup->setAlignment( AlignLeft | AlignVCenter );
+  s_tatusGroup->tqsetAlignment( AlignLeft | AlignVCenter );
 }
 
 //================================== GUI =================================
 
-void KNMainWidget::setStatusMsg(const TQString& text, int id)
+void KNMainWidget::seStatusMsg(const TQString& text, int id)
 {
-  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget());
+  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget());
   KStatusBar *bar =  mainWin ? mainWin->statusBar() : 0;
   if ( !bar )
     return;
   bar->clear();
   if (text.isEmpty() && (id==SB_MAIN)) {
     if (knGlobals.netAccess()->currentMsg().isEmpty())
-      BroadcastStatus::instance()->setStatusMsg(i18n(" Ready"));
+      BroadcasStatus::instance()->seStatusMsg(i18n(" Ready"));
     else
-      BroadcastStatus::instance()->setStatusMsg(knGlobals.netAccess()->currentMsg());
+      BroadcasStatus::instance()->seStatusMsg(knGlobals.netAccess()->currentMsg());
   } else {
     switch(id) {
       case SB_MAIN:
-        BroadcastStatus::instance()->setStatusMsg(text); break;
+        BroadcasStatus::instance()->seStatusMsg(text); break;
       case SB_GROUP:
         s_tatusGroup->setText(text); break;
       case SB_FILTER:
@@ -340,9 +340,9 @@ void KNMainWidget::setStatusMsg(const TQString& text, int id)
 }
 
 
-void KNMainWidget::setStatusHelpMsg(const TQString& text)
+void KNMainWidget::seStatusHelpMsg(const TQString& text)
 {
-  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget());
+  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget());
   KStatusBar *bar =  mainWin ? mainWin->statusBar() : 0;
   if ( bar )
     bar->message(text, 2000);
@@ -375,7 +375,7 @@ void KNMainWidget::setCursorBusy(bool b)
 void KNMainWidget::blockUI(bool b)
 {
   b_lockui = b;
-  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget());
+  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget());
   KMenuBar *mbar =  mainWin ? mainWin->menuBar() : 0;
   if ( mbar )
     mbar->setEnabled(!b);
@@ -394,7 +394,7 @@ void KNMainWidget::blockUI(bool b)
 void KNMainWidget::disableAccels(bool b)
 {
   a_ccel->setEnabled(!b);
-  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget());
+  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget());
   KAccel *naccel = mainWin ? mainWin->accel() : 0;
   if ( naccel )
     naccel->setEnabled(!b);
@@ -409,7 +409,7 @@ void KNMainWidget::disableAccels(bool b)
 void KNMainWidget::secureProcessEvents()
 {
   b_lockui = true;
-  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget());
+  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget());
   KMenuBar *mbar =  mainWin ? mainWin->menuBar() : 0;
   if ( mbar )
     mbar->setEnabled(false);
@@ -431,7 +431,7 @@ void KNMainWidget::secureProcessEvents()
 }
 
 
-TQSize KNMainWidget::sizeHint() const
+TQSize KNMainWidget::tqsizeHint() const
 {
   return TQSize(759,478);    // default optimized for 800x600
 }
@@ -484,7 +484,7 @@ void KNMainWidget::openURL(const KURL &url)
   }
 
   if (acc) {
-    bool isMID=(url.url().contains('@')==1);
+    bool isMID=(url.url().tqcontains('@')==1);
 
     if (!isMID) {
       TQString groupname=url.path(-1);
@@ -903,7 +903,7 @@ bool KNMainWidget::queryClose()
 
 void KNMainWidget::showEvent(TQShowEvent *)
 {
-  slotCheckDockWidgetStatus();
+  slotCheckDockWidgeStatus();
 }
 
 
@@ -1301,7 +1301,7 @@ void KNMainWidget::slotNetworkActive(bool b)
 }
 
 
-void KNMainWidget::slotCheckDockWidgetStatus()
+void KNMainWidget::slotCheckDockWidgeStatus()
 {
   a_ctToggleGroupView->setChecked(c_olDock->isVisible());
   a_ctToggleArticleViewer->setChecked(a_rtDock->isVisible());
@@ -1966,7 +1966,7 @@ void KNMainWidget::slotFetchArticleWithID()
 void KNMainWidget::slotToggleGroupView()
 {
   c_olDock->changeHideShowState();
-  slotCheckDockWidgetStatus();
+  slotCheckDockWidgeStatus();
 }
 
 
@@ -1977,19 +1977,19 @@ void KNMainWidget::slotToggleHeaderView()
       if ( !h_drDock->isDockBackPossible() ) {
           h_drDock->manualDock( a_rtDock, KDockWidget::DockTop );
           h_drDock->makeDockVisible();
-          slotCheckDockWidgetStatus();
+          slotCheckDockWidgeStatus();
           return;
       }
 
   h_drDock->changeHideShowState();
-  slotCheckDockWidgetStatus();
+  slotCheckDockWidgeStatus();
 }
 
 
 void KNMainWidget::slotToggleArticleViewer()
 {
   a_rtDock->changeHideShowState();
-  slotCheckDockWidgetStatus();
+  slotCheckDockWidgeStatus();
 }
 
 void KNMainWidget::slotToggleQuickSearch()
diff --git a/knode/knmainwidget.h b/knode/knmainwidget.h
index 5a02790c..4717e333 100644
--- a/knode/knmainwidget.h
+++ b/knode/knmainwidget.h
@@ -72,8 +72,8 @@ public:
   void prepareShutdown();
 
   //GUI
-  void setStatusMsg(const TQString& = TQString::null, int id=SB_MAIN);
-  void setStatusHelpMsg(const TQString& text);
+  void seStatusMsg(const TQString& = TQString::null, int id=SB_MAIN);
+  void seStatusHelpMsg(const TQString& text);
   void updateCaption();
   void setCursorBusy(bool b=true);
   void blockUI(bool b=true);
@@ -82,7 +82,7 @@ public:
   void secureProcessEvents();
 
   /** useful default value */
-  virtual TQSize sizeHint() const;
+  virtual TQSize tqsizeHint() const;
 
   /** handle URL given as command-line argument */
   void openURL(const KURL &url);
@@ -163,7 +163,7 @@ protected:
   KXMLGUIFactory *factory() const;
 
   void initActions();
-  void initStatusBar();
+  void iniStatusBar();
 
   /** checks if run for the first time, sets some global defaults (email configuration) */
   bool firstStart();
@@ -229,7 +229,7 @@ protected slots:
   void slotNetworkActive(bool b);
 
   //dock widget slots
-  void slotCheckDockWidgetStatus();
+  void slotCheckDockWidgeStatus();
   void slotGroupDockHidden();
   void slotHeaderDockHidden();
   void slotArticleDockHidden();
diff --git a/knode/knmemorymanager.cpp b/knode/knmemorymanager.cpp
index 37a63928..365e9f8c 100644
--- a/knode/knmemorymanager.cpp
+++ b/knode/knmemorymanager.cpp
@@ -162,7 +162,7 @@ void KNMemoryManager::checkMemoryUsageCollections()
     for ( TQValueList<CollectionItem*>::Iterator it = tempList.begin(); it != tempList.end(); ) {
       if ( c_ollCacheSize <= maxSize )
         break;
-      // unloadHeaders() will remove the cache entry and thus invalidate the iterator!
+      // unloadHeaders() will remove the cache entry and thus tqinvalidate the iterator!
       c = (*it)->col;
       ++it;
 
@@ -191,7 +191,7 @@ void KNMemoryManager::checkMemoryUsageArticles()
     for ( TQValueList<ArticleItem*>::Iterator it = mArtList.begin(); it != mArtList.end(); ) {
       if ( a_rtCacheSize <= maxSize )
         break;
-      // unloadArticle() will remove the cache entry and thus invalidate the iterator!
+      // unloadArticle() will remove the cache entry and thus tqinvalidate the iterator!
       KNArticle *art = (*it)->art;
       ++it;
       knGlobals.articleManager()->unloadArticle( art, false );   // *try* to unload
diff --git a/knode/knnetaccess.cpp b/knode/knnetaccess.cpp
index 7fc6fd37..016a39ee 100644
--- a/knode/knnetaccess.cpp
+++ b/knode/knnetaccess.cpp
@@ -102,7 +102,7 @@ void KNNetAccess::addJob(KNJobData *job)
   if ( !job->account()->readyForLogin() ) {
     mWalletQueue.append( job );
     knGlobals.accountManager()->loadPasswordsAsync();
-    job->setStatus( i18n( "Waiting for KWallet..." ) );
+    job->seStatus( i18n( "Waiting for KWallet..." ) );
     return;
   }
 
@@ -332,7 +332,7 @@ void KNNetAccess::threadDoneNntp()
   currentNntpJob = 0L;
 
   currMsg = TQString::null;
-  knGlobals.setStatusMsg();
+  knGlobals.seStatusMsg();
   tmp->setComplete();
 
   tmp->notifyConsumer();
@@ -359,7 +359,7 @@ void KNNetAccess::threadDoneSmtp()
   currentSmtpJob = 0L;
   if (!currentNntpJob) {
     currMsg = TQString::null;
-    knGlobals.setStatusMsg();
+    knGlobals.seStatusMsg();
   }
   tmp->setComplete();
 
@@ -398,53 +398,53 @@ void KNNetAccess::slotThreadSignal(int i)
       break;
       case KNProtocolClient::TSconnect:
         currMsg = i18n(" Connecting to server...");
-        knGlobals.setStatusMsg(currMsg);
-        currentNntpJob->setStatus(currMsg);
+        knGlobals.seStatusMsg(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSloadGrouplist:
         currMsg = i18n(" Loading group list from disk...");
-        knGlobals.setStatusMsg(currMsg);
-        currentNntpJob->setStatus(currMsg);
+        knGlobals.seStatusMsg(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSwriteGrouplist:
         currMsg = i18n(" Writing group list to disk...");
-        knGlobals.setStatusMsg(currMsg);
-        currentNntpJob->setStatus(currMsg);
+        knGlobals.seStatusMsg(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSdownloadGrouplist:
         currMsg = i18n(" Downloading group list...");
-        knGlobals.setStatusMsg(currMsg);
-        currentNntpJob->setStatus(currMsg);
+        knGlobals.seStatusMsg(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSdownloadNewGroups:
         currMsg = i18n(" Looking for new groups...");
-        knGlobals.setStatusMsg(currMsg);
-        currentNntpJob->setStatus(currMsg);
+        knGlobals.seStatusMsg(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSdownloadDesc:
         currMsg = i18n(" Downloading group descriptions...");
-        knGlobals.setStatusMsg(currMsg);
-        currentNntpJob->setStatus(currMsg);
+        knGlobals.seStatusMsg(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSdownloadNew:
         currMsg = i18n(" Downloading new headers...");
-        knGlobals.setStatusMsg(currMsg);
-        currentNntpJob->setStatus(currMsg);
+        knGlobals.seStatusMsg(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSsortNew:
         currMsg = i18n(" Sorting...");
-        knGlobals.setStatusMsg(currMsg);
-        currentNntpJob->setStatus(currMsg);
+        knGlobals.seStatusMsg(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSdownloadArticle:
         currMsg = i18n(" Downloading article...");
-        knGlobals.setStatusMsg(currMsg);
-        currentNntpJob->setStatus(currMsg);
+        knGlobals.seStatusMsg(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSsendArticle:
         currMsg = i18n(" Sending article...");
-        knGlobals.setStatusMsg(currMsg);
-        currentNntpJob->setStatus(currMsg);
+        knGlobals.seStatusMsg(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSjobStarted:
         currentNntpJob->setProgress(0);
@@ -477,7 +477,7 @@ void KNNetAccess::slotPasswordsChanged()
 {
   TQValueList<KNJobData*>::ConstIterator it;
   for ( it = mWalletQueue.begin(); it != mWalletQueue.end(); ++it ) {
-    (*it)->setStatus( i18n("Waiting...") );
+    (*it)->seStatus( i18n("Waiting...") );
     if ( (*it)->type() == KNJobData::JTmail )
       smtpJobQueue.append( (*it) );
     else
diff --git a/knode/knnntpaccount.cpp b/knode/knnntpaccount.cpp
index ba1657c0..1887baae 100644
--- a/knode/knnntpaccount.cpp
+++ b/knode/knnntpaccount.cpp
@@ -75,7 +75,7 @@ void KNNntpAccountIntervalChecking::slotCheckNews()
 KNNntpAccount::KNNntpAccount()
   : KNCollection(0), KNServerInfo(), i_dentity(0), f_etchDescriptions(true), w_asOpen(false), i_ntervalChecking(false), c_heckInterval(10)
 {
-  l_astNewFetch = TQDate::currentDate();
+  l_astNewFetch = TQDate::tqcurrentDate();
   a_ccountIntervalChecking = new KNNntpAccountIntervalChecking(this);
   mCleanupConf = new KNConfig::Cleanup( false );
 }
diff --git a/knode/knnntpclient.cpp b/knode/knnntpclient.cpp
index 47942d6b..dd4f28fe 100644
--- a/knode/knnntpclient.cpp
+++ b/knode/knnntpclient.cpp
@@ -115,7 +115,7 @@ void KNNntpClient::doFetchGroups()
 
       name = TQString::fromUtf8(line);
 
-      if (target->subscribed.contains(name)) {
+      if (target->subscribed.tqcontains(name)) {
         target->subscribed.remove(name);    // group names are unique, we wont find it again anyway...
         subscribed = true;
       } else
diff --git a/knode/knode.cpp b/knode/knode.cpp
index c2d7ee7f..d3df5b74 100644
--- a/knode/knode.cpp
+++ b/knode/knode.cpp
@@ -55,7 +55,7 @@ KNMainWindow::KNMainWindow( TQWidget* pWidget )
            TQT_SLOT( setCaption(const TQString&)) );
   setCentralWidget( m_mainWidget );
   setupStatusBar();
-  connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL(statusMsg(const TQString&)),
+  connect( KPIM::BroadcasStatus::instance(), TQT_SIGNAL(statusMsg(const TQString&)),
     this, TQT_SLOT(slotShowStatusMsg(const TQString& )) );
   createGUI( "knodeui.rc" );
   knGlobals.instance = 0;
@@ -109,7 +109,7 @@ void KNMainWindow::setupStatusBar()
   statusBar()->addWidget( mLittleProgress, 0 , true );
 
   mStatusMsgLabel = new KRSqueezedTextLabel( TQString::null, statusBar() );
-  mStatusMsgLabel->setAlignment( AlignLeft | AlignVCenter );
+  mStatusMsgLabel->tqsetAlignment( AlignLeft | AlignVCenter );
   statusBar()->addWidget( mStatusMsgLabel, 2 );
   statusBar()->addWidget(m_mainWidget->statusBarLabelFilter(), 2);
   statusBar()->addWidget(m_mainWidget->statusBarLabelGroup(), 3);
diff --git a/knode/knode.h b/knode/knode.h
index d628df1b..2c350c62 100644
--- a/knode/knode.h
+++ b/knode/knode.h
@@ -46,7 +46,7 @@ class KNMainWindow : public KMainWindow
   Q_OBJECT
 
 public:
-  KNMainWindow( TQWidget* parentWidget=0 );
+  KNMainWindow( TQWidget* tqparentWidget=0 );
   ~KNMainWindow();
   void openURL( const KURL& );
   KNMainWidget *mainWidget() { return m_mainWidget; }
diff --git a/knode/knode_part.cpp b/knode/knode_part.cpp
index 52b3e4dd..3e54361a 100644
--- a/knode/knode_part.cpp
+++ b/knode/knode_part.cpp
@@ -47,10 +47,10 @@
 typedef KParts::GenericFactory< KNodePart > KNodeFactory;
 K_EXPORT_COMPONENT_FACTORY( libknodepart, KNodeFactory )
 
-KNodePart::KNodePart(TQWidget *parentWidget, const char *widgetName,
+KNodePart::KNodePart(TQWidget *tqparentWidget, const char *widgetName,
 		     TQObject *parent, const char *name, const TQStringList &)
   : KParts::ReadOnlyPart(parent, name),
-  mParentWidget( parentWidget )
+  mParentWidget( tqparentWidget )
 {
   kdDebug(5003) << "KNodePart()" << endl;
   kdDebug(5003) << "  InstanceName: " << kapp->instanceName() << endl;
@@ -67,7 +67,7 @@ KNodePart::KNodePart(TQWidget *parentWidget, const char *widgetName,
   knGlobals.instance = KNodeFactory::instance();
 
   // create a canvas to insert our widget
-  TQWidget *canvas = new TQWidget(parentWidget, widgetName);
+  TQWidget *canvas = new TQWidget(tqparentWidget, widgetName);
   canvas->setFocusPolicy(TQWidget::ClickFocus);
   setWidget(canvas);
 
@@ -114,7 +114,7 @@ void KNodePart::guiActivateEvent(KParts::GUIActivateEvent *e)
 }
 
 
-TQWidget* KNodePart::parentWidget() const
+TQWidget* KNodePart::tqparentWidget() const
 {
   return mParentWidget;
 }
diff --git a/knode/knode_part.h b/knode/knode_part.h
index 67e1ae54..1e9a4904 100644
--- a/knode/knode_part.h
+++ b/knode/knode_part.h
@@ -43,11 +43,11 @@ class KNodePart: public KParts::ReadOnlyPart
 {
     Q_OBJECT
   public:
-    KNodePart(TQWidget *parentWidget, const char *widgetName,
+    KNodePart(TQWidget *tqparentWidget, const char *widgetName,
               TQObject *parent, const char *name, const TQStringList &);
     virtual ~KNodePart();
 
-    TQWidget* parentWidget() const;
+    TQWidget* tqparentWidget() const;
 
     static KAboutData *createAboutData();
 
diff --git a/knode/knrangefilter.cpp b/knode/knrangefilter.cpp
index ee14c794..a0f01856 100644
--- a/knode/knrangefilter.cpp
+++ b/knode/knrangefilter.cpp
@@ -118,7 +118,7 @@ KNRangeFilterWidget::KNRangeFilterWidget(const TQString& value, int min, int max
   op2->insertItem("<=");
 
   des=new TQLabel(value, this);
-  des->setAlignment(AlignCenter);
+  des->tqsetAlignment(AlignCenter);
 
   TQGridLayout *topL=new TQGridLayout(this, 2,6, 8,5 );
 
diff --git a/knode/knsearchdialog.cpp b/knode/knsearchdialog.cpp
index f72afe47..4344cbba 100644
--- a/knode/knsearchdialog.cpp
+++ b/knode/knsearchdialog.cpp
@@ -68,8 +68,8 @@ KNSearchDialog::KNSearchDialog(searchType /*t*/, TQWidget *parent)
   f_ilter->setLoaded(true);
   f_ilter->setSearchFilter(true);
 
-  setFixedHeight(sizeHint().height());
-  KNHelper::restoreWindowSize("searchDlg", this, sizeHint());
+  setFixedHeight(tqsizeHint().height());
+  KNHelper::restoreWindowSize("searchDlg", this, tqsizeHint());
   fcw->setStartFocus();
 }
 
diff --git a/knode/knserverinfo.cpp b/knode/knserverinfo.cpp
index d314a771..0a259815 100644
--- a/knode/knserverinfo.cpp
+++ b/knode/knserverinfo.cpp
@@ -78,9 +78,9 @@ void KNServerInfo::readConf(KConfig *conf)
     readPassword();
 
   TQString encStr = conf->readEntry( "encryption", "None" );
-  if ( encStr.contains( "SSL", false ) )
+  if ( encStr.tqcontains( "SSL", false ) )
     mEncryption = SSL;
-  else if ( encStr.contains( "TLS", false ) )
+  else if ( encStr.tqcontains( "TLS", false ) )
     mEncryption = TLS;
   else
     mEncryption = None;
diff --git a/knode/knstringfilter.cpp b/knode/knstringfilter.cpp
index 4f69f7ea..3f866902 100644
--- a/knode/knstringfilter.cpp
+++ b/knode/knstringfilter.cpp
@@ -57,7 +57,7 @@ bool KNStringFilter::doFilter(const TQString &s)
 
 
 
-// replace placeholders
+// tqreplace placeholders
 void KNStringFilter::expand(KNGroup *g)
 {
   KNConfig::Identity *id = (g) ? g->identity() : 0;
@@ -69,15 +69,15 @@ void KNStringFilter::expand(KNGroup *g)
   }
 
   expanded = data;
-  expanded.replace(TQRegExp("%MYNAME"), id->name());
-  expanded.replace(TQRegExp("%MYEMAIL"), id->email());
+  expanded.tqreplace(TQRegExp("%MYNAME"), id->name());
+  expanded.tqreplace(TQRegExp("%MYEMAIL"), id->email());
 }
 
 
 
 void KNStringFilter::load(KSimpleConfig *conf)
 {
-  con=conf->readBoolEntry("contains", true);
+  con=conf->readBoolEntry("tqcontains", true);
   data=conf->readEntry("Data");
   regExp=conf->readBoolEntry("regX", false);
 }
@@ -86,7 +86,7 @@ void KNStringFilter::load(KSimpleConfig *conf)
 
 void KNStringFilter::save(KSimpleConfig *conf)
 {
-  conf->writeEntry("contains", con);
+  conf->writeEntry("tqcontains", con);
   conf->writeEntry("Data", data);
   conf->writeEntry("regX", regExp);
 }
diff --git a/knode/knstringfilter.h b/knode/knstringfilter.h
index ac33c1d6..5720c6a8 100644
--- a/knode/knstringfilter.h
+++ b/knode/knstringfilter.h
@@ -37,7 +37,7 @@ class KNStringFilter {
     ~KNStringFilter() {}
 
     KNStringFilter& operator=(const KNStringFilter &sf);
-    /** replace placeholders */
+    /** tqreplace placeholders */
     void expand(KNGroup *g);
           
     void load(KSimpleConfig *conf);
diff --git a/knode/knwidgets.cpp b/knode/knwidgets.cpp
index d75cf9bf..d3f1d7b5 100644
--- a/knode/knwidgets.cpp
+++ b/knode/knwidgets.cpp
@@ -107,10 +107,10 @@ void KNDialogListBox::keyPressEvent(TQKeyEvent *e)
 //====================================================================================
 
 
-KNDockWidgetHeaderDrag::KNDockWidgetHeaderDrag(TQWidget *focusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name )
+KNDockWidgetHeaderDrag::KNDockWidgetHeaderDrag(TQWidget *tqfocusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name )
   : KDockWidgetHeaderDrag(parent, dock, name), f_ocus(false)
 {
-  connect(focusWidget, TQT_SIGNAL(focusChanged(TQFocusEvent*)), TQT_SLOT(slotFocusChanged(TQFocusEvent*)));
+  connect(tqfocusWidget, TQT_SIGNAL(focusChanged(TQFocusEvent*)), TQT_SLOT(slotFocusChanged(TQFocusEvent*)));
 }
 
 
@@ -141,7 +141,7 @@ void KNDockWidgetHeaderDrag::paintEvent(TQPaintEvent* ev)
   TQPainter paint;
 
   paint.begin(&drawBuffer);
-  paint.fillRect(drawBuffer.rect(), TQBrush(colorGroup().brush(TQColorGroup::Background)));
+  paint.fillRect(drawBuffer.rect(), TQBrush(tqcolorGroup().brush(TQColorGroup::Background)));
 
   paint.setPen(palette().active().highlight());
   paint.drawLine(1, 2, width(), 2);
diff --git a/knode/knwidgets.h b/knode/knwidgets.h
index bb01ba22..d1a19e36 100644
--- a/knode/knwidgets.h
+++ b/knode/knwidgets.h
@@ -71,7 +71,7 @@ class KNDockWidgetHeaderDrag : public KDockWidgetHeaderDrag
   Q_OBJECT
 
   public:
-    KNDockWidgetHeaderDrag(TQWidget *focusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock,
+    KNDockWidgetHeaderDrag(TQWidget *tqfocusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock,
                             const char* name = 0);
     virtual ~KNDockWidgetHeaderDrag();
 
diff --git a/knode/smtpaccountwidget_base.ui b/knode/smtpaccountwidget_base.ui
index 9acad519..f6565365 100644
--- a/knode/smtpaccountwidget_base.ui
+++ b/knode/smtpaccountwidget_base.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>SmtpAccountWidgetBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -86,7 +86,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
@@ -223,7 +223,7 @@
     <slot access="protected">useExternalMailerToggled(bool)</slot>
     <slot access="protected">loginToggled(bool)</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcmodule.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/knode/utilities.cpp b/knode/utilities.cpp
index 67d4e3ba..1e7dcba9 100644
--- a/knode/utilities.cpp
+++ b/knode/utilities.cpp
@@ -167,7 +167,7 @@ TQFile* KNSaveHelper::getFile(const TQString &dialogTitle)
   if (url.isLocalFile()) {
     if (TQFileInfo(url.path()).exists() &&
         (KMessageBox::warningContinueCancel(knGlobals.topWidget,
-                                            i18n("<qt>A file named <b>%1</b> already exists.<br>Do you want to replace it?</qt>").arg(url.path()),
+                                            i18n("<qt>A file named <b>%1</b> already exists.<br>Do you want to tqreplace it?</qt>").arg(url.path()),
                                             dialogTitle, i18n("&Replace")) != KMessageBox::Continue)) {
       return 0;
     }
@@ -274,7 +274,7 @@ int KNHelper::selectDialog(TQWidget *parent, const TQString &caption, const TQSt
   TQString s;
   for ( TQStringList::ConstIterator it = options.begin(); it != options.end(); ++it ) {
     s = (*it);
-    s.replace(TQRegExp("&"),"");   // remove accelerators
+    s.tqreplace(TQRegExp("&"),"");   // remove accelerators
     list->insertItem(s);
   }
 
@@ -293,7 +293,7 @@ int KNHelper::selectDialog(TQWidget *parent, const TQString &caption, const TQSt
   return ret;
 }
 
-// **** window geometry managing *********************************************
+// **** window tqgeometry managing *********************************************
 
 void KNHelper::saveWindowSize(const TQString &name, const TQSize &s)
 {
@@ -427,7 +427,7 @@ TQString KNHelper::rewrapStringList(TQStringList text, int wrapAt, TQChar quoteC
     thisLine = thisLine.stripWhiteSpace();
 
     if(!leftover.isEmpty()) {   // don't break paragraphs, tables and quote levels
-      if(thisLine.isEmpty() || (thisPrefix!=lastPrefix) || thisLine.contains("  ") || thisLine.contains('\t'))
+      if(thisLine.isEmpty() || (thisPrefix!=lastPrefix) || thisLine.tqcontains("  ") || thisLine.tqcontains('\t'))
         appendTextWPrefix(quoted, leftover, wrapAt, lastPrefix);
       else
         thisLine.prepend(leftover+" ");
diff --git a/knotes/Makefile.am b/knotes/Makefile.am
index 73f678a1..0f3eb458 100644
--- a/knotes/Makefile.am
+++ b/knotes/Makefile.am
@@ -35,7 +35,7 @@ kde_module_LTLIBRARIES  = knotes_local.la
 knotes_local_la_SOURCES = resourcelocal_plugin.cpp
 knotes_local_la_LDFLAGS = $(KDE_LDFLAGS) $(all_libraries) -module $(KDE_PLUGIN)
 knotes_local_la_LIBADD  = libknotesresources.la libknotesconfig.la libknotesprinting.la \
-                          $(top_builddir)/libkcal/libkcal.la -lkdeprint
+                          $(top_builddir)/libkcal/libkcal.la -lkdeprint $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -lkresources
 
 METASOURCES     = AUTO
 
diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index 9e644d7a..d4ce67b5 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -202,17 +202,17 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *
     m_editor->setCornerWidget( new TQSizeGrip( this ) );
     uint width = m_editor->cornerWidget()->width();
     uint height = m_editor->cornerWidget()->height();
-    TQBitmap mask;
-    mask.resize( width, height );
-    mask.fill( color0 );
+    TQBitmap tqmask;
+    tqmask.resize( width, height );
+    tqmask.fill( color0 );
     TQPointArray array;
     array.setPoints( 3, 0, height, width, height, width, 0 );
     TQPainter p;
-    p.begin( &mask );
+    p.begin( &tqmask );
     p.setBrush( color1 );
     p.drawPolygon( array );
     p.end();
-    m_editor->cornerWidget()->setMask( mask );
+    m_editor->cornerWidget()->setMask( tqmask );
     m_editor->cornerWidget()->setBackgroundMode( PaletteBase );
 
     // the config file location
@@ -321,7 +321,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *
     // read configuration settings...
     slotApplyConfig();
 
-    // create the mask for the fold---to be done after slotApplyConfig(),
+    // create the tqmask for the fold---to be done after slotApplyConfig(),
     // which calls createFold()
     m_fold->setMask( TQRegion( m_fold->pixmap()->createHeuristicMask() ) );
 
@@ -774,7 +774,7 @@ void KNote::slotClose()
 
 void KNote::slotInsDate()
 {
-    m_editor->insert( KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()) );
+    m_editor->insert( KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()) );
 }
 
 void KNote::slotSetAlarm()
@@ -861,7 +861,7 @@ void KNote::slotPrint()
     printer.setFont( m_config->font() );
     printer.setContext( m_editor->context() );
     printer.setStyleSheet( m_editor->styleSheet() );
-    printer.setColorGroup( colorGroup() );
+    printer.tqsetColorGroup( tqcolorGroup() );
     printer.printNote( TQString(), content );
 }
 
@@ -1035,9 +1035,9 @@ void KNote::updateLabelAlignment()
     // if the name is too long to fit, left-align it, otherwise center it (#59028)
     TQString labelText = m_label->text();
     if ( m_label->fontMetrics().boundingRect( labelText ).width() > m_label->width() )
-        m_label->setAlignment( AlignLeft );
+        m_label->tqsetAlignment( AlignLeft );
     else
-        m_label->setAlignment( AlignHCenter );
+        m_label->tqsetAlignment( AlignHCenter );
 }
 
 void KNote::updateFocus()
@@ -1100,7 +1100,7 @@ void KNote::updateMask()
     int h = height();
     TQRegion reg( 0, s_ppOffset, w, h - s_ppOffset );
 
-    const TQBitmap *pushpin_bitmap = m_pushpin->pixmap()->mask();
+    const TQBitmap *pushpin_bitmap = m_pushpin->pixmap()->tqmask();
     TQRegion pushpin_reg( *pushpin_bitmap );
     m_pushpin->setMask( pushpin_reg );
     pushpin_reg.translate( m_pushpin->x(), m_pushpin->y() );
@@ -1120,7 +1120,7 @@ void KNote::updateBackground( int y_offset )
 {
     if ( !s_ppOffset )
     {
-        m_editor->setPaper( TQBrush( colorGroup().background() ) );
+        m_editor->setPaper( TQBrush( tqcolorGroup().background() ) );
         return;
     }
 
@@ -1160,7 +1160,7 @@ void KNote::updateBackground( int y_offset )
 
 void KNote::updateLayout()
 {
-    const int headerHeight = m_label->sizeHint().height();
+    const int headerHeight = m_label->tqsizeHint().height();
     const int margin = m_editor->margin();
     bool closeLeft = false;
 
@@ -1240,9 +1240,9 @@ void KNote::drawFrame( TQPainter *p )
     TQRect r = frameRect();
     r.setTop( s_ppOffset );
     if ( s_ppOffset )
-        qDrawShadePanel( p, r, colorGroup(), false, lineWidth() );
+        qDrawShadePanel( p, r, tqcolorGroup(), false, lineWidth() );
     else
-        qDrawWinPanel( p, r, colorGroup(), false );
+        qDrawWinPanel( p, r, tqcolorGroup(), false );
 }
 
 void KNote::showEvent( TQShowEvent * )
diff --git a/knotes/knotebutton.cpp b/knotes/knotebutton.cpp
index b6cf49bc..230ba4d4 100644
--- a/knotes/knotebutton.cpp
+++ b/knotes/knotebutton.cpp
@@ -34,7 +34,7 @@ KNoteButton::KNoteButton( const TQString& icon, TQWidget *parent, const char *na
     : TQPushButton( parent, name )
 {
     setFocusPolicy( NoFocus );
-    setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+    tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
 
     m_flat = true;
 
@@ -49,18 +49,18 @@ KNoteButton::~KNoteButton()
 void KNoteButton::enterEvent( TQEvent * )
 {
     m_flat = false;
-    repaint( false );
+    tqrepaint( false );
 }
 
 void KNoteButton::leaveEvent( TQEvent * )
 {
     m_flat = true;
-    repaint();
+    tqrepaint();
 }
 
-TQSize KNoteButton::sizeHint() const
+TQSize KNoteButton::tqsizeHint() const
 {
-    return TQSize( TQPushButton::sizeHint().height(), TQPushButton::sizeHint().height() );
+    return TQSize( TQPushButton::tqsizeHint().height(), TQPushButton::tqsizeHint().height() );
 }
 
 void KNoteButton::drawButton( TQPainter* p )
@@ -78,7 +78,7 @@ void KNoteButton::drawButton( TQPainter* p )
     if ( !m_flat )
         flags |= TQStyle::Style_MouseOver;
 
-    style().drawPrimitive( TQStyle::PE_ButtonTool, p, rect(), colorGroup(), flags );
+    style().drawPrimitive( TQStyle::PE_ButtonTool, p, rect(), tqcolorGroup(), flags );
     drawButtonLabel( p );
 }
 
@@ -102,8 +102,8 @@ void KNoteButton::drawButtonLabel( TQPainter* p )
         // Shift button contents if pushed.
         if ( isOn() || isDown() )
         {
-            dx += style().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
-            dy += style().pixelMetric( TQStyle::PM_ButtonShiftVertical, this );
+            dx += style().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
+            dy += style().tqpixelMetric( TQStyle::PM_ButtonShiftVertical, this );
         }
 
         p->drawPixmap( dx, dy, pix );
diff --git a/knotes/knotebutton.h b/knotes/knotebutton.h
index 1825ce94..735fc107 100644
--- a/knotes/knotebutton.h
+++ b/knotes/knotebutton.h
@@ -35,7 +35,7 @@ public:
     KNoteButton( const TQString& icon, TQWidget *parent=0, const char *name=0 );
     ~KNoteButton();
 
-    virtual TQSize sizeHint() const;
+    virtual TQSize tqsizeHint() const;
 
 protected:
     virtual void enterEvent( TQEvent * );
diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp
index a1238768..a8833709 100644
--- a/knotes/knoteconfigdlg.cpp
+++ b/knotes/knoteconfigdlg.cpp
@@ -89,22 +89,22 @@ void KNoteConfigDlg::slotUpdateCaption()
 TQWidget *KNoteConfigDlg::makeDisplayPage( bool defaults )
 {
     TQWidget *displayPage = new TQWidget();
-    TQGridLayout *layout = new TQGridLayout( displayPage, 2, 2,
+    TQGridLayout *tqlayout = new TQGridLayout( displayPage, 2, 2,
                                            defaults ? marginHint() : 0, spacingHint() );
 
     TQLabel *label_FgColor = new TQLabel( i18n("&Text color:"), displayPage, "label_FgColor" );
-    layout->addWidget( label_FgColor, 0, 0 );
+    tqlayout->addWidget( label_FgColor, 0, 0 );
 
     KColorButton *kcfg_FgColor = new KColorButton( displayPage, "kcfg_FgColor" );
     label_FgColor->setBuddy( kcfg_FgColor );
-    layout->addWidget( kcfg_FgColor, 0, 1 );
+    tqlayout->addWidget( kcfg_FgColor, 0, 1 );
 
     TQLabel *label_BgColor = new TQLabel( i18n("&Background color:"), displayPage, "label_BgColor" );
-    layout->addWidget( label_BgColor, 1, 0 );
+    tqlayout->addWidget( label_BgColor, 1, 0 );
 
     KColorButton *kcfg_BgColor = new KColorButton( displayPage, "kcfg_BgColor" );
     label_BgColor->setBuddy( kcfg_BgColor );
-    layout->addWidget( kcfg_BgColor, 1, 1 );
+    tqlayout->addWidget( kcfg_BgColor, 1, 1 );
 
     TQCheckBox *kcfg_ShowInTaskbar = new TQCheckBox( i18n("&Show note in taskbar"),
                                                    displayPage, "kcfg_ShowInTaskbar" );
@@ -112,25 +112,25 @@ TQWidget *KNoteConfigDlg::makeDisplayPage( bool defaults )
     if ( defaults )
     {
         TQLabel *label_Width = new TQLabel( i18n("Default &width:"), displayPage, "label_Width" );
-        layout->addWidget( label_Width, 2, 0 );
+        tqlayout->addWidget( label_Width, 2, 0 );
 
         KIntNumInput *kcfg_Width = new KIntNumInput( displayPage, "kcfg_Width" );
         label_Width->setBuddy( kcfg_Width );
         kcfg_Width->setRange( 50, 2000, 10, false );
-        layout->addWidget( kcfg_Width, 2, 1 );
+        tqlayout->addWidget( kcfg_Width, 2, 1 );
 
         TQLabel *label_Height = new TQLabel( i18n("Default &height:"), displayPage, "label_Height" );
-        layout->addWidget( label_Height, 3, 0 );
+        tqlayout->addWidget( label_Height, 3, 0 );
 
         KIntNumInput *kcfg_Height = new KIntNumInput( displayPage, "kcfg_Height" );
         kcfg_Height->setRange( 50, 2000, 10, false );
         label_Height->setBuddy( kcfg_Height );
-        layout->addWidget( kcfg_Height, 3, 1 );
+        tqlayout->addWidget( kcfg_Height, 3, 1 );
 
-        layout->addWidget( kcfg_ShowInTaskbar, 4, 0 );
+        tqlayout->addWidget( kcfg_ShowInTaskbar, 4, 0 );
     }
     else
-        layout->addWidget( kcfg_ShowInTaskbar, 2, 0 );
+        tqlayout->addWidget( kcfg_ShowInTaskbar, 2, 0 );
 
     return displayPage;
 }
@@ -138,36 +138,36 @@ TQWidget *KNoteConfigDlg::makeDisplayPage( bool defaults )
 TQWidget *KNoteConfigDlg::makeEditorPage( bool defaults )
 {
     TQWidget *editorPage = new TQWidget();
-    TQGridLayout *layout = new TQGridLayout( editorPage, 4, 3,
+    TQGridLayout *tqlayout = new TQGridLayout( editorPage, 4, 3,
                                            defaults ? marginHint() : 0, spacingHint() );
 
     TQLabel *label_TabSize = new TQLabel( i18n( "&Tab size:" ), editorPage, "label_TabSize" );
-    layout->addMultiCellWidget( label_TabSize, 0, 0, 0, 1 );
+    tqlayout->addMultiCellWidget( label_TabSize, 0, 0, 0, 1 );
 
     KIntNumInput *kcfg_TabSize = new KIntNumInput( editorPage, "kcfg_TabSize" );
     kcfg_TabSize->setRange( 0, 40, 1, false );
     label_TabSize->setBuddy( kcfg_TabSize );
-    layout->addWidget( kcfg_TabSize, 0, 2 );
+    tqlayout->addWidget( kcfg_TabSize, 0, 2 );
 
     TQCheckBox *kcfg_AutoIndent = new TQCheckBox( i18n("Auto &indent"), editorPage, "kcfg_AutoIndent" );
-    layout->addMultiCellWidget( kcfg_AutoIndent, 1, 1, 0, 1 );
+    tqlayout->addMultiCellWidget( kcfg_AutoIndent, 1, 1, 0, 1 );
 
     TQCheckBox *kcfg_RichText = new TQCheckBox( i18n("&Rich text"), editorPage, "kcfg_RichText" );
-    layout->addWidget( kcfg_RichText, 1, 2 );
+    tqlayout->addWidget( kcfg_RichText, 1, 2 );
 
     TQLabel *label_Font = new TQLabel( i18n("Text font:"), editorPage, "label_Font" );
-    layout->addWidget( label_Font, 3, 0 );
+    tqlayout->addWidget( label_Font, 3, 0 );
 
     KFontRequester *kcfg_Font = new KFontRequester( editorPage, "kcfg_Font" );
-    kcfg_Font->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
-    layout->addMultiCellWidget( kcfg_Font, 3, 3, 1, 2 );
+    kcfg_Font->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
+    tqlayout->addMultiCellWidget( kcfg_Font, 3, 3, 1, 2 );
 
     TQLabel *label_TitleFont = new TQLabel( i18n("Title font:"), editorPage, "label_TitleFont" );
-    layout->addWidget( label_TitleFont, 2, 0 );
+    tqlayout->addWidget( label_TitleFont, 2, 0 );
 
     KFontRequester *kcfg_TitleFont = new KFontRequester( editorPage, "kcfg_TitleFont" );
-    kcfg_TitleFont->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
-    layout->addMultiCellWidget( kcfg_TitleFont, 2, 2, 1, 2 );
+    kcfg_TitleFont->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
+    tqlayout->addMultiCellWidget( kcfg_TitleFont, 2, 2, 1, 2 );
 
     return editorPage;
 }
@@ -184,14 +184,14 @@ TQWidget *KNoteConfigDlg::makeDefaultsPage()
 TQWidget *KNoteConfigDlg::makeActionsPage()
 {
     TQWidget *actionsPage = new TQWidget();
-    TQGridLayout *layout = new TQGridLayout( actionsPage, 2, 2, 0, spacingHint() );
+    TQGridLayout *tqlayout = new TQGridLayout( actionsPage, 2, 2, 0, spacingHint() );
 
     TQLabel *label_MailAction = new TQLabel( i18n("&Mail action:"), actionsPage, "label_MailAction" );
-    layout->addWidget( label_MailAction, 0, 0 );
+    tqlayout->addWidget( label_MailAction, 0, 0 );
 
     KLineEdit *kcfg_MailAction = new KLineEdit( actionsPage, "kcfg_MailAction" );
     label_MailAction->setBuddy( kcfg_MailAction );
-    layout->addWidget( kcfg_MailAction, 0, 1 );
+    tqlayout->addWidget( kcfg_MailAction, 0, 1 );
 
     return actionsPage;
 }
@@ -199,27 +199,27 @@ TQWidget *KNoteConfigDlg::makeActionsPage()
 TQWidget *KNoteConfigDlg::makeNetworkPage()
 {
     TQWidget *networkPage = new TQWidget();
-    TQGridLayout *layout = new TQGridLayout( networkPage, 4, 2, 0, spacingHint() );
+    TQGridLayout *tqlayout = new TQGridLayout( networkPage, 4, 2, 0, spacingHint() );
 
     TQGroupBox *incoming = new TQHGroupBox( i18n("Incoming Notes"), networkPage );
-    layout->addMultiCellWidget( incoming, 0, 0, 0, 1 );
+    tqlayout->addMultiCellWidget( incoming, 0, 0, 0, 1 );
 
     new TQCheckBox( i18n("Accept incoming notes"), incoming, "kcfg_ReceiveNotes" );
 
     TQGroupBox *outgoing = new TQHGroupBox( i18n("Outgoing Notes"), networkPage );
-    layout->addMultiCellWidget( outgoing, 1, 1, 0, 1 );
+    tqlayout->addMultiCellWidget( outgoing, 1, 1, 0, 1 );
 
     TQLabel *label_SenderID = new TQLabel( i18n("&Sender ID:"), outgoing, "label_SenderID" );
     KLineEdit *kcfg_SenderID = new KLineEdit( outgoing, "kcfg_SenderID" );
     label_SenderID->setBuddy( kcfg_SenderID );
 
     TQLabel *label_Port = new TQLabel( i18n("&Port:"), networkPage, "label_Port" );
-    layout->addWidget( label_Port, 2, 0 );
+    tqlayout->addWidget( label_Port, 2, 0 );
 
     KIntNumInput *kcfg_Port = new KIntNumInput( networkPage, "kcfg_Port" );
     kcfg_Port->setRange( 0, 65535, 1, false );
     label_Port->setBuddy( kcfg_Port );
-    layout->addWidget( kcfg_Port, 2, 1 );
+    tqlayout->addWidget( kcfg_Port, 2, 1 );
 
     return networkPage;
 }
@@ -227,17 +227,17 @@ TQWidget *KNoteConfigDlg::makeNetworkPage()
 TQWidget *KNoteConfigDlg::makeStylePage()
 {
     TQWidget *stylePage = new TQWidget();
-    TQGridLayout *layout = new TQGridLayout( stylePage, 2, 2, 0, spacingHint() );
+    TQGridLayout *tqlayout = new TQGridLayout( stylePage, 2, 2, 0, spacingHint() );
 
     TQLabel *label_Style = new TQLabel( i18n("&Style:"), stylePage, "label_Style" );
-    layout->addWidget( label_Style, 0, 0 );
+    tqlayout->addWidget( label_Style, 0, 0 );
 
     TQComboBox *kcfg_Style = new TQComboBox( stylePage, "kcfg_Style" );
     TQStringList list;
     list << "Plain" << "Fancy";
     kcfg_Style->insertStringList( list );
     label_Style->setBuddy( kcfg_Style );
-    layout->addWidget( kcfg_Style, 0, 1 );
+    tqlayout->addWidget( kcfg_Style, 0, 1 );
 
     return stylePage;
 }
diff --git a/knotes/knoteedit.cpp b/knotes/knoteedit.cpp
index 7b99254b..d89cfd37 100644
--- a/knotes/knoteedit.cpp
+++ b/knotes/knoteedit.cpp
@@ -149,7 +149,7 @@ KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *parent, const char *
     connect( this, TQT_SIGNAL(currentColorChanged( const TQColor & )),
              this, TQT_SLOT(colorChanged( const TQColor & )) );
     connect( this, TQT_SIGNAL(currentAlignmentChanged( int )),
-             this, TQT_SLOT(alignmentChanged( int )) );
+             this, TQT_SLOT(tqalignmentChanged( int )) );
     connect( this, TQT_SIGNAL(currentVerticalAlignmentChanged( VerticalAlignment )),
              this, TQT_SLOT(verticalAlignmentChanged( VerticalAlignment )) );
 }
@@ -219,7 +219,7 @@ void KNoteEdit::setTextFormat( TextFormat f )
         TQString t = text();
         KTextEdit::setTextFormat( f );
 
-        // if the note contains html/xml source try to display it, otherwise
+        // if the note tqcontains html/xml source try to display it, otherwise
         // get the modified text again and set it to preserve newlines
         if ( TQStyleSheet::mightBeRichText( t ) )
             setText( t );
@@ -298,25 +298,25 @@ void KNoteEdit::textColor()
 
 void KNoteEdit::textAlignLeft()
 {
-    setAlignment( AlignLeft );
+    tqsetAlignment( AlignLeft );
     m_textAlignLeft->setChecked( true );
 }
 
 void KNoteEdit::textAlignCenter()
 {
-    setAlignment( AlignCenter );
+    tqsetAlignment( AlignCenter );
     m_textAlignCenter->setChecked( true );
 }
 
 void KNoteEdit::textAlignRight()
 {
-    setAlignment( AlignRight );
+    tqsetAlignment( AlignRight );
     m_textAlignRight->setChecked( true );
 }
 
 void KNoteEdit::textAlignBlock()
 {
-    setAlignment( AlignJustify );
+    tqsetAlignment( AlignJustify );
     m_textAlignBlock->setChecked( true );
 }
 
@@ -409,7 +409,7 @@ void KNoteEdit::colorChanged( const TQColor &c )
     m_textColor->setIconSet( pix );
 }
 
-void KNoteEdit::alignmentChanged( int a )
+void KNoteEdit::tqalignmentChanged( int a )
 {
     // TODO: AlignAuto
     if ( ( a == AlignAuto ) || ( a & AlignLeft ) )
@@ -451,7 +451,7 @@ void KNoteEdit::autoIndent()
 
     // This routine returns the whitespace before the first non white space
     // character in string.
-    // It is assumed that string contains at least one non whitespace character
+    // It is assumed that string tqcontains at least one non whitespace character
     // ie \n \r \t \v \f and space
     TQString indentString;
 
diff --git a/knotes/knoteedit.h b/knotes/knoteedit.h
index 0e6a6e4b..2e183bfc 100644
--- a/knotes/knoteedit.h
+++ b/knotes/knoteedit.h
@@ -81,7 +81,7 @@ private slots:
 
     void fontChanged( const TQFont &f );
     void colorChanged( const TQColor &c );
-    void alignmentChanged( int a );
+    void tqalignmentChanged( int a );
     void verticalAlignmentChanged( VerticalAlignment a );
     void slotAllowTab();
 
diff --git a/knotes/knoteprinter.cpp b/knotes/knoteprinter.cpp
index c5803167..593ed8f7 100644
--- a/knotes/knoteprinter.cpp
+++ b/knotes/knoteprinter.cpp
@@ -46,14 +46,14 @@ TQFont KNotePrinter::font() const
     return m_font;
 }
 
-void KNotePrinter::setColorGroup( const TQColorGroup& colorGroup )
+void KNotePrinter::tqsetColorGroup( const TQColorGroup& tqcolorGroup )
 {
-    m_colorGroup = colorGroup;
+    m_tqcolorGroup = tqcolorGroup;
 }
 
-TQColorGroup KNotePrinter::colorGroup() const
+TQColorGroup KNotePrinter::tqcolorGroup() const
 {
-    return m_colorGroup;
+    return m_tqcolorGroup;
 }
 
 void KNotePrinter::setStyleSheet( TQStyleSheet* styleSheet )
@@ -93,7 +93,7 @@ void KNotePrinter::doPrint( KPrinter& printer, TQPainter& painter,
 
     for (;;)
     {
-        text.draw( &painter, body.left(), body.top(), view, m_colorGroup );
+        text.draw( &painter, body.left(), body.top(), view, m_tqcolorGroup );
         view.moveBy( 0, body.height() );
         painter.translate( 0, -body.height() );
 
diff --git a/knotes/knoteprinter.h b/knotes/knoteprinter.h
index 632dd85a..148a2ec4 100644
--- a/knotes/knoteprinter.h
+++ b/knotes/knoteprinter.h
@@ -27,8 +27,8 @@ public:
     void setFont( const TQFont& font );
     TQFont font() const;
 
-    void setColorGroup( const TQColorGroup& colorGroup );
-    TQColorGroup colorGroup() const;
+    void tqsetColorGroup( const TQColorGroup& tqcolorGroup );
+    TQColorGroup tqcolorGroup() const;
 
     void setStyleSheet( TQStyleSheet* styleSheet );
     TQStyleSheet* styleSheet() const;
@@ -43,7 +43,7 @@ private:
     void doPrint( KPrinter& printer, TQPainter& painter,
                   const TQString& content ) const;
 
-    TQColorGroup m_colorGroup;
+    TQColorGroup m_tqcolorGroup;
     TQFont m_font;
     TQStyleSheet* m_styleSheet;
     TQMimeSourceFactory* m_mimeSourceFactory;
diff --git a/knotes/knotesalarm.cpp b/knotes/knotesalarm.cpp
index 616c83b7..1f9e22e7 100644
--- a/knotes/knotesalarm.cpp
+++ b/knotes/knotesalarm.cpp
@@ -59,7 +59,7 @@ void KNotesAlarm::checkAlarms()
     if ( !from.isValid() )
         from.setTime_t( 0 );
 
-    KNotesGlobalConfig::self()->setAlarmsLastChecked( TQDateTime::currentDateTime() );
+    KNotesGlobalConfig::self()->setAlarmsLastChecked( TQDateTime::tqcurrentDateTime() );
     TQValueList<KCal::Alarm *> alarms = m_manager->alarms( from, KNotesGlobalConfig::self()->alarmsLastChecked() );
     if( alarms.isEmpty())
         return;
diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp
index 72b1ecce..231afede 100644
--- a/knotes/knotesapp.cpp
+++ b/knotes/knotesapp.cpp
@@ -138,7 +138,7 @@ KNotesApp::KNotesApp()
 
     // get the most recent XML UI file
     TQString xmlFileName = instance()->instanceName() + "ui.rc";
-    TQString filter = TQString::fromLatin1( instance()->instanceName() + '/' ) + xmlFileName;
+    TQString filter = TQString::tqfromLatin1( instance()->instanceName() + '/' ) + xmlFileName;
     TQStringList fileList = instance()->dirs()->findAllResources( "data", filter ) +
                            instance()->dirs()->findAllResources( "data", xmlFileName );
 
@@ -183,7 +183,7 @@ KNotesApp::KNotesApp()
     m_manager->load();
 
     // read the old config files, convert and add them
-    KCal::CalendarLocal calendar( TQString::fromLatin1( "UTC" ) );
+    KCal::CalendarLocal calendar( TQString::tqfromLatin1( "UTC" ) );
     if ( KNotesLegacy::convert( &calendar ) )
     {
         KCal::Journal::List notes = calendar.journals();
@@ -253,7 +253,7 @@ TQString KNotesApp::newNote( const TQString& name, const TQString& text )
     if ( !name.isEmpty() )
         journal->setSummary( name );
     else
-        journal->setSummary( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) );
+        journal->setSummary( KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) );
 
     // the body of the note
     journal->setDescription( text );
@@ -460,7 +460,7 @@ bool KNotesApp::isModified( const TQString& app, const TQString& id ) const
 
 void KNotesApp::mousePressEvent( TQMouseEvent* e )
 {
-    if ( !rect().contains( e->pos() ) )
+    if ( !rect().tqcontains( e->pos() ) )
         return;
 
     switch ( e->button() )
@@ -703,7 +703,7 @@ void KNotesApp::updateNoteActions()
 
     for ( TQDictIterator<KNote> it( m_noteList ); it.current(); ++it )
     {
-        KAction *action = new KAction( it.current()->name().replace("&", "&&"),
+        KAction *action = new KAction( it.current()->name().tqreplace("&", "&&"),
                                        KShortcut(), this, TQT_SLOT(slotShowNote()),
                                        (TQObject *)0,
                                        it.current()->noteId().utf8() );
diff --git a/knotes/knoteslegacy.cpp b/knotes/knoteslegacy.cpp
index 6dd80368..c51330fa 100644
--- a/knotes/knoteslegacy.cpp
+++ b/knotes/knoteslegacy.cpp
@@ -156,7 +156,7 @@ bool KNotesLegacy::convertKNotes1Config( Journal *journal, TQDir& noteDir,
     config.readConfig();
     config.setVersion( KNOTES_VERSION );
 
-    // get the geometry
+    // get the tqgeometry
     config.setWidth( props[3].toUInt() );
     config.setHeight( props[4].toUInt() );
 
diff --git a/knotes/knotesnetrecv.cpp b/knotes/knotesnetrecv.cpp
index 0a261252..259f9d36 100644
--- a/knotes/knotesnetrecv.cpp
+++ b/knotes/knotesnetrecv.cpp
@@ -61,7 +61,7 @@ KNotesNetworkReceiver::KNotesNetworkReceiver( KBufferedSocket *s )
   : TQObject(),
     m_buffer( new TQByteArray() ), m_sock( s )
 {
-    TQString date = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true, false );
+    TQString date = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), true, false );
 
     // Add the remote IP or hostname and the date to the title, to help the
     // user guess who wrote it.
diff --git a/knotes/knotesnetsend.cpp b/knotes/knotesnetsend.cpp
index 86246407..a08be4d0 100644
--- a/knotes/knotesnetsend.cpp
+++ b/knotes/knotesnetsend.cpp
@@ -62,7 +62,7 @@ void KNotesNetworkSender::setSenderId( const TQString& sender )
 
 void KNotesNetworkSender::setNote( const TQString& title, const TQString& text )
 {
-    // TODO: support for unicode and rich text.
+    // TODO: support for tqunicode and rich text.
     // Mmmmmm... how to behave with such heterogeneous environment?
     // AFAIK, ATnotes does not allow UNICODE.
     m_title = title.ascii();
diff --git a/knotes/resourcelocal.cpp b/knotes/resourcelocal.cpp
index 91e6d2d9..81c33489 100644
--- a/knotes/resourcelocal.cpp
+++ b/knotes/resourcelocal.cpp
@@ -45,7 +45,7 @@
 
 
 ResourceLocal::ResourceLocal( const KConfig *config )
-    : ResourceNotes( config ), mCalendar( TQString::fromLatin1( "UTC" ) )
+    : ResourceNotes( config ), mCalendar( TQString::tqfromLatin1( "UTC" ) )
 {
     kdDebug(5500) << "ResourceLocal::ResourceLocal()" << endl;
     setType( "file" );
diff --git a/knotes/resourcelocalconfig.cpp b/knotes/resourcelocalconfig.cpp
index 417f81a0..207730a1 100644
--- a/knotes/resourcelocalconfig.cpp
+++ b/knotes/resourcelocalconfig.cpp
@@ -32,15 +32,15 @@
 ResourceLocalConfig::ResourceLocalConfig( TQWidget *parent,  const char *name )
     : KRES::ConfigWidget( parent, name )
 {
-    TQHBoxLayout *layout = new TQHBoxLayout( this );
+    TQHBoxLayout *tqlayout = new TQHBoxLayout( this );
 
     TQLabel *label = new TQLabel( i18n( "Location:" ), this );
     mURL = new KURLRequester( this );
     KFile::Mode mode = static_cast<KFile::Mode>( KFile::File |
                                                  KFile::LocalOnly );
     mURL->setMode( mode );
-    layout->addWidget( label );
-    layout->addWidget( mURL );
+    tqlayout->addWidget( label );
+    tqlayout->addWidget( mURL );
 }
 
 ResourceLocalConfig::~ResourceLocalConfig()
diff --git a/kode/automakefile.cpp b/kode/automakefile.cpp
index 468059ae..2be52ae3 100644
--- a/kode/automakefile.cpp
+++ b/kode/automakefile.cpp
@@ -98,7 +98,7 @@ TQString AutoMakefile::text() const
       if ( t.type() != targetType ) continue;
 
       TQString name = t.name();
-      name.replace( '.', '_' );
+      name.tqreplace( '.', '_' );
       
       out += name + "_SOURCES = " + t.sources() + '\n';
       if ( !t.libAdd().isEmpty() )
diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp
index e248a93a..6542c288 100644
--- a/kode/kodemain.cpp
+++ b/kode/kodemain.cpp
@@ -309,8 +309,8 @@ int codify( KCmdLineArgs *args )
     TQTextStream ts( &f );
     TQString line;
     while( !( line = ts.readLine() ).isNull() ) {
-      line.replace( "\\", "\\\\" ); 
-      line.replace( "\"", "\\\"" );
+      line.tqreplace( "\\", "\\\\" ); 
+      line.tqreplace( "\"", "\\\"" );
       line = "code += \"" + line;
       line.append( "\";" );
       std::cout << line.local8Bit() << std::endl;
@@ -372,7 +372,7 @@ int create( KCmdLineArgs *args )
     authorEmail = a.preferredEmail();
   } else {
     KABC::Addressee::List as =
-        KABC::StdAddressBook::self()->findByEmail( authorEmail );
+        KABC::StdAddressBook::self()->tqfindByEmail( authorEmail );
     if ( as.isEmpty() ) {
       kdDebug() << "Unable to find '" << authorEmail << "' in address book."
                 << endl;
@@ -384,7 +384,7 @@ int create( KCmdLineArgs *args )
       authorName = a.realName();
   }
   if ( !authorEmail.isEmpty() ) {
-    file.addCopyright( TQDate::currentDate().year(), authorName, authorEmail );
+    file.addCopyright( TQDate::tqcurrentDate().year(), authorName, authorEmail );
   }
 
   KODE::License l;
diff --git a/kode/kwsdl/compiler.cpp b/kode/kwsdl/compiler.cpp
index 9e4c86ab..e3ccf4f8 100644
--- a/kode/kwsdl/compiler.cpp
+++ b/kode/kwsdl/compiler.cpp
@@ -107,7 +107,7 @@ void Compiler::create()
   creator.setNameSpace( mNameSpace );
   creator.create( converter.classes() );
 
-  qApp->quit();
+  tqApp->quit();
 }
 
 #include "compiler.moc"
diff --git a/kode/kwsdl/converter.cpp b/kode/kwsdl/converter.cpp
index 5d824afe..3f97efe1 100644
--- a/kode/kwsdl/converter.cpp
+++ b/kode/kwsdl/converter.cpp
@@ -32,7 +32,7 @@ static TQString escapeEnum( const TQString &str )
 {
   TQString enumStr = capitalize( str );
 
-  return enumStr.replace( "-", "_" );
+  return enumStr.tqreplace( "-", "_" );
 }
 
 Converter::Converter()
diff --git a/kode/kwsdl/kung/complexbaseinputfield.cpp b/kode/kwsdl/kung/complexbaseinputfield.cpp
index 80f75581..1c43bd95 100644
--- a/kode/kwsdl/kung/complexbaseinputfield.cpp
+++ b/kode/kwsdl/kung/complexbaseinputfield.cpp
@@ -141,14 +141,14 @@ TQWidget *ComplexBaseInputField::createWidget( TQWidget *parent )
 {
   TQGroupBox *inputWidget = new TQGroupBox( mName, parent );
   inputWidget->setColumnLayout( 0, Qt::Horizontal );
-  TQGridLayout *layout = new TQGridLayout( inputWidget->layout(), 2, 2, 6 );
+  TQGridLayout *tqlayout = new TQGridLayout( inputWidget->tqlayout(), 2, 2, 6 );
 
   InputField::List::Iterator it;
   int row = 0;
   for ( it = mFields.begin(); it != mFields.end(); ++it, ++row ) {
     TQLabel *label = new TQLabel( (*it)->name(), inputWidget );
-    layout->addWidget( label, row, 0 );
-    layout->addWidget( (*it)->createWidget( inputWidget ), row, 1 );
+    tqlayout->addWidget( label, row, 0 );
+    tqlayout->addWidget( (*it)->createWidget( inputWidget ), row, 1 );
   }
 
   return inputWidget;
diff --git a/kode/kwsdl/kung/dateinputfield.cpp b/kode/kwsdl/kung/dateinputfield.cpp
index b38d46b1..8d5c329c 100644
--- a/kode/kwsdl/kung/dateinputfield.cpp
+++ b/kode/kwsdl/kung/dateinputfield.cpp
@@ -25,7 +25,7 @@
 
 DateInputField::DateInputField( const TQString &name, const Schema::SimpleType *type )
   : SimpleInputField( name, type ),
-    mValue( TQDate::currentDate() )
+    mValue( TQDate::tqcurrentDate() )
 {
 }
 
diff --git a/kode/kwsdl/kung/dispatcher.cpp b/kode/kwsdl/kung/dispatcher.cpp
index d337d19f..9d2ecc23 100644
--- a/kode/kwsdl/kung/dispatcher.cpp
+++ b/kode/kwsdl/kung/dispatcher.cpp
@@ -85,7 +85,7 @@ void Dispatcher::nextMessage()
     mCurrentMessage = items.first();
 
   if ( mCurrentMessage.isEmpty() ) {
-    qApp->quit();
+    tqApp->quit();
     return;
   }
 
@@ -119,7 +119,7 @@ void Dispatcher::nextMessage()
       mTransport->query( doc.toString( 2 ) );
     }
   } else
-    qApp->quit();
+    tqApp->quit();
 }
 
 void Dispatcher::result( const TQString &xml )
diff --git a/kode/kwsdl/kung/listinputfield.cpp b/kode/kwsdl/kung/listinputfield.cpp
index 6bc1d824..7a5eeb71 100644
--- a/kode/kwsdl/kung/listinputfield.cpp
+++ b/kode/kwsdl/kung/listinputfield.cpp
@@ -91,19 +91,19 @@ ListWidget::ListWidget( InputField *parentField, const TQString &name, const TQS
   : TQWidget( parent ),
     mParentField( parentField ), mName( name ), mType( type )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 4, 2, 11, 6 );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, 11, 6 );
 
   mView = new TQListBox( this );
-  layout->addMultiCellWidget( mView, 0, 3, 0, 0 );
+  tqlayout->addMultiCellWidget( mView, 0, 3, 0, 0 );
 
   mAddButton = new TQPushButton( i18n( "Add" ), this );
-  layout->addWidget( mAddButton, 0, 1 );
+  tqlayout->addWidget( mAddButton, 0, 1 );
 
   mEditButton = new TQPushButton( i18n( "Edit..." ), this );
-  layout->addWidget( mEditButton, 1, 1 );
+  tqlayout->addWidget( mEditButton, 1, 1 );
 
   mRemoveButton = new TQPushButton( i18n( "Remove" ), this );
-  layout->addWidget( mRemoveButton, 2, 1 );
+  tqlayout->addWidget( mRemoveButton, 2, 1 );
 
   connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) );
   connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) );
diff --git a/kode/kwsdl/kung/pageinputfield.cpp b/kode/kwsdl/kung/pageinputfield.cpp
index 956e54bf..04f66ffa 100644
--- a/kode/kwsdl/kung/pageinputfield.cpp
+++ b/kode/kwsdl/kung/pageinputfield.cpp
@@ -88,18 +88,18 @@ TQString PageInputField::data() const
 TQWidget *PageInputField::createWidget( TQWidget *parent )
 {
   TQWidget *mInputWidget = new TQWidget( parent, "PageInputWidget" );
-  TQGridLayout *layout = new TQGridLayout( mInputWidget, 2, 2, 11, 6 );
+  TQGridLayout *tqlayout = new TQGridLayout( mInputWidget, 2, 2, 11, 6 );
 
   InputField::List::Iterator it;
   int row = 0;
   for ( it = mFields.begin(); it != mFields.end(); ++it, ++row ) {
     TQLabel *label = new TQLabel( (*it)->name(), mInputWidget );
-    label->setAlignment( Qt::AlignTop );
-    layout->addWidget( label, row, 0 );
-    layout->addWidget( (*it)->createWidget( mInputWidget ), row, 1 );
+    label->tqsetAlignment( Qt::AlignTop );
+    tqlayout->addWidget( label, row, 0 );
+    tqlayout->addWidget( (*it)->createWidget( mInputWidget ), row, 1 );
   }
 
-  layout->setRowStretch( ++row, 1 );
+  tqlayout->setRowStretch( ++row, 1 );
 
   return mInputWidget;
 }
diff --git a/kode/kwsdl/namemapper.cpp b/kode/kwsdl/namemapper.cpp
index 426498f5..6d7ae639 100644
--- a/kode/kwsdl/namemapper.cpp
+++ b/kode/kwsdl/namemapper.cpp
@@ -30,7 +30,7 @@ NameMapper::NameMapper()
 
 TQString NameMapper::escape( const TQString &name ) const
 {
-  if ( mKeyWords.contains( name ) )
+  if ( mKeyWords.tqcontains( name ) )
     return "_" + name;
   else
     return name;
diff --git a/kode/kwsdl/schema/fileprovider.cpp b/kode/kwsdl/schema/fileprovider.cpp
index 2a7448c4..54fa0163 100644
--- a/kode/kwsdl/schema/fileprovider.cpp
+++ b/kode/kwsdl/schema/fileprovider.cpp
@@ -60,7 +60,7 @@ bool FileProvider::get( const TQString &url, TQString &target )
 
   mBlocked = true;
   while ( mBlocked ) {
-    qApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput );
+    tqApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput );
     usleep( 500 );
   }
 
diff --git a/kode/kwsdl/schema/parser.cpp b/kode/kwsdl/schema/parser.cpp
index 7ec3804f..ba62b0c3 100644
--- a/kode/kwsdl/schema/parser.cpp
+++ b/kode/kwsdl/schema/parser.cpp
@@ -200,7 +200,7 @@ void Parser::parseImport( const TQDomElement &element )
   TQString location = element.attribute( "schemaLocation" );
   if ( !location.isEmpty() ) {
     // don't import a schema twice
-    if ( mImportedSchemas.contains( location ) )
+    if ( mImportedSchemas.tqcontains( location ) )
       return;
     else
       mImportedSchemas.append( location );
diff --git a/kode/kwsdl/schema/simpletype.cpp b/kode/kwsdl/schema/simpletype.cpp
index d5dcf2fd..50242808 100644
--- a/kode/kwsdl/schema/simpletype.cpp
+++ b/kode/kwsdl/schema/simpletype.cpp
@@ -202,7 +202,7 @@ void SimpleType::setFacetValue( const TQString &value )
       mFacetValue.wsp = PRESERVE;
     else if ( value == "collapse" )
       mFacetValue.wsp = COLLAPSE;
-    else if ( value == "replace" )
+    else if ( value == "tqreplace" )
       mFacetValue.wsp = REPLACE;
     else {
       qDebug( "Invalid facet value for whitespace" );
diff --git a/kode/kxml_compiler/creator.cpp b/kode/kxml_compiler/creator.cpp
index 59126588..25e91edc 100644
--- a/kode/kxml_compiler/creator.cpp
+++ b/kode/kxml_compiler/creator.cpp
@@ -621,7 +621,7 @@ void Creator::createElementParserDom( KODE::Class &c, Element *e )
 
 void Creator::registerListTypedef( const TQString &type )
 {
-  if ( !mListTypedefs.contains( type ) ) mListTypedefs.append( type );
+  if ( !mListTypedefs.tqcontains( type ) ) mListTypedefs.append( type );
 }
 
 void Creator::createListTypedefs()
diff --git a/kode/kxml_compiler/kxml_compiler.cpp b/kode/kxml_compiler/kxml_compiler.cpp
index 71720d6b..e2e529e2 100644
--- a/kode/kxml_compiler/kxml_compiler.cpp
+++ b/kode/kxml_compiler/kxml_compiler.cpp
@@ -143,7 +143,7 @@ int main( int argc, char **argv )
   for( it = start->elements.begin(); it != start->elements.end(); ++it ) {
     c.setExternalClassPrefix( c.upperFirst( (*it)->name ) );
     c.createFileParser( *it );
-    c.createFileWriter( *it, dtdFilename.replace( "rng", "dtd" ) );
+    c.createFileWriter( *it, dtdFilename.tqreplace( "rng", "dtd" ) );
   }
 
   c.createListTypedefs();
diff --git a/kode/kxml_compiler/parser.cpp b/kode/kxml_compiler/parser.cpp
index 9b3f33b9..59392ca8 100644
--- a/kode/kxml_compiler/parser.cpp
+++ b/kode/kxml_compiler/parser.cpp
@@ -100,7 +100,7 @@ Element *Parser::parse( const TQDomElement &docElement )
       it = mDefinitionMap.find( d->name );
       if ( it != mDefinitionMap.end() ) definitions = *it;
       definitions.append( d );
-      mDefinitionMap.replace( d->name, definitions );
+      mDefinitionMap.tqreplace( d->name, definitions );
     } else if ( e1.tagName() == "start" ) {
       start = new Element;
       parseElement( e1, start, Pattern() );
diff --git a/kode/printer.cpp b/kode/printer.cpp
index 3adf32ca..5fa8907c 100644
--- a/kode/printer.cpp
+++ b/kode/printer.cpp
@@ -326,7 +326,7 @@ void Printer::printHeader( const File &f )
 
   // Create include guard
   TQString className = f.filename();
-  className.replace( "-", "_" );
+  className.tqreplace( "-", "_" );
 
   TQString includeGuard;
   if ( !f.nameSpace().isEmpty() ) includeGuard += f.nameSpace().upper() + "_";
diff --git a/konsolekalendar/konsolekalendarepoch.cpp b/konsolekalendar/konsolekalendarepoch.cpp
index e469a42c..59cd7e91 100644
--- a/konsolekalendar/konsolekalendarepoch.cpp
+++ b/konsolekalendar/konsolekalendarepoch.cpp
@@ -64,8 +64,8 @@ uint KonsoleKalendarEpoch::QDateTime2epoch( TQDateTime dt )
   // SORRY QT DOESN'T HANDLE DAYLIGHT SAVINGS TIME.
 
   // Compute #seconds to subtract for local timezone difference from UTC.
-  int offset = TQDateTime::currentDateTime( Qt::UTC ).toTime_t()
-             - TQDateTime::currentDateTime( Qt::LocalTime ).toTime_t();
+  int offset = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t()
+             - TQDateTime::tqcurrentDateTime( Qt::LocalTime ).toTime_t();
   return( dt.toTime_t() - offset );
 }
 
diff --git a/konsolekalendar/konsolekalendarexports.cpp b/konsolekalendar/konsolekalendarexports.cpp
index f1d93b0a..60441bd5 100644
--- a/konsolekalendar/konsolekalendarexports.cpp
+++ b/konsolekalendar/konsolekalendarexports.cpp
@@ -174,21 +174,21 @@ bool KonsoleKalendarExports::exportAsTxtShort( TQTextStream *ts,
   *ts << "\t";
 
   // Print Event Summary
-  *ts << event->summary().replace( TQChar( '\n' ), TQChar( ' ' ) );
+  *ts << event->summary().tqreplace( TQChar( '\n' ), TQChar( ' ' ) );
 
   // Print Event Location
   if ( !event->location().isEmpty() ) {
     if ( !event->summary().isEmpty() ) {
       *ts << ", ";
     }
-    *ts << event->location().replace( TQChar( '\n' ), TQChar( ' ' ) );
+    *ts << event->location().tqreplace( TQChar( '\n' ), TQChar( ' ' ) );
   }
   *ts << endl;
 
   // Print Event Description
   if ( !event->description().isEmpty() ) {
     *ts << "\t\t\t"
-        << event->description().replace( TQChar( '\n' ), TQChar( ' ' ) )
+        << event->description().tqreplace( TQChar( '\n' ), TQChar( ' ' ) )
         << endl;
   }
 
@@ -204,7 +204,7 @@ TQString KonsoleKalendarExports::processField( TQString field, TQString dquote )
   //   2. Surrounds field with double quotes
 
   TQString double_dquote = dquote + dquote;
-  TQString retField = dquote + field.replace( dquote, double_dquote ) + dquote;
+  TQString retField = dquote + field.tqreplace( dquote, double_dquote ) + dquote;
   return retField;
 }
 
@@ -233,9 +233,9 @@ bool KonsoleKalendarExports::exportAsCSV( TQTextStream *ts,
         << delim << pF( "" );
   }
 
-  *ts << delim << pF( event->summary().replace( TQChar('\n'), TQChar(' ') ) )
-      << delim << pF( event->location().replace( TQChar('\n'), TQChar(' ') ) )
-      << delim << pF( event->description().replace( TQChar('\n'), TQChar(' ') ) )
+  *ts << delim << pF( event->summary().tqreplace( TQChar('\n'), TQChar(' ') ) )
+      << delim << pF( event->location().tqreplace( TQChar('\n'), TQChar(' ') ) )
+      << delim << pF( event->description().tqreplace( TQChar('\n'), TQChar(' ') ) )
       << delim << pF( event->uid() )
       << endl;
 
diff --git a/konsolekalendar/main.cpp b/konsolekalendar/main.cpp
index 59b9a2f8..42f5dd99 100644
--- a/konsolekalendar/main.cpp
+++ b/konsolekalendar/main.cpp
@@ -204,11 +204,11 @@ int main( int argc, char *argv[] )
   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 
   // Default values for start date/time (today at 07:00)
-  TQDate startdate = TQDate::currentDate();
+  TQDate startdate = TQDate::tqcurrentDate();
   TQTime starttime( 7, 0 );
 
   // Default values for end date/time (today at 17:00)
-  TQDate enddate = TQDate::currentDate();
+  TQDate enddate = TQDate::tqcurrentDate();
   TQTime endtime( 17, 0 );
 
   // Default values for switches
diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp
index 6d048504..e940a53c 100644
--- a/kontact/interfaces/core.cpp
+++ b/kontact/interfaces/core.cpp
@@ -42,7 +42,7 @@ Core::Core( TQWidget *parent, const char *name )
 {
   d = new Private;
   TQTimer* timer = new TQTimer( this );
-  mLastDate = TQDate::currentDate();
+  mLastDate = TQDate::tqcurrentDate();
   connect(timer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkNewDay() ) );
   timer->start( 1000*60 );
 }
@@ -114,10 +114,10 @@ void Core::slotPartDestroyed( TQObject * obj )
 
 void Core::checkNewDay()
 {
-  if ( mLastDate != TQDate::currentDate() )
-    emit dayChanged( TQDate::currentDate() );
+  if ( mLastDate != TQDate::tqcurrentDate() )
+    emit dayChanged( TQDate::tqcurrentDate() );
 
-  mLastDate = TQDate::currentDate();
+  mLastDate = TQDate::tqcurrentDate();
 }
 
 TQString Core::lastErrorMessage() const
diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h
index 2d75fb22..e84b3b8d 100644
--- a/kontact/interfaces/core.h
+++ b/kontact/interfaces/core.h
@@ -79,7 +79,7 @@ class KDE_EXPORT Core : public KParts::MainWindow
     void dayChanged( const TQDate& );
 
   protected:
-    Core( TQWidget *parentWidget = 0, const char *name = 0 );
+    Core( TQWidget *tqparentWidget = 0, const char *name = 0 );
 
     TQString lastErrorMessage() const;
 
diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h
index 13f14c58..5a62beea 100644
--- a/kontact/interfaces/plugin.h
+++ b/kontact/interfaces/plugin.h
@@ -114,7 +114,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
     TQString executableName() const;
 
     /**
-      Set name of library which contains the KPart used by this plugin.
+      Set name of library which tqcontains the KPart used by this plugin.
     */
     void setPartLibraryName( const TQCString & );
 
@@ -196,7 +196,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
       The clients name is taken from the name argument in the constructor.
       @note: The DCOPClient object will only be created when this method is
       called for the first time. Make sure that the part has been loaded
-      before calling this method, if it's the one that contains the DCOP
+      before calling this method, if it's the one that tqcontains the DCOP
       interface that other parts might use.
     */
     DCOPClient *dcopClient() const;
diff --git a/kontact/interfaces/summary.cpp b/kontact/interfaces/summary.cpp
index da978d6e..86902ca0 100644
--- a/kontact/interfaces/summary.cpp
+++ b/kontact/interfaces/summary.cpp
@@ -55,20 +55,20 @@ TQWidget* Summary::createHeader(TQWidget *parent, const TQPixmap& icon, const TQ
 
   TQLabel *label = new TQLabel( hbox );
   label->setPixmap( icon );
-  label->setFixedSize( label->sizeHint() );
-  label->setPaletteBackgroundColor( colorGroup().mid() );
+  label->setFixedSize( label->tqsizeHint() );
+  label->setPaletteBackgroundColor( tqcolorGroup().mid() );
   label->setAcceptDrops( true );
 
   label = new TQLabel( heading, hbox );
-  label->setAlignment( AlignLeft|AlignVCenter );
+  label->tqsetAlignment( AlignLeft|AlignVCenter );
   label->setIndent( KDialog::spacingHint() );
   label->setFont( boldFont );
-  label->setPaletteForegroundColor( colorGroup().light() );
-  label->setPaletteBackgroundColor( colorGroup().mid() );
+  label->setPaletteForegroundColor( tqcolorGroup().light() );
+  label->setPaletteBackgroundColor( tqcolorGroup().mid() );
 
-  hbox->setPaletteBackgroundColor( colorGroup().mid() );
+  hbox->setPaletteBackgroundColor( tqcolorGroup().mid() );
 
-  hbox->setMaximumHeight( hbox->minimumSizeHint().height() );
+  hbox->setMaximumHeight( hbox->tqminimumSizeHint().height() );
 
   return hbox;
 }
@@ -109,8 +109,8 @@ void Summary::dragEnterEvent( TQDragEnterEvent *event )
 
 void Summary::dropEvent( TQDropEvent *event )
 {
-  int alignment = (event->pos().y() < (height() / 2) ? Qt::AlignTop : Qt::AlignBottom);
-  emit summaryWidgetDropped( this, event->source(), alignment );
+  int tqalignment = (event->pos().y() < (height() / 2) ? Qt::AlignTop : Qt::AlignBottom);
+  emit summaryWidgetDropped( this, event->source(), tqalignment );
 }
 
 #include "summary.moc"
diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h
index 5bbfcf2b..29a89019 100644
--- a/kontact/interfaces/summary.h
+++ b/kontact/interfaces/summary.h
@@ -73,7 +73,7 @@ class KDE_EXPORT Summary : public QWidget
 
   signals:
     void message( const TQString &message );
-    void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int alignment );
+    void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int tqalignment );
 
   protected:
     virtual void mousePressEvent( TQMouseEvent* );
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp
index 656ffe4e..e27254e3 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.cpp
+++ b/kontact/plugins/kmail/kcmkmailsummary.cpp
@@ -75,7 +75,7 @@ void KCMKMailSummary::modified()
 
 void KCMKMailSummary::initGUI()
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 
   mFolderView = new KListView( this );
   mFolderView->setRootIsDecorated( true );
@@ -85,8 +85,8 @@ void KCMKMailSummary::initGUI()
 
   mFullPath = new TQCheckBox( i18n( "Show full path for folders" ), this );
 
-  layout->addWidget( mFolderView );
-  layout->addWidget( mFullPath );
+  tqlayout->addWidget( mFolderView );
+  tqlayout->addWidget( mFullPath );
 }
 
 void KCMKMailSummary::initFolders()
@@ -108,7 +108,7 @@ void KCMKMailSummary::initFolders()
       DCOPRef folderRef = kmail.call( "getFolder(TQString)", *it );
       folderRef.call( "displayName()" ).get( displayName );
     }
-    if ( (*it).contains( '/' ) == 1 ) {
+    if ( (*it).tqcontains( '/' ) == 1 ) {
       if ( mFolderMap.find( *it ) == mFolderMap.end() )
         mFolderMap.insert( *it, new TQListViewItem( mFolderView,
                                                    displayName ) );
@@ -137,7 +137,7 @@ void KCMKMailSummary::loadFolders()
   TQMap<TQString, TQListViewItem*>::Iterator it;
   for ( it = mFolderMap.begin(); it != mFolderMap.end(); ++it ) {
     if ( TQCheckListItem *qli = dynamic_cast<TQCheckListItem*>( it.data() ) ) {
-      if ( folders.contains( it.key() ) ) {
+      if ( folders.tqcontains( it.key() ) ) {
         qli->setOn( true );
         mFolderView->ensureItemVisible( it.data() );
       } else {
diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp
index 5a879747..c2aff819 100644
--- a/kontact/plugins/kmail/kmail_plugin.cpp
+++ b/kontact/plugins/kmail/kmail_plugin.cpp
@@ -83,7 +83,7 @@ bool KMailPlugin::canDecodeDrag( TQMimeSource *qms )
 void KMailPlugin::processDropEvent( TQDropEvent * de )
 {
   kdDebug() << k_funcinfo << endl;
-  CalendarLocal cal( TQString::fromLatin1("UTC") );
+  CalendarLocal cal( TQString::tqfromLatin1("UTC") );
   KABC::Addressee::List list;
 
   if ( VCalDrag::decode( de, &cal ) || ICalDrag::decode( de, &cal ) ) {
diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp
index 43c1e2cb..92023570 100644
--- a/kontact/plugins/kmail/summarywidget.cpp
+++ b/kontact/plugins/kmail/summarywidget.cpp
@@ -117,7 +117,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
   TQStringList::ConstIterator it;
   DCOPRef kmail( "kmail", "KMailIface" );
   for ( it = folders.begin(); it != folders.end(); ++it ) {
-    if ( activeFolders.contains( *it ) ) {
+    if ( activeFolders.tqcontains( *it ) ) {
       DCOPRef folderRef = kmail.call( "getFolder(TQString)", *it );
       const int numMsg = folderRef.call( "messages()" );
       const int numUnreadMsg = folderRef.call( "unreadMessages()" );
@@ -132,7 +132,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
 
       KURLLabel *urlLabel = new KURLLabel( *it, folderPath, this );
       urlLabel->installEventFilter( this );
-      urlLabel->setAlignment( AlignLeft );
+      urlLabel->tqsetAlignment( AlignLeft );
       urlLabel->show();
       connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
                TQT_SLOT( selectFolder( const TQString& ) ) );
@@ -143,7 +143,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
         new TQLabel( TQString( i18n("%1: number of unread messages "
                                   "%2: total number of messages", "%1 / %2") )
                     .arg( numUnreadMsg ).arg( numMsg ), this );
-      label->setAlignment( AlignLeft );
+      label->tqsetAlignment( AlignLeft );
       label->show();
       mLayout->addWidget( label, counter, 2 );
       mLabels.append( label );
@@ -154,7 +154,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
 
   if ( counter == 0 ) {
     TQLabel *label = new TQLabel( i18n( "No unread messages in your monitored folders" ), this );
-    label->setAlignment( AlignHCenter | AlignVCenter );
+    label->tqsetAlignment( AlignHCenter | AlignVCenter );
     mLayout->addMultiCellWidget( label, 0, 0, 0, 2 );
     label->show();
     mLabels.append( label );
diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp
index d4a5e854..ef70e8f5 100644
--- a/kontact/plugins/knotes/knotes_part.cpp
+++ b/kontact/plugins/knotes/knotes_part.cpp
@@ -139,7 +139,7 @@ void KNotesPart::printSelectedNotes()
     //printer.setFont( m_config->font() );
     //printer.setContext( m_editor->context() );
     //printer.setStyleSheet( m_editor->styleSheet() );
-    printer.setColorGroup( colorGroup() );
+    printer.tqsetColorGroup( tqcolorGroup() );
     printer.printNote( , content );
 #endif
 }
@@ -161,7 +161,7 @@ TQString KNotesPart::newNote( const TQString& name, const TQString& text )
   if ( !name.isEmpty() )
       journal->setSummary( name );
   else
-      journal->setSummary( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) );
+      journal->setSummary( KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) );
 
   // the body of the note
   journal->setDescription( text );
diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h
index 0bf073f3..2c96235f 100644
--- a/kontact/plugins/knotes/knotes_part_p.h
+++ b/kontact/plugins/knotes/knotes_part_p.h
@@ -129,9 +129,9 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient
       actionCollection()->setWidget( this );
 
       TQWidget *page = plainPage();
-      TQVBoxLayout *layout = new TQVBoxLayout( page );
+      TQVBoxLayout *tqlayout = new TQVBoxLayout( page );
 
-      TQHBoxLayout *hbl = new TQHBoxLayout( layout, marginHint() );
+      TQHBoxLayout *hbl = new TQHBoxLayout( tqlayout, marginHint() );
       TQLabel *label = new TQLabel( page);
       label->setText( i18n( "Name:" ) );
       hbl->addWidget( label,0 );
@@ -148,8 +148,8 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient
 
       mTool = static_cast<KToolBar *>(factory.container( "note_tool", this ));
 
-      layout->addWidget( mTool );
-      layout->addWidget( mNoteEdit );
+      tqlayout->addWidget( mTool );
+      tqlayout->addWidget( mNoteEdit );
     }
 
     TQString text() const
diff --git a/kontact/plugins/knotes/knotes_plugin.cpp b/kontact/plugins/knotes/knotes_plugin.cpp
index 1a94fdea..0fe26552 100644
--- a/kontact/plugins/knotes/knotes_plugin.cpp
+++ b/kontact/plugins/knotes/knotes_plugin.cpp
@@ -59,9 +59,9 @@ KParts::ReadOnlyPart* KNotesPlugin::createPart()
   return new KNotesPart( this, "notes" );
 }
 
-Kontact::Summary *KNotesPlugin::createSummaryWidget( TQWidget *parentWidget )
+Kontact::Summary *KNotesPlugin::createSummaryWidget( TQWidget *tqparentWidget )
 {
-  return new KNotesSummaryWidget( this, parentWidget );
+  return new KNotesSummaryWidget( this, tqparentWidget );
 }
 
 const KAboutData *KNotesPlugin::aboutData()
diff --git a/kontact/plugins/knotes/knotes_plugin.h b/kontact/plugins/knotes/knotes_plugin.h
index a9449458..65e6450d 100644
--- a/kontact/plugins/knotes/knotes_plugin.h
+++ b/kontact/plugins/knotes/knotes_plugin.h
@@ -37,7 +37,7 @@ class KNotesPlugin : public Kontact::Plugin
     KNotesPlugin( Kontact::Core *core, const char *name, const TQStringList& );
     ~KNotesPlugin();
 
-    virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget );
+    virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparentWidget );
 
     int weight() const { return 600; }
 
diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp
index 64db3a33..3ba9a9ab 100644
--- a/kontact/plugins/knotes/knotetip.cpp
+++ b/kontact/plugins/knotes/knotetip.cpp
@@ -52,8 +52,8 @@ KNoteTip::KNoteTip( KIconView *parent )
   mPreview->setHScrollBarMode( TQScrollView::AlwaysOff );
   mPreview->setVScrollBarMode( TQScrollView::AlwaysOff );
 
-  TQBoxLayout *layout = new TQVBoxLayout( this );
-  layout->addWidget( mPreview );
+  TQBoxLayout *tqlayout = new TQVBoxLayout( this );
+  tqlayout->addWidget( mPreview );
 
   setPalette( TQToolTip::palette() );
   setMargin( 1 );
diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp
index 012e6ae8..b714ff19 100644
--- a/kontact/plugins/knotes/summarywidget.cpp
+++ b/kontact/plugins/knotes/summarywidget.cpp
@@ -58,7 +58,7 @@ KNotesSummaryWidget::KNotesSummaryWidget( Kontact::Plugin *plugin,
   mLayout = new TQGridLayout( mainLayout, 7, 3, 3 );
   mLayout->setRowStretch( 6, 1 );
 
-  mCalendar = new KCal::CalendarLocal( TQString::fromLatin1("UTC") );
+  mCalendar = new KCal::CalendarLocal( TQString::tqfromLatin1("UTC") );
   KNotesResourceManager *manager = new KNotesResourceManager();
 
   TQObject::connect( manager, TQT_SIGNAL( sigRegisteredNote( KCal::Journal* ) ),
@@ -92,8 +92,8 @@ void KNotesSummaryWidget::updateView()
       // Fill Note Pixmap Field
       label = new TQLabel( this );
       label->setPixmap( pm );
-      label->setMaximumWidth( label->minimumSizeHint().width() );
-      label->setAlignment( AlignVCenter );
+      label->setMaximumWidth( label->tqminimumSizeHint().width() );
+      label->tqsetAlignment( AlignVCenter );
       mLayout->addWidget( label, counter, 0 );
       mLabels.append( label );
 
@@ -103,7 +103,7 @@ void KNotesSummaryWidget::updateView()
       KURLLabel *urlLabel = new KURLLabel( (*it)->uid(), newtext, this );
       urlLabel->installEventFilter( this );
       urlLabel->setTextFormat(RichText);
-      urlLabel->setAlignment( urlLabel->alignment() | Qt::WordBreak );
+      urlLabel->tqsetAlignment( urlLabel->tqalignment() | Qt::WordBreak );
       mLayout->addWidget( urlLabel, counter, 1 );
       mLabels.append( urlLabel );
 
@@ -118,7 +118,7 @@ void KNotesSummaryWidget::updateView()
 
   } else {
       TQLabel *noNotes = new TQLabel( i18n( "No Notes Available" ), this );
-      noNotes->setAlignment( AlignHCenter | AlignVCenter );
+      noNotes->tqsetAlignment( AlignHCenter | AlignVCenter );
       mLayout->addWidget( noNotes, 0, 1 );
       mLabels.append( noNotes );
   }
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp
index 2a4b6a3e..ba431eb3 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.cpp
+++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp
@@ -90,10 +90,10 @@ void KCMKOrgSummary::customDaysChanged( int value )
 
 void KCMKOrgSummary::initGUI()
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 
   mCalendarGroup = new TQButtonGroup( 0, Vertical, i18n( "Appointments" ), this );
-  TQVBoxLayout *boxLayout = new TQVBoxLayout( mCalendarGroup->layout(),
+  TQVBoxLayout *boxLayout = new TQVBoxLayout( mCalendarGroup->tqlayout(),
                                             KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "How many days should the calendar show at once?" ), mCalendarGroup );
@@ -122,15 +122,15 @@ void KCMKOrgSummary::initGUI()
 
   hbox->addStretch( 1 );
 
-  layout->addWidget( mCalendarGroup );
+  tqlayout->addWidget( mCalendarGroup );
 
   mTodoGroup = new TQButtonGroup( 2, Horizontal, i18n( "To-dos" ), this );
   new TQRadioButton( i18n( "Show all to-dos" ), mTodoGroup );
   new TQRadioButton( i18n( "Show today's to-dos only" ), mTodoGroup );
 
-  layout->addWidget( mTodoGroup );
+  tqlayout->addWidget( mTodoGroup );
 
-  layout->addStretch();
+  tqlayout->addStretch();
 }
 
 void KCMKOrgSummary::load()
diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp
index cd590ec9..d740721c 100644
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.cpp
@@ -224,8 +224,8 @@ void KOrganizerPlugin::processDropEvent( TQDropEvent *event )
 
       KTempFile tf;
       tf.setAutoDelete( true );
-      TQString uri = TQString::fromLatin1("kmail:") + TQString::number( mail.serialNumber() );
-      tf.file()->writeBlock( event->encodedData( "message/rfc822" ) );
+      TQString uri = TQString::tqfromLatin1("kmail:") + TQString::number( mail.serialNumber() );
+      tf.file()->writeBlock( event->tqencodedData( "message/rfc822" ) );
       tf.close();
       interface()->openEventEditor( i18n("Mail: %1").arg( mail.subject() ), txt,
                                     uri, tf.name(), TQStringList(), "message/rfc822" );
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index cab7788f..06a4694c 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -97,9 +97,9 @@ void SummaryWidget::updateView()
   TQPixmap pma = loader.loadIcon( "calendaranniversary", KIcon::Small );
 
   TQDate dt;
-  TQDate currentDate = TQDate::currentDate();
-  for ( dt=currentDate;
-        dt<=currentDate.addDays( days - 1 );
+  TQDate tqcurrentDate = TQDate::tqcurrentDate();
+  for ( dt=tqcurrentDate;
+        dt<=tqcurrentDate.addDays( days - 1 );
         dt=dt.addDays(1) ) {
 
     KCal::Event::List events = mCalendar->events( dt );
@@ -123,8 +123,8 @@ void SummaryWidget::updateView()
       int span=1; int dayof=1;
       if ( ev->isMultiDay() ) {
         TQDate d = ev->dtStart().date();
-        if ( d < currentDate ) {
-          d = currentDate;
+        if ( d < tqcurrentDate ) {
+          d = tqcurrentDate;
         }
         while ( d < ev->dtEnd().date() ) {
           if ( d < dt ) {
@@ -141,15 +141,15 @@ void SummaryWidget::updateView()
 
       // Fill Appointment Pixmap Field
       label = new TQLabel( this );
-      if ( ev->categories().contains( "Birthday" ) ) {
+      if ( ev->categories().tqcontains( "Birthday" ) ) {
         label->setPixmap( pmb );
-      } else if ( ev->categories().contains( "Anniversary" ) ) {
+      } else if ( ev->categories().tqcontains( "Anniversary" ) ) {
         label->setPixmap( pma );
       } else {
         label->setPixmap( pm );
       }
-      label->setMaximumWidth( label->minimumSizeHint().width() );
-      label->setAlignment( AlignVCenter );
+      label->setMaximumWidth( label->tqminimumSizeHint().width() );
+      label->tqsetAlignment( AlignVCenter );
       mLayout->addWidget( label, counter, 0 );
       mLabels.append( label );
 
@@ -159,12 +159,12 @@ void SummaryWidget::updateView()
 
       // Modify event date for printing
       TQDate sD = TQDate( dt.year(), dt.month(), dt.day() );
-      if ( ( sD.month() == currentDate.month() ) &&
-           ( sD.day()   == currentDate.day() ) ) {
+      if ( ( sD.month() == tqcurrentDate.month() ) &&
+           ( sD.day()   == tqcurrentDate.day() ) ) {
         datestr = i18n( "Today" );
         makeBold = true;
-      } else if ( ( sD.month() == currentDate.addDays( 1 ).month() ) &&
-                  ( sD.day()   == currentDate.addDays( 1 ).day() ) ) {
+      } else if ( ( sD.month() == tqcurrentDate.addDays( 1 ).month() ) &&
+                  ( sD.day()   == tqcurrentDate.addDays( 1 ).day() ) ) {
         datestr = i18n( "Tomorrow" );
       } else {
         datestr = KGlobal::locale()->formatDate( sD );
@@ -179,7 +179,7 @@ void SummaryWidget::updateView()
       }
 
       label = new TQLabel( datestr, this );
-      label->setAlignment( AlignLeft | AlignVCenter );
+      label->tqsetAlignment( AlignLeft | AlignVCenter );
       if ( makeBold ) {
         TQFont font = label->font();
         font.setBold( true );
@@ -198,7 +198,7 @@ void SummaryWidget::updateView()
       urlLabel->setText( newtext );
       urlLabel->setURL( ev->uid() );
       urlLabel->installEventFilter( this );
-      urlLabel->setAlignment( urlLabel->alignment() | Qt::WordBreak );
+      urlLabel->tqsetAlignment( urlLabel->tqalignment() | Qt::WordBreak );
       mLayout->addWidget( urlLabel, counter, 2 );
       mLabels.append( urlLabel );
 
@@ -228,7 +228,7 @@ void SummaryWidget::updateView()
                   .arg( KGlobal::locale()->formatTime( sST ) )
                   .arg( KGlobal::locale()->formatTime( sET ) );
         label = new TQLabel( datestr, this );
-        label->setAlignment( AlignLeft | AlignVCenter );
+        label->tqsetAlignment( AlignLeft | AlignVCenter );
         mLayout->addWidget( label, counter, 3 );
         mLabels.append( label );
       }
@@ -242,7 +242,7 @@ void SummaryWidget::updateView()
       i18n( "No appointments pending within the next day",
             "No appointments pending within the next %n days",
             days ), this, "nothing to see" );
-    noEvents->setAlignment( AlignHCenter | AlignVCenter );
+    noEvents->tqsetAlignment( AlignHCenter | AlignVCenter );
     mLayout->addWidget( noEvents, 0, 2 );
     mLabels.append( noEvents );
   }
diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp
index bc76205c..3b553ee0 100644
--- a/kontact/plugins/korganizer/todoplugin.cpp
+++ b/kontact/plugins/korganizer/todoplugin.cpp
@@ -217,7 +217,7 @@ void TodoPlugin::processDropEvent( TQDropEvent *event )
       tf.setAutoDelete( true );
       TQString uri = "kmail:" + TQString::number( mail.serialNumber() ) + "/" +
                     mail.messageId();
-      tf.file()->writeBlock( event->encodedData( "message/rfc822" ) );
+      tf.file()->writeBlock( event->tqencodedData( "message/rfc822" ) );
       tf.close();
       interface()->openTodoEditor( i18n("Mail: %1").arg( mail.subject() ),
                                    txt, uri, tf.name(), TQStringList(), "message/rfc822", false );
diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index 953aa42c..05e9ea55 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -94,7 +94,7 @@ void TodoSummaryWidget::updateView()
   TQLabel *label = 0;
   int counter = 0;
 
-  TQDate currentDate = TQDate::currentDate();
+  TQDate tqcurrentDate = TQDate::tqcurrentDate();
   KCal::Todo::List todos = mCalendar->todos();
   if ( todos.count() > 0 ) {
     TQPixmap pm = loader.loadIcon( "todo", KIcon::Small );
@@ -111,27 +111,27 @@ void TodoSummaryWidget::updateView()
 
       // show uncomplete todos from the last days
       if ( todo->hasDueDate() && !todo->isCompleted() &&
-           todo->dtDue().date() < currentDate ) {
+           todo->dtDue().date() < tqcurrentDate ) {
         accepted = true;
         stateText = i18n( "overdue" );
       }
 
       // show todos which started somewhere in the past and has to be finished in future
       if ( todo->hasStartDate() && todo->hasDueDate() &&
-           todo->dtStart().date() < currentDate &&
-           currentDate < todo->dtDue().date() ) {
+           todo->dtStart().date() < tqcurrentDate &&
+           tqcurrentDate < todo->dtDue().date() ) {
         accepted = true;
         stateText = i18n( "in progress" );
       }
 
       // all todos which start today
-      if ( todo->hasStartDate() && todo->dtStart().date() == currentDate ) {
+      if ( todo->hasStartDate() && todo->dtStart().date() == tqcurrentDate ) {
         accepted = true;
         stateText = i18n( "starts today" );
       }
 
       // all todos which end today
-      if ( todo->hasDueDate() && todo->dtDue().date() == currentDate ) {
+      if ( todo->hasDueDate() && todo->dtDue().date() == tqcurrentDate ) {
         accepted = true;
         stateText = i18n( "ends today" );
       }
@@ -141,13 +141,13 @@ void TodoSummaryWidget::updateView()
 
       label = new TQLabel( this );
       label->setPixmap( pm );
-      label->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
+      label->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
       mLayout->addWidget( label, counter, 0 );
       mLabels.append( label );
 
       label = new TQLabel( TQString::number( todo->percentComplete() ) + "%", this );
-      label->setAlignment( AlignHCenter | AlignVCenter );
-      label->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
+      label->tqsetAlignment( AlignHCenter | AlignVCenter );
+      label->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
       mLayout->addWidget( label, counter, 1 );
       mLabels.append( label );
 
@@ -168,14 +168,14 @@ void TodoSummaryWidget::updateView()
       connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ),
                this, TQT_SLOT( popupMenu( const TQString& ) ) );
 
-      TQString tipText( KCal::IncidenceFormatter::toolTipStr( mCalendar, todo, currentDate, true ) );
+      TQString tipText( KCal::IncidenceFormatter::toolTipStr( mCalendar, todo, tqcurrentDate, true ) );
       if ( !tipText.isEmpty() ) {
         TQToolTip::add( urlLabel, tipText );
       }
 
       label = new TQLabel( stateText, this );
-      label->setAlignment( AlignLeft | AlignVCenter );
-      label->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
+      label->tqsetAlignment( AlignLeft | AlignVCenter );
+      label->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
       mLayout->addWidget( label, counter, 3 );
       mLabels.append( label );
 
@@ -185,7 +185,7 @@ void TodoSummaryWidget::updateView()
 
   if ( counter == 0 ) {
     TQLabel *noTodos = new TQLabel( i18n( "No to-dos pending" ), this );
-    noTodos->setAlignment( AlignHCenter | AlignVCenter );
+    noTodos->tqsetAlignment( AlignHCenter | AlignVCenter );
     mLayout->addWidget( noTodos, 0, 1 );
     mLabels.append( noTodos );
   }
@@ -214,7 +214,7 @@ void TodoSummaryWidget::completeTodo( const TQString &uid )
   IncidenceChanger *changer = new IncidenceChanger( mCalendar, this );
   if ( !todo->isReadOnly() && changer->beginChange( todo, 0, TQString() ) ) {
     KCal::Todo *oldTodo = todo->clone();
-    todo->setCompleted( TQDateTime::currentDateTime() );
+    todo->setCompleted( TQDateTime::tqcurrentDateTime() );
     changer->changeIncidence( oldTodo, todo, KOGlobals::COMPLETION_MODIFIED, this );
     changer->endChange( todo, 0, TQString() );
     delete oldTodo;
diff --git a/kontact/plugins/kpilot/kpilot_plugin.cpp b/kontact/plugins/kpilot/kpilot_plugin.cpp
index 953c5f25..88e9d788 100644
--- a/kontact/plugins/kpilot/kpilot_plugin.cpp
+++ b/kontact/plugins/kpilot/kpilot_plugin.cpp
@@ -43,9 +43,9 @@ KPilotPlugin::KPilotPlugin( Kontact::Core *core, const char *name, const TQStrin
 
 }
 
-Kontact::Summary *KPilotPlugin::createSummaryWidget( TQWidget *parentWidget )
+Kontact::Summary *KPilotPlugin::createSummaryWidget( TQWidget *tqparentWidget )
 {
-  return new SummaryWidget( parentWidget );
+  return new SummaryWidget( tqparentWidget );
 }
 
 const KAboutData *KPilotPlugin::aboutData()
diff --git a/kontact/plugins/kpilot/kpilot_plugin.h b/kontact/plugins/kpilot/kpilot_plugin.h
index 5695d260..b1a08cbe 100644
--- a/kontact/plugins/kpilot/kpilot_plugin.h
+++ b/kontact/plugins/kpilot/kpilot_plugin.h
@@ -33,7 +33,7 @@ class KPilotPlugin : public Kontact::Plugin
     KPilotPlugin( Kontact::Core *core, const char *name, const TQStringList& );
     KPilotPlugin();
 
-    virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget );
+    virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparentWidget );
 
     virtual bool showInSideBar() const { return false; }
 //    virtual TQStringList configModules() const;
diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp
index 779a55c1..ba11d9b5 100644
--- a/kontact/plugins/kpilot/summarywidget.cpp
+++ b/kontact/plugins/kpilot/summarywidget.cpp
@@ -98,10 +98,10 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
   // Conduits:
   row++;
   mConduitsTextLabel = new TQLabel( i18n( "<i>Conduits:</i>" ), this );
-  mConduitsTextLabel->setAlignment( AlignAuto | AlignTop | ExpandTabs );
+  mConduitsTextLabel->tqsetAlignment( AlignAuto | AlignTop | ExpandTabs );
   mLayout->addWidget( mConduitsTextLabel, row, 0 );
   mConduitsLabel = new TQLabel( i18n( "No information available" ), this );
-  mConduitsLabel->setAlignment( mConduitsLabel->alignment() | Qt::WordBreak );
+  mConduitsLabel->tqsetAlignment( mConduitsLabel->tqalignment() | Qt::WordBreak );
   mLayout->addMultiCellWidget( mConduitsLabel, row, row, 1, 3 );
 
   // widgets shown if kpilotDaemon is not running
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index 13734a8a..0b0a98a3 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -60,22 +60,22 @@ NewsEditDialog::NewsEditDialog( const TQString& title, const TQString& url, TQWi
                  Ok, parent, 0, true, true )
 {
   TQWidget *page = plainPage();
-  TQGridLayout *layout = new TQGridLayout( page, 2, 3, marginHint(),
+  TQGridLayout *tqlayout = new TQGridLayout( page, 2, 3, marginHint(),
                                          spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Name:" ), page );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mTitle = new TQLineEdit( page );
   label->setBuddy( mTitle );
-  layout->addMultiCellWidget( mTitle, 0, 0, 1, 2 );
+  tqlayout->addMultiCellWidget( mTitle, 0, 0, 1, 2 );
 
   label = new TQLabel( i18n( "URL:" ), page );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
 
   mURL = new TQLineEdit( page );
   label->setBuddy( mURL );
-  layout->addMultiCellWidget( mURL, 1, 1, 1, 2 );
+  tqlayout->addMultiCellWidget( mURL, 1, 1, 1, 2 );
 
   mTitle->setText( title );
   mURL->setText( url );
@@ -331,16 +331,16 @@ void KCMKontactKNT::modified()
 
 void KCMKontactKNT::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   mAllNews = new KListView( this );
   mAllNews->addColumn( i18n( "All" ) );
   mAllNews->setRootIsDecorated( true );
   mAllNews->setFullWidth( true );
-  layout->addWidget( mAllNews, 0, 0 );
+  tqlayout->addWidget( mAllNews, 0, 0 );
 
-  TQVBoxLayout *vbox = new TQVBoxLayout( layout, KDialog::spacingHint() );
+  TQVBoxLayout *vbox = new TQVBoxLayout( tqlayout, KDialog::spacingHint() );
 
   vbox->addStretch();
   mAddButton = new KPushButton( i18n( "Add" ), this );
@@ -354,12 +354,12 @@ void KCMKontactKNT::initGUI()
   mSelectedNews = new KListView( this );
   mSelectedNews->addColumn( i18n( "Selected" ) );
   mSelectedNews->setFullWidth( true );
-  layout->addWidget( mSelectedNews, 0, 2 );
+  tqlayout->addWidget( mSelectedNews, 0, 2 );
 
   TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical,
                                   i18n( "News Feed Settings" ), this );
 
-  TQGridLayout *boxLayout = new TQGridLayout( box->layout(), 2, 3,
+  TQGridLayout *boxLayout = new TQGridLayout( box->tqlayout(), 2, 3,
                                             KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Refresh time:" ), box );
@@ -384,7 +384,7 @@ void KCMKontactKNT::initGUI()
   mDeleteButton->setEnabled( false );
   boxLayout->addWidget( mDeleteButton, 1, 2 );
 
-  layout->addMultiCellWidget( box, 1, 1, 0, 2 );
+  tqlayout->addMultiCellWidget( box, 1, 1, 0, 2 );
 }
 
 bool KCMKontactKNT::dcopActive() const
diff --git a/kontact/plugins/newsticker/newsfeeds.h b/kontact/plugins/newsticker/newsfeeds.h
index 66555d4f..6f8e7fa4 100644
--- a/kontact/plugins/newsticker/newsfeeds.h
+++ b/kontact/plugins/newsticker/newsfeeds.h
@@ -58,257 +58,257 @@ class NewsSourceData
 static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
   // Arts ---------------
     NewsSourceData(
-    TQString::fromLatin1("Bureau 42"),
-    TQString::fromLatin1("http://www.bureau42.com/rdf/"),
-    TQString::fromLatin1("http://www.bureau42.com/favicon.ico"),
+    TQString::tqfromLatin1("Bureau 42"),
+    TQString::tqfromLatin1("http://www.bureau42.com/rdf/"),
+    TQString::tqfromLatin1("http://www.bureau42.com/favicon.ico"),
     NewsSourceData::Arts ),
     NewsSourceData(
-    TQString::fromLatin1("eFilmCritic"),
-    TQString::fromLatin1("http://efilmcritic.com/fo.rdf"),
-    TQString::fromLatin1("http://efilmcritic.com/favicon.ico"),
+    TQString::tqfromLatin1("eFilmCritic"),
+    TQString::tqfromLatin1("http://efilmcritic.com/fo.rdf"),
+    TQString::tqfromLatin1("http://efilmcritic.com/favicon.ico"),
     NewsSourceData::Arts ),
   // Business -----------
     NewsSourceData(
-    TQString::fromLatin1("Internet.com Business"),
-    TQString::fromLatin1("http://headlines.internet.com/internetnews/bus-news/news.rss"),
+    TQString::tqfromLatin1("Internet.com Business"),
+    TQString::tqfromLatin1("http://headlines.internet.com/internetnews/bus-news/news.rss"),
     TQString::null,
     NewsSourceData::Business ),
     NewsSourceData(
-    TQString::fromLatin1("TradeSims"),
-    TQString::fromLatin1("http://www.tradesims.com/AEX.rdf"),
+    TQString::tqfromLatin1("TradeSims"),
+    TQString::tqfromLatin1("http://www.tradesims.com/AEX.rdf"),
     TQString::null,
     NewsSourceData::Business ),
   // Computers ----------
     NewsSourceData(
-    TQString::fromLatin1("KDE Deutschland"),
-    TQString::fromLatin1("http://www.kde.de/nachrichten/nachrichten.rdf"),
-    TQString::fromLatin1("http://www.kde.de/favicon.ico"),
+    TQString::tqfromLatin1("KDE Deutschland"),
+    TQString::tqfromLatin1("http://www.kde.de/nachrichten/nachrichten.rdf"),
+    TQString::tqfromLatin1("http://www.kde.de/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("KDE France"),
-    TQString::fromLatin1("http://www.kde-france.org/backend-breves.php3"),
+    TQString::tqfromLatin1("KDE France"),
+    TQString::tqfromLatin1("http://www.kde-france.org/backend-breves.php3"),
     TQString::null,
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("FreeBSD Project News"),
-    TQString::fromLatin1("http://www.freebsd.org/news/news.rdf"),
-    TQString::fromLatin1("http://www.freebsd.org/favicon.ico"),
+    TQString::tqfromLatin1("FreeBSD Project News"),
+    TQString::tqfromLatin1("http://www.freebsd.org/news/news.rdf"),
+    TQString::tqfromLatin1("http://www.freebsd.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("dot.kde.org"),
-    TQString::fromLatin1("http://www.kde.org/dotkdeorg.rdf"),
-    TQString::fromLatin1("http://www.kde.org/favicon.ico"),
+    TQString::tqfromLatin1("dot.kde.org"),
+    TQString::tqfromLatin1("http://www.kde.org/dotkdeorg.rdf"),
+    TQString::tqfromLatin1("http://www.kde.org/favicon.ico"),
     NewsSourceData::Computers ),
-    NewsSourceData( TQString::fromLatin1("KDE-Look.org"),
-                    TQString::fromLatin1("http://www.kde.org/kde-look-content.rdf"),
-                    TQString::fromLatin1("http://kde-look.org/img/favicon-1-1.ico"),
+    NewsSourceData( TQString::tqfromLatin1("KDE-Look.org"),
+                    TQString::tqfromLatin1("http://www.kde.org/kde-look-content.rdf"),
+                    TQString::tqfromLatin1("http://kde-look.org/img/favicon-1-1.ico"),
                     NewsSourceData::Computers ),
-    NewsSourceData( TQString::fromLatin1("KDE-Apps.org"),
-                    TQString::fromLatin1("http://www.kde.org/dot/kde-apps-content.rdf"),
-                    TQString::fromLatin1("http://kde-apps.org/img/favicon-1-1.ico"),
+    NewsSourceData( TQString::tqfromLatin1("KDE-Apps.org"),
+                    TQString::tqfromLatin1("http://www.kde.org/dot/kde-apps-content.rdf"),
+                    TQString::tqfromLatin1("http://kde-apps.org/img/favicon-1-1.ico"),
                     NewsSourceData::Computers ),
-    NewsSourceData( TQString::fromLatin1("DesktopLinux"),
-                    TQString::fromLatin1("http://www.desktoplinux.com/backend/index.html"),
-                    TQString::fromLatin1("http://www.desktoplinux.com/images/favicon.ico"),
+    NewsSourceData( TQString::tqfromLatin1("DesktopLinux"),
+                    TQString::tqfromLatin1("http://www.desktoplinux.com/backend/index.html"),
+                    TQString::tqfromLatin1("http://www.desktoplinux.com/images/favicon.ico"),
                     NewsSourceData::Computers ),
-    NewsSourceData( TQString::fromLatin1("DistroWatch"),
-                    TQString::fromLatin1("http://distrowatch.com/news/dw.xml"),
-                    TQString::fromLatin1("http://distrowatch.com/favicon.ico"),
+    NewsSourceData( TQString::tqfromLatin1("DistroWatch"),
+                    TQString::tqfromLatin1("http://distrowatch.com/news/dw.xml"),
+                    TQString::tqfromLatin1("http://distrowatch.com/favicon.ico"),
                     NewsSourceData::Computers ),
     /*URL changed*/
     NewsSourceData(
-    TQString::fromLatin1("GNOME News"),
-    TQString::fromLatin1("http://www.gnomedesktop.org/node/feed"),
+    TQString::tqfromLatin1("GNOME News"),
+    TQString::tqfromLatin1("http://www.gnomedesktop.org/node/feed"),
     TQString::null,
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Slashdot"),
-    TQString::fromLatin1("http://slashdot.org/slashdot.rdf"),
-    TQString::fromLatin1("http://slashdot.org/favicon.ico"),
+    TQString::tqfromLatin1("Slashdot"),
+    TQString::tqfromLatin1("http://slashdot.org/slashdot.rdf"),
+    TQString::tqfromLatin1("http://slashdot.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Ask Slashdot"),
-    TQString::fromLatin1("http://slashdot.org/askslashdot.rdf"),
-    TQString::fromLatin1("http://slashdot.org/favicon.ico"),
+    TQString::tqfromLatin1("Ask Slashdot"),
+    TQString::tqfromLatin1("http://slashdot.org/askslashdot.rdf"),
+    TQString::tqfromLatin1("http://slashdot.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Slashdot: Features"),
-    TQString::fromLatin1("http://slashdot.org/features.rdf"),
-    TQString::fromLatin1("http://slashdot.org/favicon.ico"),
+    TQString::tqfromLatin1("Slashdot: Features"),
+    TQString::tqfromLatin1("http://slashdot.org/features.rdf"),
+    TQString::tqfromLatin1("http://slashdot.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Slashdot: Apache"),
-    TQString::fromLatin1("http://slashdot.org/apache.rdf"),
-    TQString::fromLatin1("http://slashdot.org/favicon.ico"),
+    TQString::tqfromLatin1("Slashdot: Apache"),
+    TQString::tqfromLatin1("http://slashdot.org/apache.rdf"),
+    TQString::tqfromLatin1("http://slashdot.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Slashdot: Books"),
-    TQString::fromLatin1("http://slashdot.org/books.rdf"),
-    TQString::fromLatin1("http://slashdot.org/favicon.ico"),
+    TQString::tqfromLatin1("Slashdot: Books"),
+    TQString::tqfromLatin1("http://slashdot.org/books.rdf"),
+    TQString::tqfromLatin1("http://slashdot.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Jabber News"),
-    TQString::fromLatin1("http://www.jabber.org/news/rss.xml"),
+    TQString::tqfromLatin1("Jabber News"),
+    TQString::tqfromLatin1("http://www.jabber.org/news/rss.xml"),
     TQString::null,
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Freshmeat"),
-    TQString::fromLatin1("http://freshmeat.net/backend/fm.rdf"),
-    TQString::fromLatin1("http://freshmeat.net/favicon.ico"),
+    TQString::tqfromLatin1("Freshmeat"),
+    TQString::tqfromLatin1("http://freshmeat.net/backend/fm.rdf"),
+    TQString::tqfromLatin1("http://freshmeat.net/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Linux Weekly News"),
-    TQString::fromLatin1("http://www.lwn.net/headlines/rss"),
-    TQString::fromLatin1("http://www.lwn.net/favicon.ico"),
+    TQString::tqfromLatin1("Linux Weekly News"),
+    TQString::tqfromLatin1("http://www.lwn.net/headlines/rss"),
+    TQString::tqfromLatin1("http://www.lwn.net/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("heise online news"),
-    TQString::fromLatin1("http://www.heise.de/newsticker/heise.rdf"),
-    TQString::fromLatin1("http://www.heise.de/favicon.ico"),
+    TQString::tqfromLatin1("heise online news"),
+    TQString::tqfromLatin1("http://www.heise.de/newsticker/heise.rdf"),
+    TQString::tqfromLatin1("http://www.heise.de/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("RUS-CERT Ticker"),
-    TQString::fromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert.rdf"),
-    TQString::fromLatin1("http://cert.uni-stuttgart.de/favicon.ico"),
+    TQString::tqfromLatin1("RUS-CERT Ticker"),
+    TQString::tqfromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert.rdf"),
+    TQString::tqfromLatin1("http://cert.uni-stuttgart.de/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("RUS-CERT Elsewhere"),
-    TQString::fromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert-elsewhere.rdf"),
-    TQString::fromLatin1("http://cert.uni-stuttgart.de/favicon.ico"),
+    TQString::tqfromLatin1("RUS-CERT Elsewhere"),
+    TQString::tqfromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert-elsewhere.rdf"),
+    TQString::tqfromLatin1("http://cert.uni-stuttgart.de/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Kuro5hin"),
-    TQString::fromLatin1("http://kuro5hin.org/backend.rdf"),
-    TQString::fromLatin1("http://kuro5hin.org/favicon.ico"),
+    TQString::tqfromLatin1("Kuro5hin"),
+    TQString::tqfromLatin1("http://kuro5hin.org/backend.rdf"),
+    TQString::tqfromLatin1("http://kuro5hin.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Prolinux"),
-    TQString::fromLatin1("http://www.pl-forum.de/backend/pro-linux.rdf"),
-    TQString::fromLatin1("http://www.prolinux.de/favicon.ico"),
+    TQString::tqfromLatin1("Prolinux"),
+    TQString::tqfromLatin1("http://www.pl-forum.de/backend/pro-linux.rdf"),
+    TQString::tqfromLatin1("http://www.prolinux.de/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("LinuxSecurity.com"),
-    TQString::fromLatin1("http://www.linuxsecurity.com/linuxsecurity_hybrid.rdf"),
-    TQString::fromLatin1("http://www.linuxsecurity.com/favicon.ico"),
+    TQString::tqfromLatin1("LinuxSecurity.com"),
+    TQString::tqfromLatin1("http://www.linuxsecurity.com/linuxsecurity_hybrid.rdf"),
+    TQString::tqfromLatin1("http://www.linuxsecurity.com/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Linux Game Tome"),
-    TQString::fromLatin1("http://happypenguin.org/html/news.rdf"),
+    TQString::tqfromLatin1("Linux Game Tome"),
+    TQString::tqfromLatin1("http://happypenguin.org/html/news.rdf"),
     TQString::null,
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Mozilla"),
-    TQString::fromLatin1("http://www.mozilla.org/news.rdf"),
-    TQString::fromLatin1("http://www.mozillazine.org/favicon.ico"),
+    TQString::tqfromLatin1("Mozilla"),
+    TQString::tqfromLatin1("http://www.mozilla.org/news.rdf"),
+    TQString::tqfromLatin1("http://www.mozillazine.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("MozillaZine"),
-    TQString::fromLatin1("http://www.mozillazine.org/contents.rdf"),
-    TQString::fromLatin1("http://www.mozillazine.org/favicon.ico"),
+    TQString::tqfromLatin1("MozillaZine"),
+    TQString::tqfromLatin1("http://www.mozillazine.org/contents.rdf"),
+    TQString::tqfromLatin1("http://www.mozillazine.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Daemon News"),
-    TQString::fromLatin1("http://daily.daemonnews.org/ddn.rdf.php3"),
+    TQString::tqfromLatin1("Daemon News"),
+    TQString::tqfromLatin1("http://daily.daemonnews.org/ddn.rdf.php3"),
     TQString::null,
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("use Perl;"),
-    TQString::fromLatin1("http://use.perl.org/useperl.rdf"),
+    TQString::tqfromLatin1("use Perl;"),
+    TQString::tqfromLatin1("http://use.perl.org/useperl.rdf"),
     TQString::null,
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Root prompt"),
-    TQString::fromLatin1("http://www.rootprompt.org/rss/"),
-    TQString::fromLatin1("http://www.rootprompt.org/favicon.ico"),
+    TQString::tqfromLatin1("Root prompt"),
+    TQString::tqfromLatin1("http://www.rootprompt.org/rss/"),
+    TQString::tqfromLatin1("http://www.rootprompt.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("SecurityFocus"),
-    TQString::fromLatin1("http://www.securityfocus.com/topnews-rdf.html"),
-    TQString::fromLatin1("http://www.securityfocus.com/favicon.ico"),
+    TQString::tqfromLatin1("SecurityFocus"),
+    TQString::tqfromLatin1("http://www.securityfocus.com/topnews-rdf.html"),
+    TQString::tqfromLatin1("http://www.securityfocus.com/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Arstechnica"),
-    TQString::fromLatin1("http://arstechnica.com/etc/rdf/ars.rdf"),
-    TQString::fromLatin1("http://arstechnica.com/favicon.ico"),
+    TQString::tqfromLatin1("Arstechnica"),
+    TQString::tqfromLatin1("http://arstechnica.com/etc/rdf/ars.rdf"),
+    TQString::tqfromLatin1("http://arstechnica.com/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("amiga-news.de - deutschsprachige Amiga Nachrichten"),
-    TQString::fromLatin1("http://www.amiga-news.de/de/backends/news/index.rss"),
-    TQString::fromLatin1("http://www.amiga-news.de/favicon.ico"),
+    TQString::tqfromLatin1("amiga-news.de - deutschsprachige Amiga Nachrichten"),
+    TQString::tqfromLatin1("http://www.amiga-news.de/de/backends/news/index.rss"),
+    TQString::tqfromLatin1("http://www.amiga-news.de/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("amiga-news.de - english Amiga news"),
-    TQString::fromLatin1("http://www.amiga-news.de/en/backends/news/index.rss"),
-    TQString::fromLatin1("http://www.amiga-news.de/favicon.ico"),
+    TQString::tqfromLatin1("amiga-news.de - english Amiga news"),
+    TQString::tqfromLatin1("http://www.amiga-news.de/en/backends/news/index.rss"),
+    TQString::tqfromLatin1("http://www.amiga-news.de/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("FreshPorts - the place for ports"),
-    TQString::fromLatin1("http://www.freshports.org/news.php3"),
-    TQString::fromLatin1("http://www.freshports.org/favicon.ico"),
+    TQString::tqfromLatin1("FreshPorts - the place for ports"),
+    TQString::tqfromLatin1("http://www.freshports.org/news.php3"),
+    TQString::tqfromLatin1("http://www.freshports.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("zez.org - about code "),
-    TQString::fromLatin1("http://zez.org/article/rssheadlines"),
+    TQString::tqfromLatin1("zez.org - about code "),
+    TQString::tqfromLatin1("http://zez.org/article/rssheadlines"),
     TQString::null,
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("BSDatwork.com"),
-    TQString::fromLatin1("http://BSDatwork.com/backend.php"),
-    TQString::fromLatin1("http://BSDatwork.com/favicon.ico"),
+    TQString::tqfromLatin1("BSDatwork.com"),
+    TQString::tqfromLatin1("http://BSDatwork.com/backend.php"),
+    TQString::tqfromLatin1("http://BSDatwork.com/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("FreshSource - the place for source"),
-    TQString::fromLatin1("http://www.freshsource.org/news.php"),
-    TQString::fromLatin1("http://www.freshsource.org/favicon.ico"),
+    TQString::tqfromLatin1("FreshSource - the place for source"),
+    TQString::tqfromLatin1("http://www.freshsource.org/news.php"),
+    TQString::tqfromLatin1("http://www.freshsource.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("The FreeBSD Diary"),
-    TQString::fromLatin1("http://www.freebsddiary.org/news.php"),
-    TQString::fromLatin1("http://www.freebsddiary.org/favicon.ico"),
+    TQString::tqfromLatin1("The FreeBSD Diary"),
+    TQString::tqfromLatin1("http://www.freebsddiary.org/news.php"),
+    TQString::tqfromLatin1("http://www.freebsddiary.org/favicon.ico"),
     NewsSourceData::Computers ),
   // Miscellaneous ------
     NewsSourceData(
-    TQString::fromLatin1("tagesschau.de"),
-    TQString::fromLatin1("http://www.tagesschau.de/newsticker.rdf"),
-    TQString::fromLatin1("http://www.tagesschau.de/favicon.ico"),
+    TQString::tqfromLatin1("tagesschau.de"),
+    TQString::tqfromLatin1("http://www.tagesschau.de/newsticker.rdf"),
+    TQString::tqfromLatin1("http://www.tagesschau.de/favicon.ico"),
     NewsSourceData::Misc ),
     NewsSourceData(
-    TQString::fromLatin1("CNN Top Stories"),
-    TQString::fromLatin1("http://rss.cnn.com/rss/cnn_topstories.rss"),
-    TQString::fromLatin1("http://www.cnn.com/favicon.ico"),
+    TQString::tqfromLatin1("CNN Top Stories"),
+    TQString::tqfromLatin1("http://rss.cnn.com/rss/cnn_topstories.rss"),
+    TQString::tqfromLatin1("http://www.cnn.com/favicon.ico"),
     NewsSourceData::Misc ),
     /*feed URL changed*/
     NewsSourceData(
-    TQString::fromLatin1("HotWired"),
-    TQString::fromLatin1("http://www.wired.com/news/feeds/rss2/0,2610,,00.xml"),
-    TQString::fromLatin1("http://www.hotwired.com/favicon.ico"),
+    TQString::tqfromLatin1("HotWired"),
+    TQString::tqfromLatin1("http://www.wired.com/news/feeds/rss2/0,2610,,00.xml"),
+    TQString::tqfromLatin1("http://www.hotwired.com/favicon.ico"),
     NewsSourceData::Misc ),
     NewsSourceData(
-    TQString::fromLatin1("The Register"),
-    TQString::fromLatin1("http://www.theregister.co.uk/headlines.rss"),
-    TQString::fromLatin1("http://www.theregister.co.uk/favicon.ico"),
+    TQString::tqfromLatin1("The Register"),
+    TQString::tqfromLatin1("http://www.theregister.co.uk/headlines.rss"),
+    TQString::tqfromLatin1("http://www.theregister.co.uk/favicon.ico"),
     NewsSourceData::Misc ),
     NewsSourceData(
-    TQString::fromLatin1( "Christian Science Monitor" ),
-    TQString::fromLatin1( "http://www.csmonitor.com/rss/csm.rss"),
-    TQString::fromLatin1( "http://www.csmonitor.com/favicon.ico"),
+    TQString::tqfromLatin1( "Christian Science Monitor" ),
+    TQString::tqfromLatin1( "http://www.csmonitor.com/rss/csm.rss"),
+    TQString::tqfromLatin1( "http://www.csmonitor.com/favicon.ico"),
     NewsSourceData::Misc ),
   // Recreation
    // Society
     NewsSourceData(
-    TQString::fromLatin1("nippon.it"),
-    TQString::fromLatin1("http://www.nippon.it/backend.it.php"),
-    TQString::fromLatin1("http://www.nippon.it/favicon.ico"),
+    TQString::tqfromLatin1("nippon.it"),
+    TQString::tqfromLatin1("http://www.nippon.it/backend.it.php"),
+    TQString::tqfromLatin1("http://www.nippon.it/favicon.ico"),
     NewsSourceData::Society ),
     NewsSourceData(
-    TQString::fromLatin1( "gflash" ),
-    TQString::fromLatin1( "http://www.gflash.de/backend.php"),
-    TQString::fromLatin1( "http://www.gflash.de/favicon.ico"),
+    TQString::tqfromLatin1( "gflash" ),
+    TQString::tqfromLatin1( "http://www.gflash.de/backend.php"),
+    TQString::tqfromLatin1( "http://www.gflash.de/favicon.ico"),
     NewsSourceData::Society ),
     NewsSourceData(
-    TQString::fromLatin1( "Quintessenz" ),
-    TQString::fromLatin1( "http://quintessenz.at/cgi-bin/rdf"),
-    TQString::fromLatin1( "http://quintessenz.at/favicon.ico"),
+    TQString::tqfromLatin1( "Quintessenz" ),
+    TQString::tqfromLatin1( "http://quintessenz.at/cgi-bin/rdf"),
+    TQString::tqfromLatin1( "http://quintessenz.at/favicon.ico"),
     NewsSourceData::Society )
 };
 
diff --git a/kontact/plugins/newsticker/newsticker_plugin.cpp b/kontact/plugins/newsticker/newsticker_plugin.cpp
index 4afb0350..24f30a85 100644
--- a/kontact/plugins/newsticker/newsticker_plugin.cpp
+++ b/kontact/plugins/newsticker/newsticker_plugin.cpp
@@ -37,7 +37,7 @@ NewsTickerPlugin::NewsTickerPlugin( Kontact::Core *core, const char *name, const
 	setInstance( NewsTickerPluginFactory::instance() );
 }
 
-Kontact::Summary *NewsTickerPlugin::createSummaryWidget( TQWidget* parentWidget )
+Kontact::Summary *NewsTickerPlugin::createSummaryWidget( TQWidget* tqparentWidget )
 {
-  return new SummaryWidget( parentWidget );
+  return new SummaryWidget( tqparentWidget );
 }
diff --git a/kontact/plugins/newsticker/newsticker_plugin.h b/kontact/plugins/newsticker/newsticker_plugin.h
index b3c0b651..e651e7dd 100644
--- a/kontact/plugins/newsticker/newsticker_plugin.h
+++ b/kontact/plugins/newsticker/newsticker_plugin.h
@@ -31,7 +31,7 @@ class NewsTickerPlugin : public Kontact::Plugin
     NewsTickerPlugin( Kontact::Core *core, const char *name, const TQStringList& );
     NewsTickerPlugin();
 
-    virtual Kontact::Summary *createSummaryWidget( TQWidget* parentWidget );
+    virtual Kontact::Summary *createSummaryWidget( TQWidget* tqparentWidget );
 
   protected:
     virtual KParts::ReadOnlyPart* createPart() { return 0L; }
diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp
index b45f8c7b..5283d84d 100644
--- a/kontact/plugins/newsticker/summarywidget.cpp
+++ b/kontact/plugins/newsticker/summarywidget.cpp
@@ -140,8 +140,8 @@ void SummaryWidget::initDocuments()
     connectDCOPSignal( "rssservice", feedRef.obj(), "documentUpdated(DCOPRef)",
                        "documentUpdated(DCOPRef)", false );
 
-    if ( qApp )
-      qApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput |
+    if ( tqApp )
+      tqApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput |
                                     TQEventLoop::ExcludeSocketNotifiers );
   }
 
@@ -168,8 +168,8 @@ void SummaryWidget::documentUpdated( DCOPRef feedRef )
     DCOPRef artRef = feedRef.call( "article(int)", i );
     TQString title, url;
 
-    if ( qApp )
-      qApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput |
+    if ( tqApp )
+      tqApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput |
                                         TQEventLoop::ExcludeSocketNotifiers );
 
     artRef.call( "title()" ).get( title );
@@ -220,7 +220,7 @@ void SummaryWidget::updateView()
     KURLLabel *urlLabel = new KURLLabel( hbox );
     urlLabel->setURL( (*it).url );
     urlLabel->setPixmap( (*it).logo );
-    urlLabel->setMaximumSize( urlLabel->minimumSizeHint() );
+    urlLabel->setMaximumSize( urlLabel->tqminimumSizeHint() );
     mLabels.append( urlLabel );
 
     connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
@@ -231,13 +231,13 @@ void SummaryWidget::updateView()
     // header
     TQLabel *label = new TQLabel( hbox );
     label->setText( KCharsets::resolveEntities( (*it).title ) );
-    label->setAlignment( AlignLeft|AlignVCenter );
+    label->tqsetAlignment( AlignLeft|AlignVCenter );
     label->setFont( boldFont );
     label->setIndent( 6 );
-    label->setMaximumSize( label->minimumSizeHint() );
+    label->setMaximumSize( label->tqminimumSizeHint() );
     mLabels.append( label );
 
-    hbox->setMaximumWidth( hbox->minimumSizeHint().width() );
+    hbox->setMaximumWidth( hbox->tqminimumSizeHint().width() );
     hbox->show();
 
     // articles
diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp
index 32605585..183a2e12 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.cpp
+++ b/kontact/plugins/specialdates/kcmsdsummary.cpp
@@ -85,10 +85,10 @@ void KCMSDSummary::customDaysChanged( int value )
 
 void KCMSDSummary::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( this, 3, 2, KDialog::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, KDialog::spacingHint() );
 
   mDaysGroup = new TQButtonGroup( 0, Vertical, i18n( "Special Dates Summary" ), this );
-  TQVBoxLayout *boxLayout = new TQVBoxLayout( mDaysGroup->layout(),
+  TQVBoxLayout *boxLayout = new TQVBoxLayout( mDaysGroup->tqlayout(),
                                             KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "How many days should the special dates summary show at once?" ), mDaysGroup );
@@ -117,7 +117,7 @@ void KCMSDSummary::initGUI()
 
   hbox->addStretch( 1 );
 
-  layout->addMultiCellWidget( mDaysGroup, 0, 0, 0, 1 );
+  tqlayout->addMultiCellWidget( mDaysGroup, 0, 0, 0, 1 );
 
   mCalendarGroup = new TQButtonGroup( 1, Horizontal, i18n( "Special Dates From Calendar" ), this );
 
@@ -132,10 +132,10 @@ void KCMSDSummary::initGUI()
   mShowBirthdaysFromKAB = new TQCheckBox( i18n( "Show birthdays" ), mContactGroup );
   mShowAnniversariesFromKAB = new TQCheckBox( i18n( "Show anniversaries" ), mContactGroup );
 
-  layout->addWidget( mCalendarGroup, 1, 0 );
-  layout->addWidget( mContactGroup, 1, 1 );
+  tqlayout->addWidget( mCalendarGroup, 1, 0 );
+  tqlayout->addWidget( mContactGroup, 1, 1 );
 
-  layout->setRowStretch( 2, 1 );
+  tqlayout->setRowStretch( 2, 1 );
 }
 
 void KCMSDSummary::load()
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index 2967e889..bd1fa73b 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -183,8 +183,8 @@ int SDSummaryWidget::span( KCal::Event *event )
   int span=1;
   if ( event->isMultiDay() && event->doesFloat() ) {
     TQDate d = event->dtStart().date();
-    if ( d < TQDate::currentDate() ) {
-      d = TQDate::currentDate();
+    if ( d < TQDate::tqcurrentDate() ) {
+      d = TQDate::tqcurrentDate();
     }
     while ( d < event->dtEnd().date() ) {
       span++;
@@ -199,8 +199,8 @@ int SDSummaryWidget::dayof( KCal::Event *event, const TQDate& date )
 {
   int dayof=1;
   TQDate d = event->dtStart().date();
-  if ( d < TQDate::currentDate() ) {
-    d = TQDate::currentDate();
+  if ( d < TQDate::tqcurrentDate() ) {
+    d = TQDate::tqcurrentDate();
   }
   while ( d < event->dtEnd().date() ) {
     if ( d < date ) {
@@ -228,7 +228,7 @@ void SDSummaryWidget::updateView()
   // No reason to show the date year
   TQString savefmt = KGlobal::locale()->dateFormat();
   KGlobal::locale()->setDateFormat( KGlobal::locale()->
-                                    dateFormat().replace( 'Y', ' ' ) );
+                                    dateFormat().tqreplace( 'Y', ' ' ) );
 
   // Search for Birthdays and Anniversaries in the Addressbook
   KABC::AddressBook::Iterator it;
@@ -269,9 +269,9 @@ void SDSummaryWidget::updateView()
   // Search for Birthdays, Anniversaries, Holidays, and Special Occasions
   // in the Calendar
   TQDate dt;
-  TQDate currentDate = TQDate::currentDate();
-  for ( dt=currentDate;
-        dt<=currentDate.addDays( mDaysAhead - 1 );
+  TQDate tqcurrentDate = TQDate::tqcurrentDate();
+  for ( dt=tqcurrentDate;
+        dt<=tqcurrentDate.addDays( mDaysAhead - 1 );
         dt=dt.addDays(1) ) {
     KCal::Event::List events = mCalendar->events( dt,
                                                   KCal::EventSortStartDate,
@@ -358,8 +358,8 @@ void SDSummaryWidget::updateView()
   // Seach for Holidays
   if ( mShowHolidays ) {
     if ( initHolidays() ) {
-      for ( dt=currentDate;
-            dt<=currentDate.addDays( mDaysAhead - 1 );
+      for ( dt=tqcurrentDate;
+            dt<=tqcurrentDate.addDays( mDaysAhead - 1 );
             dt=dt.addDays(1) ) {
         TQValueList<KHoliday> holidays = mHolidays->getHolidays( dt );
         TQValueList<KHoliday>::ConstIterator it = holidays.begin();
@@ -429,8 +429,8 @@ void SDSummaryWidget::updateView()
       } else {
         label->setPixmap( icon_img );
       }
-      label->setMaximumWidth( label->minimumSizeHint().width() );
-      label->setAlignment( AlignVCenter );
+      label->setMaximumWidth( label->tqminimumSizeHint().width() );
+      label->tqsetAlignment( AlignVCenter );
       mLayout->addWidget( label, counter, 0 );
       mLabels.append( label );
 
@@ -438,7 +438,7 @@ void SDSummaryWidget::updateView()
       TQString datestr;
 
       //Muck with the year -- change to the year 'daysTo' days away
-      int year = currentDate.addDays( (*addrIt).daysTo ).year();
+      int year = tqcurrentDate.addDays( (*addrIt).daysTo ).year();
       TQDate sD = TQDate( year, (*addrIt).date.month(), (*addrIt).date.day() );
 
       if ( (*addrIt).daysTo == 0 ) {
@@ -457,7 +457,7 @@ void SDSummaryWidget::updateView()
       }
 
       label = new TQLabel( datestr, this );
-      label->setAlignment( AlignLeft | AlignVCenter );
+      label->tqsetAlignment( AlignLeft | AlignVCenter );
       mLayout->addWidget( label, counter, 1 );
       mLabels.append( label );
       if ( makeBold ) {
@@ -474,7 +474,7 @@ void SDSummaryWidget::updateView()
         label->setText( i18n( "in 1 day", "in %n days", (*addrIt).daysTo ) );
       }
 
-      label->setAlignment( AlignLeft | AlignVCenter );
+      label->tqsetAlignment( AlignLeft | AlignVCenter );
       mLayout->addWidget( label, counter, 2 );
       mLabels.append( label );
 
@@ -492,7 +492,7 @@ void SDSummaryWidget::updateView()
       }
       label = new TQLabel( this );
       label->setText( what );
-      label->setAlignment( AlignLeft | AlignVCenter );
+      label->tqsetAlignment( AlignLeft | AlignVCenter );
       mLayout->addWidget( label, counter, 3 );
       mLabels.append( label );
 
@@ -530,7 +530,7 @@ void SDSummaryWidget::updateView()
         } else {
           label->setText( i18n( "one year", "%n years", (*addrIt).yearsOld  ) );
         }
-        label->setAlignment( AlignLeft | AlignVCenter );
+        label->tqsetAlignment( AlignLeft | AlignVCenter );
         mLayout->addWidget( label, counter, 5 );
         mLabels.append( label );
       }
@@ -542,7 +542,7 @@ void SDSummaryWidget::updateView()
         i18n( "No special dates within the next 1 day",
               "No special dates pending within the next %n days",
               mDaysAhead ), this, "nothing to see" );
-    label->setAlignment( AlignHCenter | AlignVCenter );
+    label->tqsetAlignment( AlignHCenter | AlignVCenter );
     mLayout->addMultiCellWidget( label, 0, 0, 0, 4 );
     mLabels.append( label );
   }
@@ -556,7 +556,7 @@ void SDSummaryWidget::updateView()
 void SDSummaryWidget::mailContact( const TQString &uid )
 {
   KABC::StdAddressBook *ab = KABC::StdAddressBook::self( true );
-  TQString email = ab->findByUid( uid ).fullEmail();
+  TQString email = ab->tqfindByUid( uid ).fullEmail();
 
   kapp->invokeMailer( email, TQString::null );
 }
@@ -605,27 +605,27 @@ bool SDSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
 
 void SDSummaryWidget::dateDiff( const TQDate &date, int &days, int &years )
 {
-  TQDate currentDate;
+  TQDate tqcurrentDate;
   TQDate eventDate;
 
   if ( TQDate::leapYear( date.year() ) && date.month() == 2 && date.day() == 29 ) {
-    currentDate = TQDate( date.year(), TQDate::currentDate().month(), TQDate::currentDate().day() );
-    if ( !TQDate::leapYear( TQDate::currentDate().year() ) )
+    tqcurrentDate = TQDate( date.year(), TQDate::tqcurrentDate().month(), TQDate::tqcurrentDate().day() );
+    if ( !TQDate::leapYear( TQDate::tqcurrentDate().year() ) )
       eventDate = TQDate( date.year(), date.month(), 28 ); // celebrate one day earlier ;)
     else
       eventDate = TQDate( date.year(), date.month(), date.day() );
   } else {
-    currentDate = TQDate( 0, TQDate::currentDate().month(), TQDate::currentDate().day() );
+    tqcurrentDate = TQDate( 0, TQDate::tqcurrentDate().month(), TQDate::tqcurrentDate().day() );
     eventDate = TQDate( 0, date.month(), date.day() );
   }
 
-  int offset = currentDate.daysTo( eventDate );
+  int offset = tqcurrentDate.daysTo( eventDate );
   if ( offset < 0 ) {
     days = 365 + offset;
-    years = TQDate::currentDate().year() + 1 - date.year();
+    years = TQDate::tqcurrentDate().year() + 1 - date.year();
   } else {
     days = offset;
-    years = TQDate::currentDate().year() - date.year();
+    years = TQDate::tqcurrentDate().year() - date.year();
   }
 }
 
diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp b/kontact/plugins/specialdates/specialdates_plugin.cpp
index c8a816c2..70cfa521 100644
--- a/kontact/plugins/specialdates/specialdates_plugin.cpp
+++ b/kontact/plugins/specialdates/specialdates_plugin.cpp
@@ -49,9 +49,9 @@ SpecialdatesPlugin::~SpecialdatesPlugin()
 {
 }
 
-Kontact::Summary *SpecialdatesPlugin::createSummaryWidget( TQWidget *parentWidget )
+Kontact::Summary *SpecialdatesPlugin::createSummaryWidget( TQWidget *tqparentWidget )
 {
-  return new SDSummaryWidget( this, parentWidget );
+  return new SDSummaryWidget( this, tqparentWidget );
 }
 
 const KAboutData *SpecialdatesPlugin::aboutData()
diff --git a/kontact/plugins/specialdates/specialdates_plugin.h b/kontact/plugins/specialdates/specialdates_plugin.h
index 59fc8dbb..eb3a514f 100644
--- a/kontact/plugins/specialdates/specialdates_plugin.h
+++ b/kontact/plugins/specialdates/specialdates_plugin.h
@@ -39,7 +39,7 @@ class SpecialdatesPlugin : public Kontact::Plugin
 
     const KAboutData *aboutData();
 
-    virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget );
+    virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparentWidget );
 
   protected:
     virtual KParts::ReadOnlyPart *createPart() { return false; }
diff --git a/kontact/plugins/summary/dropwidget.cpp b/kontact/plugins/summary/dropwidget.cpp
index 341c37d8..5b603982 100644
--- a/kontact/plugins/summary/dropwidget.cpp
+++ b/kontact/plugins/summary/dropwidget.cpp
@@ -36,9 +36,9 @@ void DropWidget::dragEnterEvent( TQDragEnterEvent *event )
 
 void DropWidget::dropEvent( TQDropEvent *event )
 {
-  int alignment = ( event->pos().x() < (width() / 2) ? Qt::AlignLeft : Qt::AlignRight );
-  alignment |= ( event->pos().y() < (height() / 2) ? Qt::AlignTop : Qt::AlignBottom );
-  emit summaryWidgetDropped( this, event->source(), alignment );
+  int tqalignment = ( event->pos().x() < (width() / 2) ? Qt::AlignLeft : Qt::AlignRight );
+  tqalignment |= ( event->pos().y() < (height() / 2) ? Qt::AlignTop : Qt::AlignBottom );
+  emit summaryWidgetDropped( this, event->source(), tqalignment );
 }
 
 #include "dropwidget.moc"
diff --git a/kontact/plugins/summary/dropwidget.h b/kontact/plugins/summary/dropwidget.h
index ade7b6c1..41c892ea 100644
--- a/kontact/plugins/summary/dropwidget.h
+++ b/kontact/plugins/summary/dropwidget.h
@@ -32,7 +32,7 @@ class DropWidget : public QWidget
     DropWidget( TQWidget *parent, const char *name = 0 );
 
   signals:
-    void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int alignment );
+    void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int tqalignment );
 
   protected:
     virtual void dragEnterEvent( TQDragEnterEvent* );
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index f21a2bb3..22d27f47 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -93,15 +93,15 @@ PluginView::~PluginView()
 KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name )
   : KCModule( parent, name )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Here you can select which summary plugins to have visible in your summary view." ), this );
-  layout->addWidget( label );
+  tqlayout->addWidget( label );
 
   mPluginView = new PluginView( this );
-  layout->addWidget( mPluginView );
+  tqlayout->addWidget( mPluginView );
 
-  layout->setStretchFactor( mPluginView, 1 );
+  tqlayout->setStretchFactor( mPluginView, 1 );
 
   connect( mPluginView, TQT_SIGNAL( clicked( TQListViewItem* ) ),
            this, TQT_SLOT( itemClicked( TQListViewItem* ) ) );
@@ -119,7 +119,7 @@ KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name )
 void KCMKontactSummary::load()
 {
   KTrader::OfferList offers = KTrader::self()->query(
-      TQString::fromLatin1( "Kontact/Plugin" ),
+      TQString::tqfromLatin1( "Kontact/Plugin" ),
       TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
 
   TQStringList activeSummaries;
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index 0b22f853..e7c161ea 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -58,7 +58,7 @@
 #include "summaryview_part.h"
 
 #include "broadcaststatus.h"
-using KPIM::BroadcastStatus;
+using KPIM::BroadcasStatus;
 
 namespace Kontact
 {
@@ -80,7 +80,7 @@ SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*,
   connect( kapp, TQT_SIGNAL( kdisplayPaletteChanged() ), TQT_SLOT( slotAdjustPalette() ) );
   slotAdjustPalette();
 
-  setDate( TQDate::currentDate() );
+  setDate( TQDate::tqcurrentDate() );
   connect( mCore, TQT_SIGNAL( dayChanged( const TQDate& ) ),
            TQT_SLOT( setDate( const TQDate& ) ) );
 
@@ -137,7 +137,7 @@ void SummaryViewPart::updateWidgets()
   const KPIM::Identity &id = idm.defaultIdentity();
 
   TQString currentUser = i18n( "Summary for %1" ).arg( id.fullName() );
-  mUsernameLabel->setText( TQString::fromLatin1( "<b>%1</b>" ).arg( currentUser ) );
+  mUsernameLabel->setText( TQString::tqfromLatin1( "<b>%1</b>" ).arg( currentUser ) );
 
   mSummaries.clear();
 
@@ -177,12 +177,12 @@ void SummaryViewPart::updateWidgets()
         mSummaries.insert( plugin->identifier(), summary );
 
         connect( summary, TQT_SIGNAL( message( const TQString& ) ),
-                 BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) );
+                 BroadcasStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
         connect( summary, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
                  this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );
 
-        if ( !mLeftColumnSummaries.contains( plugin->identifier() ) &&
-             !mRightColumnSummaries.contains( plugin->identifier() ) ) {
+        if ( !mLeftColumnSummaries.tqcontains( plugin->identifier() ) &&
+             !mRightColumnSummaries.tqcontains( plugin->identifier() ) ) {
           mLeftColumnSummaries.append( plugin->identifier() );
         }
 
@@ -214,11 +214,11 @@ void SummaryViewPart::updateWidgets()
   TQFrame *vline = new TQFrame( mFrame );
   vline->setFrameStyle( TQFrame::VLine | TQFrame::Plain );
 
-  TQHBoxLayout *layout = new TQHBoxLayout( mFrame );
+  TQHBoxLayout *tqlayout = new TQHBoxLayout( mFrame );
 
-  mLeftColumn = new TQVBoxLayout( layout, KDialog::spacingHint() );
-  layout->addWidget( vline );
-  mRightColumn = new TQVBoxLayout( layout, KDialog::spacingHint()  );
+  mLeftColumn = new TQVBoxLayout( tqlayout, KDialog::spacingHint() );
+  tqlayout->addWidget( vline );
+  mRightColumn = new TQVBoxLayout( tqlayout, KDialog::spacingHint()  );
 
 
   TQStringList::Iterator strIt;
@@ -241,7 +241,7 @@ void SummaryViewPart::updateWidgets()
   mRightColumn->addStretch();
 }
 
-void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, int alignment )
+void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, int tqalignment )
 {
   if ( target == widget )
     return;
@@ -266,17 +266,17 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
   if ( target == mFrame ) {
     int pos = 0;
 
-    if ( alignment & Qt::AlignTop )
+    if ( tqalignment & Qt::AlignTop )
       pos = 0;
 
-    if ( alignment & Qt::AlignLeft ) {
-      if ( alignment & Qt::AlignBottom )
+    if ( tqalignment & Qt::AlignLeft ) {
+      if ( tqalignment & Qt::AlignBottom )
         pos = mLeftColumnSummaries.count();
 
       mLeftColumn->insertWidget( pos, widget );
       mLeftColumnSummaries.insert( mLeftColumnSummaries.at( pos ), widgetName( widget ) );
     } else {
-      if ( alignment & Qt::AlignBottom )
+      if ( tqalignment & Qt::AlignBottom )
         pos = mRightColumnSummaries.count();
 
       mRightColumn->insertWidget( pos, widget );
@@ -288,7 +288,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
 
   int targetPos = mLeftColumn->findWidget( target );
   if ( targetPos != -1 ) {
-    if ( alignment == Qt::AlignBottom )
+    if ( tqalignment == Qt::AlignBottom )
       targetPos++;
 
     mLeftColumn->insertWidget( targetPos, widget );
@@ -296,7 +296,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
   } else {
     targetPos = mRightColumn->findWidget( target );
 
-    if ( alignment == Qt::AlignBottom )
+    if ( tqalignment == Qt::AlignBottom )
       targetPos++;
 
     mRightColumn->insertWidget( targetPos, widget );
@@ -346,7 +346,7 @@ TQStringList SummaryViewPart::configModules() const
     TQStringList cm = it.data()->configModules();
     TQStringList::ConstIterator strIt;
     for ( strIt = cm.begin(); strIt != cm.end(); ++strIt )
-      if ( !(*strIt).isEmpty() && !modules.contains( *strIt ) )
+      if ( !(*strIt).isEmpty() && !modules.tqcontains( *strIt ) )
         modules.append( *strIt );
   }
 
@@ -374,7 +374,7 @@ void SummaryViewPart::initGUI( Kontact::Core *core )
   mUsernameLabel = new TQLabel( mMainWidget );
   hbl->addWidget( mUsernameLabel );
   mDateLabel = new TQLabel( mMainWidget );
-  mDateLabel->setAlignment( AlignRight );
+  mDateLabel->tqsetAlignment( AlignRight );
   hbl->addWidget( mDateLabel );
 
   TQFrame *hline = new TQFrame( mMainWidget );
diff --git a/kontact/plugins/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h
index 1e99f736..38e68b15 100644
--- a/kontact/plugins/summary/summaryview_part.h
+++ b/kontact/plugins/summary/summaryview_part.h
@@ -75,7 +75,7 @@ class SummaryViewPart : public KParts::ReadOnlyPart
   protected slots:
     void slotConfigure();
     void updateWidgets();
-    void summaryWidgetMoved( TQWidget *target, TQWidget *widget, int alignment );
+    void summaryWidgetMoved( TQWidget *target, TQWidget *widget, int tqalignment );
 
   private:
     void initGUI( Kontact::Core *core );
diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp
index c58f8f57..b921d025 100644
--- a/kontact/plugins/test/test_part.cpp
+++ b/kontact/plugins/test/test_part.cpp
@@ -41,7 +41,7 @@
 #include <kservice.h>
 
 
-TestPart::TestPart(TQObject *parent, const char *name) // ## parentWidget
+TestPart::TestPart(TQObject *parent, const char *name) // ## tqparentWidget
   : KParts::ReadOnlyPart(parent, name)
 {
   setInstance( new KInstance("testpart") ); // ## memleak
diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp
index 8c106409..abe11764 100644
--- a/kontact/plugins/weather/summarywidget.cpp
+++ b/kontact/plugins/weather/summarywidget.cpp
@@ -43,7 +43,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
     DCOPObject( "WeatherSummaryWidget" ), mProc( 0 )
 {
   mLayout = new TQVBoxLayout( this, 3, 3 );
-  mLayout->setAlignment( Qt::AlignTop );
+  mLayout->tqsetAlignment( Qt::AlignTop );
 
   TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kweather", KIcon::Desktop, KIcon::SizeMedium );
   TQWidget *header = createHeader( this, icon, i18n( "Weather Service" ) );
@@ -106,16 +106,16 @@ void SummaryWidget::updateView()
     TQImage img;
     img = (*it).icon();
 
-    TQGridLayout *layout = new TQGridLayout( mLayout, 3, 3, 3 );
-    mLayouts.append( layout );
+    TQGridLayout *tqlayout = new TQGridLayout( mLayout, 3, 3, 3 );
+    mLayouts.append( tqlayout );
 
     KURLLabel* urlLabel = new KURLLabel( this );
     urlLabel->installEventFilter( this );
     urlLabel->setURL( (*it).stationID() );
     urlLabel->setPixmap( img.smoothScale( 32, 32 ) );
-    urlLabel->setMaximumSize( urlLabel->sizeHint() );
-    urlLabel->setAlignment( AlignTop );
-    layout->addMultiCellWidget( urlLabel, 0, 1, 0, 0 );
+    urlLabel->setMaximumSize( urlLabel->tqsizeHint() );
+    urlLabel->tqsetAlignment( AlignTop );
+    tqlayout->addMultiCellWidget( urlLabel, 0, 1, 0, 0 );
     mLabels.append( urlLabel );
     connect ( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
               this, TQT_SLOT( showReport( const TQString& ) ) );
@@ -125,8 +125,8 @@ void SummaryWidget::updateView()
     TQFont font = label->font();
     font.setBold( true );
     label->setFont( font );
-    label->setAlignment( AlignLeft );
-    layout->addMultiCellWidget( label, 0, 0, 1, 2 );
+    label->tqsetAlignment( AlignLeft );
+    tqlayout->addMultiCellWidget( label, 0, 0, 1, 2 );
     mLabels.append( label );
 
     TQString labelText;
@@ -140,11 +140,11 @@ void SummaryWidget::updateView()
                          .arg( i18n( "Rel. Humidity" ) )
                          .arg( (*it).relativeHumidity() );
 
-    TQToolTip::add( label, labelText.replace( " ", "&nbsp;" ) );
+    TQToolTip::add( label, labelText.tqreplace( " ", "&nbsp;" ) );
 
     label = new TQLabel( cover, this );
-    label->setAlignment( AlignLeft );
-    layout->addMultiCellWidget( label, 1, 1, 1, 2 );
+    label->tqsetAlignment( AlignLeft );
+    tqlayout->addMultiCellWidget( label, 1, 1, 1, 2 );
     mLabels.append( label );
   }
 
diff --git a/kontact/plugins/weather/weather_plugin.cpp b/kontact/plugins/weather/weather_plugin.cpp
index a3ea74d1..d42a24f6 100644
--- a/kontact/plugins/weather/weather_plugin.cpp
+++ b/kontact/plugins/weather/weather_plugin.cpp
@@ -37,9 +37,9 @@ WeatherPlugin::WeatherPlugin( Kontact::Core *core, const char *name, const TQStr
   setInstance( WeatherPluginFactory::instance() );
 }
 
-Kontact::Summary *WeatherPlugin::createSummaryWidget( TQWidget *parentWidget )
+Kontact::Summary *WeatherPlugin::createSummaryWidget( TQWidget *tqparentWidget )
 {
-  return new SummaryWidget( parentWidget );
+  return new SummaryWidget( tqparentWidget );
 }
 
 const KAboutData *WeatherPlugin::aboutData()
diff --git a/kontact/plugins/weather/weather_plugin.h b/kontact/plugins/weather/weather_plugin.h
index 4ab01964..924eb0a3 100644
--- a/kontact/plugins/weather/weather_plugin.h
+++ b/kontact/plugins/weather/weather_plugin.h
@@ -31,7 +31,7 @@ class WeatherPlugin : public Kontact::Plugin
     WeatherPlugin( Kontact::Core *core, const char *name, const TQStringList& );
     WeatherPlugin();
 
-    virtual Kontact::Summary *createSummaryWidget( TQWidget *parentWidget );
+    virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparentWidget );
 
     const KAboutData *aboutData();
 
diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp
index 19e9d9ea..e671ddeb 100644
--- a/kontact/src/aboutdialog.cpp
+++ b/kontact/src/aboutdialog.cpp
@@ -93,10 +93,10 @@ void AboutDialog::addAboutData( const TQString &title, const TQString &icon,
       text += "<a href=\"" + home + "\">" + home + "</a><br>";
     }
 
-    text.replace( "\n", "<br>" );
+    text.tqreplace( "\n", "<br>" );
 
     KActiveLabel *label = new KActiveLabel( text, topFrame );
-    label->setAlignment( AlignTop );
+    label->tqsetAlignment( AlignTop );
     topLayout->addWidget( label );
 
 
diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp
index 4303175f..b54454e1 100644
--- a/kontact/src/iconsidepane.cpp
+++ b/kontact/src/iconsidepane.cpp
@@ -173,13 +173,13 @@ void EntryItem::paint( TQPainter *p )
 
     TQBrush brush;
     if ( isCurrent() || isSelected() || mPaintActive )
-      brush = box->colorGroup().brush( TQColorGroup::Highlight );
+      brush = box->tqcolorGroup().brush( TQColorGroup::Highlight );
     else
-      brush = box->colorGroup().highlight().light( 115 );
+      brush = box->tqcolorGroup().highlight().light( 115 );
     p->fillRect( 1, 0, w - 2, h - 1, brush );
     TQPen pen = p->pen();
     TQPen oldPen = pen;
-    pen.setColor( box->colorGroup().mid() );
+    pen.setColor( box->tqcolorGroup().mid() );
     p->setPen( pen );
 
     p->drawPoint( 1, 0 );
@@ -196,9 +196,9 @@ void EntryItem::paint( TQPainter *p )
     p->drawPixmap( x, y, mPixmap );
   }
 
-  TQColor shadowColor = listBox()->colorGroup().background().dark(115);
+  TQColor shadowColor = listBox()->tqcolorGroup().background().dark(115);
   if ( isCurrent() || isSelected() ) {
-    p->setPen( box->colorGroup().highlightedText() );
+    p->setPen( box->tqcolorGroup().highlightedText() );
   }
 
   if ( !text().isEmpty() && navigator()->showText() ) {
@@ -225,13 +225,13 @@ void EntryItem::paint( TQPainter *p )
     if ( plugin()->disabled() ) {
       p->setPen( box->palette().disabled().text( ) );
     } else if ( isCurrent() || isSelected() || mHasHover ) {
-      p->setPen( box->colorGroup().highlight().dark(115) );
+      p->setPen( box->tqcolorGroup().highlight().dark(115) );
       p->drawText( x + ( TQApplication::reverseLayout() ? -1 : 1),
           y + 1, text() );
-      p->setPen( box->colorGroup().highlightedText() );
+      p->setPen( box->tqcolorGroup().highlightedText() );
     }
     else
-      p->setPen( box->colorGroup().text() );
+      p->setPen( box->tqcolorGroup().text() );
 
     p->drawText( x, y, text() );
   }
@@ -284,7 +284,7 @@ Navigator::Navigator( IconSidePane *parent, const char *name )
 
 }
 
-TQSize Navigator::sizeHint() const
+TQSize Navigator::tqsizeHint() const
 {
   return TQSize( 100, 100 );
 }
@@ -344,7 +344,7 @@ void Navigator::updatePlugins( TQValueList<Kontact::Plugin*> plugins_ )
       minWidth = item->width( this );
   }
 
-  parentWidget()->setFixedWidth( minWidth );
+  tqparentWidget()->setFixedWidth( minWidth );
 }
 
 void Navigator::dragEnterEvent( TQDragEnterEvent *event )
@@ -491,7 +491,7 @@ void Navigator::slotShowRMBMenu( TQListBoxItem *, const TQPoint &pos )
     if (width > maxWidth)
       maxWidth = width;
   }
-  parentWidget()->setFixedWidth( maxWidth );
+  tqparentWidget()->setFixedWidth( maxWidth );
 
   triggerUpdate( true );
 }
diff --git a/kontact/src/iconsidepane.h b/kontact/src/iconsidepane.h
index 674980c0..a5aad36a 100644
--- a/kontact/src/iconsidepane.h
+++ b/kontact/src/iconsidepane.h
@@ -101,12 +101,12 @@ class EntryItemToolTip : public QToolTip
       if ( !mListBox ) return;
       TQListBoxItem* item = mListBox->itemAt( p );
       if ( !item ) return;
-      const TQRect itemRect = mListBox->itemRect( item );
-      if ( !itemRect.isValid() ) return;
+      const TQRect tqitemRect = mListBox->tqitemRect( item );
+      if ( !tqitemRect.isValid() ) return;
 
       const EntryItem *entryItem = static_cast<EntryItem*>( item );
       TQString tipStr = entryItem->text();
-      tip( itemRect, tipStr );
+      tip( tqitemRect, tipStr );
     }
   private:
     TQListBox* mListBox;
@@ -125,7 +125,7 @@ class Navigator : public KListBox
 
     void updatePlugins( TQValueList<Kontact::Plugin*> plugins );
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
     void highlightItem( EntryItem* item );
 
diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index c14669ff..2162ffa0 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@@ -114,7 +114,7 @@ PluginSelection::~PluginSelection()
 void PluginSelection::readConfig()
 {
   const KTrader::OfferList offers = KTrader::self()->query(
-      TQString::fromLatin1( "Kontact/Plugin" ),
+      TQString::tqfromLatin1( "Kontact/Plugin" ),
       TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
 
   int activeComponent = 0;
diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp
index ee098180..760ea846 100644
--- a/kontact/src/main.cpp
+++ b/kontact/src/main.cpp
@@ -76,7 +76,7 @@ static void listPlugins()
 {
   KInstance instance( "kontact" ); // Can't use KontactApp since it's too late for adding cmdline options
   KTrader::OfferList offers = KTrader::self()->query(
-    TQString::fromLatin1( "Kontact/Plugin" ),
+    TQString::tqfromLatin1( "Kontact/Plugin" ),
     TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
   for ( KService::List::Iterator it = offers.begin(); it != offers.end(); ++it ) {
     KService::Ptr service = (*it);
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index 247bb665..ab613466 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -124,7 +124,7 @@ void MainWindow::initGUI()
            TQT_SLOT( showAboutDialog() ) );
 
   KTrader::OfferList offers = KTrader::self()->query(
-      TQString::fromLatin1( "Kontact/Plugin" ),
+      TQString::tqfromLatin1( "Kontact/Plugin" ),
       TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
   mPluginInfos = KPluginInfo::fromServices( offers, Prefs::self()->config(), "Plugins" );
 
@@ -187,7 +187,7 @@ void MainWindow::initObject()
   // done initializing
   slotShowStatusMsg( TQString::null );
 
-  connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
+  connect( KPIM::BroadcasStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
            this, TQT_SLOT( slotShowStatusMsg( const TQString&  ) ) );
 
   // launch commandline specified module if any
@@ -226,7 +226,7 @@ void MainWindow::activatePluginModule()
   if ( !mActiveModule.isEmpty() ) {
     PluginList::ConstIterator end = mPlugins.end();
     for ( PluginList::ConstIterator it = mPlugins.begin(); it != end; ++it )
-      if ( ( *it )->identifier().contains( mActiveModule ) ) {
+      if ( ( *it )->identifier().tqcontains( mActiveModule ) ) {
         selectPlugin( *it );
         return;
       }
@@ -244,7 +244,7 @@ void MainWindow::initWidgets()
   mSplitter = new TQSplitter( mTopWidget );
   mBox = new TQHBox( mTopWidget );
   mSidePane = new IconSidePane( this, mSplitter );
-  mSidePane->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum,
+  mSidePane->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum,
                                          TQSizePolicy::Preferred ) );
   // donÄt occupy screen estate on load
   TQValueList<int> sizes;
@@ -278,7 +278,7 @@ void MainWindow::initWidgets()
   mLittleProgress = new KPIM::StatusbarProgressWidget( progressDialog, statusBar() );
 
   mStatusMsgLabel = new KRSqueezedTextLabel( i18n( " Initializing..." ), statusBar() );
-  mStatusMsgLabel->setAlignment( AlignLeft | AlignVCenter );
+  mStatusMsgLabel->tqsetAlignment( AlignLeft | AlignVCenter );
 
   statusBar()->addWidget( mStatusMsgLabel, 10 , false );
   statusBar()->addWidget( mLittleProgress, 0 , true );
@@ -802,15 +802,15 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
   }
 
   // store old focus widget
-  TQWidget *focusWidget = kapp->focusWidget();
-  if ( mCurrentPlugin && focusWidget ) {
+  TQWidget *tqfocusWidget = kapp->tqfocusWidget();
+  if ( mCurrentPlugin && tqfocusWidget ) {
     // save the focus widget only when it belongs to the activated part
-    TQWidget *parent = focusWidget->parentWidget();
+    TQWidget *parent = tqfocusWidget->tqparentWidget();
     while ( parent ) {
       if ( parent == mCurrentPlugin->part()->widget() )
-        mFocusWidgets.insert( mCurrentPlugin->identifier(), TQGuardedPtr<TQWidget>( focusWidget ) );
+        mFocusWidgets.insert( mCurrentPlugin->identifier(), TQGuardedPtr<TQWidget>( tqfocusWidget ) );
 
-      parent = parent->parentWidget();
+      parent = parent->tqparentWidget();
     }
   }
 
@@ -828,10 +828,10 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
     mPartsStack->raiseWidget( view );
     view->show();
 
-    if ( mFocusWidgets.contains( plugin->identifier() ) ) {
-      focusWidget = mFocusWidgets[ plugin->identifier() ];
-      if ( focusWidget )
-        focusWidget->setFocus();
+    if ( mFocusWidgets.tqcontains( plugin->identifier() ) ) {
+      tqfocusWidget = mFocusWidgets[ plugin->identifier() ];
+      if ( tqfocusWidget )
+        tqfocusWidget->setFocus();
     } else
       view->setFocus();
 
diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp
index bb8d5095..804f65e3 100644
--- a/kontact/src/profilemanager.cpp
+++ b/kontact/src/profilemanager.cpp
@@ -178,7 +178,7 @@ void Kontact::ProfileManager::writeProfileConfig( const Kontact::Profile& profil
 void Kontact::ProfileManager::readConfig()
 {
     
-    const TQStringList profilePaths = KGlobal::dirs()->findAllResources( "data", TQString::fromLatin1( "kontact/profiles/*/profile.cfg" ) );
+    const TQStringList profilePaths = KGlobal::dirs()->findAllResources( "data", TQString::tqfromLatin1( "kontact/profiles/*/profile.cfg" ) );
 
     typedef TQMap<TQString, Kontact::Profile> ProfileMap;
     ProfileMap profiles;
@@ -199,7 +199,7 @@ void Kontact::ProfileManager::readConfig()
     
     for ( ProfileMap::ConstIterator it = globalProfiles.begin(), end = globalProfiles.end(); it != end; ++it )
     {
-        if ( !profiles.contains( it.key() ) )
+        if ( !profiles.tqcontains( it.key() ) )
             profiles[it.key()] = it.data();
     }
 
@@ -252,7 +252,7 @@ void Kontact::ProfileManager::saveToProfile( const TQString& id )
 bool Kontact::ProfileManager::addProfile( const Kontact::Profile& profile, bool syncConfig )
 {
     const TQString id = profile.id();
-    if ( m_profiles.contains( id ) )
+    if ( m_profiles.tqcontains( id ) )
         return false;
     m_profiles[id] = profile;
     emit profileAdded( id );
@@ -266,7 +266,7 @@ bool Kontact::ProfileManager::addProfile( const Kontact::Profile& profile, bool
 
 void Kontact::ProfileManager::loadProfile( const TQString& id )
 {
-    if ( !m_profiles.contains( id ) )
+    if ( !m_profiles.tqcontains( id ) )
         return;
     emit profileLoaded( id );
 }
@@ -278,7 +278,7 @@ void Kontact::ProfileManager::removeProfile( const Kontact::Profile& profile )
 
 void Kontact::ProfileManager::removeProfile( const TQString& id )
 {
-    if ( !m_profiles.contains( id ) )
+    if ( !m_profiles.tqcontains( id ) )
         return;
     Kontact::Profile profile = profileById( id );
     if ( profile.isLocal() ) {
@@ -292,7 +292,7 @@ void Kontact::ProfileManager::removeProfile( const TQString& id )
 
 Kontact::ProfileManager::ExportError Kontact::ProfileManager::exportProfileToDirectory( const TQString& id, const TQString& path )
 {
-    if ( !m_profiles.contains( id ) )
+    if ( !m_profiles.tqcontains( id ) )
         return SuccessfulExport;
 
     if ( !TQDir( path ).exists() )
@@ -332,7 +332,7 @@ TQString Kontact::ProfileManager::generateNewId() const
     while ( true )
     {
         const TQString newId = KApplication::randomString( 10 );
-        if ( !m_profiles.contains( newId ) )
+        if ( !m_profiles.tqcontains( newId ) )
             return newId;
     }
 }
diff --git a/korganizer/Makefile.am b/korganizer/Makefile.am
index 6b434ab8..c89d8b60 100644
--- a/korganizer/Makefile.am
+++ b/korganizer/Makefile.am
@@ -29,7 +29,7 @@ kcm_korganizer_la_LIBADD = libkorganizer.la $(top_builddir)/libkdepim/libkdepim.
 kcm_korganizer_la_COMPILE_FIRST = koprefs_base.h 	kogroupwareprefspage.h
 
 libkorganizerpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-libkorganizerpart_la_LIBADD  = libkorganizer.la
+libkorganizerpart_la_LIBADD  = libkorganizer.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KPARTS) $(LIB_KIO) $(LIB_KHTML) $(LIB_KDEUI) -L$(top_builddir)/libkdepim/ -lkdepim -L$(top_builddir)/libkcal/ -lkcal -lkorganizer_calendar
 libkorganizerpart_la_SOURCES = korganizer_part.cpp
 libkorganizerpart_la_COMPILE_FIRST = publishdialog_base.h koprefs_base.h
 
diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp
index b9df9e86..8b938986 100644
--- a/korganizer/actionmanager.cpp
+++ b/korganizer/actionmanager.cpp
@@ -723,7 +723,7 @@ void ActionManager::file_open( const KURL &url )
   // is that URL already opened somewhere else? Activate that window
   KOrg::MainWindow *korg=ActionManager::findInstance( url );
   if ( ( 0 != korg )&&( korg != mMainWindow ) ) {
-    KWin::activateWindow( korg->topLevelWidget()->winId() );
+    KWin::activateWindow( korg->tqtopLevelWidget()->winId() );
     return;
   }
 
@@ -745,7 +745,7 @@ void ActionManager::file_icalimport()
   TQString progPath;
   KTempFile tmpfn;
 
-  TQString homeDir = TQDir::homeDirPath() + TQString::fromLatin1( "/.calendar" );
+  TQString homeDir = TQDir::homeDirPath() + TQString::tqfromLatin1( "/.calendar" );
 
   if ( !TQFile::exists( homeDir ) ) {
     KMessageBox::error( dialogParent(),
@@ -998,7 +998,7 @@ bool ActionManager::saveURL()
     if ( result != KMessageBox::Continue ) return false;
 
     TQString filename = mURL.fileName();
-    filename.replace( filename.length() - 4, 4, ".ics" );
+    filename.tqreplace( filename.length() - 4, 4, ".ics" );
     mURL.setFileName( filename );
     if ( mURL.isLocalFile() ) {
       mFile = mURL.path();
@@ -1043,9 +1043,9 @@ void ActionManager::exportHTML()
   settings.readConfig();
 
   TQDate qd1;
-  qd1 = TQDate::currentDate();
+  qd1 = TQDate::tqcurrentDate();
   TQDate qd2;
-  qd2 = TQDate::currentDate();
+  qd2 = TQDate::tqcurrentDate();
   if ( settings.monthView() )
     qd2.addMonths( 1 );
   else
@@ -1702,7 +1702,7 @@ void ActionManager::openEventEditor( const TQString & summary,
         attData = file;
       } else {
         if ( KMessageBox::warningContinueCancel( 0,
-              i18n("Removing attachments from an email might invalidate its signature."),
+              i18n("Removing attachments from an email might tqinvalidate its signature."),
               i18n("Remove Attachments"), KStdGuiItem::cont(), "BodyOnlyInlineAttachment" )
               != KMessageBox::Continue )
           return;
@@ -1916,7 +1916,7 @@ bool ActionManager::queryClose()
 
   if ( mCalendar && mCalendar->isModified() ) {
     int res = KMessageBox::questionYesNoCancel( dialogParent(),
-      i18n("The calendar contains unsaved changes. Do you want to save them before exiting?"), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard() );
+      i18n("The calendar tqcontains unsaved changes. Do you want to save them before exiting?"), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard() );
     // Exit on yes and no, don't exit on cancel. If saving fails, ask for exiting.
     if ( res == KMessageBox::Yes ) {
       close = saveModifiedURL();
@@ -2011,7 +2011,7 @@ void ActionManager::importCalendar( const KURL &url )
   }
 
   PreviewDialog *dialog;
-  dialog = new PreviewDialog( url, mMainWindow->topLevelWidget() );
+  dialog = new PreviewDialog( url, mMainWindow->tqtopLevelWidget() );
   connect( dialog, TQT_SIGNAL( dialogFinished( PreviewDialog * ) ),
            TQT_SLOT( slotPreviewDialogFinished( PreviewDialog * ) ) );
   connect( dialog, TQT_SIGNAL( openURL( const KURL &, bool ) ),
@@ -2104,10 +2104,10 @@ bool ActionManager::handleCommandLine()
     ret = false;
   } else if ( args->count() <= 0 ) {
     // No filenames given => all other args are meaningless, show main Window
-    mainWindow->topLevelWidget()->show();
+    mainWindow->tqtopLevelWidget()->show();
   } else if ( !args->isSet( "open" ) ) {
     // Import, merge, or ask => we need the resource calendar window anyway.
-    mainWindow->topLevelWidget()->show();
+    mainWindow->tqtopLevelWidget()->show();
 
     // Check for import, merge or ask
     if ( args->isSet( "import" ) ) {
@@ -2130,7 +2130,7 @@ bool ActionManager::handleCommandLine()
 
 TQWidget *ActionManager::dialogParent()
 {
-  return mCalendarView->topLevelWidget();
+  return mCalendarView->tqtopLevelWidget();
 }
 
 #include "actionmanager.moc"
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index ba1bbe6e..91b42b1e 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -137,7 +137,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name )
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
 
 #ifndef KORG_NOSPLITTER
-  // create the main layout frames.
+  // create the main tqlayout frames.
   mPanner = new TQSplitter( TQSplitter::Horizontal, this,
                            "CalendarView::Panner" );
   topLayout->addWidget( mPanner );
@@ -177,7 +177,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name )
 
   mDateNavigatorContainer = new KDateNavigator( leftFrame, true,
                                        "CalendarView::DateNavigator",
-                                       TQDate::currentDate() );
+                                       TQDate::tqcurrentDate() );
   mTodoList = new KOTodoView( CalendarNull::self(), leftFrame, "todolist" );
 
   mEventViewer = new KOEventViewer ( CalendarNull::self(), leftFrame, "EventViewer" );
@@ -185,7 +185,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name )
   TQWidget *rightBox = new TQWidget( mainBox );
   TQBoxLayout *rightLayout = new TQVBoxLayout( rightBox );
 
-  mNavigatorBar = new NavigatorBar( TQDate::currentDate(), rightBox );
+  mNavigatorBar = new NavigatorBar( TQDate::tqcurrentDate(), rightBox );
   rightLayout->addWidget( mNavigatorBar );
 
   mRightFrame = new TQWidgetStack( rightBox );
@@ -195,7 +195,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name )
 
   if ( KOPrefs::instance()->mVerticalScreen ) {
     // mTodoList->setFixedHeight( 60 );
-    mTodoList->setFixedHeight( mDateNavigatorContainer->sizeHint().height() );
+    mTodoList->setFixedHeight( mDateNavigatorContainer->tqsizeHint().height() );
   }
 #endif
 
@@ -387,7 +387,7 @@ TQDate CalendarView::activeDate( bool fallbackToToday )
 
   // When all else fails, use the navigator start date, or today.
   if ( fallbackToToday ) {
-    return TQDate::currentDate();
+    return TQDate::tqcurrentDate();
   } else {
     return mDateNavigator->selectedDates().first();
   }
@@ -547,7 +547,7 @@ void CalendarView::readSettings()
 
   TQValueList<int> sizes = config->readIntListEntry( "Separator1" );
   if ( sizes.count() != 2 ) {
-    sizes << mDateNavigatorContainer->minimumSizeHint().width();
+    sizes << mDateNavigatorContainer->tqminimumSizeHint().width();
     sizes << 300;
   }
   mPanner->setSizes( sizes );
@@ -779,14 +779,14 @@ void CalendarView::incidenceChanged( Incidence *oldIncidence,
         TQString description = i18n( "To-do completed: %1 (%2)" ).arg(
           newIncidence->summary() ).arg( timeStr );
 
-        Journal::List journals = calendar()->journals( TQDate::currentDate() );
+        Journal::List journals = calendar()->journals( TQDate::tqcurrentDate() );
         Journal *journal;
 
         if ( journals.isEmpty() ) {
           journal = new Journal();
-          journal->setDtStart( TQDateTime::currentDateTime() );
+          journal->setDtStart( TQDateTime::tqcurrentDateTime() );
 
-          TQString dateStr = KGlobal::locale()->formatDate( TQDate::currentDate() );
+          TQString dateStr = KGlobal::locale()->formatDate( TQDate::tqcurrentDate() );
           journal->setSummary( i18n("Journal of %1").arg( dateStr ) );
           journal->setDescription( description );
 
@@ -1137,7 +1137,7 @@ KOEventEditor *CalendarView::newEventEditor( ResourceCalendar *res, const TQStri
   // let the current view change the default start/end datetime
   bool allDay = allDayParam;
   TQDateTime startDt( startDtParam ), endDt( endDtParam );
-  // Adjust the start/end date times (i.e. replace invalid values by defaults,
+  // Adjust the start/end date times (i.e. tqreplace invalid values by defaults,
   // and let the view adjust the type.
   dateTimesForNewEvent( startDt, endDt, allDay );
 
@@ -1248,7 +1248,7 @@ void CalendarView::newTodo( ResourceCalendar *res, const TQString &subRes )
   todoEditor->setResource( res, subRes );
   if ( mViewManager->currentView()->isEventView() ) {
     dtDue.setDate( mDateNavigator->selectedDates().first() );
-    TQDateTime dtDummy = TQDateTime::currentDateTime();
+    TQDateTime dtDummy = TQDateTime::tqcurrentDateTime();
     mViewManager->currentView()->eventDurationHint( dtDue, dtDummy, allday );
     todoEditor->setDates( dtDue, allday );
   }
@@ -1669,7 +1669,7 @@ void CalendarView::schedule_forward( Incidence *incidence )
 
 void CalendarView::mailFreeBusy( int daysToPublish )
 {
-  TQDateTime start = TQDateTime::currentDateTime();
+  TQDateTime start = TQDateTime::tqcurrentDateTime();
   TQDateTime end = start.addDays(daysToPublish);
 
   FreeBusy *freebusy = new FreeBusy(mCalendar, start, end);
@@ -1865,7 +1865,7 @@ void CalendarView::eventUpdated(Incidence *)
 void CalendarView::adaptNavigationUnits()
 {
   if (mViewManager->currentView()->isEventView()) {
-    int days = mViewManager->currentView()->currentDateCount();
+    int days = mViewManager->currentView()->tqcurrentDateCount();
     if (days == 1) {
       emit changeNavStringPrev(i18n("&Previous Day"));
       emit changeNavStringNext(i18n("&Next Day"));
@@ -2797,7 +2797,7 @@ void CalendarView::getIncidenceHierarchy( Incidence *inc,
                                           Incidence::List &children )
 {
   // protecion against looping hierarchies
-  if ( inc && !children.contains( inc ) ) {
+  if ( inc && !children.tqcontains( inc ) ) {
     Incidence::List::ConstIterator it;
     Incidence::List immediateChildren = inc->relations();
     for ( it = immediateChildren.constBegin(); it != immediateChildren.constEnd(); ++it ) {
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 5922e8f2..6cdc3154 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -260,7 +260,7 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::
     /**
       Add an incidence to the active calendar.
       @param ical A calendar in iCalendar format containing the incidence. The
-                  calendar must consist of a VCALENDAR component which contains
+                  calendar must consist of a VCALENDAR component which tqcontains
                   the incidence (VEVENT, VTODO, VJOURNAL or VFREEBUSY) and
                   optionally a VTIMEZONE component. If there is more than one
                   incidence, only the first is added to KOrganizer's calendar.
@@ -371,7 +371,7 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::
 
 
     /**
-      Check if clipboard contains vCalendar event. The signal pasteEnabled() is
+      Check if clipboard tqcontains vCalendar event. The signal pasteEnabled() is
       emitted as result.
     */
     void checkClipboard();
diff --git a/korganizer/datechecker.cpp b/korganizer/datechecker.cpp
index c0ce30eb..0fdcb302 100644
--- a/korganizer/datechecker.cpp
+++ b/korganizer/datechecker.cpp
@@ -59,14 +59,14 @@ void DateChecker::enableRollover( RolloverType r )
                  TQT_SLOT( possiblyPastMidnight() ) );
       }
       mUpdateTimer->start( 0, true );
-      mLastDayChecked = TQDate::currentDate();
+      mLastDayChecked = TQDate::tqcurrentDate();
   }
   mUpdateRollover = r;
 }
 
 void DateChecker::passedMidnight()
 {
-  TQDate today = TQDate::currentDate();
+  TQDate today = TQDate::tqcurrentDate();
 
   if ( today.month() != mLastDayChecked.month() ) {
      if ( mUpdateRollover == FollowMonth ) {
@@ -78,9 +78,9 @@ void DateChecker::passedMidnight()
 
 void DateChecker::possiblyPastMidnight()
 {
-  if ( mLastDayChecked != TQDate::currentDate() ) {
+  if ( mLastDayChecked != TQDate::tqcurrentDate() ) {
     passedMidnight();
-    mLastDayChecked = TQDate::currentDate();
+    mLastDayChecked = TQDate::tqcurrentDate();
   }
   // Set the timer to go off 1 second after midnight
   // or after 8 minutes, whichever comes first.
diff --git a/korganizer/datenavigator.cpp b/korganizer/datenavigator.cpp
index edc036ce..e03e3c89 100644
--- a/korganizer/datenavigator.cpp
+++ b/korganizer/datenavigator.cpp
@@ -37,7 +37,7 @@ using namespace KCal;
 DateNavigator::DateNavigator( TQObject *parent, const char *name )
   : TQObject( parent, name )
 {
-  mSelectedDates.append( TQDate::currentDate() );
+  mSelectedDates.append( TQDate::tqcurrentDate() );
 }
 
 DateNavigator::~DateNavigator()
@@ -69,7 +69,7 @@ void DateNavigator::selectDate( const TQDate &date )
 
   if ( !d.isValid() ) {
     kdDebug(5850) << "DateNavigator::selectDates(TQDate): an invalid date was passed as a parameter!" << endl;
-    d = TQDate::currentDate();
+    d = TQDate::tqcurrentDate();
   }
 
   mSelectedDates.clear();
@@ -143,18 +143,18 @@ void DateNavigator::selectWorkWeek( const TQDate &d )
 
   int dayOfWeek = KOGlobals::self()->calendarSystem()->dayOfWeek( d );
 
-  TQDate currentDate = d.addDays( weekStart - dayOfWeek );
+  TQDate tqcurrentDate = d.addDays( weekStart - dayOfWeek );
 
   if ( weekStart != 1 && dayOfWeek < weekStart ) {
-    currentDate = currentDate.addDays( -7 );
+    tqcurrentDate = tqcurrentDate.addDays( -7 );
   }
 
   mSelectedDates.clear();
-  int mask = KOGlobals::self()->getWorkWeekMask();
+  int tqmask = KOGlobals::self()->getWorkWeekMask();
 
   for ( int i = 0; i < 7; ++i ) {
-    if( (1<< ((i + weekStart + 6) % 7)) & (mask) ) {
-	mSelectedDates.append( currentDate.addDays(i) );
+    if( (1<< ((i + weekStart + 6) % 7)) & (tqmask) ) {
+	mSelectedDates.append( tqcurrentDate.addDays(i) );
     }
   }
 
@@ -163,7 +163,7 @@ void DateNavigator::selectWorkWeek( const TQDate &d )
 
 void DateNavigator::selectToday()
 {
-  TQDate d = TQDate::currentDate();
+  TQDate d = TQDate::tqcurrentDate();
 
   int dateCount = mSelectedDates.count();
 
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index ac089294..e1e3223a 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -207,18 +207,18 @@ void DateNavigatorContainer::resizeEvent( TQResizeEvent * )
 #if 0
   kdDebug(5850) << "DateNavigatorContainer::resizeEvent()" << endl;
   kdDebug(5850) << "  CURRENT SIZE: " << size() << endl;
-  kdDebug(5850) << "  MINIMUM SIZEHINT: " << minimumSizeHint() << endl;
-  kdDebug(5850) << "  SIZEHINT: " << sizeHint() << endl;
-  kdDebug(5850) << "  MINIMUM SIZE: " << minimumSize() << endl;
+  kdDebug(5850) << "  MINIMUM SIZEHINT: " << tqminimumSizeHint() << endl;
+  kdDebug(5850) << "  SIZEHINT: " << tqsizeHint() << endl;
+  kdDebug(5850) << "  MINIMUM SIZE: " << tqminimumSize() << endl;
 #endif
   TQTimer::singleShot( 0, this, TQT_SLOT( resizeAllContents() ) );
 }
 
 void DateNavigatorContainer::resizeAllContents()
 {
-  TQSize minSize = mNavigatorView->minimumSizeHint();
+  TQSize minSize = mNavigatorView->tqminimumSizeHint();
 
-//  kdDebug(5850) << "  NAVIGATORVIEW minimumSizeHint: " << minSize << endl;
+//  kdDebug(5850) << "  NAVIGATORVIEW tqminimumSizeHint: " << minSize << endl;
 
   int margin = KDialog::spacingHint();
   int verticalCount = ( size().height() - margin*2 ) / minSize.height();
@@ -286,16 +286,16 @@ void DateNavigatorContainer::resizeAllContents()
   }
 }
 
-TQSize DateNavigatorContainer::minimumSizeHint() const
+TQSize DateNavigatorContainer::tqminimumSizeHint() const
 {
   int margin = KDialog::spacingHint() * 2;
-  return mNavigatorView->minimumSizeHint() + TQSize( margin, margin );
+  return mNavigatorView->tqminimumSizeHint() + TQSize( margin, margin );
 }
 
-TQSize DateNavigatorContainer::sizeHint() const
+TQSize DateNavigatorContainer::tqsizeHint() const
 {
   int margin = KDialog::spacingHint() * 2;
-  return mNavigatorView->sizeHint() + TQSize( margin, margin );
+  return mNavigatorView->tqsizeHint() + TQSize( margin, margin );
 }
 
 void DateNavigatorContainer::goNextMonth()
diff --git a/korganizer/datenavigatorcontainer.h b/korganizer/datenavigatorcontainer.h
index e30f19b4..b797427c 100644
--- a/korganizer/datenavigatorcontainer.h
+++ b/korganizer/datenavigatorcontainer.h
@@ -41,8 +41,8 @@ class DateNavigatorContainer: public QFrame
     */
     void setCalendar( Calendar * );
 
-    TQSize minimumSizeHint() const;
-    TQSize sizeHint() const;
+    TQSize tqminimumSizeHint() const;
+    TQSize tqsizeHint() const;
     void setUpdateNeeded();
   public slots:
     /**
diff --git a/korganizer/eventarchiver.cpp b/korganizer/eventarchiver.cpp
index c4adbf82..1cd613e6 100644
--- a/korganizer/eventarchiver.cpp
+++ b/korganizer/eventarchiver.cpp
@@ -52,7 +52,7 @@ void EventArchiver::runOnce( Calendar* calendar, const TQDate& limitDate, TQWidg
 
 void EventArchiver::runAuto( Calendar* calendar, TQWidget* widget, bool withGUI )
 {
-  TQDate limitDate( TQDate::currentDate() );
+  TQDate limitDate( TQDate::tqcurrentDate() );
   int expiryTime = KOPrefs::instance()->mExpiryTime;
   switch (KOPrefs::instance()->mExpiryUnit) {
   case KOPrefs::UnitDays: // Days
@@ -190,7 +190,7 @@ void EventArchiver::archiveIncidences( Calendar* calendar, const TQDate& /*limit
     uids << (*it)->uid();
   }
   for( it = allIncidences.begin(); it != allIncidences.end(); ++it ) {
-    if ( !uids.contains( (*it)->uid() ) ) {
+    if ( !uids.tqcontains( (*it)->uid() ) ) {
       archiveCalendar.deleteIncidence( *it );
     }
   }
@@ -247,7 +247,7 @@ bool EventArchiver::isSubTreeComplete( const Todo *todo, const TQDate &limitDate
   }
 
   // This QList is only to prevent infinit recursion
-  if ( checkedUids.contains( todo->uid() ) ) {
+  if ( checkedUids.tqcontains( todo->uid() ) ) {
     // Probably will never happen, calendar.cpp checks for this
     kdWarning() << "To-do hierarchy loop detected!";
     return false;
diff --git a/korganizer/filteredit_base.ui b/korganizer/filteredit_base.ui
index 9eb53dbf..86f95679 100644
--- a/korganizer/filteredit_base.ui
+++ b/korganizer/filteredit_base.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>FilterEdit_base</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -50,7 +50,7 @@
                 </property>
                 <widget class="QLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -95,7 +95,7 @@
                 </widget>
                 <widget class="QLayoutWidget" row="3" column="0">
                     <property name="name">
-                        <cstring>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -111,7 +111,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>15</width>
                                     <height>20</height>
@@ -165,7 +165,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>21</height>
@@ -220,7 +220,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>110</height>
@@ -312,7 +312,7 @@ Only to-dos which have least one attendee will be checked.  If you are not in th
 <slots>
     <slot>updateFilter()</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp
index 65f945ba..187e1082 100644
--- a/korganizer/freebusymanager.cpp
+++ b/korganizer/freebusymanager.cpp
@@ -80,7 +80,7 @@ FreeBusyDownloadJob::FreeBusyDownloadJob( const TQString &email, const KURL &url
   KIO::TransferJob *job = KIO::get( url, false, false );
   //pass the mainwindow to the job so any prompts are active
   KOrg::MainWindow *korg = ActionManager::findInstance( KURL() );
-  job->setWindow( korg->topLevelWidget() );
+  job->setWindow( korg->tqtopLevelWidget() );
 
   connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
            TQT_SLOT( slotResult( KIO::Job * ) ) );
@@ -140,7 +140,7 @@ void FreeBusyManager::setCalendar( KCal::Calendar *c )
 
 KCal::FreeBusy *FreeBusyManager::ownerFreeBusy()
 {
-  TQDateTime start = TQDateTime::currentDateTime();
+  TQDateTime start = TQDateTime::tqcurrentDateTime();
   TQDateTime end = start.addDays( KOPrefs::instance()->mFreeBusyPublishDays );
 
   FreeBusy *freebusy = new FreeBusy( mCalendar, start, end );
@@ -176,13 +176,13 @@ void FreeBusyManager::slotPerhapsUploadFB()
     // A timer is already running, so we don't need to do anything
     return;
 
-  int now = static_cast<int>( TQDateTime::currentDateTime().toTime_t() );
+  int now = static_cast<int>( TQDateTime::tqcurrentDateTime().toTime_t() );
   int eta = static_cast<int>( mNextUploadTime.toTime_t() ) - now;
 
   if( !mUploadingFreeBusy ) {
     // Not currently uploading
     if( mNextUploadTime.isNull() ||
-        TQDateTime::currentDateTime() > mNextUploadTime ) {
+        TQDateTime::tqcurrentDateTime() > mNextUploadTime ) {
       // No uploading have been done in this session, or delay time is over
       publishFreeBusy();
       return;
@@ -256,8 +256,8 @@ void FreeBusyManager::publishFreeBusy()
 //   if (emailpos != -1) {
 //     const TQString emailName = defaultEmail.left( emailpos );
 //     const TQString emailHost = defaultEmail.mid( emailpos + 1 );
-//     targetURL = targetURL.url().replace("%25u", emailName, true);
-//     targetURL = targetURL.url().replace("%25d", emailHost, true);
+//     targetURL = targetURL.url().tqreplace("%25u", emailName, true);
+//     targetURL = targetURL.url().tqreplace("%25d", emailHost, true);
 //   }
   targetURL.setUser( KOPrefs::instance()->mFreeBusyPublishUser );
   targetURL.setPass( KOPrefs::instance()->mFreeBusyPublishPassword );
@@ -271,7 +271,7 @@ void FreeBusyManager::publishFreeBusy()
   }
 
   // Save the time of the next free/busy uploading
-  mNextUploadTime = TQDateTime::currentDateTime();
+  mNextUploadTime = TQDateTime::tqcurrentDateTime();
   if( KOPrefs::instance()->mFreeBusyPublishDelay > 0 )
     mNextUploadTime = mNextUploadTime.addSecs(
         KOPrefs::instance()->mFreeBusyPublishDelay * 60 );
@@ -280,7 +280,7 @@ void FreeBusyManager::publishFreeBusy()
 
   // We need to massage the list a bit so that Outlook understands
   // it.
-  messageText = messageText.replace( TQRegExp( "ORGANIZER\\s*:MAILTO:" ),
+  messageText = messageText.tqreplace( TQRegExp( "ORGANIZER\\s*:MAILTO:" ),
                                      "ORGANIZER:" );
 
   // Create a local temp file and save the message to it
@@ -318,7 +318,7 @@ void FreeBusyManager::publishFreeBusy()
       targetURL.setPass( KOPrefs::instance()->mPublishPassword );
     } else {
       // we use something else
-      targetURL = KOPrefs::instance()->mPublishAnyURL.replace( "%SERVER%",
+      targetURL = KOPrefs::instance()->mPublishAnyURL.tqreplace( "%SERVER%",
                                                                emailHost );
       targetURL.setUser( KOPrefs::instance()->mPublishUserName );
       targetURL.setPass( KOPrefs::instance()->mPublishPassword );
@@ -337,7 +337,7 @@ void FreeBusyManager::publishFreeBusy()
                                      false /*don't show progress info*/ );
     //pass the mainwindow to the job so any prompts are active
     KOrg::MainWindow *korg = ActionManager::findInstance( KURL() );
-    job->setWindow( korg->topLevelWidget() );
+    job->setWindow( korg->tqtopLevelWidget() );
 
     connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
              TQT_SLOT( slotUploadFreeBusyResult( KIO::Job * ) ) );
@@ -438,7 +438,7 @@ void FreeBusyManager::cancelRetrieval()
   mRetrieveQueue.clear();
 }
 
-KURL replaceVariablesURL( const KURL &url, const TQString &email )
+KURL tqreplaceVariablesURL( const KURL &url, const TQString &email )
 {
   TQString emailName, emailHost;
   int emailpos = email.find( '@' );
@@ -448,9 +448,9 @@ KURL replaceVariablesURL( const KURL &url, const TQString &email )
   }
 
   TQString saveStr = url.path();
-  saveStr.replace( TQRegExp( "%[Ee][Mm][Aa][Ii][Ll]%" ), email );
-  saveStr.replace( TQRegExp( "%[Nn][Aa][Mm][Ee]%" ), emailName );
-  saveStr.replace( TQRegExp( "%[Ss][Ee][Rr][Vv][Ee][Rr]%" ), emailHost );
+  saveStr.tqreplace( TQRegExp( "%[Ee][Mm][Aa][Ii][Ll]%" ), email );
+  saveStr.tqreplace( TQRegExp( "%[Nn][Aa][Mm][Ee]%" ), emailName );
+  saveStr.tqreplace( TQRegExp( "%[Ss][Ee][Rr][Vv][Ee][Rr]%" ), emailHost );
 
   KURL retUrl( url );
   retUrl.setPath( saveStr );
@@ -468,7 +468,7 @@ bool fbExists( const KURL &url )
   TQByteArray data;
   if ( KIO::NetAccess::synchronousRun( job, 0, &data ) ) {
     TQString dataStr ( data );
-    if ( dataStr.contains( "BEGIN:VCALENDAR" ) ) {
+    if ( dataStr.tqcontains( "BEGIN:VCALENDAR" ) ) {
       return true;
     }
   }
@@ -492,11 +492,11 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email )
       cachedURL.setUser( KOPrefs::instance()->mFreeBusyRetrieveUser );
       cachedURL.setPass( KOPrefs::instance()->mFreeBusyRetrievePassword );
     }
-    return replaceVariablesURL( cachedURL, email );
+    return tqreplaceVariablesURL( cachedURL, email );
   }
 
   // Try with the url configurated by preferred email in kaddressbook
-  KABC::Addressee::List list= KABC::StdAddressBook::self( true )->findByEmail( email );
+  KABC::Addressee::List list= KABC::StdAddressBook::self( true )->tqfindByEmail( email );
   KABC::Addressee::List::Iterator it;
   TQString pref;
   for ( it = list.begin(); it != list.end(); ++it ) {
@@ -509,7 +509,7 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email )
       if ( !url.isEmpty() ) {
         kdDebug(5850) << "FreeBusyManager::freeBusyUrl():"
                       << "Taken url from preferred email:" << url << endl;
-        return replaceVariablesURL( KURL( url ), email );
+        return tqreplaceVariablesURL( KURL( url ), email );
       }
     }
   }
@@ -548,19 +548,19 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email )
     }
   }
 
-  if ( sourceURL.url().contains( TQRegExp( "\\.[xiv]fb$" ) ) ) { // user specified a fullpath
-    // do variable string replacements to the URL (MS Outlook style)
-    KURL fullpathURL = replaceVariablesURL( sourceURL, email );
+  if ( sourceURL.url().tqcontains( TQRegExp( "\\.[xiv]fb$" ) ) ) { // user specified a fullpath
+    // do variable string tqreplacements to the URL (MS Outlook style)
+    KURL fullpathURL = tqreplaceVariablesURL( sourceURL, email );
 
     // This should work with anything thrown at it, not just Kolab
     // Notice that Kolab URLs are just entered as the base address, e.g. http://server.com/mykolab/
     // This means that if the trailing slash is not entered, we can treat this as a custom, non-Kolab URL!
     // In that case, just pass it on through with substitution for %u and %d
     // TODO: May want an explicit configuration option in kogroupwareprefspage.ui for this
-    if ((fullpathURL.url().endsWith("/", true) == false) || (fullpathURL.url().contains("%25u", true)) || (fullpathURL.url().contains("%25d", true))) {
+    if ((fullpathURL.url().endsWith("/", true) == false) || (fullpathURL.url().tqcontains("%25u", true)) || (fullpathURL.url().tqcontains("%25d", true))) {
       // A generic URL, substitute %u and %d
-      fullpathURL = fullpathURL.url().replace("%25u", emailName, true);
-      fullpathURL = fullpathURL.url().replace("%25d", emailHost, true);
+      fullpathURL = fullpathURL.url().tqreplace("%25u", emailName, true);
+      fullpathURL = fullpathURL.url().tqreplace("%25d", emailHost, true);
     }
     else {
       // This is (probably) a Kolab URL!
@@ -584,7 +584,7 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email )
   for ( ext = extensions.constBegin(); ext != extensions.constEnd(); ++ext ) {
     // build a url for this extension
     sourceURL = KOPrefs::instance()->mFreeBusyRetrieveUrl;
-    KURL dirURL = replaceVariablesURL( sourceURL, email );
+    KURL dirURL = tqreplaceVariablesURL( sourceURL, email );
     if ( KOPrefs::instance()->mFreeBusyFullDomainRetrieval ) {
       dirURL.addPath( email + '.' + (*ext) );
     } else {
diff --git a/korganizer/freebusymanager.h b/korganizer/freebusymanager.h
index a6f4f6ce..4be671e4 100644
--- a/korganizer/freebusymanager.h
+++ b/korganizer/freebusymanager.h
@@ -90,7 +90,7 @@ class FreeBusyManager : public TQObject, public KCal::FreeBusyCache
     /**
       KOrganizer downloads somebody else's free/busy list
       The call is asynchronous, and upon download, the
-      receivers slot specified by member will be called.
+      tqreceivers slot specified by member will be called.
       The slot should be of type "member(const TQString&, KCal::FreeBusy*)"
 
       Return true if a download is initiated, and false otherwise
diff --git a/korganizer/incidencechanger.cpp b/korganizer/incidencechanger.cpp
index f0dcb7b1..1ffcc628 100644
--- a/korganizer/incidencechanger.cpp
+++ b/korganizer/incidencechanger.cpp
@@ -132,7 +132,7 @@ kdDebug(5850)<<"IncidenceChanger::deleteIncidence for incidence \""<<incidence->
           if ( me->status() == KCal::Attendee::Accepted || me->status() == KCal::Attendee::Delegated )
             notifyOrganizer = true;
           Attendee *newMe = new Attendee( *me );
-          newMe->setStatus( KCal::Attendee::Declined );
+          newMe->seStatus( KCal::Attendee::Declined );
           tmp->clearAttendees();
           tmp->addAttendee( newMe );
           break;
diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h
index 6d60a0a5..920559da 100644
--- a/korganizer/interfaces/korganizer/baseview.h
+++ b/korganizer/interfaces/korganizer/baseview.h
@@ -137,7 +137,7 @@ class KDE_EXPORT BaseView : public QWidget
     /**
       Return number of currently shown dates. A return value of 0 means no idea.
     */
-    virtual int currentDateCount() = 0;
+    virtual int tqcurrentDateCount() = 0;
 
     /** Return if this view is a view for displaying events. */
     virtual bool isEventView() { return false; }
diff --git a/korganizer/interfaces/korganizer/mainwindow.h b/korganizer/interfaces/korganizer/mainwindow.h
index dcda1bee..8c98dcd0 100644
--- a/korganizer/interfaces/korganizer/mainwindow.h
+++ b/korganizer/interfaces/korganizer/mainwindow.h
@@ -68,7 +68,7 @@ class MainWindow
     /**
       Return widget whcih represents this main window.
     */
-    virtual TQWidget *topLevelWidget() = 0;
+    virtual TQWidget *tqtopLevelWidget() = 0;
     /**
       Return ActionManager of this main window.
     */
diff --git a/korganizer/interfaces/korganizer/part.h b/korganizer/interfaces/korganizer/part.h
index 2ce21c13..e75e9085 100644
--- a/korganizer/interfaces/korganizer/part.h
+++ b/korganizer/interfaces/korganizer/part.h
@@ -39,7 +39,7 @@ class Part : public KParts::Part
     typedef TQPtrList<Part> List;
 
     Part( MainWindow *parent, const char *name )
-      : KParts::Part( parent?(parent->topLevelWidget()):0, name ), mMainWindow( parent ) {}
+      : KParts::Part( parent?(parent->tqtopLevelWidget()):0, name ), mMainWindow( parent ) {}
 
     virtual ~Part() {}
 
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index c107d618..459b25d4 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -74,7 +74,7 @@ JournalDateEntry::JournalDateEntry( Calendar *calendar, TQWidget *parent ) :
 
   mTitle = new JournalTitleLable( this );
   mTitle->setMargin(2);
-  mTitle->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
+  mTitle->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
   connect( mTitle, TQT_SIGNAL( linkClicked( const TQString & ) ),
            this, TQT_SLOT( emitNewJournal() ) );
 }
@@ -213,7 +213,7 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) :
   mDeleteButton = new TQToolButton( this, "deleteButton" );
   TQPixmap pix = KOGlobals::self()->smallIcon( "editdelete" );
   mDeleteButton->setPixmap( pix );
-  mDeleteButton->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+  mDeleteButton->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   TQToolTip::add( mDeleteButton, i18n("Delete this journal entry") );
   TQWhatsThis::add( mDeleteButton, i18n("Delete this journal entry") );
   mLayout->addWidget( mDeleteButton, 0, 4 );
@@ -221,7 +221,7 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) :
 
   mEditButton = new TQToolButton( this, "editButton" );
   mEditButton->setPixmap( KOGlobals::self()->smallIcon( "edit" ) );
-  mEditButton->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+  mEditButton->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   TQToolTip::add( mEditButton, i18n("Edit this journal entry") );
   TQWhatsThis::add( mEditButton, i18n("Opens an editor dialog for this journal entry") );
   mLayout->addWidget( mEditButton, 0, 5 );
@@ -230,7 +230,7 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) :
 #ifndef KORG_NOPRINTER
   mPrintButton = new TQToolButton( this, "printButton" );
   mPrintButton->setPixmap( KOGlobals::self()->smallIcon( "printer1" ) );
-  mPrintButton->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+  mPrintButton->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   TQToolTip::add( mPrintButton, i18n("Print this journal entry") );
   TQWhatsThis::add( mPrintButton, i18n("Opens the print dialog for this journal entry") );
   mLayout->addWidget( mPrintButton, 0, 6 );
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index 6fe79459..b56c6015 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -67,7 +67,7 @@ KDateNavigator::KDateNavigator( TQWidget *parent, const char *name )
   for( i = 0; i < 7; i++ ) {
     mHeadings[i] = new TQLabel( this );
     mHeadings[i]->setFont( TQFont( generalFont, 10, TQFont::Bold ) );
-    mHeadings[i]->setAlignment( AlignCenter );
+    mHeadings[i]->tqsetAlignment( AlignCenter );
 
     topLayout->addWidget( mHeadings[i], 1, i + 1 );
   }
@@ -75,7 +75,7 @@ KDateNavigator::KDateNavigator( TQWidget *parent, const char *name )
   // Create the weeknumber labels
   for( i = 0; i < 6; i++ ) {
     mWeeknos[i] = new TQLabel( this );
-    mWeeknos[i]->setAlignment( AlignCenter );
+    mWeeknos[i]->tqsetAlignment( AlignCenter );
     mWeeknos[i]->setFont( TQFont( generalFont, 10 ) );
     mWeeknos[i]->installEventFilter( this );
 
@@ -121,8 +121,8 @@ void KDateNavigator::setBaseDate( const TQDate &date )
     dates.append( date );
     mNavigatorBar->selectDates( dates );
 
-    repaint();
-    mDayMatrix->repaint();
+    tqrepaint();
+    mDayMatrix->tqrepaint();
   }
 }
 
@@ -135,7 +135,7 @@ TQSizePolicy KDateNavigator::sizePolicy () const
 void KDateNavigator::updateToday()
 {
   mDayMatrix->recalculateToday();
-  mDayMatrix->repaint();
+  mDayMatrix->tqrepaint();
 }
 
 TQDate KDateNavigator::startDate() const
@@ -195,14 +195,14 @@ void KDateNavigator::updateDates()
     mWeeknos[i]->setText( weeknum );
   }
 
-// each updateDates is followed by an updateView -> repaint is issued there !
-//  mDayMatrix->repaint();
+// each updateDates is followed by an updateView -> tqrepaint is issued there !
+//  mDayMatrix->tqrepaint();
 }
 
 void KDateNavigator::updateDayMatrix()
 {
   mDayMatrix->updateView();
-  mDayMatrix->repaint();
+  mDayMatrix->tqrepaint();
 }
 
 void KDateNavigator::setUpdateNeeded()
@@ -228,7 +228,7 @@ void KDateNavigator::updateView()
 //   kdDebug(5850) << "KDateNavigator::updateView(), view " << this << endl;
 
   updateDayMatrix();
-  repaint();
+  tqrepaint();
 }
 
 void KDateNavigator::updateConfig()
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index bc456a78..a0aaddbc 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -73,7 +73,7 @@ MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name )
   minutes->start(0, true);
 
   mTimeBox = new TQLabel(this);
-  mTimeBox->setAlignment(Qt::AlignRight | Qt::AlignBottom);
+  mTimeBox->tqsetAlignment(Qt::AlignRight | Qt::AlignBottom);
   TQPalette pal = mTimeBox->palette();
   pal.setColor(TQColorGroup::Foreground, Qt::red);
   mTimeBox->setPalette(pal);
@@ -92,13 +92,13 @@ MarcusBains::~MarcusBains()
 
 int MarcusBains::todayColumn()
 {
-  TQDate currentDate = TQDate::currentDate();
+  TQDate tqcurrentDate = TQDate::tqcurrentDate();
 
   DateList dateList = agenda->dateList();
   DateList::ConstIterator it;
   int col = 0;
   for(it = dateList.begin(); it != dateList.end(); ++it) {
-    if((*it) == currentDate)
+    if((*it) == tqcurrentDate)
       return KOGlobals::self()->reverseLayout() ?
              agenda->columns() - 1 - col : col;
     ++col;
@@ -296,7 +296,7 @@ void KOAgenda::init()
   setMinimumSize( 30, int( mGridSpacingY + 1 ) );
 //  setMaximumHeight(mGridSpacingY * mRows + 5);
 
-  // Disable horizontal scrollbar. This is a hack. The geometry should be
+  // Disable horizontal scrollbar. This is a hack. The tqgeometry should be
   // controlled in a way that the contents horizontally always fits. Then it is
   // not necessary to turn off the scrollbar.
   setHScrollBarMode( AlwaysOff );
@@ -1276,7 +1276,7 @@ void KOAgenda::placeAgendaItem( KOAgendaItem *item, double subCellWidth )
 //  kdDebug(5850) << "KOAgenda::placeAgendaItem(): " << item->incidence()->summary()
 //            << " subCellWidth: " << subCellWidth << endl;
 
-  // "left" upper corner, no subcells yet, RTL layouts have right/left switched, widths are negative then
+  // "left" upper corner, no subcells yet, RTL tqlayouts have right/left switched, widths are negative then
   TQPoint pt = gridToContents( TQPoint( item->cellXLeft(), item->cellYTop() ) );
   // right lower corner
   TQPoint pt1 = gridToContents( TQPoint( item->cellXLeft() + item->cellWidth(),
@@ -1300,11 +1300,11 @@ void KOAgenda::placeAgendaItem( KOAgendaItem *item, double subCellWidth )
     xpos = pt.x() + int( subCellPos );
     ypos = pt.y();
   }
-  if ( KOGlobals::self()->reverseLayout() ) { // RTL language/layout
+  if ( KOGlobals::self()->reverseLayout() ) { // RTL language/tqlayout
     xpos += width;
     width = -width;
   }
-  if ( height<0 ) { // BTT (bottom-to-top) layout ?!?
+  if ( height<0 ) { // BTT (bottom-to-top) tqlayout ?!?
     ypos += height;
     height = -height;
   }
@@ -1393,7 +1393,7 @@ void KOAgenda::drawContents(TQPainter* p, int cx, int cy, int cw, int ch)
     if ( pt2.x() >= pt1.x() /*&& pt2.y() >= pt1.y()*/) {
       int gxStart = contentsToGrid( pt1 ).x();
       int gxEnd = contentsToGrid( pt2 ).x();
-      // correct start/end for rtl layouts
+      // correct start/end for rtl tqlayouts
       if ( gxStart > gxEnd ) {
         int tmp = gxStart;
         gxStart = gxEnd;
@@ -1419,7 +1419,7 @@ void KOAgenda::drawContents(TQPainter* p, int cx, int cy, int cw, int ch)
             }
           }
         } else {
-          // last entry in holiday mask denotes the previous day not visible (needed for overnight shifts)
+          // last entry in holiday tqmask denotes the previous day not visible (needed for overnight shifts)
           if ( gxStart < int(mHolidayMask->count()-1) && !mHolidayMask->at(gxStart)) {
             dbp.fillRect( xStart, pt1.y(), xWidth, pt2.y() - pt1.y() + 1,
                           KOPrefs::instance()->mWorkingHoursColor );
@@ -1769,7 +1769,7 @@ void KOAgenda::showAgendaItem( KOAgendaItem *agendaItem )
 
   agendaItem->hide();
   addChild( agendaItem );
-  if ( !mItems.containsRef( agendaItem ) ) {
+  if ( !mItems.tqcontainsRef( agendaItem ) ) {
     mItems.append( agendaItem );
   }
   placeSubCells( agendaItem );
@@ -2038,9 +2038,9 @@ void KOAgenda::setDateList(const DateList &selectedDates)
     marcus_bains();
 }
 
-void KOAgenda::setHolidayMask(TQMemArray<bool> *mask)
+void KOAgenda::setHolidayMask(TQMemArray<bool> *tqmask)
 {
-  mHolidayMask = mask;
+  mHolidayMask = tqmask;
 
 }
 
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index de1f4ef8..21eea0e1 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -737,16 +737,16 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev )
   if ( !mIncidence )return;
 
   TQRect visRect = visibleRect();
-  // when scrolling horizontally in the side-by-side view, the repainted area is clipped
+  // when scrolling horizontally in the side-by-side view, the tqrepainted area is clipped
   // to the newly visible area, which is a problem since the content changes when visRect
-  // changes, so repaint the full item in that case
+  // changes, so tqrepaint the full item in that case
   if ( ev->rect() != visRect && visRect.isValid() && ev->rect().isValid() ) {
-    repaint( visRect );
+    tqrepaint( visRect );
     return;
   }
 
   TQPainter p( this );
-  const int ft = 2; // frame thickness for layout, see paintFrame()
+  const int ft = 2; // frame thickness for tqlayout, see paintFrame()
   const int margin = 1 + ft; // frame + space between frame and content
 
   // General idea is to always show the icons (even in the all-day events).
@@ -769,7 +769,7 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev )
     if ( static_cast<Todo*>(mIncidence)->isOverdue() )
       bgColor = KOPrefs::instance()->todoOverdueColor();
     else if ( static_cast<Todo*>(mIncidence)->dtDue().date() ==
-              TQDateTime::currentDateTime().date() )
+              TQDateTime::tqcurrentDateTime().date() )
       bgColor = KOPrefs::instance()->todoDueTodayColor();
   }
 
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index c60546f7..8cc7c561 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -137,7 +137,7 @@ KOAlternateLabel::KOAlternateLabel(const TQString &shortlabel, const TQString &l
   : TQLabel(parent, name), mTextTypeFixed(false), mShortText(shortlabel),
     mLongText(longlabel), mExtensiveText(extensivelabel)
 {
-  setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+  tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
   if (mExtensiveText.isEmpty()) mExtensiveText = mLongText;
   squeezeTextToLabel();
 }
@@ -235,9 +235,9 @@ void KOAlternateLabel::resizeEvent( TQResizeEvent * )
   squeezeTextToLabel();
 }
 
-TQSize KOAlternateLabel::minimumSizeHint() const
+TQSize KOAlternateLabel::tqminimumSizeHint() const
 {
-  TQSize sh = TQLabel::minimumSizeHint();
+  TQSize sh = TQLabel::tqminimumSizeHint();
   sh.setWidth(-1);
   return sh;
 }
@@ -258,7 +258,7 @@ KOAgendaView::KOAgendaView( Calendar *cal,
   mPendingChanges( true ),
   mAreDatesInitialized( false )
 {
-  mSelectedDates.append(TQDate::currentDate());
+  mSelectedDates.append(TQDate::tqcurrentDate());
 
   mLayoutDayLabels = 0;
   mDayLabelsFrame = 0;
@@ -313,12 +313,12 @@ KOAgendaView::KOAgendaView( Calendar *cal,
   if ( KOPrefs::instance()->compactDialogs() ) {
     mExpandButton = new TQPushButton(mDummyAllDayLeft);
     mExpandButton->setPixmap( mNotExpandedPixmap );
-    mExpandButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed,
+    mExpandButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed,
                                   TQSizePolicy::Fixed ) );
     connect( mExpandButton, TQT_SIGNAL( clicked() ), TQT_SIGNAL( toggleExpand() ) );
   } else {
     TQLabel *label = new TQLabel( i18n("All Day"), mDummyAllDayLeft );
-    label->setAlignment( Qt::AlignRight | Qt::AlignVCenter | Qt::WordBreak );
+    label->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter | Qt::WordBreak );
   }
 
   mAllDayAgenda = new KOAgenda( 1, calendarView, mAllDayFrame );
@@ -476,7 +476,7 @@ void KOAgendaView::zoomInVertically( )
 
   mTimeLabels->updateConfig();
   mTimeLabels->positionChanged();
-  mTimeLabels->repaint();
+  mTimeLabels->tqrepaint();
 
   updateView();
 }
@@ -493,7 +493,7 @@ void KOAgendaView::zoomOutVertically( )
 
     mTimeLabels->updateConfig();
     mTimeLabels->positionChanged();
-    mTimeLabels->repaint();
+    mTimeLabels->tqrepaint();
 
     updateView();
   }
@@ -635,8 +635,8 @@ void KOAgendaView::createDayLabels( bool force )
                                                       longstr, veryLongStr, mDayLabels);
     dayLabel->useShortText(); // will be recalculated in updateDayLabelSizes() anyway
     dayLabel->setMinimumWidth(1);
-    dayLabel->setAlignment(TQLabel::AlignHCenter);
-    if (date == TQDate::currentDate()) {
+    dayLabel->tqsetAlignment(TQLabel::AlignHCenter);
+    if (date == TQDate::tqcurrentDate()) {
       TQFont font = dayLabel->font();
       font.setBold(true);
       dayLabel->setFont(font);
@@ -651,7 +651,7 @@ void KOAgendaView::createDayLabels( bool force )
       // use a KOAlternateLabel so when the text doesn't fit any more a tooltip is used
       KOAlternateLabel*label = new KOAlternateLabel( (*textit), (*textit), TQString::null, mDayLabels );
       label->setMinimumWidth(1);
-      label->setAlignment(AlignCenter);
+      label->tqsetAlignment(AlignCenter);
       dayLayout->addWidget(label);
     }
 
@@ -664,7 +664,7 @@ void KOAgendaView::createDayLabels( bool force )
         // use a KOAlternateLabel so when the text doesn't fit any more a tooltip is used
         KOAlternateLabel*label = new KOAlternateLabel( text, text, TQString::null, mDayLabels );
         label->setMinimumWidth(1);
-        label->setAlignment(AlignCenter);
+        label->tqsetAlignment(AlignCenter);
         dayLayout->addWidget(label);
       }
     }
@@ -696,7 +696,7 @@ int KOAgendaView::maxDatesHint()
   return 0;
 }
 
-int KOAgendaView::currentDateCount()
+int KOAgendaView::tqcurrentDateCount()
 {
   return mSelectedDates.count();
 }
@@ -793,7 +793,7 @@ void KOAgendaView::updateConfig()
   mTimeLabels->positionChanged();
 
   // for some reason, this needs to be called explicitly
-  mTimeLabels->repaint();
+  mTimeLabels->tqrepaint();
 
   updateTimeBarWidth();
 
@@ -1343,7 +1343,7 @@ void KOAgendaView::changeIncidenceDisplay( Incidence *incidence, int mode )
   }
 
   // HACK: Update the view if the all-day agenda has been modified.
-  // Do this because there are some layout problems in the
+  // Do this because there are some tqlayout problems in the
   // all-day agenda that are not easily solved, but clearing
   // and redrawing works ok.
   if ( incidence->doesFloat() ) {
@@ -1420,7 +1420,7 @@ void KOAgendaView::fillAgenda()
 
 void KOAgendaView::displayIncidence( Incidence *incidence )
 {
-  TQDate today = TQDate::currentDate();
+  TQDate today = TQDate::tqcurrentDate();
   DateTimeList::iterator t;
 
   // FIXME: use a visitor here
@@ -1523,7 +1523,7 @@ void KOAgendaView::clearView()
 
 CalPrinterBase::PrintType KOAgendaView::printType()
 {
-  if ( currentDateCount() == 1 ) return CalPrinterBase::Day;
+  if ( tqcurrentDateCount() == 1 ) return CalPrinterBase::Day;
   else return CalPrinterBase::Week;
 }
 
@@ -1639,7 +1639,7 @@ void KOAgendaView::setHolidayMasks()
   }
 
   // Store the information about the day before the visible area (needed for
-  // overnight working hours) in the last bit of the mask:
+  // overnight working hours) in the last bit of the tqmask:
   bool showDay = !KOGlobals::self()->isWorkDay( mSelectedDates[ 0 ].addDays( -1 ) );
   mHolidayMask[ mSelectedDates.count() ] = showDay;
 
@@ -1754,8 +1754,8 @@ bool KOAgendaView::filterByResource( Incidence *incidence )
     if ( resourceCalendar()->subresourceType( subRes ) == "todo" ) {
       TQString calmatch = "/.INBOX.directory/Calendar";
       TQString i18nmatch = "/.INBOX.directory/" + i18n( "Calendar" );
-      if ( subResourceCalendar().contains( calmatch ) ||
-           subResourceCalendar().contains( i18nmatch ) ) {
+      if ( subResourceCalendar().tqcontains( calmatch ) ||
+           subResourceCalendar().tqcontains( i18nmatch ) ) {
         return true;
       }
     }
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index a31581a0..c44c2508 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -80,7 +80,7 @@ class KOAlternateLabel : public QLabel
                       TQWidget *parent = 0, const char *name = 0 );
     ~KOAlternateLabel();
 
-    virtual TQSize minimumSizeHint() const;
+    virtual TQSize tqminimumSizeHint() const;
 
     enum TextType { Short = 0, Long = 1, Extensive = 2 };
     TextType largestFittingTextType() const;
@@ -118,7 +118,7 @@ class KOAgendaView : public KOrg::AgendaView, public KCal::Calendar::Observer
     virtual int maxDatesHint();
 
     /** Returns number of currently shown dates. */
-    virtual int currentDateCount();
+    virtual int tqcurrentDateCount();
 
     /** returns the currently selected events */
     virtual Incidence::List selectedIncidences();
@@ -218,7 +218,7 @@ class KOAgendaView : public KOrg::AgendaView, public KCal::Calendar::Observer
     void createDayLabels( bool force );
 
     /**
-      Set the masks on the agenda widgets indicating, which days are holidays.
+      Set the tqmasks on the agenda widgets indicating, which days are holidays.
     */
     void setHolidayMasks();
 
diff --git a/korganizer/koapp.cpp b/korganizer/koapp.cpp
index 3fa1f28d..ff533841 100644
--- a/korganizer/koapp.cpp
+++ b/korganizer/koapp.cpp
@@ -132,7 +132,7 @@ void KOrganizerApp::processCalendar( const KURL &url )
     bool hasDocument = !url.isEmpty();
     korg = new KOrganizer( "KOrganizer MainWindow" );
     korg->init( hasDocument );
-    korg->topLevelWidget()->show();
+    korg->tqtopLevelWidget()->show();
 
     kdDebug(5850) << "KOrganizerApp::processCalendar(): '" << url.url()
                   << "'" << endl;
@@ -145,12 +145,12 @@ void KOrganizerApp::processCalendar( const KURL &url )
       korg->view()->updateView();
     }
   } else {
-    korg->topLevelWidget()->show();
+    korg->tqtopLevelWidget()->show();
   }
 
   // Handle window activation
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
-  KStartupInfo::setNewStartupId( korg->topLevelWidget(), startupId() );
+  KStartupInfo::setNewStartupId( korg->tqtopLevelWidget(), startupId() );
 #endif
 }
 
diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp
index 8766a333..548e6acb 100644
--- a/korganizer/koattendeeeditor.cpp
+++ b/korganizer/koattendeeeditor.cpp
@@ -61,10 +61,10 @@ KOAttendeeEditor::KOAttendeeEditor( TQWidget * parent, const char *name ) :
 {
 }
 
-void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * layout)
+void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * tqlayout)
 {
   mOrganizerHBox = new TQHBox( parent );
-  layout->addWidget( mOrganizerHBox );
+  tqlayout->addWidget( mOrganizerHBox );
   // If creating a new event, then the user is the organizer -> show the
   // identity combo
   // readEvent will delete it and set another label text instead, if the user
@@ -91,10 +91,10 @@ void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * lay
   mOrganizerHBox->setStretchFactor( mOrganizerCombo, 100 );
 }
 
-void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout)
+void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * tqlayout)
 {
   TQGridLayout *topLayout = new TQGridLayout();
-  layout->addLayout( topLayout );
+  tqlayout->addLayout( topLayout );
 
   TQString whatsThis = i18n("Edits the name of the attendee selected in the list "
                            "above, or adds a new attendee if there are no attendees"
@@ -430,7 +430,7 @@ void KOAttendeeEditor::updateAttendee()
   a->setUid( mUid );
   a->setEmail( email );
   a->setRole( Attendee::Role( mRoleCombo->currentItem() ) );
-  a->setStatus( Attendee::PartStat( mStatusCombo->currentItem() ) );
+  a->seStatus( Attendee::PartStat( mStatusCombo->currentItem() ) );
   a->setRSVP( mRsvpButton->isChecked() );
 
   updateCurrentItem();
diff --git a/korganizer/koattendeeeditor.h b/korganizer/koattendeeeditor.h
index e75d994e..42728a97 100644
--- a/korganizer/koattendeeeditor.h
+++ b/korganizer/koattendeeeditor.h
@@ -67,8 +67,8 @@ class KOAttendeeEditor : public QWidget
     void updateAttendeeSummary( int count );
 
   protected:
-    void initOrganizerWidgets( TQWidget *parent, TQBoxLayout *layout );
-    void initEditWidgets( TQWidget *parent, TQBoxLayout *layout );
+    void initOrganizerWidgets( TQWidget *parent, TQBoxLayout *tqlayout );
+    void initEditWidgets( TQWidget *parent, TQBoxLayout *tqlayout );
 
     /** Reads values from a KABC::Addressee and inserts a new Attendee
      * item into the listview with those items. Used when adding attendees
diff --git a/korganizer/kocore.cpp b/korganizer/kocore.cpp
index b9d404e7..d4829559 100644
--- a/korganizer/kocore.cpp
+++ b/korganizer/kocore.cpp
@@ -236,7 +236,7 @@ void KOCore::removeXMLGUIClient( TQWidget *wdg )
 
 KXMLGUIClient* KOCore::xmlguiClient( TQWidget *wdg ) const
 {
-  TQWidget *topLevel = wdg->topLevelWidget();
+  TQWidget *topLevel = wdg->tqtopLevelWidget();
   TQMap<TQWidget*, KXMLGUIClient*>::ConstIterator it = mXMLGUIClients.find( topLevel );
   if ( it != mXMLGUIClients.end() )
     return it.data();
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 065e44e7..93fb8740 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -214,9 +214,9 @@ void KODayMatrix::recalculateToday()
     mDayLabels[ i ] = TQString::number( KOGlobals::self()->calendarSystem()->day( mDays[i] ));
 
     // if today is in the currently displayed month, hilight today
-    if ( mDays[ i ].year() == TQDate::currentDate().year() &&
-         mDays[ i ].month() == TQDate::currentDate().month() &&
-         mDays[ i ].day() == TQDate::currentDate().day() ) {
+    if ( mDays[ i ].year() == TQDate::tqcurrentDate().year() &&
+         mDays[ i ].month() == TQDate::tqcurrentDate().month() &&
+         mDays[ i ].day() == TQDate::tqcurrentDate().day() ) {
       mToday = i;
     }
   }
@@ -386,15 +386,15 @@ void KODayMatrix::mouseReleaseEvent( TQMouseEvent *e )
     mSelEnd = mSelInit;
     if (tmp != mSelStart) {
       mSelStart = tmp;
-      repaint();
+      tqrepaint();
     }
   } else {
     mSelStart = mSelInit;
 
-    //repaint only if selection has changed
+    //tqrepaint only if selection has changed
     if (tmp != mSelEnd) {
       mSelEnd = tmp;
-      repaint();
+      tqrepaint();
     }
   }
 
@@ -415,15 +415,15 @@ void KODayMatrix::mouseMoveEvent( TQMouseEvent *e )
     mSelEnd = mSelInit;
     if ( tmp != mSelStart ) {
       mSelStart = tmp;
-      repaint();
+      tqrepaint();
     }
   } else {
     mSelStart = mSelInit;
 
-    //repaint only if selection has changed
+    //tqrepaint only if selection has changed
     if ( tmp != mSelEnd ) {
       mSelEnd = tmp;
-      repaint();
+      tqrepaint();
     }
   }
 }
diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h
index b8354f79..3752d52f 100644
--- a/korganizer/kodaymatrix.h
+++ b/korganizer/kodaymatrix.h
@@ -91,7 +91,7 @@ class DynamicTip : public QToolTip
  *  o no support for Ctrl+click to create groups of dates
  *    (This has not really been supported in the predecessor. It was not very intuitive nor was it
  *     user friendly.)
- *    This feature has been replaced with dragging a selection on the matrix. The matrix will
+ *    This feature has been tqreplaced with dragging a selection on the matrix. The matrix will
  *    automatically choose the appropriate selection (e.g. you are not any longer able to select
  *    two distinct groups of date selections as in the old class)
  *  o now that you can select more then a week it can happen that not all selected days are
@@ -131,7 +131,7 @@ class KODayMatrix: public TQFrame, public KCal::Calendar::Observer
 
     /** updates the day matrix to start with the given date. Does all the necessary
      *  checks for holidays or events on a day and stores them for display later on.
-     *  Does NOT update the view visually. Call repaint() for this.
+     *  Does NOT update the view visually. Call tqrepaint() for this.
      *
      *  @param actdate recalculates the day matrix to show NUMDAYS starting from this
      *                 date.
@@ -161,7 +161,7 @@ class KODayMatrix: public TQFrame, public KCal::Calendar::Observer
 
     /** sets the actual to be displayed selection in the day matrix starting from
      *  start and ending with end. Theview must be manually updated by calling
-     *  repaint. (?)
+     *  tqrepaint. (?)
      */
     void setSelectedDaysFrom( const TQDate &start, const TQDate &end );
 
@@ -312,7 +312,7 @@ class KODayMatrix: public TQFrame, public KCal::Calendar::Observer
     int       mTodayMarginWidth;
 
     /** stores actual size of each day in the widget so that I don't need to ask this data
-     *  on every repaint.
+     *  on every tqrepaint.
      */
     TQRect     mDaySize;
 
diff --git a/korganizer/koeditoralarms_base.ui b/korganizer/koeditoralarms_base.ui
index 1da10440..d7ccd665 100644
--- a/korganizer/koeditoralarms_base.ui
+++ b/korganizer/koeditoralarms_base.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KOEditorAlarms_base</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -35,7 +35,7 @@
                 </property>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -109,7 +109,7 @@
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -298,7 +298,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>21</width>
                                     <height>41</height>
@@ -400,7 +400,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>61</height>
@@ -468,7 +468,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>16</height>
@@ -530,7 +530,7 @@
         </widget>
         <widget class="QLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -570,7 +570,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>60</height>
@@ -662,7 +662,7 @@
 <includes>
     <include location="global" impldecl="in declaration">addresseelineedit.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp
index 99d775e6..19a75a99 100644
--- a/korganizer/koeditorattachments.cpp
+++ b/korganizer/koeditorattachments.cpp
@@ -151,7 +151,7 @@ class AttachmentListItem : public KIconViewItem
         if ( mAttachment->isUri() ) {
           mimeType = KMimeType::findByURL( mAttachment->uri() );
         } else {
-          mimeType = KMimeType::findByContent( mAttachment->decodedData() );
+          mimeType = KMimeType::tqfindByContent( mAttachment->decodedData() );
         }
         mAttachment->setMimeType( mimeType->name() );
       }
@@ -232,7 +232,7 @@ AttachmentEditDialog::AttachmentEditDialog( AttachmentListItem *item,
   } else {
     uint size = item->attachment()->size();
     grid->addWidget( new TQLabel( i18n( "Size:" ), topFrame ), 4, 0 );
-    grid->addWidget( new TQLabel( TQString::fromLatin1( "%1 (%2)" ).
+    grid->addWidget( new TQLabel( TQString::tqfromLatin1( "%1 (%2)" ).
                                  arg( KIO::convertSize( size ) ).
                                  arg( KGlobal::locale()->formatNumber(
                                         size, 0 ) ), topFrame ), 4, 2 );
@@ -330,7 +330,7 @@ AttachmentIconView::AttachmentIconView( KOEditorAttachments* parent )
 
 KURL AttachmentIconView::tempFileForAttachment( KCal::Attachment *attachment )
 {
-  if ( mTempFiles.contains( attachment ) ) {
+  if ( mTempFiles.tqcontains( attachment ) ) {
     return mTempFiles[attachment];
   }
   TQStringList patterns = KMimeType::mimeType( attachment->mimeType() )->patterns();
@@ -625,7 +625,7 @@ void KOEditorAttachments::handlePasteOrDrop( TQMimeSource* source )
         addUriAttachment( (*it).url(), TQString::null, label, true );
       }
     } else { // we take anything
-      addDataAttachment( source->encodedData( source->format() ),
+      addDataAttachment( source->tqencodedData( source->format() ),
                          source->format(),
                          KMimeType::mimeType( source->format() )->name() );
     }
@@ -833,7 +833,7 @@ void KOEditorAttachments::addDataAttachment( const TQByteArray &data,
   item->setData( data );
   item->setLabel( nlabel );
   if ( mimeType.isEmpty() ) {
-    item->setMimeType( KMimeType::findByContent( data )->name() );
+    item->setMimeType( KMimeType::tqfindByContent( data )->name() );
   } else {
     item->setMimeType( mimeType );
   }
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index a882363d..ee57a3d4 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -407,7 +407,7 @@ void KOEditorDetails::changeStatusForMe(Attendee::PartStat status)
     AttendeeListItem *item = static_cast<AttendeeListItem*>( it.current() );
     for ( TQStringList::ConstIterator it2( myEmails.begin() ), end( myEmails.end() ); it2 != end; ++it2 ) {
       if ( item->data()->email() == *it2 ) {
-        item->data()->setStatus( status );
+        item->data()->seStatus( status );
         item->updateItem();
       }
     }
diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp
index c56ff033..af8b0f5c 100644
--- a/korganizer/koeditorfreebusy.cpp
+++ b/korganizer/koeditorfreebusy.cpp
@@ -202,7 +202,7 @@ void FreeBusyItem::setFreeBusyPeriods( FreeBusy* fb )
       // No free/busy information
       //debug only start
       //   int ii ;
-      //       TQDateTime cur = TQDateTime::currentDateTime();
+      //       TQDateTime cur = TQDateTime::tqcurrentDateTime();
       //       for( ii = 0; ii < 10 ;++ii ) {
       //           KDGanttViewTaskItem* newSubItem = new KDGanttViewTaskItem( this );
       //           cur = cur.addSecs( 7200 );
@@ -310,16 +310,16 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent,
   mGanttView->setShowHeaderPopupMenu( false, false, false, false, false, false );
   // Initially, show 15 days back and forth
   // set start to even hours, i.e. to 12:AM 0 Min 0 Sec
-  TQDateTime horizonStart = TQDateTime( TQDateTime::currentDateTime()
+  TQDateTime horizonStart = TQDateTime( TQDateTime::tqcurrentDateTime()
                            .addDays( -15 ).date() );
-  TQDateTime horizonEnd = TQDateTime::currentDateTime().addDays( 15 );
+  TQDateTime horizonEnd = TQDateTime::tqcurrentDateTime().addDays( 15 );
   mGanttView->setHorizonStart( horizonStart );
   mGanttView->setHorizonEnd( horizonEnd );
   mGanttView->setCalendarMode( true );
   //mGanttView->setDisplaySubitemsAsGroup( true );
   mGanttView->setShowLegendButton( false );
   // Initially, center to current date
-  mGanttView->centerTimelineAfterShow( TQDateTime::currentDateTime() );
+  mGanttView->centerTimelineAfterShow( TQDateTime::tqcurrentDateTime() );
   if ( KGlobal::locale()->use12Clock() )
     mGanttView->setHourFormat( KDGanttView::Hour_12 );
   else
@@ -580,10 +580,10 @@ bool KOEditorFreeBusy::findFreeSlot( TQDateTime &dtFrom, TQDateTime &dtTo )
 
   // Make sure that we never suggest a date in the past, even if the
   // user originally scheduled the meeting to be in the past.
-  if( tryFrom < TQDateTime::currentDateTime() ) {
+  if( tryFrom < TQDateTime::tqcurrentDateTime() ) {
     // The slot to look for is at least partially in the past.
     int secs = tryFrom.secsTo( tryTo );
-    tryFrom = TQDateTime::currentDateTime();
+    tryFrom = TQDateTime::tqcurrentDateTime();
     tryTo = tryFrom.addSecs( secs );
   }
 
@@ -852,8 +852,8 @@ void KOEditorFreeBusy::clearSelection() const
   KDGanttViewItem *item = mGanttView->selectedItem();
   if ( item )
     mGanttView->setSelected( item, false );
-  mGanttView->repaint();
-  item->repaint();
+  mGanttView->tqrepaint();
+  item->tqrepaint();
 }
 
 void KOEditorFreeBusy::setSelected( int index )
@@ -890,7 +890,7 @@ void KOEditorFreeBusy::changeStatusForMe(KCal::Attendee::PartStat status)
   {
     for ( TQStringList::ConstIterator it2( myEmails.begin() ), end( myEmails.end() ); it2 != end; ++it2 ) {
       if ( item->attendee()->email() == *it2 ) {
-        item->attendee()->setStatus( status );
+        item->attendee()->seStatus( status );
         item->updateItem();
       }
     }
@@ -912,7 +912,7 @@ void KOEditorFreeBusy::showAttendeeStatusMenu()
   popup.setItemChecked( currentAttendee()->status(), true );
   int status = popup.exec( TQCursor::pos() );
   if ( status >= 0 ) {
-    currentAttendee()->setStatus( (Attendee::PartStat)status );
+    currentAttendee()->seStatus( (Attendee::PartStat)status );
     updateCurrentItem();
     updateAttendeeInput();
   }
diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp
index 0411c2f8..3466e412 100644
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@@ -104,36 +104,36 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout)
 
   TQFrame *timeBoxFrame = new TQFrame(timeGroupBox);
 
-  TQGridLayout *layoutTimeBox = new TQGridLayout( timeBoxFrame );
-  layoutTimeBox->setSpacing(topLayout->spacing());
-  layoutTimeBox->setColStretch( 3, 1 );
+  TQGridLayout *tqlayoutTimeBox = new TQGridLayout( timeBoxFrame );
+  tqlayoutTimeBox->setSpacing(topLayout->spacing());
+  tqlayoutTimeBox->setColStretch( 3, 1 );
 
   mStartDateLabel = new TQLabel(i18n("&Start:"),timeBoxFrame);
-  layoutTimeBox->addWidget(mStartDateLabel,0,0);
+  tqlayoutTimeBox->addWidget(mStartDateLabel,0,0);
 
   mStartDateEdit = new KDateEdit(timeBoxFrame);
-  layoutTimeBox->addWidget(mStartDateEdit,0,1);
+  tqlayoutTimeBox->addWidget(mStartDateEdit,0,1);
   mStartDateLabel->setBuddy( mStartDateEdit );
 
   mStartTimeEdit = new KTimeEdit(timeBoxFrame);
-  layoutTimeBox->addWidget(mStartTimeEdit,0,2);
+  tqlayoutTimeBox->addWidget(mStartTimeEdit,0,2);
 
   mEndDateLabel = new TQLabel(i18n("&End:"),timeBoxFrame);
-  layoutTimeBox->addWidget(mEndDateLabel,1,0);
+  tqlayoutTimeBox->addWidget(mEndDateLabel,1,0);
 
   mEndDateEdit = new KDateEdit(timeBoxFrame);
-  layoutTimeBox->addWidget(mEndDateEdit,1,1);
+  tqlayoutTimeBox->addWidget(mEndDateEdit,1,1);
   mEndDateLabel->setBuddy( mEndDateEdit );
 
   mEndTimeEdit = new KTimeEdit(timeBoxFrame);
-  layoutTimeBox->addWidget(mEndTimeEdit,1,2);
+  tqlayoutTimeBox->addWidget(mEndTimeEdit,1,2);
 
   mAlldayEventCheckbox = new TQCheckBox(i18n("All-&day"),timeBoxFrame);
-  layoutTimeBox->addWidget( mAlldayEventCheckbox, 0, 3 );
+  tqlayoutTimeBox->addWidget( mAlldayEventCheckbox, 0, 3 );
   connect(mAlldayEventCheckbox, TQT_SIGNAL(toggled(bool)),TQT_SLOT(associateTime(bool)));
 
   mDurationLabel = new TQLabel( timeBoxFrame );
-  layoutTimeBox->addWidget( mDurationLabel, 1, 3 );
+  tqlayoutTimeBox->addWidget( mDurationLabel, 1, 3 );
 
   // time widgets are checked if they contain a valid time
   connect(mStartTimeEdit, TQT_SIGNAL(timeChanged(TQTime)),
@@ -148,9 +148,9 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout)
           this, TQT_SLOT(endDateChanged(const TQDate&)));
 
   TQLabel *label = new TQLabel( i18n( "Recurrence:" ), timeBoxFrame );
-  layoutTimeBox->addWidget( label, 2, 0 );
+  tqlayoutTimeBox->addWidget( label, 2, 0 );
   TQBoxLayout *recLayout = new TQHBoxLayout();
-  layoutTimeBox->addMultiCellLayout( recLayout, 2, 2, 1, 4 );
+  tqlayoutTimeBox->addMultiCellLayout( recLayout, 2, 2, 1, 4 );
   mRecEditButton = new TQPushButton( timeBoxFrame );
   mRecEditButton->setIconSet( KOGlobals::self()->smallIconSet( "recur", 16 ) );
   recLayout->addWidget( mRecEditButton );
@@ -160,18 +160,18 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout)
   recLayout->addStretch( 1 );
 
   label = new TQLabel( i18n("Reminder:"), timeBoxFrame );
-  layoutTimeBox->addWidget( label, 3, 0 );
+  tqlayoutTimeBox->addWidget( label, 3, 0 );
   TQBoxLayout *alarmLineLayout = new TQHBoxLayout();
-  layoutTimeBox->addMultiCellLayout( alarmLineLayout, 3, 3, 1, 4 );
+  tqlayoutTimeBox->addMultiCellLayout( alarmLineLayout, 3, 3, 1, 4 );
   initAlarm( timeBoxFrame, alarmLineLayout );
   alarmLineLayout->addStretch( 1 );
 
   TQBoxLayout *secLayout = new TQHBoxLayout();
-  layoutTimeBox->addLayout( secLayout, 0, 4 );
+  tqlayoutTimeBox->addLayout( secLayout, 0, 4 );
   initSecrecy( timeBoxFrame, secLayout );
 
   TQBoxLayout *classLayout = new TQHBoxLayout();
-  layoutTimeBox->addLayout( classLayout, 1, 4 );
+  tqlayoutTimeBox->addLayout( classLayout, 1, 4 );
   initClass( timeBoxFrame, classLayout );
 }
 
@@ -193,15 +193,15 @@ void KOEditorGeneralEvent::initClass(TQWidget *parent,TQBoxLayout *topLayout)
   freeTimeLabel->setBuddy( mFreeTimeCombo );
 }
 
-void KOEditorGeneralEvent::initInvitationBar(TQWidget * parent, TQBoxLayout * layout)
+void KOEditorGeneralEvent::initInvitationBar(TQWidget * parent, TQBoxLayout * tqlayout)
 {
-  TQBoxLayout *topLayout = new TQHBoxLayout( layout );
+  TQBoxLayout *topLayout = new TQHBoxLayout( tqlayout );
   mInvitationBar = new TQFrame( parent );
   mInvitationBar->setPaletteBackgroundColor( KGlobalSettings::alternateBackgroundColor() );
   topLayout->addWidget( mInvitationBar );
 
   TQBoxLayout *barLayout = new TQHBoxLayout( mInvitationBar );
-  barLayout->setSpacing( layout->spacing() );
+  barLayout->setSpacing( tqlayout->spacing() );
   TQLabel *label = new TQLabel( i18n("You have not yet definitely responded to this invitation." ), mInvitationBar );
   barLayout->addWidget( label );
   barLayout->addStretch( 1 );
@@ -508,14 +508,14 @@ bool KOEditorGeneralEvent::validateInput()
   if (!mStartDateEdit->date().isValid()) {
     KMessageBox::sorry( 0,
         i18n("Please specify a valid start date, for example '%1'.")
-        .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) );
+        .arg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ) );
     return false;
   }
 
   if (!mEndDateEdit->date().isValid()) {
     KMessageBox::sorry( 0,
         i18n("Please specify a valid end date, for example '%1'.")
-        .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) );
+        .arg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ) );
     return false;
   }
 
diff --git a/korganizer/koeditorgeneralevent.h b/korganizer/koeditorgeneralevent.h
index 57ffba8d..7e7916d6 100644
--- a/korganizer/koeditorgeneralevent.h
+++ b/korganizer/koeditorgeneralevent.h
@@ -48,7 +48,7 @@ class KOEditorGeneralEvent : public KOEditorGeneral
 
     void initTime(TQWidget *,TQBoxLayout *);
     void initClass(TQWidget *,TQBoxLayout *);
-    void initInvitationBar( TQWidget* parent, TQBoxLayout *layout );
+    void initInvitationBar( TQWidget* parent, TQBoxLayout *tqlayout );
 
     void finishSetup();
 
diff --git a/korganizer/koeditorgeneraljournal.cpp b/korganizer/koeditorgeneraljournal.cpp
index 0a4e5ec3..c53babbe 100644
--- a/korganizer/koeditorgeneraljournal.cpp
+++ b/korganizer/koeditorgeneraljournal.cpp
@@ -196,7 +196,7 @@ bool KOEditorGeneralJournal::validateInput()
   if (!mDateEdit->date().isValid()) {
     KMessageBox::sorry( 0,
         i18n("Please specify a valid date, for example '%1'.")
-        .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) );
+        .arg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ) );
     return false;
   }
 
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index d659e8e9..13ba5192 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -105,59 +105,59 @@ void KOEditorGeneralTodo::initTime(TQWidget *parent,TQBoxLayout *topLayout)
                    i18n("Sets options for due and start dates and times "
                         "for this to-do.") );
 
-  TQGridLayout *layoutTimeBox = new TQGridLayout(timeBoxFrame,1,1);
-  layoutTimeBox->setSpacing(topLayout->spacing());
+  TQGridLayout *tqlayoutTimeBox = new TQGridLayout(timeBoxFrame,1,1);
+  tqlayoutTimeBox->setSpacing(topLayout->spacing());
 
 
   TQString whatsThis = i18n("Sets the start date for this to-do");
   mStartCheck = new TQCheckBox(i18n("Sta&rt:"),timeBoxFrame);
   TQWhatsThis::add( mStartCheck, whatsThis );
-  layoutTimeBox->addWidget(mStartCheck,0,0);
+  tqlayoutTimeBox->addWidget(mStartCheck,0,0);
   connect(mStartCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableStartEdit(bool)));
   connect(mStartCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(startDateModified()));
 
   mStartDateEdit = new KDateEdit(timeBoxFrame);
   TQWhatsThis::add( mStartDateEdit, whatsThis );
-  layoutTimeBox->addWidget(mStartDateEdit,0,1);
+  tqlayoutTimeBox->addWidget(mStartDateEdit,0,1);
   connect(mStartDateEdit,TQT_SIGNAL(dateChanged(const TQDate&)),TQT_SLOT(startDateModified()));
 
   mStartTimeEdit = new KTimeEdit(timeBoxFrame);
   TQWhatsThis::add( mStartTimeEdit,
                    i18n("Sets the start time for this to-do.") );
-  layoutTimeBox->addWidget(mStartTimeEdit,0,2);
+  tqlayoutTimeBox->addWidget(mStartTimeEdit,0,2);
   connect(mStartTimeEdit,TQT_SIGNAL(timeChanged(TQTime)),TQT_SLOT(startDateModified()));
 
   whatsThis = i18n("Sets the due date for this to-do.");
   mDueCheck = new TQCheckBox(i18n("&Due:"),timeBoxFrame);
   TQWhatsThis::add( mDueCheck, whatsThis );
-  layoutTimeBox->addWidget(mDueCheck,1,0);
+  tqlayoutTimeBox->addWidget(mDueCheck,1,0);
   connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableDueEdit(bool)));
   connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SIGNAL(dueDateEditToggle(bool)));
   connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(dateChanged()));
 
   mDueDateEdit = new KDateEdit(timeBoxFrame);
   TQWhatsThis::add( mDueDateEdit, whatsThis );
-  layoutTimeBox->addWidget(mDueDateEdit,1,1);
+  tqlayoutTimeBox->addWidget(mDueDateEdit,1,1);
   connect(mDueDateEdit,TQT_SIGNAL(dateChanged(const TQDate&)),TQT_SLOT(dateChanged()));
 
   mDueTimeEdit = new KTimeEdit(timeBoxFrame);
   TQWhatsThis::add( mDueTimeEdit,
                    i18n("Sets the due time for this to-do.") );
-  layoutTimeBox->addWidget(mDueTimeEdit,1,2);
+  tqlayoutTimeBox->addWidget(mDueTimeEdit,1,2);
   connect(mDueTimeEdit,TQT_SIGNAL(timeChanged( TQTime )),TQT_SLOT(dateChanged()));
 
   mTimeButton = new TQCheckBox(i18n("Ti&me associated"),timeBoxFrame);
   TQWhatsThis::add( mTimeButton,
                    i18n("Sets whether or not this to-do's start and due dates "
                         "have times associated with them.") );
-  layoutTimeBox->addWidget( mTimeButton, 0, 3 );
+  tqlayoutTimeBox->addWidget( mTimeButton, 0, 3 );
   connect(mTimeButton,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableTimeEdits(bool)));
   connect(mTimeButton,TQT_SIGNAL(toggled(bool)),TQT_SLOT(dateChanged()));
 
   TQLabel *label = new TQLabel( i18n( "Recurrence:" ), timeBoxFrame );
-  layoutTimeBox->addWidget( label, 3, 0 );
+  tqlayoutTimeBox->addWidget( label, 3, 0 );
   TQBoxLayout *recLayout = new TQHBoxLayout();
-  layoutTimeBox->addMultiCellLayout( recLayout, 3, 3, 1, 4 );
+  tqlayoutTimeBox->addMultiCellLayout( recLayout, 3, 3, 1, 4 );
   mRecEditButton = new TQPushButton( timeBoxFrame );
   mRecEditButton->setIconSet( KOGlobals::self()->smallIconSet( "recur", 16 ) );
   recLayout->addWidget( mRecEditButton );
@@ -167,17 +167,17 @@ void KOEditorGeneralTodo::initTime(TQWidget *parent,TQBoxLayout *topLayout)
   recLayout->addStretch( 1 );
 
   label = new TQLabel( i18n("Reminder:"), timeBoxFrame );
-  layoutTimeBox->addWidget( label, 4, 0 );
+  tqlayoutTimeBox->addWidget( label, 4, 0 );
   TQBoxLayout *alarmLineLayout = new TQHBoxLayout();
-  layoutTimeBox->addMultiCellLayout( alarmLineLayout, 4, 4, 1, 4 );
+  tqlayoutTimeBox->addMultiCellLayout( alarmLineLayout, 4, 4, 1, 4 );
   initAlarm( timeBoxFrame, alarmLineLayout );
   alarmLineLayout->addStretch( 1 );
 
-  // some more layouting
-  layoutTimeBox->setColStretch( 3, 1 );
+  // some more tqlayouting
+  tqlayoutTimeBox->setColStretch( 3, 1 );
 
   TQBoxLayout *secLayout = new TQHBoxLayout();
-  layoutTimeBox->addLayout( secLayout, 0, 4 );
+  tqlayoutTimeBox->addLayout( secLayout, 0, 4 );
   initSecrecy( timeBoxFrame, secLayout );
 }
 
@@ -252,7 +252,7 @@ void KOEditorGeneralTodo::initPriority(TQWidget *parent, TQBoxLayout *topLayout)
   priorityLabel->setBuddy( mPriorityCombo );
 }
 
-void KOEditorGeneralTodo::initStatus(TQWidget *parent,TQBoxLayout *topLayout)
+void KOEditorGeneralTodo::iniStatus(TQWidget *parent,TQBoxLayout *topLayout)
 {
   TQBoxLayout *statusLayout = new TQHBoxLayout(topLayout);
 
@@ -284,12 +284,12 @@ void KOEditorGeneralTodo::setDefaults( const TQDateTime &due, bool allDay )
     mDueTimeEdit->setTime( due.time() );
   } else {
     // Make it due tomorrow.
-    mDueDateEdit->setDate( TQDate::currentDate().addDays(1) );
+    mDueDateEdit->setDate( TQDate::tqcurrentDate().addDays(1) );
     mDueTimeEdit->setTime( TQTime::currentTime() );
   }
 
-  if ( !due.isValid() || (TQDateTime::currentDateTime() < due) ) {
-    mStartDateEdit->setDate( TQDate::currentDate() );
+  if ( !due.isValid() || (TQDateTime::tqcurrentDateTime() < due) ) {
+    mStartDateEdit->setDate( TQDate::tqcurrentDate() );
     mStartTimeEdit->setTime( TQTime::currentTime() );
   } else {
     mStartDateEdit->setDate( due.date().addDays( -1 ) );
@@ -322,7 +322,7 @@ void KOEditorGeneralTodo::readTodo(Todo *todo, Calendar *calendar, const TQDate
   } else {
     mDueDateEdit->setEnabled(false);
     mDueTimeEdit->setEnabled(false);
-    mDueDateEdit->setDate(TQDate::currentDate());
+    mDueDateEdit->setDate(TQDate::tqcurrentDate());
     mDueTimeEdit->setTime(TQTime::currentTime());
     mDueCheck->setChecked(false);
   }
@@ -339,7 +339,7 @@ void KOEditorGeneralTodo::readTodo(Todo *todo, Calendar *calendar, const TQDate
   } else {
     mStartDateEdit->setEnabled(false);
     mStartTimeEdit->setEnabled(false);
-    mStartDateEdit->setDate(TQDate::currentDate());
+    mStartDateEdit->setDate(TQDate::tqcurrentDate());
     mStartTimeEdit->setTime(TQTime::currentTime());
     mStartCheck->setChecked(false);
   }
@@ -545,7 +545,7 @@ void KOEditorGeneralTodo::completedChanged( int index )
 {
   if ( index == 10 ) {
     mCompletedToggle->setChecked( true );
-    mCompletedDateTime = TQDateTime::currentDateTime();
+    mCompletedDateTime = TQDateTime::tqcurrentDateTime();
   } else {
     mCompletedToggle->setChecked( false );
   }
@@ -556,7 +556,7 @@ void KOEditorGeneralTodo::completedChanged()
 {
   if ( mCompletedToggle->isChecked() ) {
     mCompletedCombo->setCurrentItem( 10 );
-    mCompletedDateTime = TQDateTime::currentDateTime();
+    mCompletedDateTime = TQDateTime::tqcurrentDateTime();
   } else {
     mCompletedCombo->setCurrentItem( 0 );
   }
diff --git a/korganizer/koeditorgeneraltodo.h b/korganizer/koeditorgeneraltodo.h
index 2d07ceca..438ff9c2 100644
--- a/korganizer/koeditorgeneraltodo.h
+++ b/korganizer/koeditorgeneraltodo.h
@@ -47,7 +47,7 @@ class KOEditorGeneralTodo : public KOEditorGeneral
     virtual ~KOEditorGeneralTodo();
 
     void initTime(TQWidget *, TQBoxLayout *);
-    void initStatus(TQWidget *, TQBoxLayout *);
+    void iniStatus(TQWidget *, TQBoxLayout *);
     void initCompletion(TQWidget *, TQBoxLayout *);
     void initPriority(TQWidget *, TQBoxLayout *);
 
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index 564c3953..46038834 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -135,10 +135,10 @@ TQComboBox *RecurBase::createMonthNameCombo( TQWidget *parent, const char *name
   return combo;
 }
 
-TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *parent, TQLayout *layout,
+TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *parent, TQLayout *tqlayout,
     TQString everyText, TQString unitText )
 {
-  TQBoxLayout *freqLayout = new TQHBoxLayout( layout );
+  TQBoxLayout *freqLayout = new TQHBoxLayout( tqlayout );
 
   TQString whatsThis = i18n("Sets how often this event or to-do should recur.");
   TQLabel *preLabel = new TQLabel( everyText, parent );
@@ -590,7 +590,7 @@ ExceptionsWidget::ExceptionsWidget( TQWidget *parent, const char *name ) :
   TQWhatsThis::add( mExceptionDateEdit,
        i18n("A date that should be considered an exception "
       "to the recurrence rules for this event or to-do.") );
-  mExceptionDateEdit->setDate( TQDate::currentDate() );
+  mExceptionDateEdit->setDate( TQDate::tqcurrentDate() );
   boxLayout->addWidget( mExceptionDateEdit, 0, 0 );
 
   TQPushButton *addExceptionButton = new TQPushButton(
@@ -991,12 +991,12 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) :
   }
 
 //  TQFrame *timeFrame = new TQFrame( mTimeGroupBox );
-//  TQBoxLayout *layoutTimeFrame = new TQHBoxLayout( timeFrame );
-//  layoutTimeFrame->setSpacing( KDialog::spacingHint() );
+//  TQBoxLayout *tqlayoutTimeFrame = new TQHBoxLayout( timeFrame );
+//  tqlayoutTimeFrame->setSpacing( KDialog::spacingHint() );
 
   mDateTimeLabel = new TQLabel( mTimeGroupBox );
 //  mDateTimeLabel = new TQLabel( timeFrame );
-//  layoutTimeFrame->addWidget( mDateTimeLabel );
+//  tqlayoutTimeFrame->addWidget( mDateTimeLabel );
 
   Qt::Orientation orientation;
   if ( KOPrefs::instance()->mCompactDialogs ) orientation = Horizontal;
diff --git a/korganizer/koeditorrecurrence.h b/korganizer/koeditorrecurrence.h
index 05074cdd..831ba62b 100644
--- a/korganizer/koeditorrecurrence.h
+++ b/korganizer/koeditorrecurrence.h
@@ -61,7 +61,7 @@ class RecurBase : public QWidget
     static TQComboBox *createWeekCountCombo( TQWidget *parent=0, const char *name=0 );
     static TQComboBox *createWeekdayCombo( TQWidget *parent=0, const char *name=0 );
     static TQComboBox *createMonthNameCombo( TQWidget *parent=0, const char *name=0 );
-    TQBoxLayout *createFrequencySpinBar( TQWidget *parent, TQLayout *layout,
+    TQBoxLayout *createFrequencySpinBar( TQWidget *parent, TQLayout *tqlayout,
     TQString everyText, TQString unitText );
 
   private:
diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp
index 8a8340fc..69cb9c76 100644
--- a/korganizer/koeventeditor.cpp
+++ b/korganizer/koeventeditor.cpp
@@ -230,7 +230,7 @@ void KOEventEditor::setDates( const TQDateTime &from, const TQDateTime &to, bool
 
 void KOEventEditor::setTexts( const TQString &summary, const TQString &description )
 {
-  if ( description.isEmpty() && summary.contains("\n") ) {
+  if ( description.isEmpty() && summary.tqcontains("\n") ) {
     mGeneral->setDescription( summary );
     int pos = summary.find( "\n" );
     mGeneral->setSummary( summary.left( pos ) );
@@ -242,7 +242,7 @@ void KOEventEditor::setTexts( const TQString &summary, const TQString &descripti
 
 void KOEventEditor::loadDefaults()
 {
-  TQDateTime from( TQDate::currentDate(), KOPrefs::instance()->mStartTime.time() );
+  TQDateTime from( TQDate::tqcurrentDate(), KOPrefs::instance()->mStartTime.time() );
   int addSecs = ( KOPrefs::instance()->mDefaultDuration.time().hour()*3600 ) +
                 ( KOPrefs::instance()->mDefaultDuration.time().minute()*60 );
   TQDateTime to( from.addSecs( addSecs ) );
diff --git a/korganizer/koeventeditor.h b/korganizer/koeventeditor.h
index dbcec875..3d65bb0a 100644
--- a/korganizer/koeventeditor.h
+++ b/korganizer/koeventeditor.h
@@ -67,7 +67,7 @@ class KOEventEditor : public KOIncidenceEditor
 
     /**
       Sets the given summary and description. If description is empty and the
-      summary contains multiple lines, the summary will be used as description
+      summary tqcontains multiple lines, the summary will be used as description
       and only the first line of summary will be used as the summary.
     */
     void setTexts( const TQString &summary, const TQString &description = TQString::null );
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 83534d6a..3937c387 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -105,7 +105,7 @@ void KOEventViewer::writeSettings( KConfig * config )
 
 void KOEventViewer::setSource( const TQString &n )
 {
-  UriHandler::process( parentWidget(), n );
+  UriHandler::process( tqparentWidget(), n );
 }
 
 bool KOEventViewer::appendIncidence( Incidence *incidence, const TQDate &date )
@@ -177,10 +177,10 @@ void KOEventViewer::contentsContextMenuEvent( TQContextMenuEvent *e )
 
   switch( menu->exec( TQCursor::pos(), 0 ) ) {
   case 0: // open
-    AttachmentHandler::view( parentWidget(), name, uid );
+    AttachmentHandler::view( tqparentWidget(), name, uid );
     break;
   case 1: // save as
-    AttachmentHandler::saveAs( parentWidget(), name, uid );
+    AttachmentHandler::saveAs( tqparentWidget(), name, uid );
     break;
   default:
     break;
diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp
index dd55bd37..814ea178 100644
--- a/korganizer/koglobals.cpp
+++ b/korganizer/koglobals.cpp
@@ -158,9 +158,9 @@ TQStringList KOGlobals::holiday( const TQDate &date )
 
 bool KOGlobals::isWorkDay( const TQDate &date )
 {
-  int mask( ~( KOPrefs::instance()->mWorkWeekMask ) );
+  int tqmask( ~( KOPrefs::instance()->mWorkWeekMask ) );
 
-  bool nonWorkDay = ( mask & ( 1 << ( date.dayOfWeek() - 1 ) ) );
+  bool nonWorkDay = ( tqmask & ( 1 << ( date.dayOfWeek() - 1 ) ) );
   if ( KOPrefs::instance()->mExcludeHolidays && mHolidays ) {
     TQValueList<KHoliday> list = mHolidays->getHolidays( date );
     TQValueList<KHoliday>::ConstIterator it = list.begin();
diff --git a/korganizer/kogroupware.cpp b/korganizer/kogroupware.cpp
index 7b799eed..c4e3a607 100644
--- a/korganizer/kogroupware.cpp
+++ b/korganizer/kogroupware.cpp
@@ -191,13 +191,13 @@ void KOGroupware::incomingDirChanged( const TQString& path )
     for ( it = attendees.begin(); it != attendees.end(); ++it ) {
       if( (*it)->email() == receiver ) {
         if ( action.startsWith( "accepted" ) )
-          (*it)->setStatus( KCal::Attendee::Accepted );
+          (*it)->seStatus( KCal::Attendee::Accepted );
         else if ( action.startsWith( "tentative" ) )
-          (*it)->setStatus( KCal::Attendee::Tentative );
+          (*it)->seStatus( KCal::Attendee::Tentative );
         else if ( KOPrefs::instance()->outlookCompatCounterProposals() && action.startsWith( "counter" ) )
-          (*it)->setStatus( KCal::Attendee::Tentative );
+          (*it)->seStatus( KCal::Attendee::Tentative );
         else if ( action.startsWith( "delegated" ) )
-          (*it)->setStatus( KCal::Attendee::Delegated );
+          (*it)->seStatus( KCal::Attendee::Delegated );
         break;
       }
     }
diff --git a/korganizer/kogroupwareprefspage.ui b/korganizer/kogroupwareprefspage.ui
index a4e558fb..71d392d6 100644
--- a/korganizer/kogroupwareprefspage.ui
+++ b/korganizer/kogroupwareprefspage.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KOGroupwarePrefsPage</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -41,7 +41,7 @@
                         <property name="text">
                             <string>By publishing Free/Busy information, you allow others to take your calendar into account when inviting you for a meeting. Only the times you have already busy are published, not why they are busy. For Kolab2 Server leave this disabled (the information is generated on the server).</string>
                         </property>
-                        <property name="alignment">
+                        <property name="tqalignment">
                             <set>WordBreak|AlignVCenter</set>
                         </property>
                     </widget>
@@ -60,7 +60,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th
                     </widget>
                     <widget class="QLayoutWidget">
                         <property name="name">
-                            <cstring>layout8</cstring>
+                            <cstring>tqlayout8</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -153,7 +153,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -226,7 +226,7 @@ For security reasons, it is not recommended to store your password in the config
                                 <property name="name">
                                     <cstring>publishUser</cstring>
                                 </property>
-                                <property name="minimumSize">
+                                <property name="tqminimumSize">
                                     <size>
                                         <width>120</width>
                                         <height>0</height>
@@ -292,7 +292,7 @@ Ask the server administrator for this information.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>21</width>
                                 <height>50</height>
@@ -319,7 +319,7 @@ Ask the server administrator for this information.</string>
                         <property name="text">
                             <string>By retrieving Free/Busy information that others have published, you can take their calendar into account when inviting them to a meeting.</string>
                         </property>
-                        <property name="alignment">
+                        <property name="tqalignment">
                             <set>WordBreak|AlignVCenter</set>
                         </property>
                     </widget>
@@ -422,7 +422,7 @@ For example: "https://kolab2.example.com/freebusy/user.xfb"</string>
                             </widget>
                             <widget class="QLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout13</cstring>
+                                    <cstring>tqlayout13</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -508,7 +508,7 @@ For security reasons, it is not recommended to store your password in the config
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>160</height>
@@ -627,5 +627,5 @@ For security reasons, it is not recommended to store your password in the config
     <slot>slotChanged()</slot>
 </slots>
 <exportmacro>KDE_EXPORT</exportmacro>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp
index 240497e1..9a917699 100644
--- a/korganizer/koincidenceeditor.cpp
+++ b/korganizer/koincidenceeditor.cpp
@@ -316,7 +316,7 @@ void KOIncidenceEditor::createEmbeddedURLPages( Incidence *i )
   if ( !mAttachedDesignerFields.isEmpty() ) {
     for ( TQPtrList<TQWidget>::Iterator it = mAttachedDesignerFields.begin();
           it != mAttachedDesignerFields.end(); ++it ) {
-      if ( mDesignerFieldForWidget.contains( *it ) ) {
+      if ( mDesignerFieldForWidget.tqcontains( *it ) ) {
         mDesignerFields.remove( mDesignerFieldForWidget[ *it ] );
       }
     }
diff --git a/korganizer/koincidenceeditor.h b/korganizer/koincidenceeditor.h
index 91f22afd..a2ac6055 100644
--- a/korganizer/koincidenceeditor.h
+++ b/korganizer/koincidenceeditor.h
@@ -78,7 +78,7 @@ class KOIncidenceEditor : public KDialogBase
       This should be called when editing only one occurrence of a recurring incidence,
       before showing the editor.
 
-      It gives the editor a pointer to the original incidence, which contains all occurrences
+      It gives the editor a pointer to the original incidence, which tqcontains all occurrences
       and a pointer to the original incidence already dissociated from the event (mEvent).
 
       If the user presses ok/apply the changes made to the incAfterDissociation are commited
diff --git a/korganizer/koincidencetooltip.cpp b/korganizer/koincidencetooltip.cpp
index 2b2a80f2..c01b5487 100644
--- a/korganizer/koincidencetooltip.cpp
+++ b/korganizer/koincidencetooltip.cpp
@@ -56,7 +56,7 @@ void KOIncidenceToolTip::add( KOAgendaItem *item, Calendar *calendar,
 void KOIncidenceToolTip::maybeTip(const TQPoint & pos)
 {
   Q_UNUSED( pos );
-  KOAgendaItem *item = dynamic_cast<KOAgendaItem*>( parentWidget() );
+  KOAgendaItem *item = dynamic_cast<KOAgendaItem*>( tqparentWidget() );
   if ( !item )
     return;
   if ( !mText )
diff --git a/korganizer/kojournaleditor.cpp b/korganizer/kojournaleditor.cpp
index b53e071e..c7566cae 100644
--- a/korganizer/kojournaleditor.cpp
+++ b/korganizer/kojournaleditor.cpp
@@ -118,7 +118,7 @@ void KOJournalEditor::newJournal()
 
 void KOJournalEditor::setTexts( const TQString &summary, const TQString &description )
 {
-  if ( description.isEmpty() && summary.contains("\n") ) {
+  if ( description.isEmpty() && summary.tqcontains("\n") ) {
     mGeneral->setDescription( summary );
     int pos = summary.find( "\n" );
     mGeneral->setSummary( summary.left( pos ) );
@@ -132,7 +132,7 @@ void KOJournalEditor::setTexts( const TQString &summary, const TQString &descrip
 
 void KOJournalEditor::loadDefaults()
 {
-  setDate( TQDate::currentDate() );
+  setDate( TQDate::tqcurrentDate() );
 }
 
 bool KOJournalEditor::processInput()
diff --git a/korganizer/kojournaleditor.h b/korganizer/kojournaleditor.h
index 291940cf..731682e9 100644
--- a/korganizer/kojournaleditor.h
+++ b/korganizer/kojournaleditor.h
@@ -64,7 +64,7 @@ class KOJournalEditor : public KOIncidenceEditor
 
     /**
       Sets the given summary and description. If description is empty and the
-      summary contains multiple lines, the summary will be used as description
+      summary tqcontains multiple lines, the summary will be used as description
       and only the first line of summary will be used as the summary.
     */
     void setTexts( const TQString &summary, const TQString &description = TQString::null );
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp
index 74a0f17c..4a5513d9 100644
--- a/korganizer/kojournalview.cpp
+++ b/korganizer/kojournalview.cpp
@@ -64,7 +64,7 @@ KOJournalView::~KOJournalView()
 void KOJournalView::appendJournal( Journal*journal, const TQDate &dt)
 {
   JournalDateEntry *entry = 0;
-  if ( mEntries.contains( dt ) ) {
+  if ( mEntries.tqcontains( dt ) ) {
     entry = mEntries[dt];
   } else {
     entry = new JournalDateEntry( calendar(), mVBox );
@@ -97,7 +97,7 @@ void KOJournalView::appendJournal( Journal*journal, const TQDate &dt)
   }
 }
 
-int KOJournalView::currentDateCount()
+int KOJournalView::tqcurrentDateCount()
 {
   return mEntries.size();
 }
@@ -211,7 +211,7 @@ void KOJournalView::setIncidenceChanger( IncidenceChangerBase *changer )
 void KOJournalView::newJournal()
 {
   emit newJournalSignal( 0/*ResourceCalendar*/, TQString()/*subResource*/,
-                         TQDate::currentDate() );
+                         TQDate::tqcurrentDate() );
 }
 
 #include "kojournalview.moc"
diff --git a/korganizer/kojournalview.h b/korganizer/kojournalview.h
index fbc38efb..a22c4d8a 100644
--- a/korganizer/kojournalview.h
+++ b/korganizer/kojournalview.h
@@ -46,7 +46,7 @@ class KOJournalView : public KOrg::BaseView
                    const char *name = 0);
     ~KOJournalView();
 
-    virtual int currentDateCount();
+    virtual int tqcurrentDateCount();
     virtual Incidence::List selectedIncidences();
     DateList selectedIncidenceDates() { return DateList(); }
     void appendJournal( Journal*journal, const TQDate &dt);
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 59b7f17e..35474f89 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -72,7 +72,7 @@ void KOListViewToolTip::maybeTip( const TQPoint &pos )
 
   if ( i && KOPrefs::instance()->mEnableToolTips ) {
     /* Calculate the rectangle. */
-    r = eventlist->itemRect( it );
+    r = eventlist->tqitemRect( it );
     /* Show the tip */
     TQString tipText( IncidenceFormatter::toolTipStr( mCalendar, i->data() ) );
     if ( !tipText.isEmpty() ) {
@@ -220,8 +220,8 @@ KOListView::KOListView( Calendar *calendar,
 
   mListView->addColumn( i18n("Categories") );
 
-  TQBoxLayout *layoutTop = new TQVBoxLayout( this );
-  layoutTop->addWidget( mListView );
+  TQBoxLayout *tqlayoutTop = new TQVBoxLayout( this );
+  tqlayoutTop->addWidget( mListView );
 
   mPopupMenu = eventPopup();
 /*
@@ -248,7 +248,7 @@ KOListView::KOListView( Calendar *calendar,
 
   new KOListViewToolTip( mListView->viewport(), calendar, mListView );
 
-  mSelectedDates.append( TQDate::currentDate() );
+  mSelectedDates.append( TQDate::tqcurrentDate() );
 }
 
 KOListView::~KOListView()
@@ -261,7 +261,7 @@ int KOListView::maxDatesHint()
   return 0;
 }
 
-int KOListView::currentDateCount()
+int KOListView::tqcurrentDateCount()
 {
   return mSelectedDates.count();
 }
@@ -299,7 +299,7 @@ void KOListView::showDates( bool show )
     mListView->setColumnWidth( 1, oldColWidth1 );
     mListView->setColumnWidth( 3, oldColWidth3 );
   }
-  mListView->repaint();
+  mListView->tqrepaint();
 }
 
 void KOListView::showDates()
@@ -499,9 +499,9 @@ void KOListView::clear()
   mDateList.clear();
 }
 
-TQSize KOListView::sizeHint() const
+TQSize KOListView::tqsizeHint() const
 {
-  const TQSize s = KOEventView::sizeHint();
-  return TQSize( s.width() + style().pixelMetric( TQStyle::PM_ScrollBarExtent ) + 1,
+  const TQSize s = KOEventView::tqsizeHint();
+  return TQSize( s.width() + style().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) + 1,
                 s.height() );
 }
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h
index 5a5c40d8..e29a5e39 100644
--- a/korganizer/kolistview.h
+++ b/korganizer/kolistview.h
@@ -76,7 +76,7 @@ class KOListView : public KOEventView
     ~KOListView();
 
     virtual int maxDatesHint();
-    virtual int currentDateCount();
+    virtual int tqcurrentDateCount();
     virtual Incidence::List selectedIncidences();
     virtual DateList selectedIncidenceDates();
 
@@ -89,7 +89,7 @@ class KOListView : public KOEventView
     void writeSettings(KConfig *config);
 
     void clear();
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
   public slots:
     virtual void updateView();
diff --git a/korganizer/komailclient.cpp b/korganizer/komailclient.cpp
index 1b3215c0..8b65d1d1 100644
--- a/korganizer/komailclient.cpp
+++ b/korganizer/komailclient.cpp
@@ -188,18 +188,18 @@ bool KOMailClient::send(const TQString &from,const TQString &_to,const TQString
   if (KOPrefs::instance()->mMailClient == KOPrefs::MailClientSendmail) {
     bool needHeaders = true;
 
-    TQString command = KStandardDirs::findExe(TQString::fromLatin1("sendmail"),
-        TQString::fromLatin1("/sbin:/usr/sbin:/usr/lib"));
-    if (!command.isNull()) command += TQString::fromLatin1(" -oi -t");
+    TQString command = KStandardDirs::findExe(TQString::tqfromLatin1("sendmail"),
+        TQString::tqfromLatin1("/sbin:/usr/sbin:/usr/lib"));
+    if (!command.isNull()) command += TQString::tqfromLatin1(" -oi -t");
     else {
-      command = KStandardDirs::findExe(TQString::fromLatin1("mail"));
+      command = KStandardDirs::findExe(TQString::tqfromLatin1("mail"));
       if (command.isNull()) return false; // give up
 
-      command.append(TQString::fromLatin1(" -s "));
+      command.append(TQString::tqfromLatin1(" -s "));
       command.append(KProcess::quote(subject));
 
       if (bcc) {
-        command.append(TQString::fromLatin1(" -b "));
+        command.append(TQString::tqfromLatin1(" -b "));
         command.append(KProcess::quote(from));
       }
 
@@ -224,14 +224,14 @@ bool KOMailClient::send(const TQString &from,const TQString &_to,const TQString
     TQString textComplete;
     if (needHeaders)
     {
-      textComplete += TQString::fromLatin1("From: ") + from + '\n';
-      textComplete += TQString::fromLatin1("To: ") + to + '\n';
+      textComplete += TQString::tqfromLatin1("From: ") + from + '\n';
+      textComplete += TQString::tqfromLatin1("To: ") + to + '\n';
       if ( !cc.isEmpty() ) {
-        textComplete += TQString::fromLatin1("Cc: " ) + cc + '\n';
+        textComplete += TQString::tqfromLatin1("Cc: " ) + cc + '\n';
       }
-      if (bcc) textComplete += TQString::fromLatin1("Bcc: ") + from + '\n';
-      textComplete += TQString::fromLatin1("Subject: ") + subject + '\n';
-      textComplete += TQString::fromLatin1("X-Mailer: KOrganizer") + korgVersion + '\n';
+      if (bcc) textComplete += TQString::tqfromLatin1("Bcc: ") + from + '\n';
+      textComplete += TQString::tqfromLatin1("Subject: ") + subject + '\n';
+      textComplete += TQString::tqfromLatin1("X-Mailer: KOrganizer") + korgVersion + '\n';
     }
     textComplete += '\n'; // end of headers
     textComplete += body;
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 26452541..930e6c8d 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -78,7 +78,7 @@ void KOMonthCellToolTip::maybeTip( const TQPoint &pos )
 
   if( i && KOPrefs::instance()->mEnableToolTips ) {
     /* Calculate the rectangle. */
-    r=eventlist->itemRect( it );
+    r=eventlist->tqitemRect( it );
     /* Show the tip */
     TQString tipText( IncidenceFormatter::toolTipStr( mCalendar, i->incidence(), mDate ) );
     if ( !tipText.isEmpty() ) {
@@ -249,7 +249,7 @@ void MonthViewItem::paint( TQPainter *p )
   if ( mIncidence && mTodo ) {
     if ( static_cast<Todo*>( mIncidence )->isOverdue() ) {
       bgColor = KOPrefs::instance()->todoOverdueColor();
-    } else if ( static_cast<Todo*>( mIncidence )->dtDue().date() == TQDate::currentDate() ) {
+    } else if ( static_cast<Todo*>( mIncidence )->dtDue().date() == TQDate::tqcurrentDate() ) {
       bgColor = KOPrefs::instance()->todoDueTodayColor();
     }
   }
@@ -392,7 +392,7 @@ MonthViewCell::MonthViewCell( KOMonthView *parent)
   mLabel = new TQLabel( this );
   mLabel->setFrameStyle( TQFrame::Panel | TQFrame::Plain );
   mLabel->setLineWidth( 1 );
-  mLabel->setAlignment( AlignCenter );
+  mLabel->tqsetAlignment( AlignCenter );
 
   mItemList = new KNoScrollListBox( this );
   mItemList->setMinimumSize( 10, 10 );
@@ -455,7 +455,7 @@ TQDate MonthViewCell::date() const
 void MonthViewCell::setFrameWidth()
 {
   // show current day with a thicker frame
-  if ( mDate == TQDate::currentDate() ) {
+  if ( mDate == TQDate::tqcurrentDate() ) {
     mItemList->setLineWidth( 3 );
   } else if ( !isSelected ) {
     mItemList->setLineWidth( 1 );
@@ -500,7 +500,7 @@ void MonthViewCell::updateCell()
 {
   setFrameWidth();
 
-  if ( mDate == TQDate::currentDate() ) {
+  if ( mDate == TQDate::tqcurrentDate() ) {
     setPalette( mTodayPalette );
 
     TQPalette pal = mItemList->palette();
@@ -763,7 +763,7 @@ void MonthViewCell::select()
     enableScrollBars( true );
 
   // don't mess up the cell when it represents today
-  if( mDate != TQDate::currentDate() ) {
+  if( mDate != TQDate::tqcurrentDate() ) {
     mItemList->setFrameStyle( TQFrame::Sunken | TQFrame::Panel );
     mItemList->setLineWidth( 3 );
   }
@@ -832,14 +832,14 @@ KOMonthView::KOMonthView( Calendar *calendar, TQWidget *parent, const char *name
   // month name on top
   mLabel = new TQLabel( this );
   mLabel->setFont( mfont );
-  mLabel->setAlignment( AlignCenter );
+  mLabel->tqsetAlignment( AlignCenter );
   mLabel->setLineWidth( 0 );
   mLabel->setFrameStyle( TQFrame::Plain );
 
   dayLayout->addMultiCellWidget( mLabel, 0, 0, 0, mDaysPerWeek );
 
   // create the day of the week labels (Sun, Mon, etc) and add them to
-  // the layout.
+  // the tqlayout.
   mDayLabels.resize( mDaysPerWeek );
   int i;
   for( i = 0; i < mDaysPerWeek; i++ ) {
@@ -847,7 +847,7 @@ KOMonthView::KOMonthView( Calendar *calendar, TQWidget *parent, const char *name
     label->setFont( bfont );
     label->setFrameStyle( TQFrame::Panel | TQFrame::Raised );
     label->setLineWidth( 1 );
-    label->setAlignment( AlignCenter );
+    label->tqsetAlignment( AlignCenter );
 
     mDayLabels.insert( i, label );
 
@@ -890,7 +890,7 @@ int KOMonthView::maxDatesHint()
   return mNumCells;
 }
 
-int KOMonthView::currentDateCount()
+int KOMonthView::tqcurrentDateCount()
 {
   return mNumCells;
 }
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index dafce597..f503a29d 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -251,7 +251,7 @@ class KOMonthView: public KOEventView
     virtual int maxDatesHint();
 
     /** Returns number of currently shown dates. */
-    virtual int currentDateCount();
+    virtual int tqcurrentDateCount();
 
     /** Returns the currently selected events */
     virtual Incidence::List selectedIncidences();
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 535fe104..a5b44cce 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -262,7 +262,7 @@ void KOPrefs::usrWriteConfig()
 
 void KOPrefs::setCategoryColor( const TQString &cat, const TQColor & color)
 {
-  mCategoryColors.replace( cat, new TQColor( color ) );
+  mCategoryColors.tqreplace( cat, new TQColor( color ) );
 }
 
 TQColor *KOPrefs::categoryColor( const TQString &cat )
@@ -285,7 +285,7 @@ void KOPrefs::setResourceColor ( const TQString &cal, const TQColor &color )
 {
   // kdDebug(5850)<<"KOPrefs::setResourceColor: " << cal << " color: "<<
   // color.name()<<endl;
-  mResourceColors.replace( cal, new TQColor( color ) );
+  mResourceColors.tqreplace( cal, new TQColor( color ) );
 }
 
 TQColor* KOPrefs::resourceColor( const TQString &cal )
@@ -403,7 +403,7 @@ bool KOPrefs::thatIsMe( const TQString& _email )
     return true;
   */
 
-  // in case email contains a full name, strip it out
+  // in case email tqcontains a full name, strip it out
   // the below is the simpler but slower version of the following KMime code
   // const TQString email = KPIM::getEmailAddress( _email );
   const TQCString tmp = _email.utf8();
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 37f889cf..63b2a347 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -442,11 +442,11 @@ class KOPrefsDialogTime : public KPrefsModule
       KOPrefs::instance()->mReminderTime = mReminderTimeSpin->value();
       KOPrefs::instance()->mReminderTimeUnits = mReminderUnitsCombo->currentItem();
 
-      int mask = 0;
+      int tqmask = 0;
       for ( int i = 0; i < 7; ++i ) {
-        if (mWorkDays[i]->isChecked()) mask = mask | (1<<i);
+        if (mWorkDays[i]->isChecked()) tqmask = tqmask | (1<<i);
       }
-      KOPrefs::instance()->mWorkWeekMask = mask;
+      KOPrefs::instance()->mWorkWeekMask = tqmask;
       KOPrefs::instance()->writeConfig();
     }
 
@@ -774,7 +774,7 @@ void KOPrefsDialogColors::updateCategories()
 
 void KOPrefsDialogColors::setCategoryColor()
 {
-  mCategoryDict.replace(mCategoryCombo->currentText(), new TQColor(mCategoryButton->color()));
+  mCategoryDict.tqreplace(mCategoryCombo->currentText(), new TQColor(mCategoryButton->color()));
   slotWidChanged();
 }
 
@@ -823,7 +823,7 @@ void KOPrefsDialogColors::setResourceColor()
 {
   kdDebug( 5850) << "KOPrefsDialogColors::setResorceColor()" << endl;
 
-  mResourceDict.replace( mResourceIdentifier[mResourceCombo->currentItem()],
+  mResourceDict.tqreplace( mResourceIdentifier[mResourceCombo->currentItem()],
     new TQColor( mResourceButton->color() ) );
   slotWidChanged();
 }
@@ -1108,11 +1108,11 @@ KOPrefsDialogPlugins::KOPrefsDialogPlugins( TQWidget *parent, const char* name )
   topLayout->addWidget( mListView );
 
   mDescription = new TQLabel( topFrame );
-  mDescription->setAlignment( TQLabel::NoAccel | TQLabel::WordBreak | TQLabel::AlignVCenter );
+  mDescription->tqsetAlignment( TQLabel::NoAccel | TQLabel::WordBreak | TQLabel::AlignVCenter );
   mDescription->setFrameShape( TQLabel::Panel );
   mDescription->setFrameShadow( TQLabel::Sunken );
   mDescription->setMinimumSize( TQSize( 0, 55 ) );
-  mDescription->setSizePolicy(
+  mDescription->tqsetSizePolicy(
          TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0,
                       0, 0, mDescription->sizePolicy().hasHeightForWidth() ) );
   topLayout->addWidget( mDescription );
diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp
index 839d463a..6b12f76c 100644
--- a/korganizer/korgac/alarmdialog.cpp
+++ b/korganizer/korgac/alarmdialog.cpp
@@ -192,7 +192,7 @@ static TQString cleanSummary( const TQString &summary )
 {
   uint maxLen = 45;
   TQString retStr = summary;
-  retStr.replace( '\n', ' ' );
+  retStr.tqreplace( '\n', ' ' );
   if ( retStr.length() > maxLen ) {
     maxLen -= etc.length();
     retStr = retStr.left( maxLen );
@@ -402,7 +402,7 @@ void AlarmDialog::suspend()
     if ( item->isSelected() && item->isVisible() ) {
       item->setVisible( false );
       item->setSelected( false );
-      item->mRemindAt = TQDateTime::currentDateTime().addSecs( unit * mSuspendSpin->value() );
+      item->mRemindAt = TQDateTime::tqcurrentDateTime().addSecs( unit * mSuspendSpin->value() );
       item->mNotified = false;
       selitem = item;
     }
@@ -435,8 +435,8 @@ void AlarmDialog::setTimer()
   int nextReminderAt = -1;
   for ( TQListViewItemIterator it( mIncidenceListView ) ; it.current() ; ++it ) {
     AlarmListItem * item = static_cast<AlarmListItem*>( it.current() );
-    if ( item->mRemindAt > TQDateTime::currentDateTime() ) {
-      int secs = TQDateTime::currentDateTime().secsTo( item->mRemindAt );
+    if ( item->mRemindAt > TQDateTime::tqcurrentDateTime() ) {
+      int secs = TQDateTime::tqcurrentDateTime().secsTo( item->mRemindAt );
       nextReminderAt = nextReminderAt <= 0 ? secs : QMIN( nextReminderAt, secs );
     }
   }
@@ -532,7 +532,7 @@ void AlarmDialog::wakeUp()
       continue;
     }
 
-    if ( item->mRemindAt <= TQDateTime::currentDateTime() ) {
+    if ( item->mRemindAt <= TQDateTime::tqcurrentDateTime() ) {
       if ( !item->isVisible() ) {
         item->setVisible( true );
         item->setSelected( false );
@@ -650,7 +650,7 @@ bool AlarmDialog::ensureKorganizerRunning() const
   TQString error;
   TQCString dcopService;
 
-  int result = KDCOPServiceStarter::self()->findServiceFor(
+  int result = KDCOPServiceStarter::self()->tqfindServiceFor(
     "DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService );
 
   if ( result == 0 ) {
@@ -659,12 +659,12 @@ bool AlarmDialog::ensureKorganizerRunning() const
     // but korganizer not loaded into it...]
     static const char* const dcopObjectId = "KOrganizerIface";
     TQCString dummy;
-    if ( !kapp->dcopClient()->findObject(
+    if ( !kapp->dcopClient()->tqfindObject(
            dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
       DCOPRef ref( dcopService, dcopService ); // talk to KUniqueApplication or its kontact wrapper
       DCOPReply reply = ref.call( "load()" );
       if ( reply.isValid() && (bool)reply ) {
-        Q_ASSERT( kapp->dcopClient()->findObject(
+        Q_ASSERT( kapp->dcopClient()->tqfindObject(
                     dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
       } else {
         kdWarning() << "Error loading " << dcopService << endl;
diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp
index bef9b1bd..90360dc6 100644
--- a/korganizer/korgac/alarmdockwindow.cpp
+++ b/korganizer/korgac/alarmdockwindow.cpp
@@ -91,7 +91,7 @@ AlarmDockWindow::AlarmDockWindow( const char *name )
     connect( quit, TQT_SIGNAL( activated() ), TQT_SLOT( slotQuit() ) );
   }
 #else //FIXME: remove for KDE 4.0
-    quit->disconnect( TQT_SIGNAL( activated() ), qApp,
+    quit->disconnect( TQT_SIGNAL( activated() ), tqApp,
                       TQT_SLOT( closeAllWindows() ) );
   }
   connect( this, TQT_SIGNAL( quitSelected() ), TQT_SLOT( slotQuit() ) );
@@ -192,7 +192,7 @@ void AlarmDockWindow::slotQuit()
            "(note that you will not get reminders whilst the daemon is not running)?"),
       i18n("Close KOrganizer Reminder Daemon"),
       i18n("Start"), i18n("Do Not Start"),
-      TQString::fromLatin1("AskForStartAtLogin")
+      TQString::tqfromLatin1("AskForStartAtLogin")
       );
 
   bool autostart = true;
diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp
index ec19ce9a..7ed25518 100644
--- a/korganizer/korgac/koalarmclient.cpp
+++ b/korganizer/korgac/koalarmclient.cpp
@@ -108,7 +108,7 @@ void KOAlarmClient::checkAlarms()
   if ( !cfg->readBoolEntry( "Enabled", true ) ) return;
 
   TQDateTime from = mLastChecked.addSecs( 1 );
-  mLastChecked = TQDateTime::currentDateTime();
+  mLastChecked = TQDateTime::tqcurrentDateTime();
 
   kdDebug(5891) << "Check: " << from.toString() << " - " << mLastChecked.toString() << endl;
 
@@ -188,7 +188,7 @@ void KOAlarmClient::dumpDebug()
 
 TQStringList KOAlarmClient::dumpAlarms()
 {
-  TQDateTime start = TQDateTime( TQDateTime::currentDateTime().date(),
+  TQDateTime start = TQDateTime( TQDateTime::tqcurrentDateTime().date(),
                                TQTime( 0, 0 ) );
   TQDateTime end = start.addDays( 1 ).addSecs( -1 );
 
diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp
index 5a3ba5a1..7cf090e2 100644
--- a/korganizer/korgac/testalarmdlg.cpp
+++ b/korganizer/korgac/testalarmdlg.cpp
@@ -48,7 +48,7 @@ int main(int argc,char **argv)
 
   Event *e1 = new Event;
   e1->setSummary( "This is a summary." );
-  TQDateTime now = TQDateTime::currentDateTime();
+  TQDateTime now = TQDateTime::tqcurrentDateTime();
   e1->setDtStart( now );
   e1->setDtEnd( now.addDays( 1 ) );
   Alarm *a = e1->newAlarm();
@@ -97,19 +97,19 @@ int main(int argc,char **argv)
 
   AlarmDialog dlg( mCalendar, 0 );
   app.setMainWidget( &dlg );
-  dlg.addIncidence( e2, TQDateTime::currentDateTime().addSecs( 60 ),
+  dlg.addIncidence( e2, TQDateTime::tqcurrentDateTime().addSecs( 60 ),
                     TQString() );
-  dlg.addIncidence( t1, TQDateTime::currentDateTime().addSecs( 300 ),
+  dlg.addIncidence( t1, TQDateTime::tqcurrentDateTime().addSecs( 300 ),
                     TQString( "THIS IS DISPLAY TEXT" ) );
-  dlg.addIncidence( e4, TQDateTime::currentDateTime().addSecs( 120 ),
+  dlg.addIncidence( e4, TQDateTime::tqcurrentDateTime().addSecs( 120 ),
                     TQString( "Fred and Barney get cloned" ) );
-  dlg.addIncidence( e3, TQDateTime::currentDateTime().addSecs( 240 ),
+  dlg.addIncidence( e3, TQDateTime::tqcurrentDateTime().addSecs( 240 ),
                     TQString() );
-  dlg.addIncidence( e1, TQDateTime::currentDateTime().addSecs( 180 ),
+  dlg.addIncidence( e1, TQDateTime::tqcurrentDateTime().addSecs( 180 ),
                     TQString() );
-  dlg.addIncidence( t2, TQDateTime::currentDateTime().addSecs( 600 ),
+  dlg.addIncidence( t2, TQDateTime::tqcurrentDateTime().addSecs( 600 ),
                     TQString( "THIS IS DISPLAY TEXT" ) );
-  dlg.addIncidence( t3, TQDateTime::currentDateTime().addSecs( 360 ),
+  dlg.addIncidence( t3, TQDateTime::tqcurrentDateTime().addSecs( 360 ),
                     TQString() );
   dlg.show();
   dlg.eventNotification();
diff --git a/korganizer/korganizer.h b/korganizer/korganizer.h
index d088becb..d5246b87 100644
--- a/korganizer/korganizer.h
+++ b/korganizer/korganizer.h
@@ -50,7 +50,7 @@ namespace KCal { class CalendarResources; }
 
 using namespace KCal;
 
-// Workaround for moc workaround for visual c++ 6.0 sucking
+// Workaround for tqmoc workaround for visual c++ 6.0 sucking
 typedef KOrg::MainWindow KOrgMainWindow;
 typedef KParts::MainWindow KPartsMainWindow;
 
@@ -93,7 +93,7 @@ class KOrganizer : public KPartsMainWindow, public KOrgMainWindow
 
     virtual KXMLGUIFactory *mainGuiFactory() { return factory(); }
     virtual KXMLGUIClient *mainGuiClient() { return this; }
-    virtual TQWidget *topLevelWidget() { return this; }
+    virtual TQWidget *tqtopLevelWidget() { return this; }
 
     virtual bool isCurrentlyActivePart();
 
diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp
index 65511bd1..cc6252d5 100644
--- a/korganizer/korganizer_part.cpp
+++ b/korganizer/korganizer_part.cpp
@@ -66,10 +66,10 @@
 typedef KParts::GenericFactory< KOrganizerPart > KOrganizerFactory;
 K_EXPORT_COMPONENT_FACTORY( libkorganizerpart, KOrganizerFactory )
 
-KOrganizerPart::KOrganizerPart( TQWidget *parentWidget, const char *widgetName,
+KOrganizerPart::KOrganizerPart( TQWidget *tqparentWidget, const char *widgetName,
                                 TQObject *parent, const char *name,
                                 const TQStringList & ) :
-  KParts::ReadOnlyPart(parent, name), mTopLevelWidget( parentWidget->topLevelWidget() )
+  KParts::ReadOnlyPart(parent, name), mTopLevelWidget( tqparentWidget->tqtopLevelWidget() )
 {
   KGlobal::locale()->insertCatalogue( "libkcal" );
   KGlobal::locale()->insertCatalogue( "libkdepim" );
@@ -80,7 +80,7 @@ KOrganizerPart::KOrganizerPart( TQWidget *parentWidget, const char *widgetName,
   TQString pname( name );
 
   // create a canvas to insert our widget
-  TQWidget *canvas = new TQWidget( parentWidget, widgetName );
+  TQWidget *canvas = new TQWidget( tqparentWidget, widgetName );
   canvas->setFocusPolicy( TQWidget::ClickFocus );
   setWidget( canvas );
   mView = new CalendarView( canvas );
@@ -155,9 +155,9 @@ void KOrganizerPart::slotChangeInfo( Incidence *incidence, const TQDate & )
   }
 }
 
-TQWidget *KOrganizerPart::topLevelWidget()
+TQWidget *KOrganizerPart::tqtopLevelWidget()
 {
-  return mView->topLevelWidget();
+  return mView->tqtopLevelWidget();
 }
 
 ActionManager *KOrganizerPart::actionManager()
diff --git a/korganizer/korganizer_part.h b/korganizer/korganizer_part.h
index ad6a4508..1aececaf 100644
--- a/korganizer/korganizer_part.h
+++ b/korganizer/korganizer_part.h
@@ -58,7 +58,7 @@ class KOrganizerPart: public KParts::ReadOnlyPart,
 {
     Q_OBJECT
   public:
-    KOrganizerPart( TQWidget *parentWidget, const char *widgetName,
+    KOrganizerPart( TQWidget *tqparentWidget, const char *widgetName,
                     TQObject *parent, const char *name, const TQStringList & );
     virtual ~KOrganizerPart();
 
@@ -78,7 +78,7 @@ class KOrganizerPart: public KParts::ReadOnlyPart,
 
     virtual KXMLGUIFactory *mainGuiFactory() { return factory(); }
     virtual KXMLGUIClient *mainGuiClient() { return this; }
-    virtual TQWidget *topLevelWidget();
+    virtual TQWidget *tqtopLevelWidget();
     virtual ActionManager *actionManager();
     virtual KActionCollection *getActionCollection() const { return actionCollection(); }
     virtual void showStatusMessage( const TQString &message );
diff --git a/korganizer/korganizeriface.h b/korganizer/korganizeriface.h
index 88ab61d5..225f0f2d 100644
--- a/korganizer/korganizeriface.h
+++ b/korganizer/korganizeriface.h
@@ -48,7 +48,7 @@ class KOrganizerIface : virtual public DCOPObject
     /**
       Add an incidence to the active calendar.
       @param iCal A calendar in iCalendar format containing the incidence. The
-                  calendar must consist of a VCALENDAR component which contains
+                  calendar must consist of a VCALENDAR component which tqcontains
                   the incidence (VEVENT, VTODO, VJOURNAL or VFREEBUSY) and
                   optionally a VTIMEZONE component. If there is more than one
                   incidence, only the first is added to KOrganizer's calendar.
diff --git a/korganizer/kotimelineview.cpp b/korganizer/kotimelineview.cpp
index 1eb1084d..ea987ccf 100644
--- a/korganizer/kotimelineview.cpp
+++ b/korganizer/kotimelineview.cpp
@@ -94,7 +94,7 @@ KCal::DateList KOTimelineView::selectedIncidenceDates()
 }
 
 /*virtual*/
-int KOTimelineView::currentDateCount()
+int KOTimelineView::tqcurrentDateCount()
 {
     return 0;
 }
@@ -293,7 +293,7 @@ void KOTimelineView::insertIncidence(KCal::Incidence * incidence)
   for ( TQDate day = mStartDate; day <= mEndDate; day = day.addDays( 1 ) ) {
     Event::List events = calendar()->events( day, EventSortStartDate, SortDirectionAscending );
     for ( Event::List::ConstIterator it = events.constBegin(); it != events.constEnd(); ++it ) {
-      if ( events.contains( event ) )
+      if ( events.tqcontains( event ) )
         insertIncidence( *it, day );
     }
   }
diff --git a/korganizer/kotimelineview.h b/korganizer/kotimelineview.h
index 81e1eef4..72ba9084 100644
--- a/korganizer/kotimelineview.h
+++ b/korganizer/kotimelineview.h
@@ -51,7 +51,7 @@ class KOTimelineView : public KOEventView
 
     virtual KCal::ListBase<KCal::Incidence> selectedIncidences();
     virtual KCal::DateList selectedIncidenceDates();
-    virtual int currentDateCount();
+    virtual int tqcurrentDateCount();
     virtual void showDates(const TQDate&, const TQDate&);
     virtual void showIncidences(const KCal::ListBase<KCal::Incidence>&, const TQDate &date);
     virtual void updateView();
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index 9d273b3a..180ff139 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -128,7 +128,7 @@ void KOTodoEditor::setupGeneral()
 
     mGeneral->initHeader( topFrame, topLayout );
     mGeneral->initTime(topFrame,topLayout);
-    mGeneral->initStatus(topFrame,topLayout);
+    mGeneral->iniStatus(topFrame,topLayout);
     mGeneral->initDescription(topFrame,topLayout);
     mGeneral->initAttachments(topFrame,topLayout);
     connect( mGeneral, TQT_SIGNAL( openURL( const KURL& ) ),
@@ -172,7 +172,7 @@ void KOTodoEditor::newTodo()
 
 void KOTodoEditor::setTexts( const TQString &summary, const TQString &description )
 {
-  if ( description.isEmpty() && summary.contains("\n") ) {
+  if ( description.isEmpty() && summary.tqcontains("\n") ) {
     mGeneral->setDescription( summary );
     int pos = summary.find( "\n" );
     mGeneral->setSummary( summary.left( pos ) );
@@ -185,7 +185,7 @@ void KOTodoEditor::setTexts( const TQString &summary, const TQString &descriptio
 void KOTodoEditor::loadDefaults()
 {
   kdDebug(5850) << k_funcinfo << endl;
-  setDates( TQDateTime::currentDateTime().addDays( 7 ), true, 0 );
+  setDates( TQDateTime::tqcurrentDateTime().addDays( 7 ), true, 0 );
   mGeneral->toggleAlarm( KOPrefs::instance()->defaultTodoReminders() );
 }
 
@@ -271,7 +271,7 @@ void KOTodoEditor::setDates( const TQDateTime &due, bool allDay, Todo *relatedEv
   if ( mTodo ) {
     mRecurrence->setDefaults( mTodo->dtStart(), due, false );
   } else {
-    mRecurrence->setDefaults( TQDateTime::currentDateTime(), due, false );
+    mRecurrence->setDefaults( TQDateTime::tqcurrentDateTime(), due, false );
   }
 }
 
diff --git a/korganizer/kotodoeditor.h b/korganizer/kotodoeditor.h
index 5ab3e36d..f743c11c 100644
--- a/korganizer/kotodoeditor.h
+++ b/korganizer/kotodoeditor.h
@@ -55,7 +55,7 @@ class KOTodoEditor : public KOIncidenceEditor
 
     /**
       Sets the given summary and description. If description is empty and the
-      summary contains multiple lines, the summary will be used as description
+      summary tqcontains multiple lines, the summary will be used as description
       and only the first line of summary will be used as the summary.
     */
     void setTexts( const TQString &summary, const TQString &description = TQString::null );
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 5951d8bc..333e2fbf 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -84,7 +84,7 @@ void KOTodoListViewToolTip::maybeTip( const TQPoint & pos)
   {
 
     /* Calculate the rectangle. */
-    r=todolist->itemRect(i);
+    r=todolist->tqitemRect(i);
     headerPos = todolist->header()->sectionPos(col)-todolist->contentsX();
     r.setLeft( (headerPos < 0 ? 0 : headerPos) );
     r.setRight(headerPos + todolist->header()->sectionSize(col));
@@ -563,7 +563,7 @@ void KOTodoView::updateView()
   mTodoMap.clear();
   Todo::List::ConstIterator it;
   for( it = todoList.begin(); it != todoList.end(); ++it ) {
-    if ( !mTodoMap.contains( *it ) ) {
+    if ( !mTodoMap.tqcontains( *it ) ) {
       insertTodoItem( *it );
     }
   }
@@ -635,7 +635,7 @@ void KOTodoView::removeTodoItems()
   KOTodoViewItem *item;
   for ( item = mItemsToDelete.first(); item; item = mItemsToDelete.next() ) {
     Todo *todo = item->todo();
-    if ( todo && mTodoMap.contains( todo ) ) {
+    if ( todo && mTodoMap.tqcontains( todo ) ) {
       mTodoMap.remove( todo );
     }
     delete item;
@@ -656,7 +656,7 @@ bool KOTodoView::scheduleRemoveTodoItem( KOTodoViewItem *todoItem )
 
 void KOTodoView::updateConfig()
 {
-  mTodoListView->repaintContents();
+  mTodoListView->tqrepaintContents();
 }
 
 Incidence::List KOTodoView::selectedIncidences()
@@ -691,7 +691,7 @@ void KOTodoView::changeIncidenceDisplay(Incidence *incidence, int action)
   Todo *todo = static_cast<Todo *>(incidence);
   if ( todo ) {
     KOTodoViewItem *todoItem = 0;
-    if ( mTodoMap.contains( todo ) ) {
+    if ( mTodoMap.tqcontains( todo ) ) {
       todoItem = mTodoMap[todo];
     }
     switch ( action ) {
@@ -705,7 +705,7 @@ void KOTodoView::changeIncidenceDisplay(Incidence *incidence, int action)
             // correctly update changes in relations
             Todo*parent = dynamic_cast<Todo*>( todo->relatedTo() );
             KOTodoViewItem*parentItem = 0;
-            if ( parent && mTodoMap.contains(parent) ) {
+            if ( parent && mTodoMap.tqcontains(parent) ) {
               parentItem = mTodoMap[ parent ];
             }
             if ( todoItem->parent() != parentItem ) {
@@ -797,7 +797,7 @@ void KOTodoView::popupMenu( TQListViewItem *item, const TQPoint &, int column )
       if ( mActiveItem->todo()->hasDueDate () ) {
         mMovePopupMenu->datePicker()->setDate( date );
       } else {
-        mMovePopupMenu->datePicker()->setDate( TQDate::currentDate() );
+        mMovePopupMenu->datePicker()->setDate( TQDate::tqcurrentDate() );
       }
       switch ( column ) {
         case ePriorityColumn:
@@ -815,7 +815,7 @@ void KOTodoView::popupMenu( TQListViewItem *item, const TQPoint &, int column )
           break;
         default:
           mCopyPopupMenu->datePicker()->setDate( date );
-          mCopyPopupMenu->datePicker()->setDate( TQDate::currentDate() );
+          mCopyPopupMenu->datePicker()->setDate( TQDate::tqcurrentDate() );
           mItemPopupMenu->setItemEnabled( ePopupUnSubTodo,
                                           mActiveItem->todo()->relatedTo() );
           mItemPopupMenu->setItemEnabled( ePopupUnAllSubTodo,
@@ -832,7 +832,7 @@ void KOTodoView::newTodo()
 {
   kdDebug() << k_funcinfo << endl;
   emit newTodoSignal( 0/*ResourceCalendar*/, TQString()/*subResource*/,
-                      TQDate::currentDate().addDays(7) );
+                      TQDate::tqcurrentDate().addDays(7) );
 }
 
 void KOTodoView::newSubTodo()
@@ -917,7 +917,7 @@ void KOTodoView::setNewPercentage( KOTodoViewItem *item, int percentage )
       myChild = myChild->nextSibling();
     }*/
     if ( percentage == 100 ) {
-      todo->setCompleted( TQDateTime::currentDateTime() );
+      todo->setCompleted( TQDateTime::tqcurrentDateTime() );
       // If the todo does recur, it doesn't get set as completed. However, the
       // item is still checked. Uncheck it again.
       if ( !todo->isCompleted() ) {
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index bc7302d3..1d53a382 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -124,7 +124,7 @@ class KOTodoView : public KOrg::BaseView
     DateList selectedIncidenceDates() { return DateList(); }
 
     /** Return number of shown dates. TodoView does not show dates, */
-    int currentDateCount() { return 0; }
+    int tqcurrentDateCount() { return 0; }
 
     CalPrinterBase::PrintType printType();
 
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index f5b0adce..bb03fe32 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -243,7 +243,7 @@ bool KOTodoViewItem::isAlternate()
 #endif
 }
 
-void KOTodoViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
+void KOTodoViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
 {
   TQColorGroup _cg = cg;
   // If no todo is set, just don't paint anything...
@@ -252,12 +252,12 @@ void KOTodoViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column,
   if (isAlternate())
         _cg.setColor(TQColorGroup::Base, static_cast< KOTodoListView* >(listView())->alternateBackground());
   if (mTodo->hasDueDate()) {
-    if (mTodo->dtDue().date()==TQDate::currentDate() &&
+    if (mTodo->dtDue().date()==TQDate::tqcurrentDate() &&
         !mTodo->isCompleted()) {
       _cg.setColor(TQColorGroup::Base, KOPrefs::instance()->mTodoDueTodayColor);
       _cg.setColor(TQColorGroup::Text, getTextColor(KOPrefs::instance()->mTodoDueTodayColor));
     }
-    if (mTodo->dtDue().date() < TQDate::currentDate() &&
+    if (mTodo->dtDue().date() < TQDate::tqcurrentDate() &&
         !mTodo->isCompleted()) {
       _cg.setColor(TQColorGroup::Base, KOPrefs::instance()->mTodoOverdueColor);
       _cg.setColor(TQColorGroup::Text, getTextColor(KOPrefs::instance()->mTodoOverdueColor));
@@ -278,6 +278,6 @@ void KOTodoViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column,
         KGlobalSettings::highlightColor() );
     p->restore();
   } else {
-    TQCheckListItem::paintCell(p, _cg, column, width, alignment);
+    TQCheckListItem::paintCell(p, _cg, column, width, tqalignment);
   }
 }
diff --git a/korganizer/kotodoviewitem.h b/korganizer/kotodoviewitem.h
index 80b3b961..5388d6da 100644
--- a/korganizer/kotodoviewitem.h
+++ b/korganizer/kotodoviewitem.h
@@ -66,7 +66,7 @@ class KOTodoViewItem : public QCheckListItem
     bool isAlternate();
     int compare( TQListViewItem *i, int col, bool ascending ) const;
     virtual void paintCell(TQPainter *p, const TQColorGroup &cg,
-      int column, int width, int alignment);
+      int column, int width, int tqalignment);
 
   protected:
 #if QT_VERSION >= 300
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 1906a07e..06ae0741 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -451,7 +451,7 @@ void KOViewManager::showNextXView()
 {
   mAgendaMode = AGENDA_NEXTX;
   showAgendaView();
-  mMainView->dateNavigator()->selectDates( TQDate::currentDate(),
+  mMainView->dateNavigator()->selectDates( TQDate::tqcurrentDate(),
                                            KOPrefs::instance()->mNextXDays );
 }
 
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 884b70b2..1ec28ed2 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -65,9 +65,9 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, TQWidget *parent,
   : KOrg::BaseView(calendar, parent, name)
 {
 //  TQLabel *dateLabel =
-//      new TQLabel(KGlobal::locale()->formatDate(TQDate::currentDate()),this);
+//      new TQLabel(KGlobal::locale()->formatDate(TQDate::tqcurrentDate()),this);
 //  dateLabel->setMargin(2);
-//  dateLabel->setAlignment(AlignCenter);
+//  dateLabel->tqsetAlignment(AlignCenter);
 
   mView = new WhatsNextTextBrowser(this);
   connect(mView,TQT_SIGNAL(showIncidence(const TQString &)),TQT_SLOT(showIncidence(const TQString &)));
@@ -81,7 +81,7 @@ KOWhatsNextView::~KOWhatsNextView()
 {
 }
 
-int KOWhatsNextView::currentDateCount()
+int KOWhatsNextView::tqcurrentDateCount()
 {
   return mStartDate.daysTo( mEndDate );
 }
@@ -183,7 +183,7 @@ void KOWhatsNextView::updateView()
 
   TQStringList myEmails( KOPrefs::instance()->allEmails() );
   int replies = 0;
-  events = calendar()->events( TQDate::currentDate(), TQDate(2975,12,6) );
+  events = calendar()->events( TQDate::tqcurrentDate(), TQDate(2975,12,6) );
   Event::List::ConstIterator it2;
   for( it2 = events.begin(); it2 != events.end(); ++it2 ) {
     Event *ev = *it2;
diff --git a/korganizer/kowhatsnextview.h b/korganizer/kowhatsnextview.h
index 69c6a62e..211984ed 100644
--- a/korganizer/kowhatsnextview.h
+++ b/korganizer/kowhatsnextview.h
@@ -55,7 +55,7 @@ class KOWhatsNextView : public KOrg::BaseView
                     const char *name = 0);
     ~KOWhatsNextView();
 
-    virtual int currentDateCount();
+    virtual int tqcurrentDateCount();
     virtual Incidence::List selectedIncidences() { return Incidence::List(); }
     DateList selectedIncidenceDates() { return DateList(); }
 
diff --git a/korganizer/mailscheduler.cpp b/korganizer/mailscheduler.cpp
index 0c0ddb96..a5fe92b4 100644
--- a/korganizer/mailscheduler.cpp
+++ b/korganizer/mailscheduler.cpp
@@ -122,7 +122,7 @@ TQPtrList<ScheduleMessage> MailScheduler::retrieveTransactions()
         TQTextStream t( &f );
         t.setEncoding( TQTextStream::Latin1 );
         TQString messageString = t.read();
-        messageString.replace( TQRegExp( "\n[ \t]"), "" );
+        messageString.tqreplace( TQRegExp( "\n[ \t]"), "" );
         messageString = TQString::fromUtf8( messageString.latin1() );
         ScheduleMessage *mess = mFormat->parseScheduleMessage( mCalendar,
                                                                messageString );
diff --git a/korganizer/multiagendaview.cpp b/korganizer/multiagendaview.cpp
index a6aa5166..7d77a3da 100644
--- a/korganizer/multiagendaview.cpp
+++ b/korganizer/multiagendaview.cpp
@@ -60,7 +60,7 @@ MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView,
   mLeftSplitter = new TQSplitter( Qt::Vertical, topSideBox );
   mLeftSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
   TQLabel *label = new TQLabel( i18n("All Day"), mLeftSplitter );
-  label->setAlignment( Qt::AlignRight | Qt::AlignVCenter | Qt::WordBreak );
+  label->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter | Qt::WordBreak );
   TQVBox *sideBox = new TQVBox( mLeftSplitter );
   EventIndicator *eiSpacer = new EventIndicator( EventIndicator::Top, sideBox );
   eiSpacer->changeColumns( 0 );
@@ -265,7 +265,7 @@ void MultiAgendaView::setupViews()
 
   int minWidth = 0;
   for ( TQValueList<TQWidget*>::ConstIterator it = mAgendaWidgets.constBegin(); it != mAgendaWidgets.constEnd(); ++it )
-    minWidth = QMAX( minWidth, (*it)->minimumSizeHint().width() );
+    minWidth = QMAX( minWidth, (*it)->tqminimumSizeHint().width() );
   for ( TQValueList<TQWidget*>::ConstIterator it = mAgendaWidgets.constBegin(); it != mAgendaWidgets.constEnd(); ++it )
     (*it)->setMinimumWidth( minWidth );
 }
@@ -292,10 +292,10 @@ DateList MultiAgendaView::selectedIncidenceDates()
   return list;
 }
 
-int MultiAgendaView::currentDateCount()
+int MultiAgendaView::tqcurrentDateCount()
 {
   FOREACH_VIEW( agendaView )
-    return agendaView->currentDateCount();
+    return agendaView->tqcurrentDateCount();
   return 0;
 }
 
@@ -427,7 +427,7 @@ void MultiAgendaView::resizeEvent(TQResizeEvent * ev)
 void MultiAgendaView::resizeScrollView(const TQSize & size)
 {
   const int widgetWidth = size.width() - mTimeLabels->width() - mScrollBar->width();
-  int width = QMAX( mTopBox->sizeHint().width(), widgetWidth );
+  int width = QMAX( mTopBox->tqsizeHint().width(), widgetWidth );
   int height = size.height();
   if ( width > widgetWidth ) {
     const int sbHeight = mScrollView->horizontalScrollBar()->height();
@@ -536,7 +536,7 @@ void MultiAgendaView::zoomView( const int delta, const TQPoint & pos, const Qt::
 
   mTimeLabels->updateConfig();
   mTimeLabels->positionChanged();
-  mTimeLabels->repaint();
+  mTimeLabels->tqrepaint();
 }
 
 // KDE4: not needed, use existing TQSplitter signals instead
diff --git a/korganizer/multiagendaview.h b/korganizer/multiagendaview.h
index ebdfc900..8fec0b7c 100644
--- a/korganizer/multiagendaview.h
+++ b/korganizer/multiagendaview.h
@@ -50,7 +50,7 @@ class MultiAgendaView : public AgendaView
     void deSelectAgendaView() { mSelectedAgendaView = 0; }
     Incidence::List selectedIncidences();
     DateList selectedIncidenceDates();
-    int currentDateCount();
+    int tqcurrentDateCount();
     int maxDatesHint();
 
     bool eventDurationHint(TQDateTime &startDt, TQDateTime &endDt, bool &allDay);
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index f663af81..836c251f 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -71,43 +71,43 @@ NavigatorBar::NavigatorBar( TQWidget *parent, const char *name )
   pix = KOGlobals::self()->smallIcon( isRTL ? "2rightarrow" : "2leftarrow" );
   mPrevYear = new TQPushButton( this );
   mPrevYear->setPixmap( pix );
-  mPrevYear->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+  mPrevYear->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   TQToolTip::add( mPrevYear, i18n( "Previous year" ) );
 
   pix = KOGlobals::self()->smallIcon( isRTL ? "1rightarrow" : "1leftarrow");
   mPrevMonth = new TQPushButton( this );
   mPrevMonth->setPixmap( pix );
-  mPrevMonth->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+  mPrevMonth->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   TQToolTip::add( mPrevMonth, i18n( "Previous month" ) );
 
   // Create forward navigation buttons
   pix = KOGlobals::self()->smallIcon( isRTL ? "1leftarrow" : "1rightarrow");
   mNextMonth = new TQPushButton( this );
   mNextMonth->setPixmap( pix );
-  mNextMonth->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+  mNextMonth->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   TQToolTip::add( mNextMonth, i18n( "Next month" ) );
 
   pix = KOGlobals::self()->smallIcon( isRTL ? "2leftarrow" : "2rightarrow");
   mNextYear = new TQPushButton( this );
   mNextYear->setPixmap( pix );
-  mNextYear->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+  mNextYear->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   TQToolTip::add( mNextYear, i18n( "Next year" ) );
 
   // Create month name button
   mMonth = new ActiveLabel( this );
   mMonth->setFont( tfont );
-  mMonth->setAlignment( AlignCenter );
-  mMonth->setMinimumHeight( mPrevYear->sizeHint().height() );
+  mMonth->tqsetAlignment( AlignCenter );
+  mMonth->setMinimumHeight( mPrevYear->tqsizeHint().height() );
   TQToolTip::add( mMonth, i18n( "Select a month" ) );
 
   // Create year button
   mYear = new ActiveLabel( this );
   mYear->setFont( tfont );
-  mYear->setAlignment( AlignCenter );
-  mYear->setMinimumHeight( mPrevYear->sizeHint().height() );
+  mYear->tqsetAlignment( AlignCenter );
+  mYear->setMinimumHeight( mPrevYear->tqsizeHint().height() );
   TQToolTip::add( mYear, i18n( "Select a year" ) );
 
-  // set up control frame layout
+  // set up control frame tqlayout
   TQHBoxLayout *ctrlLayout = new TQHBoxLayout( this );
   ctrlLayout->addWidget( mPrevYear );
   ctrlLayout->addWidget( mPrevMonth );
diff --git a/korganizer/plugins/datenums/Makefile.am b/korganizer/plugins/datenums/Makefile.am
index 8081a564..9924bf45 100644
--- a/korganizer/plugins/datenums/Makefile.am
+++ b/korganizer/plugins/datenums/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkorg_datenums.la
 
 libkorg_datenums_la_SOURCES = configdialog.cpp datenums.cpp
 libkorg_datenums_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) 
-libkorg_datenums_la_LIBADD = $(top_builddir)/korganizer/libkorganizer.la $(LIB_KDEUI)
+libkorg_datenums_la_LIBADD = $(top_builddir)/korganizer/libkorganizer.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
 
 noinst_HEADERS = datenums.h
 
diff --git a/korganizer/plugins/exchange/Makefile.am b/korganizer/plugins/exchange/Makefile.am
index 39290aad..ab3eb177 100644
--- a/korganizer/plugins/exchange/Makefile.am
+++ b/korganizer/plugins/exchange/Makefile.am
@@ -15,7 +15,8 @@ libkorg_exchange_la_SOURCES =  exchange.cpp exchangedialog.cpp exchangeconfig.cp
 libkorg_exchange_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries)
 libkorg_exchange_la_LIBADD = $(top_builddir)/korganizer/libkorganizer.la \
 			     $(top_builddir)/libkpimexchange/libkpimexchange.la \
-			     $(LIB_KDEUI) $(LIB_KPARTS)
+			     $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) \
+			     $(top_builddir)/libkcal/libkcal.la
 
 noinst_HEADERS = exchange.h exchangedialog.h exchangeconfig.h
 
diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp
index 3d3719ed..8455d61b 100644
--- a/korganizer/plugins/exchange/exchange.cpp
+++ b/korganizer/plugins/exchange/exchange.cpp
@@ -65,7 +65,7 @@ Exchange::Exchange(KOrg::MainWindow *parent, const char *name) :
 
   mAccount = new KPIM::ExchangeAccount( "Calendar/Exchange Plugin" );
   mClient = new KPIM::ExchangeClient( mAccount );
-  mClient->setWindow( parent->topLevelWidget() );
+  mClient->setWindow( parent->tqtopLevelWidget() );
 
   setXMLFile("plugins/exchangeui.rc");
 
@@ -219,9 +219,9 @@ void Exchange::showError( int error, const TQString& moreInfo /* = TQString::nul
 
   if ( error !=  KPIM::ExchangeClient::ResultOK ) {
     if ( moreInfo.isNull() )
-      KMessageBox::error( mainWindow()->topLevelWidget(), errorText, i18n( "Exchange Plugin" ) );
+      KMessageBox::error( mainWindow()->tqtopLevelWidget(), errorText, i18n( "Exchange Plugin" ) );
     else
-      KMessageBox::detailedError( mainWindow()->topLevelWidget(), errorText, moreInfo, i18n( "Exchange Plugin" ) );
+      KMessageBox::detailedError( mainWindow()->tqtopLevelWidget(), errorText, moreInfo, i18n( "Exchange Plugin" ) );
   }
 }
 
diff --git a/korganizer/plugins/hebrew/Makefile.am b/korganizer/plugins/hebrew/Makefile.am
index 4f48cc58..3326ba1f 100644
--- a/korganizer/plugins/hebrew/Makefile.am
+++ b/korganizer/plugins/hebrew/Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libkorg_hebrew.la
 
 libkorg_hebrew_la_SOURCES = hebrew.cpp configdialog.cpp holiday.cpp parsha.cpp converter.cpp
 libkorg_hebrew_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) 
-libkorg_hebrew_la_LIBADD = $(LIB_KDECORE) $(LIB_KDEUI)
+libkorg_hebrew_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
 
 noinst_HEADERS = hebrew.h configdialog.h parsha.h converter.h holiday.h
 
diff --git a/korganizer/plugins/printing/journal/Makefile.am b/korganizer/plugins/printing/journal/Makefile.am
index 6238b1f1..626ecf17 100644
--- a/korganizer/plugins/printing/journal/Makefile.am
+++ b/korganizer/plugins/printing/journal/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkorg_journalprint.la
 
 libkorg_journalprint_la_SOURCES =calprintjournalconfig_base.ui  journalprint.cpp
 libkorg_journalprint_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) 
-libkorg_journalprint_la_LIBADD = $(LIB_KDECORE) $(LIB_KDEUI) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la
+libkorg_journalprint_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la -L$(top_builddir)/libkdepim/ -lkdepim
 
 noinst_HEADERS = 
 
diff --git a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
index bee91a36..1e41fdb8 100644
--- a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
+++ b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
@@ -6,7 +6,7 @@
     <property name="name">
         <cstring>CalPrintJournal_Base</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -65,7 +65,7 @@
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout2</cstring>
+                        <cstring>tqlayout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -81,7 +81,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>15</width>
                                     <height>20</height>
@@ -136,7 +136,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>324</width>
                                     <height>21</height>
@@ -157,7 +157,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>201</height>
@@ -193,7 +193,7 @@
     <tabstop>mFromDate</tabstop>
     <tabstop>mToDate</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kdateedit.h</includehint>
     <includehint>kdateedit.h</includehint>
diff --git a/korganizer/plugins/printing/list/calprintlistconfig_base.ui b/korganizer/plugins/printing/list/calprintlistconfig_base.ui
index cea873e6..22c6d577 100644
--- a/korganizer/plugins/printing/list/calprintlistconfig_base.ui
+++ b/korganizer/plugins/printing/list/calprintlistconfig_base.ui
@@ -6,7 +6,7 @@
     <property name="name">
         <cstring>CalPrintList_Base</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -40,7 +40,7 @@
                 </property>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout2</cstring>
+                        <cstring>tqlayout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -56,7 +56,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>15</width>
                                     <height>20</height>
@@ -111,7 +111,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>324</width>
                                     <height>21</height>
@@ -169,7 +169,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>40</height>
@@ -182,5 +182,5 @@
     <tabstop>mFromDate</tabstop>
     <tabstop>mToDate</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
index c93e48ed..c855976a 100644
--- a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
+++ b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
@@ -6,7 +6,7 @@
     <property name="name">
         <cstring>CalPrintWhatsNext_Base</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -40,7 +40,7 @@
                 </property>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout2</cstring>
+                        <cstring>tqlayout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -56,7 +56,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>15</width>
                                     <height>20</height>
@@ -111,7 +111,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>324</width>
                                     <height>21</height>
@@ -132,7 +132,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>201</height>
@@ -168,7 +168,7 @@
     <tabstop>mFromDate</tabstop>
     <tabstop>mToDate</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kdateedit.h</includehint>
     <includehint>kdateedit.h</includehint>
diff --git a/korganizer/plugins/printing/year/Makefile.am b/korganizer/plugins/printing/year/Makefile.am
index f51e29e6..5d691357 100644
--- a/korganizer/plugins/printing/year/Makefile.am
+++ b/korganizer/plugins/printing/year/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkorg_yearlyprint.la
 
 libkorg_yearlyprint_la_SOURCES =calprintyearconfig_base.ui  yearprint.cpp
 libkorg_yearlyprint_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) 
-libkorg_yearlyprint_la_LIBADD = $(LIB_KDECORE) $(LIB_KDEUI) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la
+libkorg_yearlyprint_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KDEPRINT) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la
 
 noinst_HEADERS = 
 
diff --git a/korganizer/plugins/printing/year/calprintyearconfig_base.ui b/korganizer/plugins/printing/year/calprintyearconfig_base.ui
index 43d906d6..38b7822b 100644
--- a/korganizer/plugins/printing/year/calprintyearconfig_base.ui
+++ b/korganizer/plugins/printing/year/calprintyearconfig_base.ui
@@ -6,7 +6,7 @@
     <property name="name">
         <cstring>CalPrintYear_Base</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -84,7 +84,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>120</width>
                             <height>21</height>
@@ -106,7 +106,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>131</width>
                             <height>21</height>
@@ -187,7 +187,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>40</height>
@@ -196,5 +196,5 @@
         </spacer>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp
index 6c45ff42..d5abb1f4 100644
--- a/korganizer/plugins/projectview/koprojectview.cpp
+++ b/korganizer/plugins/projectview/koprojectview.cpp
@@ -107,8 +107,8 @@ KOProjectView::KOProjectView(Calendar *calendar,TQWidget* parent,
 void KOProjectView::createMainTask()
 {
   mMainTask = new KGanttItem(0,i18n("main task"),
-                         TQDateTime::currentDateTime(),
-                         TQDateTime::currentDateTime());
+                         TQDateTime::tqcurrentDateTime(),
+                         TQDateTime::tqcurrentDateTime());
   mMainTask->setMode(KGanttItem::Rubberband);
   mMainTask->setStyle(KGanttItem::DrawBorder | KGanttItem::DrawText |
                       KGanttItem::DrawHandle);
@@ -154,8 +154,8 @@ void KOProjectView::updateView()
 
 #if 0
   KGanttItem* t1 = new KGanttItem(mGantt->getMainTask(), "task 1, no subtasks",
-                             TQDateTime::currentDateTime().addDays(10),
-                             TQDateTime::currentDateTime().addDays(20) );
+                             TQDateTime::tqcurrentDateTime().addDays(10),
+                             TQDateTime::tqcurrentDateTime().addDays(20) );
 
   KGanttItem* t2 = new KGanttItem(mGantt->getMainTask(), "task 2, subtasks, no rubberband",
                              TQDateTime(TQDate(2000,10,1)),
@@ -188,7 +188,7 @@ void KOProjectView::updateView()
   mTodoMap.clear();
   Todo::List::ConstIterator it;
   for( it = todoList.begin(); it != todoList.end(); ++it ) {
-    if ( !mTodoMap.contains( *it ) ) {
+    if ( !mTodoMap.tqcontains( *it ) ) {
       insertTodoItem( *it );
     }
   }
@@ -224,14 +224,14 @@ KGanttItem *KOProjectView::createTask(KGanttItem *parent,Todo *todo)
   if (todo->hasStartDate() && !todo->hasDueDate()) {
     // start date but no due date
     startDt = todo->dtStart();
-    endDt = TQDateTime::currentDateTime();
+    endDt = TQDateTime::tqcurrentDateTime();
   } else if (!todo->hasStartDate() && todo->hasDueDate()) {
     // due date but no start date
     startDt = todo->dtDue();
     endDt = todo->dtDue();
   } else if (!todo->hasStartDate() || !todo->hasDueDate()) {
-    startDt = TQDateTime::currentDateTime();
-    endDt = TQDateTime::currentDateTime();
+    startDt = TQDateTime::tqcurrentDateTime();
+    endDt = TQDateTime::tqcurrentDateTime();
   } else {
     startDt = todo->dtStart();
     endDt = todo->dtDue();
diff --git a/korganizer/plugins/projectview/koprojectview.h b/korganizer/plugins/projectview/koprojectview.h
index aa856621..39062179 100644
--- a/korganizer/plugins/projectview/koprojectview.h
+++ b/korganizer/plugins/projectview/koprojectview.h
@@ -74,7 +74,7 @@ class KOProjectView : public KOrg::BaseView
     DateList selectedDates();
 
     /** Return number of shown dates. */
-    int currentDateCount() { return 0; }
+    int tqcurrentDateCount() { return 0; }
 
     void readSettings();
     void writeSettings(KConfig *);
diff --git a/korganizer/plugins/timespanview/kotimespanview.cpp b/korganizer/plugins/timespanview/kotimespanview.cpp
index eec3ab46..01fc0cb4 100644
--- a/korganizer/plugins/timespanview/kotimespanview.cpp
+++ b/korganizer/plugins/timespanview/kotimespanview.cpp
@@ -79,7 +79,7 @@ int KOTimeSpanView::maxDatesHint()
   return 0;
 }
 
-int KOTimeSpanView::currentDateCount()
+int KOTimeSpanView::tqcurrentDateCount()
 {
   return 0;
 }
diff --git a/korganizer/plugins/timespanview/kotimespanview.h b/korganizer/plugins/timespanview/kotimespanview.h
index d115b630..49e54ab6 100644
--- a/korganizer/plugins/timespanview/kotimespanview.h
+++ b/korganizer/plugins/timespanview/kotimespanview.h
@@ -38,7 +38,7 @@ class KOTimeSpanView : public KOEventView
     ~KOTimeSpanView();
 
     virtual int maxDatesHint();
-    virtual int currentDateCount();
+    virtual int tqcurrentDateCount();
     virtual Incidence::List selectedIncidences();
     DateList selectedDates() { return DateList(); }
 
diff --git a/korganizer/printing/calprintdayconfig_base.ui b/korganizer/printing/calprintdayconfig_base.ui
index 8abfaa1c..bb1bfc0b 100644
--- a/korganizer/printing/calprintdayconfig_base.ui
+++ b/korganizer/printing/calprintdayconfig_base.ui
@@ -6,7 +6,7 @@
     <property name="name">
         <cstring>CalPrintDay_Base</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -56,7 +56,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>121</width>
                             <height>21</height>
@@ -73,7 +73,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>121</width>
                             <height>21</height>
@@ -228,7 +228,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>201</height>
@@ -249,7 +249,7 @@
 <includes>
     <include location="global" impldecl="in declaration">kdateedit.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>libkdepim/kdateedit.h</includehint>
     <includehint>libkdepim/kdateedit.h</includehint>
diff --git a/korganizer/printing/calprintdefaultplugins.cpp b/korganizer/printing/calprintdefaultplugins.cpp
index 8c2539e8..b62c7add 100644
--- a/korganizer/printing/calprintdefaultplugins.cpp
+++ b/korganizer/printing/calprintdefaultplugins.cpp
@@ -52,7 +52,7 @@
 static TQString cleanString( const TQString &instr )
 {
   TQString ret = instr;
-  return ret.replace( '\n', ' ' );
+  return ret.tqreplace( '\n', ' ' );
 }
 
 /**************************************************************
diff --git a/korganizer/printing/calprinter.cpp b/korganizer/printing/calprinter.cpp
index 0ab61fda..0517dec0 100644
--- a/korganizer/printing/calprinter.cpp
+++ b/korganizer/printing/calprinter.cpp
@@ -178,7 +178,7 @@ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins,
 
   mTypeGroup = new TQVButtonGroup( i18n("Print Style"), splitter, "buttonGroup" );
   // use the minimal width possible = max width of the radio buttons, not extensible
-/*  mTypeGroup->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4,
+/*  mTypeGroup->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4,
     (TQSizePolicy::SizeType)5, 0, 0,
       mTypeGroup->sizePolicy().hasHeightForWidth() ) );*/
 
@@ -220,11 +220,11 @@ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins,
     TQRadioButton *radioButton = new TQRadioButton( p->description(), mTypeGroup );
     radioButton->setEnabled( p->enabled() );
     mTypeGroup->insert( radioButton, mapit.key() );
-//     radioButton->setMinimumHeight( radioButton->sizeHint().height() - 5 );
+//     radioButton->setMinimumHeight( radioButton->tqsizeHint().height() - 5 );
   }
 
-  setMinimumSize( minimumSizeHint() );
-  resize( minimumSizeHint() );
+  setMinimumSize( tqminimumSizeHint() );
+  resize( tqminimumSizeHint() );
 }
 
 CalPrintDialog::~CalPrintDialog()
@@ -255,7 +255,7 @@ void CalPrintDialog::setOrientation( CalPrinter::ePrintOrientation orientation )
 KOrg::PrintPlugin *CalPrintDialog::selectedPlugin()
 {
   int id = mTypeGroup->selectedId();
-  if ( mPluginIDs.contains( id ) ) {
+  if ( mPluginIDs.tqcontains( id ) ) {
     return mPluginIDs[id];
   } else {
     return 0;
diff --git a/korganizer/printing/calprintincidenceconfig_base.ui b/korganizer/printing/calprintincidenceconfig_base.ui
index 5a85fb71..ef238b52 100644
--- a/korganizer/printing/calprintincidenceconfig_base.ui
+++ b/korganizer/printing/calprintincidenceconfig_base.ui
@@ -6,7 +6,7 @@
     <property name="name">
         <cstring>CalPrintIncidence_Base</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -90,7 +90,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>201</height>
@@ -99,5 +99,5 @@
         </spacer>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/korganizer/printing/calprintmonthconfig_base.ui b/korganizer/printing/calprintmonthconfig_base.ui
index 00172958..6fd311ea 100644
--- a/korganizer/printing/calprintmonthconfig_base.ui
+++ b/korganizer/printing/calprintmonthconfig_base.ui
@@ -6,7 +6,7 @@
     <property name="name">
         <cstring>CalPrintMonth_Base</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -31,7 +31,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>20</height>
@@ -131,7 +131,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>17</width>
                             <height>21</height>
@@ -200,7 +200,7 @@
 <includes>
     <include location="global" impldecl="in declaration">kdateedit.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp
index e16e72c6..c0e61b92 100644
--- a/korganizer/printing/calprintpluginbase.cpp
+++ b/korganizer/printing/calprintpluginbase.cpp
@@ -46,7 +46,7 @@ inline int round(const double x)
 static TQString cleanStr( const TQString &instr )
 {
   TQString ret = instr;
-  return ret.replace( '\n', ' ' );
+  return ret.tqreplace( '\n', ' ' );
 }
 
 /******************************************************************
@@ -128,7 +128,7 @@ CalPrintPluginBase::~CalPrintPluginBase()
 TQWidget *CalPrintPluginBase::createConfigWidget( TQWidget *w )
 {
   TQFrame *wdg = new TQFrame( w );
-  TQVBoxLayout *layout = new TQVBoxLayout( wdg );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( wdg );
 
   TQLabel *title = new TQLabel( description(), wdg );
   TQFont titleFont( title->font() );
@@ -136,13 +136,13 @@ TQWidget *CalPrintPluginBase::createConfigWidget( TQWidget *w )
   titleFont.setBold( true );
   title->setFont( titleFont );
 
-  layout->addWidget( title );
-  layout->addWidget( new TQLabel( info(), wdg ) );
-  layout->addSpacing( 20 );
-  layout->addWidget( new TQLabel( i18n("This printing style does not "
+  tqlayout->addWidget( title );
+  tqlayout->addWidget( new TQLabel( info(), wdg ) );
+  tqlayout->addSpacing( 20 );
+  tqlayout->addWidget( new TQLabel( i18n("This printing style does not "
                                       "have any configuration options."),
                                  wdg ) );
-  layout->addStretch();
+  tqlayout->addStretch();
   return wdg;
 }
 
@@ -182,7 +182,7 @@ void CalPrintPluginBase::doLoadConfig()
   if ( mConfig ) {
     KConfigGroupSaver saver( mConfig, description() );
     mConfig->sync();
-    TQDateTime currDate( TQDate::currentDate() );
+    TQDateTime currDate( TQDate::tqcurrentDate() );
     mFromDate = mConfig->readDateTimeEntry( "FromDate", &currDate ).date();
     mToDate = mConfig->readDateTimeEntry( "ToDate" ).date();
     mUseColors = mConfig->readBoolEntry( "UseColors", true );
@@ -558,7 +558,7 @@ int CalPrintPluginBase::drawFooter( TQPainter &p, TQRect &footbox )
   TQFont oldfont( p.font() );
   p.setFont( TQFont( "sans-serif", 6 ) );
   TQFontMetrics fm( p.font() );
-  TQString dateStr = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false );
+  TQString dateStr = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), false );
   p.drawText( footbox, TQt::AlignCenter | TQt::AlignVCenter | TQt::SingleLine,
               i18n( "print date: formatted-datetime", "printed: %1" ).arg( dateStr ) );
   p.setFont( oldfont );
@@ -1602,7 +1602,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p,
     // The problem is that relations() does not apply filters, so
     // we need to compare manually with the complete filtered list!
     Todo* subtodo = dynamic_cast<Todo *>( *it );
-    if (subtodo && todoList.contains( subtodo ) ) {
+    if (subtodo && todoList.tqcontains( subtodo ) ) {
       drawTodo( count, subtodo, p, connectSubTodos, strikeoutCompleted,
                 desc, posPriority, posSummary, posDueDt, posPercentComplete,
                 level+1, x, y, width, pageHeight, todoList, &startpt );
@@ -1619,7 +1619,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p,
     // The problem is that relations() does not apply filters, so
     // we need to compare manually with the complete filtered list!
     Todo* subtodo = dynamic_cast<Todo *>( *it );
-    if ( subtodo && todoList.contains( subtodo ) ) {
+    if ( subtodo && todoList.tqcontains( subtodo ) ) {
       t.append( subtodo );
     }
   }
diff --git a/korganizer/printing/calprintpluginbase.h b/korganizer/printing/calprintpluginbase.h
index b845b379..16a1cc2f 100644
--- a/korganizer/printing/calprintpluginbase.h
+++ b/korganizer/printing/calprintpluginbase.h
@@ -259,7 +259,7 @@ class KDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin
       It prints the given text and optionally one or two small
       month views, as specified by the two TQDate. The printed
       text can also contain a line feed.
-      If month2 is invalid, only the month that contains month1
+      If month2 is invalid, only the month that tqcontains month1
       is printed.
       E.g. the filofax week view draws just the current month,
       while the month view draws the previous and the next month.
@@ -419,7 +419,7 @@ class KDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin
       On the left side the time scale is printed (using drawTimeLine), then each
       day gets one column (printed using drawAgendaDayBox),
       and the events are displayed as boxes (like in korganizer's day/week view).
-      The first cell of each column contains the all-day events (using
+      The first cell of each column tqcontains the all-day events (using
       drawAllDayBox with expandable=false).
       The given time range cannot be expanded to include all events.
       \param p TQPainter of the printout
@@ -435,7 +435,7 @@ class KDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin
 
     /**
       Draw the month table of the month containing the date qd. Each day gets one
-      box (using drawDayBox) that contains a list of all events on that day. They are arranged
+      box (using drawDayBox) that tqcontains a list of all events on that day. They are arranged
       in a matrix, with the first column being the first day of the
       week (so it might display some days of the previous and the next month).
       Above the matrix there is a bar showing the weekdays (drawn using drawDaysOfWeek).
diff --git a/korganizer/printing/calprinttodoconfig_base.ui b/korganizer/printing/calprinttodoconfig_base.ui
index 53fd3bfb..ea2dcff2 100644
--- a/korganizer/printing/calprinttodoconfig_base.ui
+++ b/korganizer/printing/calprinttodoconfig_base.ui
@@ -6,7 +6,7 @@
     <property name="name">
         <cstring>CalPrintTodoConfig_Base</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -86,7 +86,7 @@
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout2</cstring>
+                        <cstring>tqlayout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -102,7 +102,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -191,7 +191,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>21</height>
@@ -275,7 +275,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -341,7 +341,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>121</width>
                             <height>20</height>
@@ -358,7 +358,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>121</width>
                             <height>20</height>
@@ -447,7 +447,7 @@
 <includes>
     <include location="global" impldecl="in declaration">kdateedit.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>libkdepim/kdateedit.h</includehint>
     <includehint>libkdepim/kdateedit.h</includehint>
diff --git a/korganizer/printing/calprintweekconfig_base.ui b/korganizer/printing/calprintweekconfig_base.ui
index a14013ce..32ea6fb4 100644
--- a/korganizer/printing/calprintweekconfig_base.ui
+++ b/korganizer/printing/calprintweekconfig_base.ui
@@ -6,7 +6,7 @@
     <property name="name">
         <cstring>CalPrintWeek_Base</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -34,7 +34,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>27</height>
@@ -62,7 +62,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>16</width>
                             <height>21</height>
@@ -118,7 +118,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>110</width>
                             <height>20</height>
@@ -246,7 +246,7 @@
                         <string>Print as &amp;timetable view</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>This view is similar to the weekview in KOrganizer. The week is printed in landscape layout. You can even use the same colors for the items if you check &lt;i&gt;Use Colors&lt;/i&gt;.</string>
+                        <string>This view is similar to the weekview in KOrganizer. The week is printed in landscape tqlayout. You can even use the same colors for the items if you check &lt;i&gt;Use Colors&lt;/i&gt;.</string>
                     </property>
                 </widget>
                 <widget class="QRadioButton" row="2" column="0" rowspan="1" colspan="3">
@@ -257,7 +257,7 @@
                         <string>Print as split week view</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>This view is similar to the week view in KOrganizer. The only difference with the timetable view is the page layout. Timetables are printed in landscape, the split week view in portrait.</string>
+                        <string>This view is similar to the week view in KOrganizer. The only difference with the timetable view is the page tqlayout. Timetables are printed in landscape, the split week view in portrait.</string>
                     </property>
                 </widget>
             </grid>
@@ -292,7 +292,7 @@
 <includes>
     <include location="global" impldecl="in declaration">kdateedit.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>libkdepim/kdateedit.h</includehint>
     <includehint>libkdepim/kdateedit.h</includehint>
diff --git a/korganizer/publishdialog_base.ui b/korganizer/publishdialog_base.ui
index e6574be6..7e7a5ff1 100644
--- a/korganizer/publishdialog_base.ui
+++ b/korganizer/publishdialog_base.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>PublishDialog_base</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -112,7 +112,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>241</height>
@@ -129,5 +129,5 @@
     <tabstop>mRemove</tabstop>
     <tabstop>mSelectAddressee</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp
index 150aa014..0f2d0e13 100644
--- a/korganizer/resourceview.cpp
+++ b/korganizer/resourceview.cpp
@@ -83,7 +83,7 @@ static TQString labelFromSubResName( ResourceCalendar *resource, const TQString
 static TQString labelFromIdentifier( ResourceCalendar *resource, const TQString &identifier )
 {
   TQString subResLabel;
-  if ( identifier.contains( "/.INBOX.directory/" ) ) { // my subresource
+  if ( identifier.tqcontains( "/.INBOX.directory/" ) ) { // my subresource
     TQString subResName = identifier;
     subResName.remove( TQRegExp( "^.*/\\.INBOX\\.directory/" ) );
     subResLabel = labelFromSubResName( resource, subResName );
@@ -238,18 +238,18 @@ void ResourceItem::setStandardResource( bool std )
 {
   if ( mIsStandardResource != std ) {
     mIsStandardResource = std;
-    repaint();
+    tqrepaint();
   }
 }
 
 void ResourceItem::paintCell(TQPainter *p, const TQColorGroup &cg,
-      int column, int width, int alignment)
+      int column, int width, int tqalignment)
 {
   TQFont oldFont = p->font();
   TQFont newFont = oldFont;
   newFont.setBold( mIsStandardResource && !mIsSubresource );
   p->setFont( newFont );
-  TQCheckListItem::paintCell( p, cg, column, width, alignment );
+  TQCheckListItem::paintCell( p, cg, column, width, tqalignment );
   p->setFont( oldFont );
 /*  TQColorGroup _cg = cg;
   if(!mResource) return;
@@ -595,7 +595,7 @@ void ResourceView::editResource()
   if ( item->isSubresource() ) {
     if ( resource->type() == "imap" || resource->type() == "scalix" ) {
       TQString identifier = item->resourceIdentifier();
-      if ( !identifier.contains( "/.INBOX.directory/" ) ) {
+      if ( !identifier.tqcontains( "/.INBOX.directory/" ) ) {
         KMessageBox::sorry(
           this,
           i18n( "Cannot rename someone else's calendar folder." ) );
@@ -708,7 +708,7 @@ void ResourceView::contextMenuRequested ( TQListViewItem *lvitem, const TQPoint
 
     if ( item->isSubresource() &&
          ( item->resource()->type() == "imap" || item->resource()->type() == "scalix" ) ) {
-      if ( item->resourceIdentifier().contains( "/.INBOX.directory/" ) ) {
+      if ( item->resourceIdentifier().tqcontains( "/.INBOX.directory/" ) ) {
         menu->insertItem( i18n("&Rename..."), this, TQT_SLOT( editResource() ) );
       }
     } else {
diff --git a/korganizer/resourceview.h b/korganizer/resourceview.h
index ee406027..304ab8c6 100644
--- a/korganizer/resourceview.h
+++ b/korganizer/resourceview.h
@@ -69,7 +69,7 @@ class ResourceItem : public QCheckListItem
     void update();
 
     virtual void paintCell(TQPainter *p, const TQColorGroup &cg,
-      int column, int width, int alignment);
+      int column, int width, int tqalignment);
 
     void setResourceColor(TQColor& color);
     TQColor &resourceColor() {return mResourceColor;}
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 2cc4bb44..b8b6ea1e 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -52,11 +52,11 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
   mCalendar = calendar;
 
   TQFrame *topFrame = plainPage();
-  TQVBoxLayout *layout = new TQVBoxLayout(topFrame,0,spacingHint());
+  TQVBoxLayout *tqlayout = new TQVBoxLayout(topFrame,0,spacingHint());
 
   // Search expression
   TQHBoxLayout *subLayout = new TQHBoxLayout();
-  layout->addLayout(subLayout);
+  tqlayout->addLayout(subLayout);
 
   searchEdit = new TQLineEdit( "*", topFrame ); // Find all events by default
   searchLabel = new TQLabel( searchEdit, i18n("&Search for:"), topFrame );
@@ -68,7 +68,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
 
 
   TQHButtonGroup *itemsGroup = new TQHButtonGroup( i18n("Search For"), topFrame );
-  layout->addWidget( itemsGroup );
+  tqlayout->addWidget( itemsGroup );
   mEventsCheck = new TQCheckBox( i18n("&Events"), itemsGroup );
   mTodosCheck = new TQCheckBox( i18n("To-&dos"), itemsGroup );
   mJournalsCheck = new TQCheckBox( i18n("&Journal entries"), itemsGroup );
@@ -78,7 +78,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
   // Date range
   TQGroupBox *rangeGroup = new TQGroupBox( 1, Horizontal, i18n( "Date Range" ),
                                         topFrame );
-  layout->addWidget( rangeGroup );
+  tqlayout->addWidget( rangeGroup );
 
   TQWidget *rangeWidget = new TQWidget( rangeGroup );
   TQHBoxLayout *rangeLayout = new TQHBoxLayout( rangeWidget, 0, spacingHint() );
@@ -89,7 +89,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
 
   mEndDate = new KDateEdit( rangeWidget );
   rangeLayout->addWidget( new TQLabel( mEndDate, i18n("&To:"), rangeWidget ) );
-  mEndDate->setDate( TQDate::currentDate().addDays( 365 ) );
+  mEndDate->setDate( TQDate::tqcurrentDate().addDays( 365 ) );
   rangeLayout->addWidget( mEndDate );
 
   mInclusiveCheck = new TQCheckBox( i18n("E&vents have to be completely included"),
@@ -100,7 +100,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
 
   // Subjects to search
   TQHButtonGroup *subjectGroup = new TQHButtonGroup( i18n("Search In"), topFrame );
-  layout->addWidget(subjectGroup);
+  tqlayout->addWidget(subjectGroup);
 
   mSummaryCheck = new TQCheckBox( i18n("Su&mmaries"), subjectGroup );
   mSummaryCheck->setChecked( true );
@@ -111,7 +111,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
   // Results list view
   listView = new KOListView( mCalendar, topFrame );
   listView->showDates();
-  layout->addWidget( listView );
+  tqlayout->addWidget( listView );
 
   if ( KOPrefs::instance()->mCompactDialogs ) {
     KOGlobals::fitDialogToScreen( this, true );
diff --git a/korganizer/template_management_dialog_base.ui b/korganizer/template_management_dialog_base.ui
index 093ff3c5..606db9ec 100644
--- a/korganizer/template_management_dialog_base.ui
+++ b/korganizer/template_management_dialog_base.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>TemplateManagementDialog_base</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -75,7 +75,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>51</height>
@@ -86,7 +86,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistbox.h</includehint>
 </includehints>
diff --git a/korganizer/templatemanagementdialog.h b/korganizer/templatemanagementdialog.h
index fbc4c512..9216108f 100644
--- a/korganizer/templatemanagementdialog.h
+++ b/korganizer/templatemanagementdialog.h
@@ -56,7 +56,7 @@ Q_OBJECT
     /* Emitted whenever the user wants to add teh current incidence as a template
     with the given name. */
     void saveTemplate( const TQString& templateName );
-    /* Emitted when the dialog changed the list of templates. Calling code can the replace
+    /* Emitted when the dialog changed the list of templates. Calling code can the tqreplace
        the list that was handed in with the one this signal transports. */
     void templatesChanged( const TQStringList& templates );
     
diff --git a/korganizer/timelabels.cpp b/korganizer/timelabels.cpp
index 81b53c1f..53bc3458 100644
--- a/korganizer/timelabels.cpp
+++ b/korganizer/timelabels.cpp
@@ -197,7 +197,7 @@ void TimeLabels::updateConfig()
   sFont.setPointSize(  sFont.pointSize()/2 );
   TQFontMetrics fmS(   sFont );
   mMiniWidth += fmS.width(  test ) + frameWidth()*2+4 ;
-  // update geometry restrictions based on new settings
+  // update tqgeometry restrictions based on new settings
   setFixedWidth(  mMiniWidth );
 
   // update HourSize
@@ -237,14 +237,14 @@ void TimeLabels::setAgenda( KOAgenda* agenda )
 }
 
 
-/** This is called in response to repaint() */
+/** This is called in response to tqrepaint() */
 void TimeLabels::paintEvent(TQPaintEvent*)
 {
 //  kdDebug(5850) << "paintevent..." << endl;
   // this is another hack!
 //  TQPainter painter(this);
   //TQString c
-  repaintContents(contentsX(), contentsY(), visibleWidth(), visibleHeight());
+  tqrepaintContents(contentsX(), contentsY(), visibleWidth(), visibleHeight());
 }
 
 #include "timelabels.moc"
diff --git a/korn/account_input.cpp b/korn/account_input.cpp
index d7584805..feafbe86 100644
--- a/korn/account_input.cpp
+++ b/korn/account_input.cpp
@@ -136,7 +136,7 @@ TQString ComboInput::value() const
 
 void ComboInput::setValue( const TQString& value )
 {
-	if( _list->contains( value ) )
+	if( _list->tqcontains( value ) )
 		_right->setCurrentItem( _list->keys().findIndex( value ) );
 	else
 		_right->setCurrentItem( -1 );
diff --git a/korn/account_input.h b/korn/account_input.h
index 548db498..43e68047 100644
--- a/korn/account_input.h
+++ b/korn/account_input.h
@@ -33,7 +33,7 @@ class TQCheckBox;
 #include <tqmap.h>
 
 /**
- * This classe contains methods to use in the creation of the protocol configuration box.
+ * This classe tqcontains methods to use in the creation of the protocol configuration box.
  * The subclasses of this classes define the methods.
  */
 class AccountInput
diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp
index 4dec0190..c4976f23 100644
--- a/korn/boxcontaineritem.cpp
+++ b/korn/boxcontaineritem.cpp
@@ -216,23 +216,23 @@ void BoxContainerItem::showPassivePopup( TQWidget* parent, TQPtrList< KornMailSu
 {
 	KPassivePopup *popup = new KPassivePopup( parent, "Passive popup" );
 		
-	TQVBox *mainvlayout = popup->standardView( i18n( "KOrn - %1/%2 (total: %3)" ).arg( objId() ).arg( accountName )
+	TQVBox *mainvtqlayout = popup->standardView( i18n( "KOrn - %1/%2 (total: %3)" ).arg( objId() ).arg( accountName )
 			.arg( total ), "", TQPixmap(), 0 );
-	TQGrid *mainglayout = new TQGrid( date ? 3 : 2 ,mainvlayout, "Grid-Layout" );
+	TQGrid *maingtqlayout = new TQGrid( date ? 3 : 2 ,mainvtqlayout, "Grid-Layout" );
 	
-	TQLabel *title = new TQLabel( i18n("From"), mainglayout, "from_label" );
+	TQLabel *title = new TQLabel( i18n("From"), maingtqlayout, "from_label" );
 	TQFont font = title->font();
 	font.setBold( true );
 	title->setFont( font );
 		
-	title = new TQLabel( i18n("Subject"), mainglayout, "subject_label" );
+	title = new TQLabel( i18n("Subject"), maingtqlayout, "subject_label" );
 	font = title->font();
 	font.setBold( true );
 	title->setFont( font );
 		
 	if( date )
 	{
-		title = new TQLabel( i18n("Date"), mainglayout, "date_label" );
+		title = new TQLabel( i18n("Date"), maingtqlayout, "date_label" );
 		font = title->font();
 		font.setBold( true );
 		title->setFont( font );
@@ -240,19 +240,19 @@ void BoxContainerItem::showPassivePopup( TQWidget* parent, TQPtrList< KornMailSu
 	
 	for( KornMailSubject* subject = list->first(); subject; subject = list->next() )
 	{
-		new TQLabel( subject->getSender(), mainglayout, "from-value" );
-		new TQLabel( subject->getSubject(), mainglayout, "subject-value" );
+		new TQLabel( subject->getSender(), maingtqlayout, "from-value" );
+		new TQLabel( subject->getSubject(), maingtqlayout, "subject-value" );
 		if( date )
 		{
 			TQDateTime tijd;
 			tijd.setTime_t( subject->getDate() );
-			new TQLabel( tijd.toString(), mainglayout, "date-value" );
+			new TQLabel( tijd.toString(), maingtqlayout, "date-value" );
 		}
 	}
 	
 	popup->setAutoDelete( true ); //Now, now care for deleting these pointers.
 	
-	popup->setView( mainvlayout );
+	popup->setView( mainvtqlayout );
 	
 	popup->show(); //Display it
 }
@@ -316,7 +316,7 @@ void BoxContainerItem::drawLabel( TQLabel *label, const int count, const bool ne
 		if( _fonts[ index ] )
 			label->setFont( *_fonts[ index ] );
 		label->setPaletteForegroundColor( *_fgColour[ index ] );
-		label->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
+		label->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
 		label->setText( TQString::number( count ) );
 	}
 	
@@ -358,7 +358,7 @@ TQPixmap BoxContainerItem::calcComplexPixmap( const TQPixmap &icon, const TQColo
 		for( int yy = 0; yy < numberImage.width(); ++yy )
 		{
 			//Set colour and alpha channel
-			rgbline[ yy ] = qRgba( fgColour.red(), fgColour.green(), fgColour.blue(), qRed( rgbline[ yy ] ) ); 
+			rgbline[ yy ] = tqRgba( fgColour.red(), fgColour.green(), fgColour.blue(), tqRed( rgbline[ yy ] ) ); 
 		}
 	}
 
@@ -371,7 +371,7 @@ TQPixmap BoxContainerItem::calcComplexPixmap( const TQPixmap &icon, const TQColo
 
 void BoxContainerItem::setAnimIcon( TQLabel* label, const TQString& anim )
 {
-	label->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
+	label->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
 	label->setMovie( TQMovie( anim ) );
 	label->show();
 }
diff --git a/korn/boxcontaineritem.h b/korn/boxcontaineritem.h
index 86a4efc9..06c02993 100644
--- a/korn/boxcontaineritem.h
+++ b/korn/boxcontaineritem.h
@@ -68,7 +68,7 @@ public:
 	/**
 	 * This function reads the config. It stores the readed values in the class.
 	 * It also sets the DCOPObject-name.
-	 * @param config The KConfigGroup-object which contains the configuration of this box.
+	 * @param config The KConfigGroup-object which tqcontains the configuration of this box.
 	 * @param index The index of the box used in the config-file
 	 */
 	virtual void readConfig( KConfig* config, const int index );
diff --git a/korn/dcopdrop.cpp b/korn/dcopdrop.cpp
index 407a6ff0..7eb8d2a0 100644
--- a/korn/dcopdrop.cpp
+++ b/korn/dcopdrop.cpp
@@ -74,7 +74,7 @@ bool DCOPDrop::readConfigGroup( const KConfigGroup &cfg )
 
 bool DCOPDrop::readConfigGroup( const TQMap< TQString, TQString > &map, const Protocol * )
 {
-	if( !map.contains( "dcopname" ) )
+	if( !map.tqcontains( "dcopname" ) )
 		//The mapping MUST contain dcopname.
 		kdDebug() << "mapping is niet compleet" << endl;
 
@@ -125,7 +125,7 @@ bool DCOPDrop::deleteMails( TQPtrList<const KornMailId> * ids, bool * )
 	for( const KornMailId *it = ids->first(); it; it = ids->next() )
 	{
 		const KornIntId* id = dynamic_cast< const KornIntId* >( it );
-		if( _msgList->contains( id->getId() ) )
+		if( _msgList->tqcontains( id->getId() ) )
 			_msgList->erase( id->getId() );
 	}
 	
@@ -162,7 +162,7 @@ int DCOPDrop::addMessage( const TQString& subject, const TQString& message )
 	mailsubject->setSender( TQString( "DCOP: %1" ).arg( *_name ) );
 	mailsubject->setHeader( message, true );
 	mailsubject->setSize( message.length() );
-	mailsubject->setDate( TQDateTime::currentDateTime().toTime_t() );
+	mailsubject->setDate( TQDateTime::tqcurrentDateTime().toTime_t() );
 	
 	_msgList->insert( id->getId(), mailsubject );
 	
@@ -173,7 +173,7 @@ int DCOPDrop::addMessage( const TQString& subject, const TQString& message )
 
 bool DCOPDrop::removeMessage( int id )
 {
-	if( ! _msgList->contains( id ) )
+	if( ! _msgList->tqcontains( id ) )
 		return false;
 	
 	delete (*_msgList)[ id ];
diff --git a/korn/dcopdrop.h b/korn/dcopdrop.h
index 124d197e..c14953f0 100644
--- a/korn/dcopdrop.h
+++ b/korn/dcopdrop.h
@@ -93,7 +93,7 @@ public:
 	/**
 	 * This function reeds the config which are shipped which the group.
 	 *
-	 * @param config The configuration group which contains the info for this account.
+	 * @param config The configuration group which tqcontains the info for this account.
 	 * @return The same value as KMailDrop::readConfigGroup( config ) returns.
 	 */
 	virtual bool readConfigGroup( const KConfigGroup& config );
diff --git a/korn/dockeditem.h b/korn/dockeditem.h
index ae6689f8..13cce3af 100644
--- a/korn/dockeditem.h
+++ b/korn/dockeditem.h
@@ -57,7 +57,7 @@ public:
 	 * This functions reads the config. It used the parent
 	 * version for the main things, but it is possible to
 	 * add some configurations over here.
-	 * @param config The KConfig-instance which contains the settings of this tray-item.
+	 * @param config The KConfig-instance which tqcontains the settings of this tray-item.
 	 * @param index The index of the box in the configuration file
 	 */
 	virtual void readConfig( KConfig* config, const int index );
diff --git a/korn/imap_proto.cpp b/korn/imap_proto.cpp
index caedb459..735f5de6 100644
--- a/korn/imap_proto.cpp
+++ b/korn/imap_proto.cpp
@@ -65,18 +65,18 @@ void Imap_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObjec
 
 void Imap_Protocol::readEntries( TQMap< TQString, TQString >* map, TQMap< TQString, TQString > *metadata ) const
 {
-	if( map->contains( "ssl" ) && *map->find( "ssl" ) == "true" )
+	if( map->tqcontains( "ssl" ) && *map->find( "ssl" ) == "true" )
 		map->insert( "encryption", "ssl" );
-	if( metadata->contains( "tls" ) )
+	if( metadata->tqcontains( "tls" ) )
 		map->insert( "encryption", TQString( "tls=%1" ).arg( *metadata->find( "tls" ) ) );
-	if( metadata->contains( "auth" ) )
+	if( metadata->tqcontains( "auth" ) )
 		map->insert( "auth", TQString( "auth=%1" ).arg( *metadata->find( "auth" ) ) );
 }
 
 void Imap_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const
 {
 	TQString metadata;
-	if( map->contains( "encryption" ) )
+	if( map->tqcontains( "encryption" ) )
 	{
 		if( *map->find( "encryption" ) == "ssl" )
 			map->insert( "ssl", "true" );
@@ -88,7 +88,7 @@ void Imap_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const
 		map->erase( "encryption" );
 	}
 
-	if( map->contains( "auth" ) )
+	if( map->tqcontains( "auth" ) )
 	{
 		if( !metadata.isEmpty() )
 			metadata += ",";
diff --git a/korn/imap_proto.h b/korn/imap_proto.h
index 97fb209a..451742eb 100644
--- a/korn/imap_proto.h
+++ b/korn/imap_proto.h
@@ -134,7 +134,7 @@ public:
 	 * This function edits writeEntry. It merge things back to a metadata-key and adds this
 	 * key to the configuration.
 	 *
-	 * @param map The mapping which contains the information to be written to a configuarion file.
+	 * @param map The mapping which tqcontains the information to be written to a configuarion file.
 	 *	the contents of this mapping can change in this function.
 	 */
         virtual void writeEntries( TQMap< TQString, TQString >* map ) const;
diff --git a/korn/kconf_update/korn-3-4-config_change.cpp b/korn/kconf_update/korn-3-4-config_change.cpp
index 08ca732b..9f275181 100644
--- a/korn/kconf_update/korn-3-4-config_change.cpp
+++ b/korn/kconf_update/korn-3-4-config_change.cpp
@@ -188,7 +188,7 @@ int main( int, char**  )
 		}
 		else if( currentGroup1.isNull() || !isKey )
 			continue;
-		if( mapping1.contains( key_value.cap( 1 ) ) )
+		if( mapping1.tqcontains( key_value.cap( 1 ) ) )
 		{
 			out << currentGroup1 << endl;
 			out << mapping1[ key_value.cap( 1 ) ] << "=" << key_value.cap( 2 ) << endl;
@@ -198,7 +198,7 @@ int main( int, char**  )
 				out << "name=" << key_value.cap( 2 ) << endl;
 			}
 		}
-		else if( mapping2.contains( key_value.cap( 1 ) ) )
+		else if( mapping2.tqcontains( key_value.cap( 1 ) ) )
 		{
 			to_printed.insert( key_value.cap( 1 ), key_value.cap( 2 ) );
 		}
diff --git a/korn/kio.cpp b/korn/kio.cpp
index 8015595c..6fdacdcd 100644
--- a/korn/kio.cpp
+++ b/korn/kio.cpp
@@ -180,11 +180,11 @@ void KKioDrop::setKioServer(const TQString & proto, const TQString & server, int
 	_ssl = ssl;
 	
 	//Checking for authentication-settings.
-	//if( _metadata->contains("auth") )
+	//if( _metadata->tqcontains("auth") )
 	//{
 	//	auth = (*_metadata)["auth"];
 	//	*_metadata = metadata;
-	//	if( ! _metadata->contains("auth") )
+	//	if( ! _metadata->tqcontains("auth") )
 	//		(*_metadata)["auth"] = auth;
 	//} else
 	*_metadata = metadata;
@@ -201,7 +201,7 @@ void KKioDrop::setUser(const TQString & user, const TQString & password,
 	_kurl->setPath( mailbox );
 	if( ! auth.isEmpty() && auth != "Plain" )
 		(*_metadata)["auth"] = auth;
-	else if( _metadata->contains( "auth" ) )
+	else if( _metadata->tqcontains( "auth" ) )
 		_metadata->erase( "auth" );
 
 	_valid = _kurl->isValid();
@@ -241,7 +241,7 @@ TQString KKioDrop::mailbox() const
 }
 TQString KKioDrop::auth() const
 {
-	return ( _metadata->contains("auth")?(*_metadata)["auth"]:"" );
+	return ( _metadata->tqcontains("auth")?(*_metadata)["auth"]:"" );
 }
 
 void KKioDrop::recheck()
@@ -337,8 +337,8 @@ bool KKioDrop::readConfigGroup( const TQMap< TQString, TQString > &map, const Pr
 {
 	TQString val, val2;
 
-	if( !map.contains( "server" ) || !map.contains( "port" ) || !map.contains( "ssl" ) || !map.contains( "username" ) ||
-	    !map.contains( "mailbox" ) || !map.contains( "password" ) || !map.contains( "metadata" ) || !map.contains( "name" ) )
+	if( !map.tqcontains( "server" ) || !map.tqcontains( "port" ) || !map.tqcontains( "ssl" ) || !map.tqcontains( "username" ) ||
+	    !map.tqcontains( "mailbox" ) || !map.tqcontains( "password" ) || !map.tqcontains( "metadata" ) || !map.tqcontains( "name" ) )
 	{
 		kdWarning() << "Bug: map niet compleet" << endl;
 		return false;
diff --git a/korn/kio_count.cpp b/korn/kio_count.cpp
index d97fa1e9..71da3080 100644
--- a/korn/kio_count.cpp
+++ b/korn/kio_count.cpp
@@ -259,7 +259,7 @@ void KIO_Count::entries( KIO::Job* job, const KIO::UDSEntryList &list )
 	for ( it1 = list.begin() ; it1 != list.end() ; it1++ )
 	{
 		/*
-		 * The list contains multiple objects. Each object could be a file.
+		 * The list tqcontains multiple objects. Each object could be a file.
 		 * Settings about it are saved in this scope until it is added to the list.
 		 */
 		isFile=false;
@@ -292,7 +292,7 @@ void KIO_Count::entries( KIO::Job* job, const KIO::UDSEntryList &list )
 		if( ! fileinfo.name.isNull() && isFile )
 		{
 			_new_mailurls->append( fileinfo );
-			if( ! old_list.contains( fileinfo.name ) && _kio->passivePopup() )
+			if( ! old_list.tqcontains( fileinfo.name ) && _kio->passivePopup() )
 				showPassive( fileinfo.name );
 		}
 	}
diff --git a/korn/kio_count.h b/korn/kio_count.h
index d8df7dc0..a881d410 100644
--- a/korn/kio_count.h
+++ b/korn/kio_count.h
@@ -25,7 +25,7 @@
 
 #include "kio.h" //Alsewise, no access to KKioDrop::FileInfo (needed in template)
 
-#include <kio/global.h> //FIXME: without this, moc-compiler fails.
+#include <kio/global.h> //FIXME: without this, tqmoc-compiler fails.
 
 class KIO_Protocol;
 class KIO_Single_Subject;
diff --git a/korn/kio_proto.cpp b/korn/kio_proto.cpp
index 8434fe44..5177a2f3 100644
--- a/korn/kio_proto.cpp
+++ b/korn/kio_proto.cpp
@@ -63,7 +63,7 @@ void KIO_Protocol::readEntries( TQMap< TQString, TQString >* map ) const
 {
 	TQMap< TQString, TQString> *metadata = new TQMap< TQString, TQString >;
 
-	if( map->contains( "metadata" ) )
+	if( map->tqcontains( "metadata" ) )
 	{
 		TQStringList list = TQStringList::split( ",", *map->find( "metadata" ) );
 		TQStringList::Iterator it;
diff --git a/korn/kornaccountcfg.ui b/korn/kornaccountcfg.ui
index 18b06829..15afffef 100644
--- a/korn/kornaccountcfg.ui
+++ b/korn/kornaccountcfg.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KornAccountCfg</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -31,7 +31,7 @@
                     <property name="name">
                         <cstring>lbProtocol</cstring>
                     </property>
-                    <property name="geometry">
+                    <property name="tqgeometry">
                         <rect>
                             <x>11</x>
                             <y>41</y>
@@ -50,7 +50,7 @@
                     <property name="name">
                         <cstring>cbProtocol</cstring>
                     </property>
-                    <property name="geometry">
+                    <property name="tqgeometry">
                         <rect>
                             <x>223</x>
                             <y>41</y>
@@ -73,7 +73,7 @@
                     </property>
                     <widget class="QLayoutWidget">
                         <property name="name">
-                            <cstring>layout35</cstring>
+                            <cstring>tqlayout35</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -137,7 +137,7 @@
                             </property>
                             <widget class="QLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout33</cstring>
+                                    <cstring>tqlayout33</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -237,7 +237,7 @@
 <slots>
     <slot access="protected">slotProtocolChanged( const QString&amp; )</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/korn/kornaccountcfgimpl.cpp b/korn/kornaccountcfgimpl.cpp
index 4a8af84e..5b7706e1 100644
--- a/korn/kornaccountcfgimpl.cpp
+++ b/korn/kornaccountcfgimpl.cpp
@@ -44,7 +44,7 @@ KornAccountCfgImpl::KornAccountCfgImpl( TQWidget * parent, const char * name )
 	_urlfields( 0 ),
 	_boxnr( 0 ),
 	_accountnr( 0 ),
-	_vlayout( 0 ),
+	_vtqlayout( 0 ),
 	_protocolLayout( 0 ),
 	_groupBoxes( 0 ),
 	_accountinput( new TQPtrList< AccountInput >() )
@@ -80,7 +80,7 @@ void KornAccountCfgImpl::readConfig( KConfigGroup *config, TQMap< TQString, TQSt
 	(*entries)[ "password" ] = KOrnPassword::readKOrnPassword( boxnr, accountnr, *config );
 	
 	for( input = _accountinput->first(); input; input = _accountinput->next() )
-		if( entries->contains( input->configName() ) )
+		if( entries->tqcontains( input->configName() ) )
 			input->setValue( *(entries->find( input->configName() ) ) );
 	
 	this->edInterval->setText( _config->readEntry( "interval", "300" ) );
@@ -115,7 +115,7 @@ void KornAccountCfgImpl::writeConfig()
 
 	protocol->writeEntries( map );
 
-	if( map->contains( "password" ) )
+	if( map->tqcontains( "password" ) )
 	{
 		KOrnPassword::writeKOrnPassword( _boxnr, _accountnr, *_config, *map->find( "password" ) );
 		map->erase( "password" );
@@ -173,12 +173,12 @@ void KornAccountCfgImpl::slotProtocolChanged( const TQString& proto )
 	_accountinput->clear();
 	delete _groupBoxes;
 	delete _protocolLayout;
-	delete _vlayout;
-	_vlayout = new TQVBoxLayout( this->server_tab, groupBoxes->count() + 1 );
-	_vlayout->setSpacing( 10 );
-	_vlayout->setMargin( 10 );
+	delete _vtqlayout;
+	_vtqlayout = new TQVBoxLayout( this->server_tab, groupBoxes->count() + 1 );
+	_vtqlayout->setSpacing( 10 );
+	_vtqlayout->setMargin( 10 );
 
-	_protocolLayout = new TQHBoxLayout( _vlayout );
+	_protocolLayout = new TQHBoxLayout( _vtqlayout );
 	_protocolLayout->addWidget( this->lbProtocol );
 	_protocolLayout->addWidget( this->cbProtocol );
 
@@ -189,7 +189,7 @@ void KornAccountCfgImpl::slotProtocolChanged( const TQString& proto )
 	for( it = groupBoxes->begin(); it != groupBoxes->end(); ++it )
 	{
 		_groupBoxes->insert( counter, new TQGroupBox( (*it), this->server_tab, "groupbox" ) );
-		_vlayout->addWidget( _groupBoxes->at( counter ) );
+		_vtqlayout->addWidget( _groupBoxes->at( counter ) );
 		++counter;
 	}
 	delete groupBoxes;
diff --git a/korn/kornaccountcfgimpl.h b/korn/kornaccountcfgimpl.h
index 27464f8b..9be27bc6 100644
--- a/korn/kornaccountcfgimpl.h
+++ b/korn/kornaccountcfgimpl.h
@@ -59,7 +59,7 @@ private:
 	int _urlfields;
 	int _boxnr, _accountnr;
 		
-	TQVBoxLayout *_vlayout;
+	TQVBoxLayout *_vtqlayout;
 	TQHBoxLayout *_protocolLayout;
 	TQPtrVector< TQWidget > *_groupBoxes;
 	
diff --git a/korn/kornboxcfg.ui b/korn/kornboxcfg.ui
index 4b61ee06..3f69aabf 100644
--- a/korn/kornboxcfg.ui
+++ b/korn/kornboxcfg.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KornBoxCfg</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -33,7 +33,7 @@
                     </property>
                     <widget class="QLayoutWidget" row="1" column="2">
                         <property name="name">
-                            <cstring>layout32</cstring>
+                            <cstring>tqlayout32</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -69,7 +69,7 @@
                     </widget>
                     <widget class="QLayoutWidget" row="2" column="1">
                         <property name="name">
-                            <cstring>layout34</cstring>
+                            <cstring>tqlayout34</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -124,7 +124,7 @@
                     </widget>
                     <widget class="QLayoutWidget" row="2" column="2">
                         <property name="name">
-                            <cstring>layout33</cstring>
+                            <cstring>tqlayout33</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -161,13 +161,13 @@
                         <property name="text">
                             <string>Normal</string>
                         </property>
-                        <property name="alignment">
+                        <property name="tqalignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
                     <widget class="QLayoutWidget" row="3" column="2">
                         <property name="name">
-                            <cstring>layout36</cstring>
+                            <cstring>tqlayout36</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -201,7 +201,7 @@
                         <property name="text">
                             <string>New Mail</string>
                         </property>
-                        <property name="alignment">
+                        <property name="tqalignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
@@ -215,7 +215,7 @@
                     </widget>
                     <widget class="QLayoutWidget" row="1" column="1">
                         <property name="name">
-                            <cstring>layout31</cstring>
+                            <cstring>tqlayout31</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -251,7 +251,7 @@
                     </widget>
                     <widget class="QLayoutWidget" row="3" column="1">
                         <property name="name">
-                            <cstring>layout35</cstring>
+                            <cstring>tqlayout35</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -288,7 +288,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>41</width>
                                 <height>160</height>
@@ -297,7 +297,7 @@
                     </spacer>
                     <widget class="QLayoutWidget" row="5" column="1">
                         <property name="name">
-                            <cstring>layout29</cstring>
+                            <cstring>tqlayout29</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -326,7 +326,7 @@
                     </widget>
                     <widget class="QLayoutWidget" row="5" column="2">
                         <property name="name">
-                            <cstring>layout28</cstring>
+                            <cstring>tqlayout28</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -371,7 +371,7 @@
                     </widget>
                     <widget class="QLayoutWidget" row="4" column="2">
                         <property name="name">
-                            <cstring>layout28_2</cstring>
+                            <cstring>tqlayout28_2</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -400,7 +400,7 @@
                     </widget>
                     <widget class="QLayoutWidget" row="4" column="1">
                         <property name="name">
-                            <cstring>layout29_2</cstring>
+                            <cstring>tqlayout29_2</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -442,7 +442,7 @@
                     </property>
                     <widget class="QLayoutWidget">
                         <property name="name">
-                            <cstring>layout31</cstring>
+                            <cstring>tqlayout31</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -455,13 +455,13 @@
                                 <property name="text">
                                     <string>Left</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignCenter</set>
                                 </property>
                             </widget>
                             <widget class="QLayoutWidget" row="5" column="2">
                                 <property name="name">
-                                    <cstring>layout52_7</cstring>
+                                    <cstring>tqlayout52_7</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -477,7 +477,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -502,7 +502,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -518,13 +518,13 @@
                                 <property name="text">
                                     <string>Right</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignCenter</set>
                                 </property>
                             </widget>
                             <widget class="QLayoutWidget" row="2" column="2">
                                 <property name="name">
-                                    <cstring>layout52</cstring>
+                                    <cstring>tqlayout52</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -540,7 +540,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -565,7 +565,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -576,7 +576,7 @@
                             </widget>
                             <widget class="QLayoutWidget" row="3" column="1">
                                 <property name="name">
-                                    <cstring>layout52_4</cstring>
+                                    <cstring>tqlayout52_4</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -592,7 +592,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -617,7 +617,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -628,7 +628,7 @@
                             </widget>
                             <widget class="QLayoutWidget" row="5" column="3">
                                 <property name="name">
-                                    <cstring>layout52_9</cstring>
+                                    <cstring>tqlayout52_9</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -644,7 +644,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -669,7 +669,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -680,7 +680,7 @@
                             </widget>
                             <widget class="QLayoutWidget" row="2" column="1">
                                 <property name="name">
-                                    <cstring>layout52</cstring>
+                                    <cstring>tqlayout52</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -696,7 +696,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -721,7 +721,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -745,13 +745,13 @@
                                 <property name="text">
                                     <string>Mousebutton</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignCenter</set>
                                 </property>
                             </widget>
                             <widget class="QLayoutWidget" row="4" column="3">
                                 <property name="name">
-                                    <cstring>layout52_9</cstring>
+                                    <cstring>tqlayout52_9</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -767,7 +767,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -792,7 +792,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -803,7 +803,7 @@
                             </widget>
                             <widget class="QLayoutWidget" row="5" column="1">
                                 <property name="name">
-                                    <cstring>layout52_5</cstring>
+                                    <cstring>tqlayout52_5</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -819,7 +819,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -844,7 +844,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -860,13 +860,13 @@
                                 <property name="text">
                                     <string>Middle</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignCenter</set>
                                 </property>
                             </widget>
                             <widget class="QLayoutWidget" row="6" column="1">
                                 <property name="name">
-                                    <cstring>layout52_5</cstring>
+                                    <cstring>tqlayout52_5</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -882,7 +882,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -907,7 +907,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -926,7 +926,7 @@
                             </widget>
                             <widget class="QLayoutWidget" row="3" column="3">
                                 <property name="name">
-                                    <cstring>layout52_8</cstring>
+                                    <cstring>tqlayout52_8</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -942,7 +942,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -967,7 +967,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -986,7 +986,7 @@
                             </widget>
                             <widget class="QLayoutWidget" row="6" column="2">
                                 <property name="name">
-                                    <cstring>layout52_7</cstring>
+                                    <cstring>tqlayout52_7</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1002,7 +1002,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -1027,7 +1027,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -1046,7 +1046,7 @@
                             </widget>
                             <widget class="QLayoutWidget" row="4" column="1">
                                 <property name="name">
-                                    <cstring>layout52_5</cstring>
+                                    <cstring>tqlayout52_5</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1062,7 +1062,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -1087,7 +1087,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -1098,7 +1098,7 @@
                             </widget>
                             <widget class="QLayoutWidget" row="2" column="3">
                                 <property name="name">
-                                    <cstring>layout52_3</cstring>
+                                    <cstring>tqlayout52_3</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1114,7 +1114,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -1139,7 +1139,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -1150,7 +1150,7 @@
                             </widget>
                             <widget class="QLayoutWidget" row="3" column="2">
                                 <property name="name">
-                                    <cstring>layout52_6</cstring>
+                                    <cstring>tqlayout52_6</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1166,7 +1166,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -1191,7 +1191,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -1202,7 +1202,7 @@
                             </widget>
                             <widget class="QLayoutWidget" row="4" column="2">
                                 <property name="name">
-                                    <cstring>layout52_7</cstring>
+                                    <cstring>tqlayout52_7</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1218,7 +1218,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -1243,7 +1243,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -1262,7 +1262,7 @@
                             </widget>
                             <widget class="QLayoutWidget" row="6" column="3">
                                 <property name="name">
-                                    <cstring>layout52_9</cstring>
+                                    <cstring>tqlayout52_9</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1278,7 +1278,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -1303,7 +1303,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -1316,7 +1316,7 @@
                     </widget>
                     <widget class="QLayoutWidget">
                         <property name="name">
-                            <cstring>layout31_3</cstring>
+                            <cstring>tqlayout31_3</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1356,7 +1356,7 @@
                             </property>
                             <widget class="QLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout33</cstring>
+                                    <cstring>tqlayout33</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -1677,7 +1677,7 @@
     <slot access="protected">slotNormalAnimToggled( bool )</slot>
     <slot access="protected">slotNewAnimToggled( bool )</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/korn/korncfg.ui b/korn/korncfg.ui
index 46a812a5..b1b55307 100644
--- a/korn/korncfg.ui
+++ b/korn/korncfg.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KornCfgWidget</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -172,5 +172,5 @@
     <slot access="protected">slotSetDefaults( const QString&amp;, const int, KConfig* )</slot>
     <slot access="protected">slotEditBox()</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/korn/korncfgimpl.cpp b/korn/korncfgimpl.cpp
index ae49765c..df426464 100644
--- a/korn/korncfgimpl.cpp
+++ b/korn/korncfgimpl.cpp
@@ -198,10 +198,10 @@ void KornCfgImpl::readConfig()
 {
 	_config->setGroup( "korn" );
 	
-	TQChar layout = _config->readEntry( "layout" ).stripWhiteSpace()[0].upper();
-	if( layout == TQChar( 'H' ) )
+	TQChar tqlayout = _config->readEntry( "tqlayout" ).stripWhiteSpace()[0].upper();
+	if( tqlayout == TQChar( 'H' ) )
 		rbHorizontal->setChecked( true );
-	else if( layout == TQChar( 'V' ) )
+	else if( tqlayout == TQChar( 'V' ) )
 		rbVertical->setChecked( true );
 	else
 		rbDocked->setChecked( true );
@@ -214,11 +214,11 @@ void KornCfgImpl::writeConfig()
 	_config->setGroup( "korn" );
 	
 	if( rbHorizontal->isChecked() )
-		_config->writeEntry( "layout", "Horizontal" );
+		_config->writeEntry( "tqlayout", "Horizontal" );
 	if( rbVertical->isChecked() )
-		_config->writeEntry( "layout", "Vertical" );
+		_config->writeEntry( "tqlayout", "Vertical" );
 	if( rbDocked->isChecked() )
-		_config->writeEntry( "layout", "Docked" );
+		_config->writeEntry( "tqlayout", "Docked" );
 
 	//Default is 'false' here, because if no option is set, KWallet isn't used.
 	if( _config->readBoolEntry( "usewallet", false ) != chUseWallet->isChecked() )
diff --git a/korn/kornshell.cpp b/korn/kornshell.cpp
index 4fccd075..553cac42 100644
--- a/korn/kornshell.cpp
+++ b/korn/kornshell.cpp
@@ -95,12 +95,12 @@ void KornShell::readConfig()
 	static bool shownConfig = false;
 	
 	_config->setGroup( "korn" );
-	TQChar layout = _config->readEntry( "layout", "Docked" )[0].upper();
+	TQChar tqlayout = _config->readEntry( "tqlayout", "Docked" )[0].upper();
 	KOrnPassword::setUseWallet( _config->readBoolEntry( "usewallet", false ) );
 	
-	if( layout == 'H' )
+	if( tqlayout == 'H' )
 		_box = new HVContainer( Qt::Horizontal, this, "horizontal container" );
-	else if( layout == 'V' )
+	else if( tqlayout == 'V' )
 		_box = new HVContainer( Qt::Vertical, this, "vertical container" );
 	else
 		_box = new DockedContainer( this, "docked container" );
@@ -135,14 +135,14 @@ void KornShell::slotDialogClosed()
 	_configDialog->deleteLater(); _configDialog = 0;
 
 	//At this time, just delete all widgets and make a new one.
-	//Maybe, this should replaces later by a better variant.
+	//Maybe, this should tqreplaces later by a better variant.
 	slotApply();
 }
 
 void KornShell::slotApply()
 {
 	//At this time, just delete all widgets and make a new one.
-	//Maybe, this should replaces later by a better variant.
+	//Maybe, this should tqreplaces later by a better variant.
 	
 	delete _box; _box = 0;
 
diff --git a/korn/maildir_proto.h b/korn/maildir_proto.h
index 2ce5e9db..0023cfdc 100644
--- a/korn/maildir_proto.h
+++ b/korn/maildir_proto.h
@@ -47,7 +47,7 @@ public:
 	virtual TQString serverName() const { return i18n( "Path:" ); }
 
 	virtual void recheckKURL( KURL &kurl, KIO::MetaData & )
-	                               { kurl.setPath( kurl.host() + "/." + kurl.path().replace( '/' , '.' ) + "/new" ); kurl.setHost( "" ); }
+	                               { kurl.setPath( kurl.host() + "/." + kurl.path().tqreplace( '/' , '.' ) + "/new" ); kurl.setHost( "" ); }
 	virtual void readSubjectKURL( KURL &, KIO::MetaData & ) { }
 	virtual void deleteMailKURL( KURL &, KIO::MetaData & )  { }
 	virtual void readMailKURL( KURL &, KIO::MetaData & )    { }
diff --git a/korn/maildlg.cpp b/korn/maildlg.cpp
index 086796c8..3424e19e 100644
--- a/korn/maildlg.cpp
+++ b/korn/maildlg.cpp
@@ -43,12 +43,12 @@ void KornMailDlg::showFullMessage()
 	// this should show it even if the mailbox does not support progress bars
 	_progress->setTotalSteps(1000);
 	_progress->setProgress(1);
-	qApp->processEvents();
+	tqApp->processEvents();
 
 	// connect the mailbox with the progress dialog in case it supports progress bars
 	connect(_mailDrop, TQT_SIGNAL(readMailTotalSteps(int)), _progress, TQT_SLOT(setTotalSteps(int)));
 	connect(_mailDrop, TQT_SIGNAL(readMailProgress(int)), _progress, TQT_SLOT(setProgress(int)));
-	qApp->processEvents();
+	tqApp->processEvents();
 
 	// connect the mailbox's cancel button
 	connect(_progress, TQT_SIGNAL(canceled()), this, TQT_SLOT(loadMailCanceled()));
diff --git a/korn/maildrop.h b/korn/maildrop.h
index 4052c8c3..b15ec973 100644
--- a/korn/maildrop.h
+++ b/korn/maildrop.h
@@ -358,7 +358,7 @@ signals:
     
     /**
      * The next signal is emitted when a passive popup could be displayed.
-     * As argument, there is a KornSubject, which contains a subject and
+     * As argument, there is a KornSubject, which tqcontains a subject and
      * some more info that could be used with the popup.
      */
     void showPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& realname );
diff --git a/korn/mailsubject.h b/korn/mailsubject.h
index 75f0571f..3e85b69e 100644
--- a/korn/mailsubject.h
+++ b/korn/mailsubject.h
@@ -47,7 +47,7 @@ public:
 	KornMailSubject(const KornMailSubject & src);
 
 	/**
-	 * replaces the contents of this by the contents of another
+	 * tqreplaces the contents of this by the contents of another
 	 * KornMailSubject instance.  All data of the source
 	 * KornMailSubject instance are cloned.
 	 * @param src KornMailSubject to copy from
@@ -92,7 +92,7 @@ public:
 	/**
 	 * Set the mails header and (if possible) body.
 	 * @param header the mails header with or without body (see fullMessage parameter).
-	 * @param fullMessage true, if header contains the message body as well, false otherwise.
+	 * @param fullMessage true, if header tqcontains the message body as well, false otherwise.
 	 */
 	void setHeader(const TQString & header, bool fullMessage) {_header = header; _fullMessage = fullMessage;}
 
@@ -103,8 +103,8 @@ public:
 	const TQString & getHeader() const {return _header;}
 
 	/**
-	 * Return true, if the header contains the header and the full message.
-	 * Return false if the header just contains the header.
+	 * Return true, if the header tqcontains the header and the full message.
+	 * Return false if the header just tqcontains the header.
 	 * @return see above.
 	 */
 	bool isHeaderFullMessage() const {return _fullMessage;}
diff --git a/korn/password.cpp b/korn/password.cpp
index 764b90f9..f0ae5d8f 100644
--- a/korn/password.cpp
+++ b/korn/password.cpp
@@ -241,7 +241,7 @@ TQString KOrnPassword::KMailDecrypt( const TQString& enc )
 {
 	TQString result;
 	for (uint i = 0; i < enc.length(); i++)
-		result += (enc[i].unicode() <= 0x21) ? enc[i] : TQChar(0x1001F - enc[i].unicode());
+		result += (enc[i].tqunicode() <= 0x21) ? enc[i] : TQChar(0x1001F - enc[i].tqunicode());
 
 	return result;
 }
diff --git a/korn/pop3_proto.cpp b/korn/pop3_proto.cpp
index b42a63ec..6f904614 100644
--- a/korn/pop3_proto.cpp
+++ b/korn/pop3_proto.cpp
@@ -64,18 +64,18 @@ void Pop3_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObjec
 
 void Pop3_Protocol::readEntries( TQMap< TQString, TQString >* map, TQMap< TQString, TQString > *metadata ) const
 {
-	if( map->contains( "ssl" ) && *map->find( "ssl" ) == "true" )
+	if( map->tqcontains( "ssl" ) && *map->find( "ssl" ) == "true" )
 		map->insert( "encryption", "ssl" );
-	if( metadata->contains( "tls" ) )
+	if( metadata->tqcontains( "tls" ) )
 		map->insert( "encryption", TQString( "tls=%1" ).arg( *metadata->find( "tls" ) ) );
-	if( metadata->contains( "auth" ) )
+	if( metadata->tqcontains( "auth" ) )
 		map->insert( "auth", TQString( "auth=APOP" ) );
 }
 
 void Pop3_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const
 {
 	TQString metadata;
-	if( map->contains( "encryption" ) )
+	if( map->tqcontains( "encryption" ) )
 	{
 		if( *map->find( "encryption" ) == "ssl" )
 			map->insert( "ssl", "true" );
@@ -87,7 +87,7 @@ void Pop3_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const
 		map->erase( "encryption" );
 	}
 
-	if( map->contains( "auth" ) )
+	if( map->tqcontains( "auth" ) )
 	{
 		if( !metadata.isEmpty() && ! (*map->find( "auth" )).isEmpty() )
 			metadata += ",";
diff --git a/korn/pop3_proto.h b/korn/pop3_proto.h
index c828e595..feaed812 100644
--- a/korn/pop3_proto.h
+++ b/korn/pop3_proto.h
@@ -44,8 +44,8 @@ public:
 
 	virtual TQStringList authList() const { return TQStringList::split( '|', "Plain|APOP", false ); }
 	
-	virtual void readSubjectKURL( KURL & kurl, KIO::MetaData & ) const { kurl.setPath( kurl.path().replace( "/download/", "/headers/" ) ); }
-	virtual void deleteMailKURL ( KURL & kurl, KIO::MetaData & ) const { kurl.setPath( kurl.path().replace( "/download/", "/remove/" ) ); }
+	virtual void readSubjectKURL( KURL & kurl, KIO::MetaData & ) const { kurl.setPath( kurl.path().tqreplace( "/download/", "/headers/" ) ); }
+	virtual void deleteMailKURL ( KURL & kurl, KIO::MetaData & ) const { kurl.setPath( kurl.path().tqreplace( "/download/", "/remove/" ) ); }
 	virtual bool commitDelete () const { return true; }
 	virtual void deleteCommitKURL(KURL & kurl, KIO::MetaData & ) const { kurl.setPath( "commit" ); }
 
diff --git a/korn/progress_dialog.ui b/korn/progress_dialog.ui
index 6e6b53fa..d21ecee2 100644
--- a/korn/progress_dialog.ui
+++ b/korn/progress_dialog.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>DoubleProgressDialog</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -39,7 +39,7 @@
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -55,7 +55,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>41</width>
                             <height>20</height>
@@ -80,7 +80,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>41</width>
                             <height>31</height>
@@ -116,5 +116,5 @@
     <slot>setProgress( int number )</slot>
     <slot access="private" specifier="non virtual">cancelbutton()</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/korn/subjectsdlg.cpp b/korn/subjectsdlg.cpp
index f16d3a91..b001f776 100644
--- a/korn/subjectsdlg.cpp
+++ b/korn/subjectsdlg.cpp
@@ -60,8 +60,8 @@ KornSubjectsDlg::KornSubjectsDlg( TQWidget *parent )
 	_loadSubjectsCanceled = false;
 	setModal( true );
 
-	// The dialog contains a list view and several buttons.
-	// Two box layouts hol dthem.
+	// The dialog tqcontains a list view and several buttons.
+	// Two box tqlayouts hol dthem.
 	TQWidget * page = new TQWidget( this );
 	setMainWidget(page);
 	invertSelButton = new KPushButton(i18n("&Invert Selection"), page);
@@ -88,7 +88,7 @@ KornSubjectsDlg::KornSubjectsDlg( TQWidget *parent )
 	_list->addColumn(i18n("Date"));
 	_list->addColumn(i18n("Size (Bytes)"));
 
-	// column 3 contains a number (change alignment)
+	// column 3 tqcontains a number (change tqalignment)
 	_list->setColumnAlignment(3, Qt::AlignRight);
 	_list->setItemMargin(3);
 
diff --git a/korn/systemtray.h b/korn/systemtray.h
index 2387ea7c..83daaeb3 100644
--- a/korn/systemtray.h
+++ b/korn/systemtray.h
@@ -47,7 +47,7 @@ protected:
 	/**
 	 * Reimplementation because in the reimplementation of KSystray it popup's of restores.
 	 * In this implemention, the action depends on the settings.
-	 * @param me An object which contains the mousebutton which is pressed.
+	 * @param me An object which tqcontains the mousebutton which is pressed.
 	 */
 	virtual void mousePressEvent( TQMouseEvent* me );
 	
diff --git a/kpilot/.emacs-dirvars b/kpilot/.emacs-dirvars
deleted file mode 100644
index beac4cb1..00000000
--- a/kpilot/.emacs-dirvars
+++ /dev/null
@@ -1,7 +0,0 @@
-;; -*- emacs-lisp -*-
-;;
-;; This file is processed by the dirvars emacs package.  Each variable
-;; setting below is performed when this dirvars file is loaded.
-;;
-indent-tabs-mode: t
-tab-width: 4
diff --git a/kpilot/AUTHORS b/kpilot/AUTHORS
deleted file mode 100644
index 6d1d418d..00000000
--- a/kpilot/AUTHORS
+++ /dev/null
@@ -1,29 +0,0 @@
-KPilot was written by Dan Pilone.  It is currently under
-active development by a worldwide group of contributors.
-Adriaan de Groot and Reinhold Kainhofe are currently the maintainers.
-
-
-o Jason 'vanRijn' Kasper is prime motivator in 2006.
-o The vcal and todo conduit were originally written by Preston Brown.
-o The popclient conduit was written by Michael Kropfberger.
-o The null conduit and KNotes conduit were written by Adriaan de Groot.
-o The XML GUI stuff was written by Martin Junius.
-o Philipp Hullmann fixed many bugs in the todo conduit.
-o David Bishop converted most of the UI to Qt Designer .ui.
-o Reinhold Kainhofer fixed and extended the VCal conduits when it was 
-  really needed.
-o The addressbook conduit was rewritten by R. Kainhofer to use libkabc 
-o The time conduit, the MAL conduit (AvantGo) and the PalmDOC conduit 
-  were also written by R. Kainhofer
-o Aaron J. Seigo, Jorg Habenicht, and others contributed too.
-o David Mott contributed useful extra features.
-
-For more information, see the About box or:
-http://www.kpilot.org/
-
--- Dan Pilone 5/30/99
--- Adriaan de Groot April 14th 2001
--- Adriaan de Groot January 20th 2002
--- Reinhold Kainhofer, April 5th 2003
--- Adriaan de Groot, March 4th 2004
--- Adriaan de Groot, November 18th 2006
diff --git a/kpilot/CMakeLists.txt b/kpilot/CMakeLists.txt
deleted file mode 100644
index aae086ce..00000000
--- a/kpilot/CMakeLists.txt
+++ /dev/null
@@ -1,96 +0,0 @@
-project(kpilot)
-
-if(EXISTS ${CMAKE_SOURCE_DIR}/CMakeOptions.txt)
-	include(${CMAKE_SOURCE_DIR}/CMakeOptions.txt)
-else(EXISTS ${CMAKE_SOURCE_DIR}/CMakeOptions.txt)
-	message(FATAL_ERROR "CMakeOptions.txt not found! Run configure first.")
-endif(EXISTS ${CMAKE_SOURCE_DIR}/CMakeOptions.txt)
-
-# Search our own cmake modules path first
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
-
-# Need 2.4.3 for its KDE3 support
-# Need 2.4.4 for its fixed KDE3 support
-cmake_minimum_required(VERSION 2.4.4)
-
-CONFIGURE_FILE(
-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-  IMMEDIATE @ONLY)
-
-ADD_CUSTOM_TARGET(uninstall
-  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
-
-# Disallow in-source build
-STRING(COMPARE EQUAL "${kpilot_SOURCE_DIR}" "${kpilot_BINARY_DIR}" insource)
-if(insource)
-	MESSAGE(FATAL_ERROR 
-		"KPilot requires an out of source build. Please create a separate build
-directory and run 'cmake path_to_kpilot [options]' there."
-	)
-endif(insource)
-
-find_package(Qt3 REQUIRED) # find and setup Qt3 for this project
-find_package(KDE3 REQUIRED) # find and setup KDE3 for this project
-find_package(Pilotlink REQUIRED)
-find_package(Mal) # see if mal is available, but it's not required
-
-add_definitions(
-	${QT_DEFINITIONS}
-	${KDE3_DEFINITIONS}
-	-DQT_THREAD_SUPPORT
-)
-
-STRING(COMPARE EQUAL "${CMAKE_BUILD_TYPE}" "debug" builddebug)
-if (NOT builddebug)
-	add_definitions(-DNDEBUG)
-endif(NOT builddebug)
-
-
-# Get the kde3 dir. This is a bit tricky, i'm not sure how well
-# this works on other systems.
-STRING(REPLACE "/lib" "" KDE3_DIR ${KDE3_LIB_DIR})
-
-# TODO: INSTALL PREFIX. RIGHT NOW EVERYTHING IS INSTALLED IN $KDEDIR
-if(NOT CMAKE_INSTALL_PREFIX)
-	set(CMAKE_INSTALL_PREFIX ${KDE3_DIR})
-endif(NOT CMAKE_INSTALL_PREFIX)
-set(KDE3_KCFG_DIR ${CMAKE_INSTALL_PREFIX}/share/config.kcfg)
-set(KDE3_SERVICETYPES_DIR ${CMAKE_INSTALL_PREFIX}/share/servicetypes)
-set(KDE3_SERVICES_DIR ${CMAKE_INSTALL_PREFIX}/share/services)
-set(KDE3_XDG_APPS_DIR ${CMAKE_INSTALL_PREFIX}/share/applications/kde)
-set(KDE3_LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib)
-set(KDE3_PLUGIN_INSTALL_DIR ${KDE3_LIB_INSTALL_DIR}/kde3)
-
-# tell cmake where to search for libraries:
-link_directories(${KDE3_LIB_DIR})
-
-# tell cmake where to search for Qt/KDE headers:
-include_directories(${PILOTLINK_INCLUDE_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR})
-
-# include custom macros
-INCLUDE(${CMAKE_SOURCE_DIR}/cmake/modules/KPilotCustom.cmake)
-
-# tell cmake to process CMakeLists.txt in that subdirectory
-add_subdirectory(lib)
-add_subdirectory(kpilot)
-add_subdirectory(conduits)
-
-
-STRING(COMPARE EQUAL "${ENABLE_TESTS}" "YES" buildtests)
-if (buildtests)
-	MESSAGE(STATUS "BUILD: Test suite enabled.")
-	enable_testing()
-	add_subdirectory(tests)
-else (buildtests)
-	MESSAGE(STATUS "BUILD: Test suite disabled.")
-endif(buildtests)
-
-if (builddebug)
-	MESSAGE(STATUS "BUILD: Debug build selected.")
-else(builddebug)
-	MESSAGE(STATUS "BUILD: Normal build selected.")
-endif(builddebug)
-
-MESSAGE(STATUS "BUILD: Install prefix set to ${CMAKE_INSTALL_PREFIX} .")
-
diff --git a/kpilot/COPYING b/kpilot/COPYING
deleted file mode 100644
index 7c315881..00000000
--- a/kpilot/COPYING
+++ /dev/null
@@ -1,355 +0,0 @@
-[KPilot is licensed under the terms of this GNU GENERAL PUBLIC LICENSE, 
-except for the following parts which are licenced under the GNU LESSER
-GENERAL PUBLIC LICENSE:
-
-* The contents of the lib/ directory under this directory (ie. kpilot/lib/),
-to allow plugins with non-GPL yet LGPL-compatible licenses to be written.
-
-* The NULL conduit in conduits/null/, so that it can serve as a development
-example even for non-GPL conduits.
-
-* The malconduit in conduits/malconduit/ is licensed under the GPL with the
-  additional specific permission for the code to be linked to libmal, 
-	which is released under the Mozilla Public License (MPL).
-  This is necessary because the libmal license is not GPL-compatible.
-]
-
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-               51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	Appendix: How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/kpilot/ChangeLog b/kpilot/ChangeLog
deleted file mode 100644
index 01da1b8d..00000000
--- a/kpilot/ChangeLog
+++ /dev/null
@@ -1,4220 +0,0 @@
-** KPILOT CHANGELOG **
-======================
-
-TODO: Figure out why archived records are bad.
-	[23:07] <till> Now i'm hunting why new entries on the palm are dropped and
-	               deletes from the palm as well.
-	[23:44] <till> [ade]: Hm, I delete a task on the palm, sync, and the
-	               record->isDeleted() is false, on sync, but it is modified and
-	               updated on the pc, although that does not change anything.
-
-TODO: store map of pilot-id <-> uid elsewhere (not in the .vcf file)
-TODO: don't make ActionQueue auto-delete the actions in it.
-TODO: provide template-based, interpreted databases much like the
-      AppInfo classes now have.
-TODO: give the knotes conduit a decent test mode.
-TODO: only re-write a local database if it is changed.
-
-2007-12-30  Jason 'vanRijn' Kasper
-* Fixing bug reported by Pablo Yepes on kdepim-users mailing list. We did
-  severe goofiness with middle names... The Palm can't handle them, so we
-  blindly tacked firstname + " " + lastname and stuck it into the Palm's
-  firstname field. The problem is that whenever a copy from palm->pc is
-  done, the kludged first name is transferred to kabc ("firstname middle").
-  And, it's compounded by every change in either direction. It's an ugly
-  hack and I've removed it. The only way to work around it would be to add
-  an additional check for !firstname.endsWith(abEntry.additionalName()),
-  but that's even sillier. Stop the insanity!
-
-2007-12-17  Jason 'vanRijn' Kasper
-* Woot! Fixing major breakage for funky usb devices.  pulled back some
-  removed code from KDE 3.5.6's kpilot for usb workaround code and fit it
-  into the new threaded model.  This fixes syncing for me on my Palm Treo
-  700p.
-* Reformatting and cleaning up kpilotdevicelink.cc.
-* New Private.h to hold the bits of kpilotdevicelink.cc that should not be
-  exposed via kpilotdevicelink.h.  Also, DeviceCommThread extends QObject
-  and QThread, so we need to have automoc run on it.
-* Switching from using QCustomEvent to using QEvent for device tickle
-  thread to match what is done in kpilotdevicelink.  
-
-2007-04-15  Jason 'vanRijn' Kasper
-* merging all development and bug fixes from kdepim-3.5.5+ branch into
-  stable branches/KDE/3.5 in preparation for KDE 3.5.7
-* cmake cleanups
-* namespacing and cleanups in sysinfoconduit
-* lots of debugging cleanups.  remove #ifdef DEBUG from much of the code.
-* cleanups in memofile conduit.  now try to use new (OS5) database
-  (MemosDB-PMem) if it's found, otherwise fall back to the legacy one
-  (MemoDB)
-* as a first step to combatting the "kpilot ate my future" e-mails (read:
-  data loss), we now use a CUDCounter (Create/Update/Delete). step 1 is to
-  track these and report on them to the user in their sync log.  step 2 is
-  to catch ill behavior and prompt the user as to whether or not to allow
-  kpilot to make the large amount of changes.  step 3 is to allow the user
-  to configure the count or percentage of changes that kpilot can make
-  without his/her confirmation.  step 1 is done. we'll approach steps 2 and
-  3 post kde 3.5.7.
-* new strings related to the above
-* bug fixing in popconduit... making sure we always have a sent date
-* Bertjan has the start of knotes cleanup going on
-* bug fixing in vcalconduit... long-time bug that existed in libkcal that
-  caused every calendar resource save to mark every calendar event as
-  modified.  now kpilot won't have to sync every record every time.
-* bug fixing kabc resource problems in abbrowser conduit.  although it's
-  not documented in kabc, it looks like we should be removing a local
-  resource from the address book before we delete it.
-* bringing mal conduit back alive again.  none of our small band of merry
-  men use it, though, so it may or may not actually do what it's supposed
-  to.
-* fixing bug where we were saving conduit databases to DBBackup instead of
-  conduits/ directory.
-* changing KPilotDeviceLink to use a separate thread, dedicated to doing
-  device communication.  this is much better design as a start, but fixes
-  the problems kpilot was having (and widely talked about) where kpilot
-  would hang and crash if our user was using "usb:" or "net:any" devices
-  because of how these new "device"s operated (allowed immediate opening,
-  even though there is no physical device connected, and then hung
-  indefinitely until the real device connected).
-* bringing in design documents (jpegs) for memofile conduit from 2004-12-12
-  (they're not installed, but are valuable for documentation and insight)
-* icon naming error bug fix 122582
-
-
-2006-10-24  Jason 'vanRijn' Kasper
-* Getting rid of FastSync.  The only difference between it and HotSync was
-  that HotSync did a Backup and FastSync did not.  Having a third
-  permutation because of not having a way to set it in the Backup settings
-  seems wrong.  Also, if one of them is to go, I think that HotSync is much
-  more recognizable and widely used than FastSync.  
-* Allowing finer-grained control around when database backups are done.
-  This is so that users can choose when they want a backup to be done.
-  The problem I need to solve for myself is that since I'm now syncing
-  between 2 PCs, I need a full sync to be done whenever I switch.  But I
-  do not EVER want an automatic backup to be done.  Currently, this is not
-  possible.  Fixing it.  =:)  This will also allow for schedule backups to
-  be done, which is also of interest to me.
-
-2006-01-30  Adriaan de Groot
-* Updated pilot-link to today's CVS, with one change - use of pl_socklen_t
-  in inet.c changed back to socklen_t.
-* Added --loop to kpilotTest to repeatedly run the same action. Only
-  works for --list right now.
-
-2006-01-23  Adriaan de Groot
-* Gosh, where to begin. KPilot moved SVN repositories, changed build
-  systems, had the guts of the device link class refactored, bumped the
-  plugin API version again, and tons more. The commit logs are probably
-  the most useful source of information about what's changed.
-
-2005-08-18  Adriaan de Groot
-* Found out that the PilotAppCategory constructor that takes
-  a PilotRecord * was passing subsequent parameters in the wrong
-  order, which caused Jason's problem below.
-* Renamed soem icons and fixed up the icon loading code so that
-  the "sidebar" icons in KPilot can now be themed as well.
-
-2005-08-18  Jason 'vanRijn' Kasper
-* Started fixing bug #103581.  Got side-tracked by my discovery that when
-  we change ToDos on the palm, we sync them to the PC and then promptly
-  delete them from the Palm--not very nice of us.  I'll try to get the rest
-  working tomorrow, but the end result will be that if our user changes a
-  ToDo category and there is only one category in korganizer for that ToDo,
-  we will change the category for the KCal event.  If there is already more
-  than one category that korganizer knows about, then we'll continue to
-  append the Palm's category to the one in korganizer.
-
-2005-08-17  Adriaan de Groot
-* Promote the new Pilot*Info (template) classes which simplify loading
-  AppInfo structures from a database. Deprecate some AddressEntry
-  constructors to do so, and add one that takes a PilotAddressInfo
-  instead. In kpilot/, replace a bunch of error-prone buffer-handling
-  calls by the use of these template classes.
-* Use PilotAddressInfo also in the abbrowser conduit. This removes a
-  bunch of tricky encoding handling from the conduit and puts it in
-  the base Info class, where it belongs.
-
-2005-08-16  Jason 'vanRijn' Kasper
-* Fixed annoyance in vcalconduit (korganizer calendar/todo conduit) that
-  caused it to not clean up duplicates/things that should be deleted from
-  the Palm on a copy PC to Handheld sync.
-* Fixed some majorly ugly bugs in the addressbook conduit that caused
-  duplicate addressbook records to be generated and not deleted once
-  created.
-
-2005-08-15  Adriaan de Groot
-* Added lots of null-pointer checks so that it may become possible to
-  run conduits without a device link soon. This would be good for testing.
-* Noticed that the factory code needs refactoring into templates.
-  Did so, and ported the abbrowser factory to it. Basically, this
-  removes a lot of cut-and-paste from the whole thing. Same for the
-  timeconduit.
-
-2005-06-05  Adriaan de Groot
-* I learned to make Chinese dumplings yesterday. That's a much better use
-  of a saturday afternoon than bug hunting, don't you think?
-* Put lots of effort into the dox for PilotDateEntry, normalized a lot
-  of things, gave things slightly more sensible names. This is work towards
-  implementing the DatabaseInterpreter for appointments, so you can treat
-  the data on the Pilot as a sequence of (libkcal) Events instead of as
-  binary blobs.
-* Patch from Dylan G applied that replaces 15s and 16s in the code with a
-  defined constant (there already was one, just not used consistently).
-  Did some more rationalizing, finally removed the CATEGORY_COUNT define
-  which was just a duplicate.
-
-2005-05-27  Adriaan de Groot
-* Start of the PIM meeting! Way!
-* Committed some critical data-loss fixes yesterday. Too late for the KDE 3.4.1 release.
-  Argh. I think it would have been better not to touch BRANCH at all and leave it
-  at the same buggy state as in KDE 3.4.0
-* Fairly large-scale deprecation of functions in lib/, finally factored out the
-  shared attributes/category/id stuff from records and AppCategory objects.
-
-2005-05-26  Jason 'vanRijn' Kasper
-* Fixing nasty little bug (#106324) causing data loss in memofile conduit
-* isFirstSync() is true for both copyHHtoPC and copyPCtoHH.  memofile
-  conduit only wants to do copyHHtoPC if we're either told to, or we don't
-  have any local memos in the filesystem
-
-2005-05-22  Adriaan de Groot
-* Gratuitously update the version number, call this one "kind" (Dutch for
-  "child", or otherwise short for "kind of liable to eat your data").
-  This sort-of makes me wish we'd just left BRANCH totally unchanged
-  since the last release. KDE 3.4.1 tomorrow.
-
-2005-05-20  Adriaan de Groot
-* Split PISOCK_LIB into PISOCK_LIB and PISOCK_LDFLAGS. This makes it possible
-  to slip the include and library dir for pilot-link right in front, which in
-  turn makes it possible to build against development pilot-link versions even
-  if there are installed copies in standard locations as well.
-* Extended the AppInfo template class with a pack function as well, so that
-  reading and writing AppInfo blocks can be delegated there.
-* Ported the ToDo conduit to use the PilotToDoInfo template instantiation.
-
-2005-05-16  Adriaan de Groot
-* Added yet another constructor to the local databases, this time hopefully
-  one that doesn't have a horribly convoluted semantics -- it just opens
-  a file (or not).
-* Added more tests for lib. These will always fail unless you have a copy
-  of Aesop's fables in /tmp .
-
-2005-05-13  Adriaan de Groot
-* Friday the 13th! I merged HEAD to BRANCH and am now working in
-  BRANCH (branches/KDE/3.4/kdepim/kpilot) to do bugfixes. New features
-  and strings go in HEAD, and we'll forward-port bugfixes at some
-  point. The cutover is revision 413061.
-
-2005-05-11  Adriaan de Groot
-* Wasted much time trying to get generic FreeBSD USB support for non-
-  Visors working in pilot-link-0.12 before I found out that ColdSync
-  doesn't support that either.
-* Removed non-working calendar conduits (calendarbaseconduit/ and
-  calendarconduits/) from the conduits dir; restore them w/ SVN
-  commits near 412528. These were recordconduit-based conduits
-  by Reinhold, but I broke the RecordConduit in the meantime.
-
-2005-05-07  Adriaan de Groot
-* After tweaking pilot-link 0.12-pre3 so that KPilot will with it (has to do
-  with API consistency) the AppInfo template class works again, and i've
-  extended it a little to make setting and getting category names nicer.
-* Applied the new template to the memofile conduit.
-
-2005-04-22  Adriaan de Groot
-* Fixed (I hope) bug in notepad conduit related to having zero records in the
-  database.
-* Added some more dox.
-
-2005-04-20  Adriaan de Groot
-* Finally added a general test() function to sync actions to mirror the
-  exec() call. By default, this calls exec() and logs a warning. Removed it
-  again because it won't work -- SyncAction doesn't _have_ a SyncMode set.
-* Started doing a little bit of test code in the KNotes conduit.
-
-2005-04-18  Adriaan de Groot
-* Being on vacation doesn't mean I'm not on the job. Doxied a lot, did some cleanup.
-* Renamed PilotLocalDatabase::writeID() and changed its signature, since it
-  was kind of stupid. Doxied it, too.
-
-2005-04-12  Adriaan de Groot
-* For a lark, and for David, re-added some KDE 3.2 compatibility code.
-* Template madness! An easy way to create the right appinfo's from any database.
-
-2005-04-11  Adriaan de Groot
-* Bumped KPilot version.
-* Added a test program for some parts of the library. Woo! A first!
-  Finally something resembling actual software engineering in KPilot.
-* Cleaned up headers that weren't including all required (system) headers.
-* Moved all the conduits to the new SyncMode.
-
-2005-04-10  Adriaan de Groot
-* Some useful patches from Philip T. to the vcal conduit committed.
-* Made the sync mode a full-fledged class and ported lib/ and kpilot/
-  to use it. Disabled all the conduits for the time being. Bumped the
-  conduit API because of this. This might cause some serious breakage
-  for the time being.
-
-2005-04-09  Adriaan de Groot
-* Geez, can we switch to Subversion yet?
-* Committed the weird-ass record conduit template changes. This makes the
-  RecordConduit a fully templated "container". You plug in 5 other classes
-  to get a working implementation. This is similar to what the record
-  conduit already. The main difference is that it is easier to re-use
-  the things you plug into the recordconduit template. I have a KNotes
-  partial implementation that wraps KCal::Calendar, so that is immediately
-  reuseable for the other 4-button ones.
-* Ripped out test mode from KPilotTest and elsewhere, since it wasn't working
-  at all. I think the "mode" setting for conduits needs a lot more structure.
-  Just having an enum doesn't cut it (what about doing a test-mode local
-  PC to HH sync? Such a sync could be used to produce .pdb files from Kontact
-  data, which is just what the doctor ordered sometimes).
-
-2005-03-22  Adriaan de Groot
-* Long drought in doing any KPilot work or updating the ChangeLog.
-* Meddled in lib/ some to add modifiedIDList() and sanitize some types.
-* Prepared to make fFirstSync private, though it has getters and setters
-  so that doesn't really do much for OO'ness.
-* Wrote a template class for doing syncs generically, to replace the
-  RecordConduit. This one I understand, at least. It's not done yet though,
-  by a long shot, though I have classes to plug in to it for KNotes.
-
-
-
-2005-01-30  Adriaan de Groot
-* Fixed one nasty random crash thanks to vanRijn, probably fixed
-  the KNotes HHtoPC problem, tagged 4.4.7, released it. This
-  is the last version to support KDE 3.2 at all, since KDE PIM
-  moved to KDE 3.3 ages ago and KDE 3.4 is at the door.
-
-2005-01-12  Adriaan de Groot
-* Made KNotes conduit work when KNotes is embedded in kontact, too.
-* One branch of the check-username code wasn't setting the username properly.
-* More debugging niftiness, major NO_CAST cleanup.
-* Fixed sysinfo conduit, which didn't read its config file.
-
-
-2005-01-11  Adriaan de Groot
-* Added a workaround for buggy Zire USB behavior. It works most of the time.
-* Fixed memory leak when reading AppInfo.
-* Updated website with some more OS-specific information. As always, I am
-  in dire need of workable explanations for OS (usually Linux-distro)
-  specific quirks.
-* Worked on debugging output a little, normalized more output.
-* Verified that copy PC to HH works on Addressbook, ToDo, Calendar.
-
-
-2005-01-05  Adriaan de Groot
-* Pilot-link 0.12, when it comes out, is source incompatible with 0.11,
-  but KPilot is already ported to it.
-* Fixed up silly conflict resolution question in the datebook, but
-  really it needs the field-by-field resolution that the addressbook has.
-* In KPilotDeviceLink, move around check for unconfigured device to
-  notice earlier, before doing any work. Minor coding style fixes.
-* Revamped debugging (again) so it's now much more 7 * 191; the call trace
-  is pretty readable now.
-
-2004-12-27  Adriaan de Groot
-* Quitting and having the daemon go with you works now.
-
-2004-12-07  Adriaan de Groot
-* Tried to make conduit descriptions more consistent. Remember: "handheld",
-  not "Pilot". Removed ugly const_cast. Added depth indication to the
-  call trace -- this is a pretty big change, it makes the output from
-  kpilot with --debug 1 more tree-ish, so it's easier to see what is being
-  called from where.
-
-2004-12-06  Adriaan de Groot
-* Imported memofile from vanRijn.
-
-2004-11-30  Adriaan de Groot
-* Having a second child .. puts a dent in development time.
-* Make the daemon's next-sync match the one in KPilot, added tooltips
-  and whatsthis. Make the daemon tell KPilot what the next sync is,
-  so that changes from the tray menu are visible. This removes some strings.
-
-2004-11-29  Adriaan de Groot
-* Waiting for second child .. puts a dent in development time too.
-* Ported KPilot to pilot-link 0.12 (unreleased) which adds support
-  for newer devices and saves memory in the process.
-* Data-loss on restore bug fixed by Will Stephenson.
-
-2004-11-23  Adriaan de Groot
-* Squashed several silly bugs in wizard and startup code.
-
-2004-11-17  Adriaan de Groot
-* Hiatus in KPilot due to working upstream on pilot-link.
-* Patches from Olivier, merci.
-
-2004-10-11  Adriaan de Groot
-* Made an actual CVS tag for KPilot, kpilot_4_4_6. Uploaded new 4.4.6
-  tarballs. Updated the site. Posted more developer's notes.
-* Added initial encoding-selection boxes to the doc conduit, to indicate
-  that the input text files are not UTF-8 but something else.
-* Started revamping PilotLocalDatabase so we can get rid of the must-
-  sync-to-delete-new-(memo|address|whatever) in the internal viewers.
-* All the bugs in the database really need a "can you check this again"?
-  added. Till Adam has been messing with recent code and is reporting
-  new crashes and bugs.
-
-
-2004-10-07  Adriaan de Groot
-* Started adding encoding support to PalmDOC conduit dialogs. Not
-  sure how to proceed there.
-* Closed some more bugs, generally confused about some of the bugs
-  remaining in the database -- I need cooperation from the folks
-  reporting the bugs.
-* Went on a str*cpy() hunt to avoid bad copies; converted most to
-  strlcpy(). Not the ones in the docconduit, though, since there,
-  the strncpy()s go to a data structure that doesn't necessarily
-  expect NUL termination (note to self: need to check that _extracting_
-  data from the structure doesn't rely on NUL).
-
-2004-10-05  Adriaan de Groot
-* I wonder if the codec() stuff shouldn't move from the PilotAppCategory
-  to the device link -- after all, it's the _device_ that knows what
-  the encoding is (who knows, maybe future versions of Pilots will be
-  able to tell th desktop this).
-* Added a localBackup action, so we can make ~ backup files of all the
-  database files before doing a sync, just in case.
-* Merged lots of bugs.
-* Found out that KPilot uses title instead of prefix for the honorific
-  titles in the addressbook - this means KPilot and KAddressbook got
-  out of sync. Fixed.
-* New questionYesNoCancel() didn't return correct button codes.
-* Checked all the codec stuff, added some in relevant places but can't
-  spot any addressbook fields that are not synced.
-
-2004-10-04  Adriaan de Groot
-* Bail if the Pilot disconnects, but only between conduits. Conduits
-  themselves should still check for disconnect.
-* Bug maintainence turned up a useful patch for category support
-  in the calendar.
-
-2004-10-01  Adriaan de Groot
-* Merged nice patch from Adrian S for HotPlug.
-* Moved tickle stuff into a separate thread, so that it doesn't
-  require a Qt event loop to keep the Pilot awake.
-* Added tickles in the right (?) places in the abbrowser - around
-  the loading part.
-* Discovered that UserCheck used KMessageBox::question*() instead of
-  a version with timeouts. Fixed that by adding a qYNCancel() to
-  InteractiveSync, and updated both qYN*() methods there to use
-  KDE 3.3 KMessageBox support.
-* Merged InteractiveAction with SyncAction, cleaning up the inheritance
-  tree and making it possible to conduits to use the question* methods.
-
-2004-09-26  Adriaan de Groot
-* Put up new tarballs on kpilot.org.
-* Patched up the KNotes conduit a little - notes listed as modified
-  but unknown to the Pilot are now added as new.
-* Bumped version to 4.4.5. Polished the splash a little.
-* Fixed 71122, finally. There wasn't any code at all in the conduit
-  for deleting memos.
-
-
-2004-09-22  Adriaan de Groot
-* Added some cheap RTTI to PilotDatabase, so you can call
-  dbType() to find out if it's really a local or a serial DB.
-* Stared at the doc conduit for a long time. Did whitespace first.
-
-2004-09-18  Adriaan de Groot & Reinhold Kainhofer
-* Deprecated a bunch of poorly-named functions in lib/, and
-  moved everything to the new names. Finally, no more getCat(),
-  but just category().
-* Detect special case of bad resource headers in file installer.
-* Rearranged sync enum just a little. Moved eTest out of the way,
-  since it's not really a valid value to pass to the demon and made
-  0 the value to indicate "default, whatever is stored in the
-  config file".
-* Fixed up sync-type not honored, clarified next-sync menu (I
-  think so, didn't ask -usability about it though).
-
-
-2004-08-16  Adriaan de Groot
-* Was away at a summer school for two weeks. Got no KPilot stuff
-  done except an off-by-one bug in the memo stuff.
-* Split the CopyHHtoPC code out in the knotes conduit,
-  ready for QThreading (maybe).
-
-2004-07-27  Adriaan de Groot
-* MAL conduit proxy password not loaded properly. Reported by
-  Olivier D.
-* Clean out ancient cruft in fileInstaller.{h,cc}. Run file installer
-  twice, to allow conduits to create files to install. Determine
-  list of files at ::exec() time, not at object creation time.
-* Added some docs to the conduit configure.in.in.
-* Give PERL conduit more information to work with.
-
-2004-07-19  Adriaan de Groot
-* In kontact, if the daemon gets started it shouldn't complain loudly
-  about messed-up configurations.
-
-2004-07-14  Adriaan de Groot
-* Joyeux quatorze juillet! Spent most of the past week totally ignoring
-  KPilot, working on personal websites, KDE-FreeBSD, and porting
-  k3b to FreeBSD (breaking it on Linux only briefly).
-
-2004-06-29  Reinhold Kainhofer
-* Fix the bug that todos that were marked finished on the handheld
-  lost that state when synced to the PC.
-* A few layout adjustments for the perl/python conduits (QTextEdit
-  instead of QLineEdit)
-
-
-2004-06-29  Joern Ahrens
-* Corrected the behavior of the configuration dialog, when the
-  screensaver option is changed.
-* Moved the tickle code from InteractiveAction to SyncAction.
-  Now it can be used in ConduitAction subclasses as well.
-* Ahh, got Adriaans m100, now I'm able to test without destroying
-  my data on the palm. Thanks Adriaan !
-
-2004-06-27  Joern Ahrens
-* Filled the notepad conduit with life. The notepads are saved as png
-  files in a configurable directory.
-
-2004-06-21  Adriaan de Groot
-* Disable editor buttons when 'internal editors' is disabled (Carlos)
-  and fix up the tooltips when they are disabled. Also update some
-  copyright lines. Work on the docs.
-
-2004-06-16  Adriaan de Groot
-* Disposed of foolish file installer bug. Updated tarballs on website
-  before fixing it, so now we're stuck :) Looked at 71122 again,
-  testing with my m500.
-* Corrected finaly layout problems in some conduit config pages.
-
-2004-06-10  Adriaan de Groot
-* Much delay in getting back to work on KPilot, even after a new mobo
-  arrived for my primary devel system. Useful patches were received
-  in the meantime, and commited by Joern. Olivier D. has started
-  improving the MAL conduit, wrt. proxy and password support.
-
-2004-06-02  Joern Ahrens
-* Improved the wizards whatsthis text, thanks to David Bishop
-
-2004-05-30  Adriaan de Groot
-* Handle first-time startups more gracefully by just running configure or
-  the config wizard. Better reporting of non-running daemon. Fix some
-  copyright headers. Add icons to next-sync menu in daemon.
-
-2004-05-28  Adriaan de Groot
-* Make the tarballs available on the site; still no resolution for
-  memo bug, or timezone bug. Change strings in the applications to
-  point ot the new kpilot.org.
-
-2004-05-20  Adriaan de Groot
-* Tested new tarballs for 4.4.3, and they seem ok. Put their md5s up on the
-  website. Note that the memos-not-deleted-on-palm bug still exists, as
-  do 60 others by last count.
-
-2004-05-16  Adriaan de Groot
-* Put up the new KPilot.org website.
-* Updated docs about net: syncing, thanks to Miles Sabin.
-* Patch from Joern probably closes 4 bugs at once.
-
-2004-05-11  Reinhold Kainhofer
-* Deprecated the JPilotProxy and expenses conduits, moved to nonbeta.
-
-2004-05-07  Adriaan de Groot
-* PilotDatabase was a QObject. I wonder why, it didn't have signals or slots.
-* PilotDatabase creation and destruction is now tracked (counted, at least,
-  so you can see if there's a leak there).
-
-2004-04-30  Adriaan de Groot
-* Vrolijke koninginnedag!
-* Finally updated the site some.
-* Removed deprecated files, started using KDevelop, fixed random stuff.
-
-2004-04-28  Adriaan de Groot
-* [kpilotConfigDialog] Added UI for screenlockSecure option. Docs, too.
-* [kpilot] Changed hotSync button to one with a little dropdown
-  menu, thanks to Joern. [kpilotConfig] String fix for outdated config.
-  [probeDialog] Fixed up comments. [hotSync] Normalized debugging output.
-  [pilotDaemon] Fixed backwards logic.
-
-2004-04-26  Adriaan de Groot
-* [kpilot.kcfg] Added [a68k] as default skip in the database list.
-* [pilotDaemon] Use standard names for sync actions. Queue sorry
-  when sync type is bad.
-* [hotSync] Change signature of backup action, lose the confusing
-  int mode parameter.
-* [syncStack] Took out the mode stuff, replaced with SyncAction::SyncMode.
-  This simplified a lot of things, actually.  Removed extra changed-PC check
-  in ConduitProxy, on the assumption this is already checked elsewhere.
-
-2004-04-21  Adriaan de Groot
-* [hotSync] Made skip-database work properly, with wildcard support
-  and proper checking again, so you can now backup your Pilot and
-  specify that FATFS and *a68k can be skipped. Even did docs for it.
-* [syncAction] Added function to return standard names for the
-  (enum) sync actions.
-
-2004-04-19  Adriaan de Groot
-* Cleaned up header comments, copyrights, body comments, indentation,
-  brace style, and unused code in all kinds of files. Normalized use of
-  magic constant 0xffff in PilotRecord::APP_BUFFER_SIZE. Removed
-  some * in char *buffer[] where char buffer[] was meant, reducing KPilot's
-  stack memory usage there by a factor of 4 or more.
-* Patch from Joern Ahrens to close another Bugzilla bug.
-
-2004-04-18  Reinhold Kainhofer
-* Finish the autodetection of the handheld for the wizard. You *CAN* pi_bind
-  to multiple devices, so I just create a bunch of device links and wait for
-  connected signals... This also means we can get rid of page one of the wizard.
-  There is one problem left: If /dev/pilot or so is a symlink to a real device,
-  a connection on /dev/pilot and the actual device will be detected, and kpilot
-  will lock up. I guess I'll have to keep a (static) QStringList of real devices
-  we are bound to in KPilotDeviceLink and disallow binding to the same real
-  device again.
-
-2004-04-18  Adriaan de Groot
-* Default debug_level to 0, so it doesn't print the call trace, but just the
-  (sometimes) useful debug output; use --debug 1 to print the call trace.
-* [pilotDaemon] Add more useful warning output when conversation with screen-
-  saver fails. Add human-friendly way to request a specific sync type.
-  Factor out a whole lot in the startHotSync() to clear up the actual logic.
-* Massive damage inflicted to factor out the one set of sync-enums and
-  use them everywhere, while cleaning up the setup-sync logic too.
-  Remove leading 'e' from enum type names (not the elements).
-
-2004-04-16  Adriaan de Groot
-* Fixed double dialog when cancelling a change in the selection in the config
-  dialog. Took patch from Joern to fix resize problem in abbrowser resolution
-  dialog. Minor constructor mod in pilotMemo.h, and a much more nasty problem
-  in pilotMemo.cc, which seems to use a wrong memo length. Added some
-  docs. Removed a warning in addressWidget.cc.
-* [conduitConfigWizard] Can't assign copyright except in writing, and even then
-  in the EU you can't renounce your copyright. Added a "None" sync setting,
-  for the use-case described on 4-11.
-
-2004-04-11  Adriaan de Groot
-* Testing, testing, 1, 2, 3. Let's look at a use case: someone who doesn't want
-  to sync his or her palm with KDE apps, but does want a convenient application
-  to install files and keep a backup of their palm. How can they use KPilot?
-  Well, uncheck all the conduits except install files, set the daemon to auto-start,
-  and do nothing more than drop the pilot inthe cradle occasionally and hit the
-  HotSync button. Use kpilot's viewers to check the state of the backup.
-* [conduitConfigDialog] Use the CE macro for general config pages. Tighten typing
-  on handleGeneralPages. Add names to the viewers tabs. Make unsaved-changes
-  message make sense.
-
-2004-04-11  Reinhold Kainhofer
-* Fix the codec handling to use KGlobal::charsets.
-* Implemented the startListening and stopListening methods of the daemon.
-* Fixed the config dialog so that just showing a conduit's config widget
-  doesn't trigger the modified signal.
-* Some cleanup in the daemon
-
-2004-04-10  Reinhold Kainhofer
-* Split kpilot's configuration into several files, one for each conduit.
-  Also wrote a kconf_update script so the old settings are preserved.
-  We still need to sort out the remaining settings written to kpilotrc.
-* Corrected all path variables in the .kcfg files from type String to Path
-* The configuration wizard now also sets the conduits' settings to sensitive
-  defaults for the chosen application (kde pim, kontact, evolution)
-
-2004-04-10  Adriaan de Groot
-* Move about in config dialog to sensible spot. Follow suggestions by Carlos
-  to simplify the config dialog a bit. Default general setup to open, even
-  if the message says it it for esoteric stuff.
-
-2004-04-09  Adriaan de Groot
-* Work on docs. Accept patch from Joern for broken config in abbrowser
-  conduit. Receive docs patches from Carlos.
-
-2004-04-05  Adriaan de Groot
-* Work on the Kontact plugin for KPilot, make daemon's installedConduits
-  DCOP call return human-readable names instead of internal stuff.
-
-2004-04-04  Adriaan de Groot
-* Split out the general settings pages so that no tab widgets are
-  needed. Joern's title patch for those pages made the tabs weird
-  anyway, and now things are consistent, at least. We could move
-  the backup page to "Actions", if we want.
-
-2004-04-01  Adriaan de Groot
-* Happy birthday to Mira, who has now managed to watch a whole
-  year of KPilot development, and has learned to sit up and say
-  "aya!" appreciatively when Daddy fixes a bug. Or something.
-
-2004-03-28  Adriaan de Groot
-* Added a "reset daemon" button. Added whatsthis help to toolbar.
-* Added a "suppress confirm" option to the notes conduit, partly
-  for 71122.
-* Suppressed some more warnings. Fixed little buglets. Put off
-  testing 71122 as long as possible.
-
-2004-03-26  Adriaan de Groot
-* Another day, another fix from Joern.
-* Backported the fix for backup settings being ignored from Sebastian V.
-  (Actually, just used his original patch, which didn't use kcfgXT.
-* Prevent sync when screen locked, as a security measure.
-* Still haven't tested 69595 or 71122. Ugh.
-
-2004-03-24  Adriaan de Groot
-* 71122 has been top of the list for over a week - not getting around to
-  it at all. Fixes elsewhere; working on getting a Linux machine up and
-  running to be able to run POSE with a null-modem pseudo-device.
-* Another patch from Joern; arr, it's a learning experience!
-* Removed logging weirdness in the fileinstall action.
-
-2004-03-19  Adriaan de Groot
-* Discovered that the daemon's DCOP interface disappears after one
-  HotSync. Man, that's weird. Removed QString(CSL1()) constructs -
-  CSL1() returns a QString already. Using DCOPClient::attach() in
-  the pop conduit is a really bad idea!
-* Picked bug 72251 to work on tonight. Closed another one related to
-  settings not propagating properly as well.
-* Minor cleanup in the log on the pilot, get conduits to start on new lines.
-  Use correct name for icon. Handle FastSync correctly, don't queue all
-  the extra checks for it based on the sync settings (or do we want to
-  deprecate fastsync as a fNextSyncMode entirely?). At end of sync
-  reset next sync to normal.
-
-2004-03-17  Reinhold Kainhofer
-* Implemented a first version of the config wizard. The code to autodetect
-  the device is not yet finished, though.
-* Extended the daemon DCOP interface to stop listening and start listening
-  on the configured device (needed e.g. if some other application wants to
-  bind to that device for some time, like the autodetect dialog needs to).
-  Here, also the code for really (de-)attaching to the device is not there
-  yet, just the interface to the functions.
-
-2004-03-17  Adriaan de Groot
-* Ripped out all the dead and broken and useless code in the mail
-  conduit, fixed up the code that was left, reduced the size of the
-  setup dialog, and ended up with something that actually works again.
-  Fixed bugs  60579 and 77948.
-* Yet another patch from Joern, added him to credits, too.
-
-2004-03-15  Adriaan de Groot
-* Patches from David Mott and Joern Ahrens today. Excellent!
-* Worked on the docs and website some.
-
-2004-03-14  Reinhold Kainhofer
-* Make sure the config is really read in in the vcal conduit's setup dlg.
-* also the conduit version number of the vcal conduit needs to be really
-  written to the cfg file to make sure categories are really synced. So far,
-  the version number was not written to the config, which resulted in a full
-  sync every time!
-
-2004-03-13  Adriaan de Groot
-* Stared at the screen for a while trying to think of how to test syncing
-  with my spare m100 without breaking my existing stuff from my m500.
-  And I realize that it means I need a second monitor and to run X dual-head.
-* Some minor rearrangements in the config dialog again.
-* Added configuration widget to perl conduit.
-
-2004-03-12  Adriaan de Groot
-* Received patches from Joern Ahrens and Sebastian Voitzsch for
-  various issues. Thanks guys! It's contributions like this that
-  really inspire me to keep working on KPilot. Reinhold and I can't
-  do everything by ourselves.
-* There will be tarballs of KPilot 4.4.2 soon; this will make it
-  possible to get the bugfixes from Joern and Sebastian - and others -
-  on your system now without waiting for another KDE release.
-
-2004-03-08  Reinhold Kainhofer
-* Ported all conduits' setup dialog to the new style and remove all old code
-* First steps for the config wizard.
-* Updated the malconduit to work with libmal 0.4, too (using configure
-  checks, as the code is source-incompatible)
-* Moved the kpilot config page to the correct place in the kontact
-  setup dlg hierarchy
-* Fixed a crash in the old-style conduits' setup code (widget was removed
-  in favor of some other, but code still tried to access it)
-
-2004-03-08  Adriaan de Groot
-* Wow, lots of activity by Reinhold. I hope he updates the ChangeLog
-  sometime as well.
-* Revert the variable timeout, just do a straight 5 second wait, that
-  should just fix it, and save us a lot of trouble too. Anyway, who
-  wants to sync again within 5 seconds of the previous one finishing?
-  It's just as well that the value wasn't saved anywhere anyway.
-
-2004-03-05  Adriaan de Groot
-* Spent most of the day putting together new tarballs, so I can push
-  KPilot improvements out the door again when needed.
-
-2004-03-02  Adriaan de Groot
-* Add a variable timeout after the sync, specially for some T3 users.
-  Thanks to Alec Mitchell for pointing that out and providing an initial patch.
-
-2004-02-25  Adriaan de Groot
-* In the KNotes conduit: Coding style fixes. Cleanup doubled strings.
-  Improved status reporting. Probably dealt with the memo viewer issue.
-* Imported another patch from David Mott, for drag-n-drop file install.
-* Added a config option and UI for running conduits during a backup.
-  Default to not, in order to fix bug 7xxxx.
-
-
-2004-02-21  Adriaan de Groot
-* At FOSDEM, not much hacking was done, but it was fun and boozy.
-
-2004-02-03  Adriaan de Groot
-* I see lots of spelling fixes have been introduced in HEAD. Thanks, TLs.
-* Plans for a photo conduit (Zire71) and a NotePad conduit are forming.
-  pilot-link has the relevant code already, it just needs to be fit
-  into KPilot's form.
-* Worked on the KNotes conduit some more. Remember to update the
-  local database copy, and non-CopyHHtoPC code needs work.
-
-2004-01-31  Adriaan de Groot
-* Finished up the KNotes conduit, I think. The copy to PC part was
-  a little over-enthusiastic.
-
-2004-01-25  Adriaan de Groot
-* Fixed up copyright notices here and there. Dan is listed as copyright
-  holder in lots of files he's never worked on; since copyright cannot
-  be assigned except in writing, I'm going to have to take responsibility
-  for my parts.
-* Fixed up conduit modes in kpilotTest.
-* Removed compile warnings in the vcal conduit.
-* Moved 72342 to top of list, since now I got HHtoPC copy
-  working in kpilotTest I can actually _see_ the bug. It seems to be in
-  PilotMemo.
-
-2004-01-20  Adriaan de Groot
-* Added experimental A-A-P build system.
-* Cleanups in conduit config, added stub buttons for wizards.
-
-2004-01-16  Adriaan de Groot
-* De-tabified ChangeLog again.
-* Updated version. Hope that \374 makes sense (it's a ü).
-* Added explanation for "Actions" page in config. Ditto for "Conduits".
-  Prevent user from collapsing the tree.
-* Fixup layout for popmail conduit when including it in the config dialog.
-* Experimental stab at separating the config into separate bits in the
-  new KCM config dialog.
-
-2004-01-02 - 2004-01-11  Reinhold Kainhofer
-* This was work done in osnabrueck_branch, at the 2004 kdepim meeting
-  and the week afterwards. This issue is one of the feature targets
-  for the kdepim 3.3 release in Q1 2004.
-* Moved the general setup dialog from a separate dialog to a page of
-  the conduit config dlg. Combined the kpilot setup and conduit config
-  dialog to one dialog.
-* Implemented the kontact plugin for KPilot (showing status information)
-* Added three DCOP functions to the daemon for querying status information
-* Hotsync log is written out to a file (~/.kde/share/apps/kpilot/lastsync.log)
-* Converted all conduits to KConfig XT (mail und kroupware still missing)
-* Converted the config dialog to a KCM module
-* KPilot plugin for contact: shows status in summary and makes config available
-* kpilotDaemon sends a DCOP signal when its settings/state are changed
-* New DCOP functions in the daemon to query its state and settings
-* the kontact plugin also detects if the daemon is quit
-* Use a QSplitter in the config dialog instead of the QHBox layout
-* implemented the kconf_update scripts to move groupless entries to the
-  [General] group
-* Still missing:
-    o) KConfig sync between the three processes working on the
-       kpilot config: kpilot, kpilotDaemon and possibly kontact
-       with the kpilot plugin
-    o) Wizard to setup kpilot correctly for kontact (the defaults
-       should suffice, just in case someone played around and
-       messed them up)
-
-
-2004-01-02 - 2004-01-04 Adriaan de Groot
-* This was work done in osnabrueck_branch, at the 2004 kdepim meeting.
-* Fixed the TODO_I18N -> they're all i18n() now.
-* Discovered ttypatch, which is da bong. Thanks to Dan Clemmensen
-  for writing it, and Bernhard Reiter for showing it to me. All of
-  a sudden, POSE actually looks usable.
-
-2004-01-02  Adriaan de Groot
-* Non-functional commits all over; split off osnabrueck_branch.
-* Naming changes in todo conduit.
-* Fix sync race in knotes conduit.
-
-2003-12-29  Adriaan de Groot
-* Reenabled the popmail conduit, but in severely limited form.
-
-2003-12-28  Adriaan de Groot
-* Committed the knotes stuff, since it does do HH->PC properly. OTOH,
-  I don't think the mode code is right in that conduit either.
-* Stared at various bugs that I can't reproduce.
-* Looked into #69987, changed some names in the todo conduit.
-* Changed the parts of the changelog to real changelog format
-  (dates must be yyyy-mm-dd, with leading zeroes if needed).
-
-2003-12-23  Adriaan de Groot
-* Added recent hardware reports. If you reported something and I've
-  forgotten it, please send me a gentle reminder.
-* Added IrDA howto from Stuart, who failed to provide an email
-  address that I can respond to.
-* I think I got the KNotes conduit working again, but it needs some
-  testing so that change hasn't been committed yet.
-
-2003-12-12  Adriaan de Groot
-* Reduce warnings in vcalconduit.
-
-2003-12-10  Adriaan de Groot
-* Fix for #66321 - fill in a default value for the vcal file.
-
-2003-12-05  Adriaan de Groot
-* Het heerlijk avondje is gekomen. Damn right it is.
-
-2003-12-02  Adriaan de Groot
-* Removed #if 0'ed code; moved some deprecated code to #if 0; removed
-  use of deprecated stuff. Fixed up includes.
-
-2003-11-23  Adriaan de Groot
-* Minor string fixups that don't affect TL.
-
-2003-11-22  Reinhold Kainhofer
-* Fixed the broken conduit config dialog (wasn't able to show config
-  widgets of more than one conduit. If you configured one conduit, and
-  switched to another, its config widget couldn't be added to the stack).
-* Configure conduits dialog now has an apply button.
-
-2003-10-21  Adriaan de Groot
-* Updated the website some with lots of new hardware. Thanks to
-  everyone who reported new stuff.
-
-2003-10-10  Adriaan de Groot
-* Sure, we let the ChangeLog slide, but didn't do much, I don't
-  think, over the summer. Main point is that AAP can pretty much
-  build KPilot now, suck to be auto* and make.
-
-2003-07-30  Reinhold Kainhofer
-* The addressbook conduit now uses a different algorithm to find
-  the type of address on the PC to sync with.
-  First, if there is a preferred address (no matter if home, work
-  or whatever), this one is synced to the handheld. If no preferred
-  address exists, either home or work (depending on the setting in
-  the conduit config dialog) is used for the sync. If that doesn't
-  exist, either, the other one (work/home) is tried. If that also
-  doesn't exist, and the address is copied to the PC, its type is
-  set to preferred+the setting from the config dialog.
-  This fixes both bugs #50560 (conduit should sync with preferred
-  address) as well as bug #60659 (conduit should use the existing
-  address from the PC, even if the type is not the one chosen in
-  the config dialog).  (also backported to BRANCH)
-* Allow two addressbook entries with the same name and organization,
-  but different phones, addresses etc. Actually, it allows entries
-  which are equal up to at least one entry. This fixes bug #59569.
-* Fixed bug #60691 where events recurring monthly on a given weekday
-  were shifted by one day. (also backported to BRANCH)
-* Also, when initializing a LocalCalendar, you are not supposed
-  to give a time zone...
-* Also, fixed infinite loop glitch by Cornelius.
-* If the user chose to sync to an iCalendar file instead of the
-  standard (resource) calendar, and he gave an empty or invalid
-  file name, an error message is now written out to inform him/her
-  about the problem.
-  I don't want to ask him for a file name, because one of the
-  guidelines of conduit development is that a sync should be able
-  to run without user intervention.
-  this should probably also be backported, but it introduces two
-  new i18n strings, so it is not possible. Thus the bug will remain
-  in 3.1 branch.
-* Fixed the toolbar configuration.
-
-2003-07-27  Reinhold Kainhofer
-* The internal editor action now displays the contents of the conflicting
-  records and lets the user decide which one overrides (Fixes bug #61103).
-* For this I added a function getTextRepresentation(bool richText) to
-  PilotAppCategory, PilotAddress, PilotMemo, PilotDateEnty and PilotTodoEnty,
-  which returns the contents of the record as a string that can be displayed
-  to the user. Moved that code from the internal viewers to the classes.
-* If there is no nice-text representation, I now use KHE::KHexEdit to
-  show the raw contents, so the user gets an idea of the conflicting records.
-
-
-2003-07-26  Adriaan de Groot
-* Time flies when you're having fun and mucking with other
-  bits of KDE. Worked on meinproc, build fixes, dependencies, etc.
-
-2003-07-26  Reinhold Kainhofer
-* Changed a few accelerators (duplicates reported by Dr.Klash)
-* Also show items marked as deleted in the GenericDB viewer.
-* All conduits now have their own copy of the handheld's database
-  in $KDEHOME/share/apps/kpilot/conduits/UserName/*.pdb. This was
-  needed so that backup runs don't break the conduit's algorithm to
-  detect changed records on the PC. So far, we compared each entry
-  to the corresponding entry in the backup database. It that changed,
-  basically we are screwed.
-  For this new feature I extended the constructur of PilotLocalDatabase
-  to take an additional boolean parameter useConduitDBs. If that is set,
-  the db will be opened in ..../conduits/Username/
-* Do not return "Unfiled" or "Nicht abgelegt" as category label
-  if no category is set. Instead return an empty string.
-* Added isArchived() and makeArchived() methods to PilotAppCategory
-  to set the dlpRecArchived flag.
-* Changed the way how the DBBackup/username/ and conduits/username/
-  directories are created (now I'm using KStandardDirs::makeDir and
-  KStandardDirs::exists).
-* FirstSync now also means PC->HH or HH->PC directions (which is clear
-  intuitively, as with these direction, nothing that's on the other
-  side should matter at all).
-* Added eDelete to the sync actions in the SyncAction class
-
-
-2003-07-15 to 2003-7-26  Reinhold Kainhofer
-Complete rewrite of the addressbook conduit (for the, umhh, third(?) time).
-* NEW FEATURE: custom fields can now also be synced with
-  birth date, URL, ICQ, etc. (bug #50871)
-* Conflict resolution shows the whole conflicting item
-  and all conflicting fields (so far, every conflicting
-  field was shown on its own, bug #59222). The conflict
-  resolution is done completely independent from the addressee
-  object and might so be reused later in other conduits as well.
-* Separated the mechanism to detect changes from the mechanism
-  to sync/merge addressees. This makes the whole thing a lot
-  easier to understand and maintain, and there are far less
-  cases you have to consider.
-* the conduit now obeys the global conflict resolution (ask,
-  PC overrides, HH overrides, last sync overrides, duplicate)
-  and sync direction (fast, full, only PC->HH, only HH->PC)
-  settings. Bug #59220.
-* The "only HH->PC" and "only PC->HH" sync directions first
-  copy all existing entries to the receiving end, and only then
-  remove all other entries from there. This avoids data loss if
-  the connection breaks while such a special sync is running.
-* Added a crash handler to clean up the addressbook if the
-  conduit crashes.
-
-2003-07-11  Reinhold Kainhofer
-* Records in the PilotLocalDatabase with ID 0 (i.e. new records
-  added by KPilot's internal editors) will always be treated as
-  modified records and found by readNextModifiedRecord, even if
-  they don't have the dirty flag set. This ensures that all new
-  records from KPilot will be added to the handheld
-* Finished the internal todo editor:
-  Entries can be maked completed and edited directly in the check
-  list view.
-  Moved the editor dialog to a designer ui file instead of a
-  manually created layout
-* Finished the sync action that copies the changes done in the
-  internal editors of KPilot to the handheld. So, finally, the
-  internal viewers/editors of KPilot are working again, unlike
-  the last few years, where they were in a terribly broken state.
-
-2003-06-01 to 2003-7-10  Reinhold Kainhofer
-* I was busy with a lot of stuff from KPilot, none of which is actually
-  in a state where I can commit it. In particular, I'm working on
-   -) Custom field sync of the addressbook conduit
-   -) Make the conflict resolution of the abook conduit more
-      intuitive (ask just once for each conflicting address)
-   -) Finish up the todo editor
-   -) Make the generic DB viewer an editor (more or less finished,
-      but the KHexEdit widget is not yet publically available, so
-      I can't commit that part either)
-   -) Implement the InternalEditorAction which syncs the changes
-      done in the internal editors/viewers to the handheld
-
-
-KPilot Developer's notes for July 9th
-=====================================
-
-2003-7-9  Adriaan de Groot
-* Ditched spurious code in KNotes conduit config. Updated copyrights,
-  still assigned to Dan. Updated the notes interface stubs.
-
-2003-7-7  Adriaan de Groot
-* Added a conduit description to PalmDOC. Well, fixed the "Conduit"
-  vs. "Comment" typo in the .desktop file.
-
-2003-7-6  Adriaan de Groot
-* Made the bugreport and question and help links in the about pages
-  clickable through KActiveLabel. Made the credits text scrollable
-  with a QTextEdit.
-* Weird redraw bugs reappear in the conduit config dialog, fixed again.
-* Added sorryVersionOutdated() to KPilotConfig to notify user that
-  the configs are old, and telling what's changed. Used in kpilot and
-  the daemon. Includes cleanup. Use getDebugLevel() properly.
-
-2003-7-5  Adriaan de Groot
-* Upped the config version number to 440.
-* Worked on the docs (really!), so the HEAD docs now reflect _some_ of
-  the reality of KPilot 4.4.0. Noted lots of inconsistencies.
-  Put in lots of TODO's, and the whole thing needs going over.
-* Using the trademark HotSync in the GUI might not be a good idea.
-  Removed where I could, added a trademark reference in the about pages.
-
-2003-7-5  Adriaan de Groot
-* Renamed all conduit plugins from lib<bla>conduit (and variants) to
-  conduit_<bla>, so that they're easier to identify in $KDEDIR/lib/kde3.
-  Of course, this doesn't work right. Feh.
-* Removed listCat again.
-* Implemented a notion of "internal conduit", so that we can move
-  the "install files" and "kroupware" stuff to the conduit config
-  dialog and out of the general stuff, where it looks weird.
-
-2003-7-4  Adriaan de Groot
-* Removed the words "KPilot", "KDE" and "Conduit" from all the conduit names.
-* Removed double logging in NULL conduit, added message for explicit fail.
-  Use the generic config dialog implementation. I see now that the NULL
-  conduit isn't built or installed anymore. Fixed its .desktop comment.
-* Disabled the expenses and popmail conduit from compiling.
-* Made new-style config for the vcal conduit. Made new-style config for the
-  todo conduit. Stripped out lots of extra #includes. Stripped out extra
-  Q_OBJECT macros. Reduced space in widget some. Fixed void return 0;
-  Fixed improper AboutData in todo conduit.
-* New-style for abbrowser. Minor == vs = mixup.
-* Shrunk margin for kpilot config dialog. Use the available charsets from
-  KDE instead of our own list. Added a quit-after-sync option.
-
-
-
-2003-6-29  Adriaan de Groot
-* Added some code validation support to plugin.h
-* Messed about with popmail's config. What was the firewall stuff for?
-  Created new-style configs, didn't complete the load/save code, and
-  then sortof gave up because is there really any point to doing this
-  conduit without switching to the SMTP ioslave? And using identities
-  then?
-
-2003-6-26  Adriaan de Groot
-* Removed stupid comment in popmail/Makefile.am
-
-2003-6-25  Adriaan de Groot
-* Be consistent about naming the sysinfo conduit "System Information"
-  in user-visible strings.
-* Remove "conduit" from the name of the Palm DOC conduit, and add a
-  new-style config panel to it. Made it resize properly.
-* Note that ConduitConfigBase::load() and its overrides should set
-  fModified to false.
-
-2003-6-22  Adriaan de Groot
-* Turn off NO_CAST_ASCII when doing DEBUG_CERR, because ostream is
-  lacking an operator << for QString. (Nicer is probably to add
-  such an operator, but hey.)
-* Removed uselessly virtual conduitName() function from conduit classes.
-  No-one was overriding it anyway.
-* The vcal and abbrowser conduits shouldn't be compiled if you're building
-  KPilot HEAD on older systems.
-
-2003-6-21  Adriaan de Groot
-* Fixed up the layout of the sysinfo conduit.
-* Documented ConduitConfigBase::isModified() and made it virtual.
-* Fixed up the sysinfo conduit and saving modified entries.
-* Moved the --debug argument to all apps individually.
-
-2003-6-20  Adriaan de Groot
-* Updated the hardware lists on the website.
-* Updated some "What's This?" texts.
-* Removed evil static QStrings in kpilotConfigDialog.cc.
-* Discovered that the "start at login" functionality has been broken forever.
-* Added a workaround for KTimeWidget not present in KDE 3.1.x.
-
-2003-6-20  Reinhold Kainhofer
-* Implemented the dialog to change the database flags and the dates (DBInfo
-  struct) in the internal generic DB viewer. PilotLocalDatabase got a new
-  method setDBInfo for this.
-* Implemented creating, editing and deleting records in the generic DB editor.
-* Added the CHexViewWidget from khexedit to the kpilot/kpilot/ directory.
-  There are still several open issues with it (i.e. how do I set the data
-  at all???)
-
-2003-6-19  Reinhold Kainhofer
-* Implemented the list of records in the generic DB viewer. To be
-  able to sort the records by their index, I had to write my own
-  compare method of the QListViewItem, which compares the numerical
-  representation of the column entries. For large DBs (>300 records)
-  this is way too slow (QString::toULong for each comparison, increasing
-  with n*n), so I had to implement some caching. Now even large databases
-  are sorted very fast.
-
-2003-6-16  Reinhold Kainhofer
-* First layout of the internal calendar viewer/editor. The KDatePicker
-  poses a big problem to me as it swallows all toolbar buttons.
-* Implemented a InternalEditorAction to sync changes done to the databases
-  in the internal viewers. Every PilotComponent that changes a database
-  needs to mark it as dirty (e.g. markDBDirt("AddressDB")) so the
-  Action knows which databases need to be considered.
-
-2003-6-15  Reinhold Kainhofer
-* Implemented a first layout of the generic database viewer. To view
-  the records, I'd need a hex editor, which is not available in KDE, yet.
-  I tried using the widget that khexedit uses, but somehow I can't get
-  it to work :-((
-
-KPilot Developer's notes for June 15th, 2003
-============================================
-
-2003-6-15  Adriaan de Groot
-* Yay, father's day. Which includes me. Mira drew me a wonderful card.
-* Fixed some TL problems in debug output, and added documentation.
-
-2003-6-14  Adriaan de Groot
-* Fixed the conduit config dialog's repaint and behavior problems by
-  ditching the .ui file and implementing it by hand again. I'll look
-  into a switch back to .ui later.
-
-2003-6-12  Reinhold Kainhofer
-* Tracked down why the handheld crashes with Invalid UniqueID error
-  message (bugs #59313 and #51216). RecordIDs are supposed to be 3
-  bytes, and the handheld will crash if they are longer. For some
-  reason, several entries in the calendar or the addressbook were
-  assigned longer Record IDs, so I added a check for invalid values
-  before sending them to the handheld. This fixes the symptoms (i.e.
-  these crashes won't appear in the future again, and new valid ids
-  will be assigned), but there is still another bug that assigned
-  the wrong values in the first place...
-
-2003-6-9   Reinhold Kainhofer
-* Fixed crash from bug #59315. I used the value of a char as a char*,
-  in the code for extension cards in the sysinfo conduit. pilot-link
-  doesn't detect my Clie's memory stick as extension card so this code
-  was never executed on my machine, and I didn't detect the bug myself.
-
-2003-6-1   Reinhold Kainhofer
-* Fixed several (possible  and really occurring) null pointer crashes
-* Submited most of the items in our TODO list as bugs or wishes on
-  bugs.kde.org
-
-2003-5-31  Reinhold Kainhofer
-* Restructured the setup dialog of KPilot. Several per-conduit
-  settings were moved to global settings. The conduits now have
-  isFullSync(), isFirstSync(), getSyncDirection(), and
-  getConflictResolution() members for these settings. I think I fixed
-  all conduits to use these new settings and didn't miss anything.
-* The Backup works again (fast sync doesn't do a backup, hot sync
-  does conduits and a fast backup, full sync does a full backup where
-  the modified flags are ignored). Also added a fast backup where
-  only modified records are retrieved.
-
-
-2003-6-1  Adriaan de Groot
-* pilotComponent.cc Another fix for 52138 - I'd missed the category
-  drop-down box.
-* Woo. After months of wrestling, I actually managed to run KPilotTest
-  and list the contents of my m500. Sometimes, there is something
-  to be said for Linux and a working USB stack. This means I have
-  limited testing hardware available again.
-* Minor fixups to make HEAD compile with 3.1.x again.
-
-2003-5-31  Adriaan de Groot
-* Updated my build environment to HEAD. This will leave some people
-  in the dust, for sure, since 4.4.0 will thus have an address conduit
-  that requires HEAD, not 3.1.x. Perhaps we can ship two tarballs,
-  but that's going to start to be messy again.
-* Talked to lioux about conduits and categories on IRC. It seems
-  that PC->Palm syncs usually respect categories and such, but Palm->PC
-  doesn't, among other little tidbits. He'll file bug reports.
-
-
-KPilot Developer's notes for May 30th, 2003
-===========================================
-
-2003-5-30  Adriaan de Groot
-* Spent this week at conferences (Mira at 8 weeks was the
-  youngest attendee of the EEF School on Formal Methods,
-  though I doubt she'll remember how to do protocol
-  verification in PVS).
-
-2003-5-19  Reinhold Kainhofer
-* This weekend I wrote this new conduit for KPilot, called
-  sysinfoconduit. It writes all important Palm system information
-  to a text or html file. For an example, see
-  http://reinhold.kainhofer.com/Linux/KPilot/KPilotSysInfo.html.
-  The output is completely customizable via templates. Currently,
-  txt and html templates are available, but the user can provide
-  his/her own template in the conduit configuration dialog. The
-  current html template uses css for the markup, and passes the
-  w3c html validator without warnings.
-  Hopefully, the debug output section will help us kpilot developers
-  track down problems easier (the users can send us the output of
-  this conduit, and we can let it write out all important stuff we
-  need/want to see).
-
-2003-5-11  Adriaan de Groot
-* kpilotDCOP.h Changed enum values so that you can distinguish
-  between call failed and normal operation.
-* conduitConfigDialog.cc When closing config dialog, release last
-  selected conduit.
-
-2003-5-9  Adriaan de Groot
-* Fixed up some config issues in the NULL conduit.
-* Added conduitName() to conduit config things and their actions,
-  to provide a user-readable name for the conduit.
-
-2003-5-5  Adriaan de Groot
-* plugin.{h,cc} Added a maybeSave() function for the new conduit config
-  style. Removed some unused variables.
-* conduitConfigDialog.{h,cc} Using maybeSave() to save or cancel selection
-  changes.
-
-2003-5-3  Adriaan de Groot
-* Spent lots of time panicing my system and causing fatal exceptions
-  on my Pilot by playing with pilot-link 0.11.7 and FreeBSD's USB
-  stack.
-* kpilotlink.cc Suppress printing the "accidentally in acceptDevice"
-  more than once. Try to escape from the infinite socketnotifier loop.
-
-
-2003-5-2  Adriaan de Groot
-* Aiming for bi-weekly notes this month again.
-* Looks like I reverted the PRETTY_FUNCTION printing.
-* I'm working from an everything-HEAD-except vcal and abbrowser
-  checkout, because the new resources framework breaks everything.
-* Next KPilot tarballs will be 4.4.0 (HEAD) release.
-
-KPilot Developer's notes for April 30th, 2003
-=============================================
-
-2003-4-25  Adriaan de Groot
-* Updated resizing action in the conduit config dialog.
-* Added a ConduitConfigBase to the knotes conduit.
-* Changed a bunch of Name[] entries for the time conduit. We
-  need shorter names; most of them are horribly redundant.
-* Noticed that the conduit checklist items don't always get
-  painted right. Added a workaround.
-
-2003-4-24  Adriaan de Groot
-* More work on the conduit configuration stuff.
-* Make FUNCTIONSETUP print PRETTY_FUNCTION instead of just FUNCTION.
-* Added a ConduitConfigBase object to the time conduit.
-
-2003-4-22  Reinhold Kainhofer
-* Cleanup of several cout and other debug messages
-* In the addressbook and todo conduits, after the sync the AppInfoBlock
-  is written back to the databases so that adding categories to the
-  database finally works.
-
-2003-4-21  Adriaan de Groot
-* Changed the description for the KPilot NULL conduit to just "NULL",
-  since both "KPilot" and "conduit" are redundant in this context.
-* Messed around a little with the types of plugin code, created a
-  class ConduitConfigBase which is supposed to supplant the current
-  config widget stuff.
-
-2003-4-21  Reinhold Kainhofer
-* Implemented different ways to convert the bookmarks in the doc
-  conduit when doing Handheld->PC sync.
-* Some tab order fixes in several conduit setup dialogs.
-* Improved the question when the handheld and the KPilot user
-  names don't match.
-
-2003-4-20  Adriaan de Groot
-* Added the sources for a generic DB viewer and a datebook viewer.
-  These don't show up anywhere yet though. The datebook viewer has
-  no functionality yet.
-* kpilot.cc Minor change to detect non-functioning daemon better.
-* Restored the tooltip code to the conduit config dialog. Removed
-  the "description" column again.
-* uiDialog.{h,cc} Moved the addAboutPage() code to a static function so
-  that it can be reused elsewhere.
-* plugin.{h,cc} Added a new base class ConduitConfigBase for deriving
-  the configuration widgets for conduits from. This will make them
-  more generically pluggable.
-
-2003-4-19  Reinhold Kainhofer
-* Fixed the categories sync in both the addressbook and the todo conduits.
-
-2003-4-18  Adriaan de Groot
-* Laurent Montel did some compile fixes for restrictive (NO_ASCII_ ...)
-  compile environments. And I fixed them to match the coding guide.
-* Make file installer emit a [] message like the conduits do, to
-  give the "No files to install" message context. Tell the user how
-  many files will be installed.
-* Tell the user if the daemon can't be started. Tell the user what
-  charset is selected.
-
-
-2003-4-17  Adriaan de Groot
-* Finished moving the conduit config to checklist items. Worked out
-  a sensible compromise with the command buttons. The conduit
-  descriptions (comment lines in the .desktop files) need work.
-
-2003-4-16  Reinhold Kainhofer
-* Tried to add a logMessagePart slot which would append some words
-  to the last line of the sync log (but would not start a new paragraph,
-  and more text could be added to the last paragraph). Realized that this
-  is not possible in a QTextEdit with LogText, and using RichText is too
-  buggy to be useful. However, I found a way to get rid of the pseudo-
-  progressbar in the libmal output, so this is not an issue any longer.
-
-2003-4-16  Adriaan de Groot
-* Moved conduit config to a list of QCheckListItems, finally.
-  This was easier than I thought. Took a bit of time to polish,
-  though. This change introduces a new class ConduitConfigWidget
-  which could be placed in a tab elsewhere if needed.
-
-2003-4-15  Reinhold Kainhofer
-* Finally fixed the configure.in.in check for libmal in the malconduit
-* calendar conduit had wrong RadioButton IDs, so the Resource and LocalCalendar
-  settings were messed upt
-
-2003-4-14  Adriaan de Groot
-* Made some reasonable mock-ups, see my kpilot page, mulled over the
-  non-editing by the viewers. I'm now working in HEAD only.
-* kpilot.{h,cc} Fixed up backwards compatibility.
-
-2003-4-12  Adriaan de Groot
-* Mucking about with KPilot's UI again. Trying to remove dialogs
-  and to make the viewers just viewers.
-
-2003-4-1  Adriaan de Groot
-* My daughter, Mira Annelie Engel, was born this evening and is a
-  bouncing healthy girl. But she's going to put a crimp in KPilot
-  development, that's for sure.
-
-KPilot Developer's notes for March 26th, 2003
-=============================================
-
-2003-3-26  Adriaan de Groot
-* pilotLocalDatabase.cc [BOTH] Qt 3.0 compatibility.
-* More merging: lib/ just spacing fixes.
-* kpilot/ In HEAD, muck about with the toggle actions that were removed
-  from kpilot.cc. This stuff is supposed to build in all KDE 3.x.
-* I've been thinking about _where_ to hack next. HEAD is evolving
-  further under Reinhold's influence, and I feel pretty much stymied
-  in BRANCH because I can't touch strings and the like. However, I'm
-  still running KDE 3.1 and dedicated to KDE 3.0 compatibility as well.
-  Since the things I want to change are in lib/ and kpilot/ and affect
-  strings, I'm going to pick up those from HEAD, but stick to BRANCH
-  conduits for the next while. Then I can catch up with HEAD in the
-  conduits one by one. So initial KPilot 4.4.x tarballs will be from
-  a mix of CVS branches. We might consider doing the conduit releases
-  separately from KPilot itself - more 3rd party-ish - since the conduits
-  change far more drastically than KPilot itself.
-
-  Initial plans for 4.4.0: disable editing in the viewers ; move the
-  configuration things into the JanusWidget, and out of separate dialogs.
-
-2003-3-24  Reinhold Kainhofer
-* Adapted the layout of the addressbook conduit's setup dialog to
-  resemble the one from the calendar/todo conduit
-* Addressbook conduit: Implemented the option to sync with an
-  arbitrary vcard file instead of only the standard addressbook.
-  This actually involved quite a lot of dealing with resources,
-  factories etc., so I'm still looking for an easier way to
-  obtain the addressbook from a single local vcard file.
-
-2003-3-23  Reinhold Kainhofer
-* Lot of work on the docconduit. Finished the KPalmDOC application.
-  It converts text files to .pdb files that can be viewed as ebooks
-  on the handheld. The user can either convert single text files
-  to or from PalmDOC .pdb files, or choose a directory, where all
-  *.txt or *.pdb files will be converted to another directory.
-  I created some icons by just putting the text mime-type icon
-  behind the kpilot icon, so the icons don't look too well. All artists
-  are welcome to improve them.
-* Tried to implement a configure option for libmal, and use autoconf's
-  built-in functionality to detect libmal. Doesn't work yet, so I
-  haven't committed it yet.
-
-2003-3-23  Adriaan de Groot
-* More merging .. conduits today:
-* null/ There's a single string change, "Failure" -> "failure".
-* expense/ knotes/ Nothing changed - except the Makefile.am,
-  which breaks things in HEAD.
-* malconduit/ "" -> QString() for QString cleanness. Some authors
-  should have been credits. There's still a spelling fix string
-  change in HEAD. Lots of spacing updates.
-
-2003-3-21  Adriaan de Groot
-* Heh, noone ever noticed the "Edit Toolbars" menu item called the
-  "Edit Keyboard Shortcuts" dialog.
-
-2003-3-20  Adriaan de Groot
-* Merging between BRANCH and HEAD.
-* options.h [BRANCH] Upped the version number again.
-* lib/ [BOTH] Merged documentation, fixed minor bug in plugin.cc in HEAD.
-* kpilot/ [BOTH] Merged stuff.
-* pilotDaemon.{h,cc} [HEAD] The daemon has extra DCOP features and kroupware.
-* kpilot.h [HEAD] Extra in-use code and Ben's removal of toolbars
-  (supported by standards in KDE 3.2 - this needs backporting and
-  #ifdeffing).
-* conduitConfigDialog.cc [HEAD] Has all the setup stuff for the checkbox
-  list conversion (a GJJ) but #if 0'ed out.
-* kpilotConfig{Dialog,}.{h,cc} [HEAD] Adds a GUI for the pilot encoding.
-* kpilotDCOP.h [HEAD] Extra configure methods from David.
-* listCat.h [BOTH] One-up the spelling mafia.
-
-2003-3-17  Adriaan de Groot
-* [fileInstallWidget.cc] Applied file-installer multiselect patch
-  from Ulrik Mikaelsson.
-* [pilotDaemon.cc] Applied DCOP interface additions from David Mott.
-
-2003-3-15  Adriaan de Groot
-* The popmail conduit runs in backup mode during syncs. So do all the
-  other conduits. What's going on? Thanks to Tobia Baier for spotting this.
-  Worse still, the bug comes from the difference between & and &&. Fixed.
-* syncStack.cc [BOTH] Fixed --backup bug.
-* David Mott is back with more patches, but he's got competition from
-  Ulrik Mikaelsson, who's also doing GJJs.
-
-KPilot Developer's notes for March 12th, 2003
-=============================================
-
-2003-3-12  Adriaan de Groot
-* Lots of administrivia changes, like the FSF address.
-* Really ought to merge the copyright changes into BRANCH, since they're
-  still being released with weird copyright assignments.
-* vcal conduit in local-test mode will write out an .ics.
-
-2003-3-4  Adriaan de Groot
-* Welcome back to David Mott, author of several patches already and
-  ready to dive into the code again for GJJs. Happy distraction, dude.
-* [vcal-conduitbase.cc] Checked against wrong KDE_VERSION. [BRANCH]
-* Various merging from BRANCH to HEAD. Layout fixups here and there.
-* Test mode in the vcal conduit by default uses local databases from
-  /tmp.
-
-2003-3-3  Adriaan de Groot
-* pilotDatabase.h [BRANCH] Merged additional parameters to findDatabase
-  from HEAD. Merged every other change in lib/ from BRANCH to HEAD.
-* pilotRecord.{h,cc} [BRANCH] Added instrumentation for alloc/delete count.
-
-2003-3-2  Adriaan de Groot
-* Continued instrumentation of the vcal conduit.
-
-2003-3-2 Reinhold Kainhofer
-* the DOC conduit now also finds the correct sync direction
-  if the user only wants PC->PDA or only PDA->PC sync.
-  Also, if a text was deleted on one side, it is also deleted
-  on the other end
-* The resolution dialog of the DOC conduit now uses a QScrollView
-  instead of a QTable for the list of conflicting texts
-* In the DOC conduit, regular expressions as bookmark names work
-  now. E.g. a bookmark search string of "return (\S+);" and a
-  bookmark name of "RetVal: $1" or "RetVal: \1" replaces all $i or
-  \i by the i-th subexpression of the match.
-* DOC databases are now also kept locally if the user set this option
-  (installDatabases has the addidtional argument not to delete
-  the files)
-* The calendar and todo conduits now use the standard calendar by
-  default. The user can also specify a single  file to sync with
-  instead of the whole calendar.
-* The calendar and todo conduits use identical setup dialogs, so
-  there is no reason for code duplication. Removed the setup dialog
-  of the todo conduit and derived it from the calendar conduit setup
-  dialog.
-* Updated the copyright lines in the source files as well as
-  in the about tabs of kpilot and the conduits.
-* Since we have the calendar resource framework, the calendarr conduit
-  can run even while korganizer has the calendar open without causing
-  calendar corruption. So I removed the check for running korganizer
-  and alarm daemon
-
-
-2003-2-28  Adriaan de Groot
-* Discovered that the changes from 2003-1-31 to syncAction.{h,cc}
-  had disappeared in some of my periodic CVS screwups. Re-did them.
-* vcal-conduitbase.{h,cc} [BRANCH] Added more instruments for
-  running test mode.
-
-2003-2-27  Adriaan de Groot
-* Merged Reinhold's print-conduit-id patch from HEAD.
-* Continued updating the documentation. Ripped out the revision
-  history, Lauri says I'm the only developer in the history of
-  KDE to actually maintain it in the docs.
-* Updated version to 4.3.9 now that 4.3.8 is out.
-* Started work on a real test mode for the vcal conduit.
-* syncStack.cc [BRANCH] Set conduit action name to the conduit's name.
-
-KPilot Developer's notes for February 26th, 2003
-================================================
-
-2003-2-26  Adriaan de Groot
-* Finally solved KDE 3.0 build issues, incorporated minor fixes, updated
-  build scripts and RELEASED KPILOT 4.3.8. Get it from the website,
-  possibly in a few hours after it updates or from my personal
-  backup copy (replace pilone by adridg in the URL).
-
-KPilot Developer's notes for February 14th, 2003
-================================================
-
-2003-2-14  Adriaan de Groot
-* Happy Valentine's Day, eh. Remember guys, today your girlfriend
-  _is_ more important than hacking. Which reminds me ..
-
-2003-2-13  Adriaan de Groot
-* kpilotLink.{h,cc} [BRANCH] Added a messagesType flag to distinguish
-  error messages from normal once-only messages in shouldPrint().
-  Print out device name before opening in open().
-
-2003-2-12  Adriaan de Groot
-* Applied David Mott's DCOP patches to HEAD. Also applied his RMB
-  patches to HEAD. This takes care of some GJJs.
-* memoWidget.cc [BOTH] Replaced the label "Memos:" beside the
-  category combobox by "Category:" which is also used by the
-  address widget. Kept the old string around for safekeeping.
-* Dealing with non-latin1 Pilots again, now in Russian. And it
-  _seems_ to work. I think last week's changes were sufficiently
-  general. Added in the rest of the Pilot languages as well,
-  from the JPilot source.
-
-2003-2-10  Adriaan de Groot
-* popmail-conduit.cc [HEAD] Did some actual TODO_I18N work,
-  removed printfs from the message construction in the conduit.
-  Added a GJJ for it.
-* pilotDaemon.cc has lots of Kroupware additions in HEAD and
-  also changes "unix" -> "KDE" in the about box.
-* conduitConfigDialog.cc has lots of new code for changing the
-  conduit list to a list of checkboxes.
-* kpilotConfigDialog_base has been edited in HEAD for new Kroupware
-  options. Same with kpilotConfigDialog.cc, kpilotConfig.{h,cc}.
-* conduitSetup.cc may be deprecated, but there was a minor difference
-  between files. HEAD <- BRANCH (ie. HEAD gets BRANCH version).
-* hotSync.cc variable names changed, BRANCH <- HEAD.
-* interactiveSync.cc typos and latin1() fixes. BRANCH <-> HEAD.
-* logWidgetDCOP.h still had Log: tag in it,. removed [HEAD,BRANCH]
-* abbrowser conduit has new custom field code. Did BRANCH <- HEAD
-  for the includes, though, just to normalize 'em. But, to quote
-  TMBG, "Who keeps moving my #includes?" The only unmerged stuff
-  that _could_ be merged is minor code beautification in
-  @@ -1496,22 +1563,26 @@
-* Should re-add a Pilot*Database constructor that takes a const char *
-  for those places that already have a dbName.
-* vcalconduit has startOffset() support for alarms.
-
-
-2003-2-9  Adriaan de Groot (merge status)
-* Merging. I hate merging. We _definitely_ need a better process for
-  this, like merging every fix into HEAD as soon as it's done. That
-  would save a lot of effort, I think. And I'm going to check out
-  KPilot with -kk for merging efforts from now on. Here's the list
-  of features I found in HEAD that are not in BRANCH:
-  - KPilotDeviceLink::installFiles() extra arguments.
-  - KPilotDeviceLink::findDatabase() extra arguments.
-  - PilotDatabase::createDatabase() and deleteDatabase() added.
-  - Pilot*Database::readNextModifiedRec() extra arguments.
-  - Pilot*Database::deleteRecord() added.
-  - PilotLocalDatabase::PilotLocalDatabase extra arguments.
-  - FileInstallWidget lots of changes. FileInstaller as well. [MERGED]
-* Managed to revert, prevert, and advert syncStack.{h,cc} all in
-  one go. I think I have it back to normal now.
-
-KPilot Developer's notes for February 7th, 2003
-===============================================
-
-* KPilot 4.3.7 is released. Tarballs on the website tonight.
-* Need to backport the changes from 2002-11-10 to BRANCH.
-* Grep for and destroy latin1() calls in code. These are now in
-  the code to keep KPilot working under QT_NO_ASCII_CAST conditions,
-  but should all be replaced by the proper functions instead - either
-  QFile::encodeName() or by updating other functions to take QStrings
-  instead of const char *, and using the Pilot codec where appropriate.
-* Reinhold's on vacation for a little while.
-
-2003-2-7  Adriaan de Groot
-* Updated the website some.
-* options.h [BRANCH] Version number now 4.3.7.
-
-2003-2-6  Adriaan de Groot
-* Did a big chunk of merging from BRANCH to HEAD. Discovered two
-  things that didn't work well:
-  - Changes in the abbrowser conduit wrt. getCustomField()
-  - Memo widget optimizations
-  I hope I got them right. I'm going back to work in BRANCH.
-* Constant strings in the source are now (almost all) marked
-  with CSL1() for Constant String Latin 1. This reduces the
-  number of hits for [lL]atin1. The macro uses a syntactic trick
-  to make sure it's only applied to constant strings.
-
-
-2003-2-5  Adriaan de Groot
-* Almost everywhere [BRANCH] Search and destroyed latin1().
-* options.h [BRANCH] Handle <kdebugclasses.h> properly. Um, sort of.
-  The dag-blabbed file is obsolete in KDE 3.2, required in 3.1, and
-  incomplete in 3.0. Ignore it instead. Ignore all the fancy Q*
-  operator <<s and do it all by hand.
-
-2003-2-2  Adriaan de Groot
-* conduitConfigDialog.cc [HEAD] Started inserting code for improved
-  conduit selection and activation.
-* kpilot.cc [BRANCH] Improve perceived startup time by delaying
-  the loading of databases till the GUI is up.
-* options.h [BRANCH] To enforce discipline, use NO_ASCII_CAST.
-  NOT COMMITTED - it'll break a lot of debug stuff as well.
-  However, as an occasional test, it's a good idea.
-* {many files} [BRANCH] Clean up random char * conversions.
-* kpilotConfig.{h,cc} [BRANCH] Introduce config entry for encoding.
-* kpilot.cc pilotDaemon.cc pilotAppCategory.h pilotRecord.cc [BRANCH]
-  Use the config entry for encoding. Applications that use any
-  PilotAppCategory derived class - ie. that interpret data from the
-  Pilot in any way - should call setupPilotCodec() beforehand with
-  the name of the encoding (QString::null == "ISO8859-1", the default,
-  or use something like "Shift-JIS").
-* pilotMemo.{h,cc} memoWidget.cc [BRANCH] Use the codec for the returned
-  title of the memo. This is the first step on making PilotMemo return
-  everything in QString format suitable for any encoding. In order to
-  change the encoding, add
-        Encoding=<name>
-  to the kpilotrc file in the top part (ie. after DeviceName).
-
-2003-2-1  Adriaan de Groot
-* Some time spent tracking down double activations of slowShowMemo().
-* memoWidget.{h,cc} [BRANCH] Removed double initialization. Removed
-  heavy-handed initialize() call after memo deletion. Found potential
-  data-loss bug with deleting memos after unselecting one. Decided that
-  extended select in this case is just _evil_. I can't decide which
-  memo to show after deselections, and there's several other problems
-  as well related to slotUpdateButtons(). Reverted the multiple-select.
-* options.h [BRANCH] Added the TODO_I18N macro to BRANCH as well,
-  where it's more important.
-* kpilotlink.cc [BRANCH] Reordered ReadSysInfo and ReadUserInfo to
-  copy JPilot's setup, maybe that will help with password issues.
-* kpilot.cc [BRANCH] Cleaned up deprecated headers.
-* conduitConfigDialog.cc [BRANCH] Preparing to repair the clumsy
-  conduit selection and activation
-
-
-KPilot Developer's notes for January 30th, 2003
-===============================================
-
-* Ugh. Looked at jpilot source. Now I remember why doing C often
-  seemed a little unproductive. But it does give some very useful
-  information: We need a combo box to choose the Pilot's encoding.
-  We can use the list from JPilot. Next, we need to make _all_ the
-  QString::fromLatin1() and QString::latin1() -- also all the
-  implicit ones -- that refer to pilot records use the right codec.
-  This will require some possibly major work on the database classes.
-* The logging is still lousy for many conduits. I ran the
-  notes and address conduits, and the log was less than enlightening.
-* We need to sync _all_ databases, not just the conduited ones.
-* Encoding and decoding non-latin1 Pilots is a priority.
-
-2003-2-1  Adriaan de Groot
-* memoWidget.{h,cc} [BRANCH] Applied patch from David Mott for the GJJ
-  "Lose QMLE". Good job! ... Ugh, and it breaks on KDE 3.0. Hacked.
-* pilotDatabase.h [BRANCH] Missing #include fixed. How this ever compiled
-  is a mystery to me.
-* pilotRecord.{h,cc} [BRANCH] Inlined trivial functions.
-* pilotRecord.{h,cc} pilotAppCategory.h [BRANCH] Start of codec support.
-* Put together some scripts to do more automated building and testing
-  in KDE 3.1 and 3.0 environments. This makes tarball delivery a _lot_
-  easier.
-
-
-2003-1-31  Adriaan de Groot
-* Let's do the time-warp again!
-* syncAction.{h,cc} [HEAD] Added a delayDone() function for use from
-  exec() to avoid possible stack growth as follows:
-  conduitExec()
-    exec()
-      syncDone()
-        SyncStack::conduitDone()
-          delete syncAction   // The one whose exec() we're still in!
-          conduitExec()       // Another conduit!
-            ...
-    return true;
-  I'm not sure I trust all the pointers to still be OK when this happens.
-  Using delayDone() makes sure that exec() and conduitExec() return
-  first and we get back to the main event loop.
-* syncStack.{h,cc} [HEAD] Using a stack instead of a queue has some
-  comp-sci chique, but little practical value. Break up the API
-  to make it more easy to use elsewhere and practical to insert
-  extra items (like Kroupware) into the sync order.
-
-2003-1-30  Adriaan de Groot
-* Removing local8bit() calls in the code. They're not wanted.
-* Marked conduitSetup.{h,cc} as deprecated and removed from build.
-* Looked into bug #52138 again, and I just can't see it. My Pilot
-  syncs fine with KAddressbook and KNotes, both ways, with names
-  and memos with any latin1 character. [Update: aha! The bug is
-  about Japanese language Sony Clie's. So it turns out there are
-  Pilots that don't use latin1 at all. I'll take a look at how
-  jpilot deals with them.]
-* I'd like to change the About box tag-line for KPilot to:
-        KPilot - HotSync software for KDE
-  for a variety of consistency reasons. This can only happen
-  in HEAD, though.
-* Reversed some confusing accidental commits by me in the
-  debugging department for the daemon.
-
-
-2003-1-26  Adriaan de Groot
-* Ugh. Still sick with the flu. Hacking just a little, though.
-  The Kroupware stuff in HEAD needs to be moved. Ugh, it's ugly.
-  It needs to become a conduit of its own, but it's hard to tell
-  just what it's doing.
-
-2003-1-24  Adriaan de Groot
-* Received a patch from David Mott that removes lots of the Log:
-  tags from the KPilot source (mostly in kpilot/). Finished the
-  job too, committed.
-
-2003-1-20  Adriaan de Groot
-* For the next little while, I'll be working in _BRANCH fixing
-  bugs as best I can. These will end up in KDE 3.1.x releases.
-  Reinhold will be working in HEAD, adding neat features.
-  BRANCH will be merged to HEAD regularly so that no bug-fixes
-  are lost in HEAD.
-* Reduced debugging output clutter in PilotAddress by changing
-  to FUNCTIONSETUPL(). Assigned Levels are: 4=PilotAddress.
-
-
-2003-1-18  Reinhold Kainhofer
-* Removed several Log: ... tags from the conduits I maintain
-* started implementing the custom fields sync of the addressbook conduit.
-  I still have problems converting a string to a QDate using a custom format
-* Cleanup of includes in my conduits.
-* Some more work on the DOCConduit. There are still several open issues, but
-  the basic functionality works just fine!
-
-
-KPilot Developer's notes for January 17th, 2003
-===============================================
-
-2003-1-15  Adriaan de Groot
-* Back to BSD. Committed lots of header file changes. Did some fixing
-  for strlcpy() in 3_0_BRANCH for folks with KDE < 3.0.5a.
-
-2003-1-11  Adriaan de Groot
-* Weirdly, I can list the databases on the pilot just fine with kpilotTest,
-  but at the end of the sync the pilot complains about the password.
-* Similarly, using the daemon I can back up the pilot just fine (pilot-link
-  0.11.3, all this) and at the end the pilot complains. The data is backed
-  up just fine, though.
-* Wow, USB connections are _fast_.
-* Weirdness comes in threes: after a while the debug output stops printing.
-  Even when it's sent to cerr directly. Hmm .. has something to do with
-  printing NULL QStrings.
-* [hotSync.cc] Every "Backing up:" message was logged twice.
-* [logWidget.cc] Added more version information. Discovered that
-  QTextView is obsolete. Fixed log tailing problem. #ifdeffed it to
-  Qt 3.1 and later.
-
-2003-1-10  Adriaan de Groot
-* [kpilot/interactivesync.cc] Some strlcpy problems when compiling HEAD
-  (or BRANCH) KPilot on a KDE 3.0 system. Since we don't maintain branches,
-  backwards compatibility in HEAD is essential. Added #if KDE_VERSION < 310.
-* [lib/kpilotlink.cc] Might have found the source of the KPilot-hangs-with-USB
-  problems. There's a note in the QSocketNotifier docs saying not to disable
-  read-notifiers.  I did anyway, and it never caused problems before.
-  Added some workaround crud.
-* I'm currently building kdelibs and base and pim on a Linux box, something
-  I haven't done in over a year. This will allow me access to a USB stack
-  that can actually handle the m500, so I can do some more testing.
-  Primary platform remains FreeBSD, though, for all-the-other-KDE-problems-
-  on-nonlinux.
-* Made a round of removing <iostream.h>, since it's already in options.h.
-  Needed a "using namespace std;" in options to get stuff to work.
-
-2003-1-9  Adriaan de Groot
-* Made new tarballs of the build system (for 3.0 and 3.1) and
-  the sources.
-* Decision: I'm going to do bugfixes in _BRANCH. Reinhold can do
-  bugfixes and new conduits in HEAD, and I'll merge from BRANCH to
-  HEAD fairly regularly. I think that's the best balance between
-  getting stuff out the door and sticking to the KDE release schedule.
-* Decision: Remove all the Log: tags from the source files.
-  The Id: tags stay in, for debugging output.
-
-2003-1-1  Adriaan de Groot
-* Ho ho ho. Happy new year.
-
-KPilot Developer's notes for December 30th, 2002
-================================================
-
-2002-12-30  Reinhold Kainhofer
-* Some more work on the docconduit. I'm currently restructuring again,
-  so right now it doesn't work at all, but should be finished really
-  soon now.
-* Add a method PilotDatabase::deleteDatabase() to delete the database.
-* Add a warning to the vcal conduit's setup dialog to clear any
-  misconception about conflict resolution. Also changed "Pilot" to
-  "handheld" at several places.
-
-2002-12-15  Reinhold Kainhofer
-* Added a parameter "bool useDefaultPath=false" to
-  PilotLocalDatabase::PilotLocalDatabase to prevent resetting
-  the dbPathName to the default path (kpilot/DBBackup/UserName)
-
-2002-12-13  Reinhold Kainhofer
-* Initial import of the docconduit, which syncs text files on
-  the desktop with PalmDOC databases (kind of e-book format for
-  the palm) on the handheld for use with AportisDoc, TealReader,
-  QED, etc.
-* VCalConduit: yearly recurrence now works correctly (had wrong
-  yearly recurrence type rYearlyDay instead of rYearlyMonth)
-* Addressbook conduit: _equal also compares the categories to
-  check if an item was changed
-* Added the new methods createDatabase(..) and deleteRecord(..)
-  to the PilotDatabase classes. createDatabase creates a new
-  database with given type and creator, and deleteRecord deletes
-  either a single record or all records in the whole database
-* PilotDatabse::readNextModifiedRec has a new optional argument
-  of type int* which receives the index of the returned record.
-* PilotDatabase::findDatabase has optional arguments
-  int index=0, long type=0, long creator=0
-
-
-
-KPilot Developer's notes for november 10th, 2002
-================================================
-
-2002-11-10  Adriaan de Groot
-* Is kate acting up? I would have sworn I did some ChangeLog
-  editing last night. Anyway:
-* Expanded the DCOP interface so the daemon can signal KPilot
-  when the HotSync is done. This causes postHotSync things to
-  be called and unfreezes the FileInstaller.
-* Adjusted the progress bar during installing files.
-* Daemon->Quit now still waits til lthe end of the sync.
-* Display some form of progress during a restore. Reduce verbosity a little.
-
-2002-11-08  Adriaan de Groot
-* Clear the file installer list after a HotSync. Disable dropping files
-  on the installer during a Sync.
-* When installing files, the "done" message was printed at the
-  beginning of the last file to be installed. Fixed.
-
-2002-11-07  Adriaan de Groot
-* only call slotTextChanged() in the MemoWidget
-  when switching memos, and only if the memo is changed.
-  This saves rewriting the database every time you hit a
-  key in the memo edit box.
-
-2002-11-06  Adriaan de Groot
-* Fix the KNotes conduit's name.
-
-2002-11-05  Adriaan de Groot
-* Patched up the website again a bit.
-* Mucking about in libkcal to make it useful for KPilot.
-* Lots of includes changed in the vcalconduit to reflect that.
-
-2002-11-02  Adriaan de Groot
-* Regarding the "Hidden config feature", it's in the group for the
-  popmail conduit, called "outboxFolder". Set it to the i18n'ed name
-  of KMail's outbox. Damn KMail's DCOP interface / config. This
-  should make it possible to send mail with KMail again.
-* Finally got a separate build tree of KPilot working. Can distribute
-  sources again, now, assuming SLAC can suffer the bandwidth penalty.
-* Most of libkcal's header files aren't installed. Why? Is it really intended
-  to be totally internal to the kdepim module in KDE's CVS?
-
-2002-10-31  Adriaan de Groot
-* Happy Hallowe'en, eh.
-
-2002-10-27  Adriaan de Groot
-* Don't you hate code / feature freezes? It always stops KPilot development
-  in it's tracks, if only because fixing the bug related to KMail's outbox
-  requires a new string. Bitch bitch, moan moan.
-* Added new TODO_I18N macro to flag I18N todos. The popmail
-  conduit is a big candidate for fixups.
-* Thought of a new starter project: moving the popmail conduit config
-  dialog to Qt Designer. Another one would be to fixup the capitalization
-  of popmail in that conduit.
-* Added extra undocumented configuration option to the popmail
-  conduit in an effort to save KMail sending capability.
-
-
-KPilot Developer's notes for september 19th, 2002
-=================================================
-
-
-2002-09-13  Reinhold Kainhofer
-* Finally, the addressbook conduit is in a shape where I can release
-  it with beta 2. There are still some issues (e.g. duplication as
-  conflict resolution is messed up on the next sync. Also, entries
-  with newlines in an address field are always determined as changed,
-  so the fast sync is not so fast with them.), but they can be targeted
-  later on.
-
-2002-09-10  Adriaan de Groot
-* Problems related to immediate "Exiting on Cancel" traced back to
-  having two pilot-link versions installed; compile against one
-  and link against the other.
-
-2002-09-02  Adriaan de Groot
-* Added finer-grained pilot-link version checking in configure.in.in.
-  Removed all support for ancient pilot-link versions.
-
-2002-08-30  Adriaan de Groot
-* Much mucking about with dlp_ functions in an attempt to discover why
-  syncing wasn't discovering _any_ of my databases. Also handling
-  dlp_ReadUserInfo failures, indicating possible password use. Weird.
-
-2002-08-28  Adriaan de Groot
-* Mess around a bit with Chris' crashes and the exiting-on-cancel one.
-* PilotDaemon not passing on correct signals and slots to KPilot.
-  This should finally enable some progress-meter changing.
-* Ditched the check of dlp_OpenConduit when the device is opened
-  initially, it's returning -18 after the user name is read correctly.
-  The USB support under FBSD is still very patchy, though, since
-  it thinks I have just one database.
-
-2002-08-24  Adriaan de Groot
-* Add a "Fail Now" mode to the NULL conduit to help debugging.
-
-2002-08-24  Adriaan de Groot
-* (syncAction.cc) Whoops, forgot to implement the timeout feature
-  in interactive questionYesNo.
-* One more go through all the sources removing warnings.
-
-2002-08-23  Adriaan de Groot
-* (addressWidget.cc) Added more debugging output in response to bug #45977.
-  Gosh, it's even a FreeBSD user. This basically means that the database
-  can't be opened, and I have no idea why.
-* (kpilotlink.cc) Added more debugging output in KPilotLink::acceptDevice()
-  to deal with problems from Chris Cowell and Beat Straehl.
-* (kpilotlink.cc) (Perhaps) check pilot-link version more gracefully.
-* (pilotUser.h) bzero() new KPilotUser data structures, just in case.
-* (interactiveSync.cc) Fix compile warnings.
-* (knotes-action.cc) Fix bug that causes the KNotes conduit to hang
-  when KNotes isn't running.
-* (everything dependent on SyncAction) Changed the type of exec() to virtual
-  bool, and removed it from the slots. Added a new slot execConduit() which
-  calls exec(). This makes you return a value from exec(), and false is intended
-  to indicate "processing never started due to errors" and will cause execConduit()
-  to generate a generic error message and emit the syncDone(this) signal, which
-  is otherwise easily forgotten when just doing return;
-
-
-KPilot Developer's notes for august 15th, 2002
-==============================================
-
-2002-08-15  Reinhold Kainhofer
-* Implemented categories in the todo conduit
-* Fixed the bug which prevented error messages from
-  being included in the hotsync log (the signals from
-  fDeviceLink were not connected!)
-* Included the malconduit in the CVS tree (but disabled
-  its compilation for now), wrote several
-  emails asking for permission to either relicense libmal
-  to use MPL 1.1, or to include special permission into
-  KPilot's COPYING to permit linking to libmal.
-
-
-KPilot Developer's notes for july 31th, 2002
-===========================================
-
-2002-07-31  Reinhold Kainhofer
-* Added a time conduit which syncs the time from the pc to the palm
-* Also wrote an AvantGo conduit, but didn't add it to the cvs tree yet
-  because it uses libmal, which is MPL (and thus GPL-incompatible).
-  We have yet to figure out a way to make them compatible...
-
-KPilot Developer's notes for july 17th, 2002
-===========================================
-
-2002-07-17  Reinhold Kainhofer
-* A first almost-working version of the address conduit. Chances are,
-  some data will be lost, but most parts work. "Duplicate entries"
-  conflict resolution setting does not yet work.
-
-
-KPilot Developer's notes for july 4th, 2002
-===========================================
-
-2002-07-04  Reinhold Kainhofer
-* Added a function KPilotDeviceLink::tickle() which prevents a timeout
-  on the palm side if it is called with a timer (e.g. when a dialog is open)
-* Some more work on the addressbook conduit, which seems to be trickier
-  than I had thought initially.
-
-
-KPilot Developer's notes for june 24th, 2002
-============================================
-
-Moving on past 3.0.2 and trying to sort things out.
-
-2002-06-24  Adriaan de Groot
-* The config file the daemon allocates is read-only. This is inconvenient
-  when conduits want to save data in the config file. Backed that out,
-  am now worried about what happens when you leave the KPilot UI running
-  during a sync, since both applications have a RW copy of the config file.
-
-2002-06-24  Reinhold Kainhofer
-  Still fighting with the addressbook conduit. The Palm -> PC way already
-  seems to work. Haven't committed anything yet to prevent breaking
-  compilation of the kdepim module with a conduit which won't work yet anyway.
-
-
-KPilot Developer's notes for june 16th, 2002
-============================================
-
-2002-06-16 Reinhold Kainhofer
-* backported many fixes in the vcal conduits to the BRANCH for the 3.0.2
-  release.
-* For the addressbook conduit I implemented a method
-  QValueList<recordid_t> PilotDatabase::idList()
-  which returns a list of all record ids in the database
-* KPilotDeviceLink::openDatabases now fetches the database from the palm
-  if no backup copy exists on the PC.
-
-KPilot Developer's notes for june 9th, 2002
-===========================================
-
-Not sure just what Reinhold has been up to recently, but
-I know I've been sitting in the sun and relaxing. Mostly.
-
-H==HEAD, B==Branch in the bracketed notes after the patch description.
-
-2002-06-10  Adriaan de Groot
-* Using version 4.3.3 in BRANCH for the 3.0.2 release, and
-  4.3.4 in HEAD for later.
-
-2002-06-08  Adriaan de Groot
-* Conduits, conduits, conduits and documentation, documentation, documentation.
-  That's what we need. Sigh.
-
-2002-06-07  Adriaan de Groot
-* Patched VCalConduitBase::cleanup() to be careful about
-  calling functions on objects that may not be allocated. [H,B]
-* Patched VCalConduitBase to use variables from ConduitBase. [H]
-* Added tooltip for daemon. Gosh, that's ugly. Should put a
-  nicer message in there. [H]
-
-KPilot Developer's notes for may 25th 2002
-==========================================
-
-2002-05-23  Adriaan de Groot
-* KNotes syncing now really seems to work both ways.
-* Time to deal with a lot of little administrative files.
-* Fixed tooltips in config dialog.
-* KPilotTest now resets after a sync as well.
-* Added hooks in LogWidget to allow extra buttons.
-
-2002-05-21  Adriaan de Groot
-* Renamed PilotDatabase::cleanUpDatabase() to cleanup(), this
-  affected the Serial and Local reimplementations and also the
-  abbrowser conduit, which is the only conduit to do the right
-  thing and cleanup the database after a sync.
-* Added missing close and delete on the databases for plugins.
-
-2002-05-19  Adriaan de Groot
-* Time to take a good hard look at the conduits individually.
-  We'll start with the notes conduit, since it only does one-
-  way syncing. I suspect this will chime in some more testing
-  instrumentation in the base classes for conduits, too.
-* Changed lots of bitconstants to hex, for clarity.
-* Added a FlagLocal to plugin.h with the intent that you can
-  then try to sync two _local_ databases -- so you don't even
-  need a Pilot for testing.
-* The KNotes conduit now tries to do something sensible with
-  getting notes back to the Pilot, but fails.
-
-KPilot Developer's notes for may 18th 2002
-==========================================
-
-2002-05-18  Adriaan de Groot
-* Bunch of compile fixes. What happened?
-
-2002-05-15  Adriaan de Groot
-* Updated the version number.
-* Removed the device type combobox, since it's not needed.
-* Updated the what's this text for the speed combobox.
-* Removed the "alpha" warning from the log widget.
-
-
-KPilot Developer's notes for april 28st 2002
-============================================
-
-Hopefully we'll have merged the HEAD version of the vcal conduit --
-by Reinhold K. -- with branch so that it actually works.
-
-
-
-KPilot Developer's notes for april 21st 2002
-============================================
-
-A week when I should have been working on KPilot, and I've been
-working on the build system instead. Reinhold K. has hinted that
-he's making tremendous progress on the vcal conduit, which is a good thing.
-
-2002-04-20  Adriaan de Groot
-* Closed a few bugs that I could verify are resolved. Other conduit-
-  related bugs remain open even if I suspect they're done, since I
-  haven't actually physically tested them.
-
-2002-04-16  Adriaan de Groot
-* Finally committed all of David B's patches and things. [HEAD]
-* More modification of configure.in.in and the Makefile.am's to
-  make pilot-link more easily found (I hope). [BRANCH]
-
-2002-04-15  Adriaan de Groot
-* Cosmetic fix: center splash image under KDE3 as well.
-* Fixed misleading debug statement when KPilot starts the daemon.
-
-KPilot Developer's notes for mid-april 2002
-===========================================
-
-2002-04-13  Adriaan de Groot
-* Received a patch from Carlo Perassi for handling cases where there
-  is no user name set in the Pilot.
-* Worked on configure changes to detect pilot-link automatically and
-  properly. [BRANCH]
-
-2002-04-09  Adriaan de Groot
-* Did some minor debugging in setting flags for the conduits.
-
-2002-04-07  Adriaan de Groot
-* There are now two real branches of development for KPilot. KDE_3_0_BRANCH
-  gets bugfixes to the existing code, while HEAD gets new features. I imagine
-  I'll merge BRANCH back to HEAD sometime when I feel that the main bugs
-  are out (like next week, I hope). I'll be showing where patches go until
-  we merge again.
-* Added a message (no i18n) showing KPilot and pilot-link versions.
-* Still need a workaround for dlp_addSyncLogEntry() for pilot-link 0.10.1
-  [BRANCH - should go in HEAD as well]
-* Fixed Makefile.am bug in popmailconduit. [BRANCH]
-- --test mode wasn't working with kpilotTest (when running conduits) [BRANCH]
-
-2002-04-06  Adriaan de Groot
-* Applied patch to avoid crash with undefined symbol. I forget who sent
-  it in, though. Thanks to you, anonymous! Wrote a script to catch this
-  kind of situation in the future.
-
-
-
-KPilot Developer's notes for sometime in march 2002
-===================================================
-
-2002-03-09  Adriaan de Groot
-* Sanitized syncStack so that nextAction isn't so ambiguous.
-* Fixed missing default (--list) in kpilotTest.
-* Some neatness fixes in pilotDaemon.cc and pilotDaemonDCOP.h.
-* Test syncs shouldn't run conduits or install files. Fixed in pilotDaemon.
-* The daemon leaked 2 FD's on every sync, which is bad. Added some extra
-  ::close() calls, which fixes this (under p-l 0.9.5 and 0.10.1).
-* Mucked about with USB devices some more, but it looks like the m500
-  is going to be unusable under FBSD for some time. This isn't bad, since
-  I can then concentrate on getting things working with the serial PalmV.
-* It might be a good idea to start using the daemon to do just device tests
-  instead of kpilotTest -- though it doens't make a big difference.
-
-2002-03-08  Adriaan de Groot
-* Fiddled around w/ getting a broadband connection, for whatever
-  reason. I guess effortless connectivity is the goal. Fiddled with
-  my new m500 USB and discovered that pilot-link 0.10.1pre works
-  perfectly with it under Linux (well, pilot-xfer -l works). Under
-  FreeBSD, though, it seems that there's nothing available for this
-  kind of device. Hmph. So now I need to spend some time to figure
-  out how to get KDE up and running on my somewhat deprecated Linux
-  install. Serve the source by NFS?
-
-2002-03-07  Adriaan de Groot
-* Finally picked up where I left off, adding yet another message to
-  the startup log window (again, I think this is temporary). The versions
-  of relevant items now appear there.
-* Messed around with crashes while deleting CleanupActions.
-
-2002-03-06  David Bishop
-* Lots of work on exporting memos in XML format. It looks like the
-  whole memo viewer widget is going to be reworked, slightly.
-* Finished off the kdDebug() repairs someone else started.
-
-KPilot Developer's notes for february 11th 2002
-===============================================
-
-2002-02-06  Adriaan de Groot
-* kpilot/listItems.cc lib/pilotRecord.cc
-  - Removed some FUNCTIONSETUPs, since they were really clogging debugging
-    output and not adding anything interesting. Changes some other
-    debug output as well.
-* kpilot/addressWidget.cc
-  - I *think* I squashed a memory leak, caused by createTitle which
-    was still returning char * instead of QString. Moved to QString anyway.
-
-2002-02-03  Adriaan de Groot
-* kpilot/Icons/kpilot-hotsync.png
-  - Whipped up a new icon for HotSyncing. This makes all the icons in
-    the Janus view the same size.
-
-KPilot Developer's notes for february 2nd 2002
-==============================================
-
-2002-01-26  Adriaan de Groot
-* Wherever
-  - Invented an icon for the address viewer.
-  - Doubleclick on conduit in active column configures it.
-  - Fixed some compile problems under KDE3.
-  - Messed around with the vcal conduit.
-  - Configuring conduits resets the daemon.
-  - You can't reset the daemon during a sync; replaced fQuitAfterSync.
-
-I'm starting to think the logWidget belongs with the *daemon*
-(and should be showable from the daemon's context menu), not
-from KPilot (which should be just a viewer). Opinions?
-
-2002-01-27  Adriaan de Groot
-* Wherever
-  - Got rid of the remaining dlp_ functions in code outside
-    of kpilotlink.cc and pilotSerialDatabase.cc. This leaves the pi_ stuff.
-
-Development of KPilot is now done on a 80x25 serial terminal running at
-38400 baud. I have no idea what kind of effect this will have, but it means
-I can sit on the couch and do devel work :)
-
-2002-02-02  Adriaan de Groot
-* lib/kpilotlink.{h,cc}
-  - Continue moving pilot-link related things (pi_*) into the KPilotLink
-    class, so that Dag might have an easier time of it.
-* lib/options.cc
-  - Removed some messy #ifdef DEBUG stuff, with debugging enabled
-    call tracing is now default on.
-* kpilot/logWidget.cc
-  - Added some text stating that KPilot is really alpha. No-one will read
-    this, of course, and it will only piss off the translators.
-
-KPilot Developer's notes for january 25th 2002
-==============================================
-
-Found my Pilot again, made tea, thought about Dag's and Neil's comments
-on ColdSync (I still believe that ColdSync has the drawback that it's not
-meant to be a library you can build on, it resembles the pilot-xfer tools
-much more than anything else). Grepped for dlp_ in the sources. They seem
-fairly isolated, which is good -- maybe we *can* move to some other Pilot
-access method.
-
-Looked at some old sources. *uuuuugly*. PilotRecord, PilotAppCategory,
-PilotTodoEntry, etc. could use a good dose of sanity.
-
-2002-01-21  Adriaan de Groot
-* conduits/vcalconduit/*
-  - Some serious rewriting going on.
-* kpilot/hotSync.cc
-  - Removed old KPilotLink code
-  - Moved calls from dlp_OpenConduit to KPilotDeviceLink::openConduit()
-* lib/syncAction.h lib/kpilotlink.{h,cc}
-  - Added openConduit to abstract the underlying lib interface more.
-* kpilot/logWidget.cc
-  - suppress empty log lines.
-* lib/pilotLocalDatabase.{h,cc}
-  - Added a hook for UserCheck to set the default search path for
-    databases opened by name only.
-
-It's time to say hi, welcome, and thanks to a couple of new people on
-the KPilot / kde-pim team. There's Chris Abiad, who has already made his
-presence felt on the mailing list. Thanks for fielding questions for
-me, Chris, and stalling on the question of when the next release is.
-Chris will also be maintaining the website. Next up is Stephanie Bryant,
-a writer of technical documentation. She'll be helping me document the
-various files in kpilot/lib so that they actually form an understandable
-and usable API for third-party conduit-writers. Philipp Hullmann, you
-should be overjoyed to hear this :) Once she's practiced on KPilot, Steph
-will be leaving us for kdelibs, where weird and wonderful things await ...
-
-2002-01-25  Adriaan de Groot
-* *.ui
-  - Danimo was wondering why we use ToolTips everywhere instead of WhatsThis.
-    My answer was "because we knew about QToolTip before QWhatsThis." Anyway,
-    switching over to the correct form of on-line help is a simple search-
-    and-replace thing. So that has happened. David, can you keep that in
-    mind as well?
-* kpilot/pilotDaemon.{h,cc} kpilot/Icons/
-  - Minor changes to get the daemon's icons to display properly.
-  - Woo.. the busysync icon is *ugly*. Partly fixed, and I hope Kristof
-    can do something about it sometime. Really we need the icon in 4 rotated
-    states (well, maybe 2) to indicate activity during the sync.
-  - Of course the daemon was exiting after each sync .. I forgot to initialize
-    fQuitAfterSync (which isn't used, BTW, except if you use DCOP to call
-    quitNow()) to false.
-* kpilot/kpilot.cc
-  - Forgot to inform daemon of changing settings.
-* kpilot/syncStack.cc
-  - All conduits now put *something* in the Sync log.
-
-
-KPilot Developer's notes for january 20th 2002
-==============================================
-
-It's been a slightly sleepy time. Some rocky backporting has occurred,
-though, as KDE3-isms sneak into the codebase and break my compiles at
-home. At work, though, I've switched to KDE3 and it's really nice.
-Now if only I could release a version of KPilot that works before KDE3
-comes out and makes all this compatibility effort moot ...
-
-2002-01-15  Adriaan de Groot
-* conduits/vcalconduit/*
-  - Class Recurrence is the KDE3 name of class KORecurrence. Where the
-    libkcal API has changed, added #ifdefs to use the right one, and
-    #define Recurrence KORecurrence when compiling under KDE2.
-2002-01-16  David Bishop
-* *.ui
-  - Added <qt>'s to all tooltips, neatness fixes.
-2002-01-16  Adriaan de Groot
-* lib/options.{h,cc}
-  - Added support for both ostream and kdbgstream << QSize to avoid
-    plugin crashes when the plugin is compiled with different DEBUG_CERR
-    settings from libkpilot.
-2002-01-19  Adriaan de Groot
-* Documentation
-  - Added a warning "Docs out of date" to the docs, adapted all the top-level
-    README &c. files to reflect the current situation.
-2002-01-20  Adriaan de Groot
-* lib/pilotLocalDatabase.{h,cc}
-  - Added new constructor that doesn't take a path, but just uses the
-    application-instance database directory.
-* lib/plugin.{h,cc}
-  - Added isRunning() to PluginUtility, since several conduits need to
-    know if the application they are syncing is already running or not.
-* conduits/knotes/knotes-action.{h,cc}
-  - Replaced knotesRunning by call to isRunning();
-* conduits/vcalconduit/*
-  - Started a real re-write of the vcal conduit (what??!)
-* TODO
-  - Updated the TODO list with some concrete stuff.
-
-KPilot Developer's notes for december 31st 2001
-===============================================
-
-Time to go out with a bang, eh.
-
-Fixing the VCal conduits so they actually do a sync was a fair bit of
-work, partly because it was so weirdly crufty, partly because of the
-peculiar separation of the todo from the vcal conduit.
-
-
-2001-12-28  Adriaan de Groot
-* conduits/vcalconduit/vcalBase.{h,cc}
-* conduits/vcalconduit/vcal-conduit.{h,cc}
-* conduits/vcalconduit/todo-conduit.{h,cc}
-  - Well, it compiles now.
-* lib/plugin.{h,cc}
-  - Added isBackup() so that conduits can now also do their own
-    backups. Note that conduits aren't called (yet) during a backup
-    action.
-* conduits/popmail/*
-  - Why the heck does this (still) use FILE *?
-  - It compiles and there is a sync action.
-
-Next up is checking out kpilotTest and making sure that it does sensible
-things, like closing the device handle, allowing multiple syncs, and
-running file install correctly. After that, testing testing testing.
-
-2001-12-28  Adriaan de Groot
-* kpilot/main-test.cc
-  - Added one-letter cmd-line-options, sanity checking.
-  - Switched to SyncStack integrated syncing (see below).
-* kpilot/main-config.cc
-  - Removed unused new-style option.
-* kpilot/syncStack.{h,cc}
-  - New files encapsulating sync sequence knowledge.
-
-2001-12-29  Adriaan de Groot
-* kpilot/pilotDaemon.{h,cc}
-  - Switched to SyncStack.
-* lib/kpilotlink.cc
-  - Work around an off-by-one bug in pilot-link versions < 0.9.6.
-* kpilot/interactiveSync.cc
-  - Added support for don't ask again in the check-user questions.
-    This changes the API of questionYesNo, but only inserts a
-    (defaulted) parameter, so "regular" calls of this should be
-    unaffected.
-
-The GUI isn't updated at all (?) during a backup action. Hmph. Well, only
-between databases, but that's not much. The backup appears to work, which
-is a good thing. Gonna hafta try the restore action soon ;)
-
-2001-12-29  Adriaan de Groot
-* conduits/null/null-*.{h,cc}
-  - Fixed some configuration load / restore / use bugs.
-    Moved configuration keys to the factory.
-* kpilot/syncStack.{h,cc}
-  - The conduit proxy action also needs to proxy the messages from the conduit.
-    I never knew connect(p,SIGNAL(),q,SIGNAL()) worked! Wow.
-* kpilot/logWidget.{h,cc}
-  - Added missing slot for logProgress.
-
-Aieee! I'm becoming a kate user, vi is suffering from abandonment on my
-devel box. This is troubling -- using the software you write. Heck, next
-thing you know, I'll be using KPilot to sync my Pilot. Ewwwww.
-
-
-2001-12-29  Adriaan de Groot
-* kpilot/conduitConfigDialog.{h,cc}
-  - Removed old Exec= style conduits entirely. They're warned for now.
-* conduits/abbrowserconduit/*
-  - See conduit run. See DrKonqui. Whee! Oh, and this *one* conduit has
-    a name of the form bla_conduit, while all others are bla-conduit. Yay.
-    See pointer get used before initialization. Cool! It crashes elsewhere.
-    Isn't delayed loading great? __rs__FR11QDataStreamRt5QDict1Z12ContactEntry
-    And ... that was fucking amazing. Greg, you da man.
-
-    OK, so that one also runs to completion, at least the first time. It looks
-    like FirstTime isn't being turned off like it should, so I'll do that by
-    hand. OK, changes get copied from the Pilot to KAddressbook ok, but the
-    conduit seems to read *all* records from the Pilot, not just the modified
-    ones. That's bad for the batteries. Oh well, I'm just so happy it works
-    that I'll move on to the next conduit and deal with bugs tomorrow.
-* conduits/expense/*
-  - Seems to work fine.
-* conduits/knotes/*
-  - Undefined symbols ... man, I (semi) hate libtool libraries.
-    See, I just left some essential code *out* here, and thus libtool
-    thinks it'll be resolved later. Ha!
-
-    OK, it at least copies new KNotes to the Pilot. That's enough for now.
-* conduits/popmail/*
-  - Um, does this actually *do* anything? OK, config fixes, dcop fixes ...
-    and voila, a message shows up in the outbox of KMail. So let's call
-    sending via KMail a success and have a cup of tea.
-* conduits/vcalconduit/*
-  - Now things get hairy / exciting. Let's start with the ToDo conduit:
-
-    kpilotTest: WARNING: [void ConduitProxy::exec()] : Can't create SyncAction.
-
-    Very wise. Of course, the code to create a conduit is not in the
-    factory. Brilliant! Nothing a little cut-n-paste can't cure, and
-    configure, and .. DrKonqui. Did some indenting, my brain hurts from
-    trying to (a) understand this (b) fix all the memory leaks. Rewrite?
-  - VCalConduit: it doesn't crash, but it's probably going to read all
-    the things from my Pilot and install them in KOrganizer with a date
-    of 0000/00/00 (from looking at the debug messages as they fly by).
-    And .. whump, KOrganizer now can't read the .ics file anymore.
-
-*Every* sync, KPilot tells me that the name in the pilot is different
-from the name in KPilot. Gotta fix that.
-
-2001-12-30  Aaron J Seigo
-* kpilot/logWidget.cc
-* kpilot/kpilot.cc
-  - Paint the KPilot version number in the splash screen.
-
-2001-12-30  Adriaan de Groot
-* conduits/vcalconduit/vcal-conduit.cc
-* conduits/vcalconduit/vcalBase.cc
-  - Removed some __FUNCTION__ things, added #ifdef DEBUG to debug code.
-    In some other files, too.
-  - The code in vcalBase.cc is in heavy need of an invocation of indent.
-    It's horrible and ugly in other ways, too, but this is a start.
-
-2001-12-31  Adriaan de Groot
-
-Some general polishing of ToolTips &c.
-
-* kpilot/*
-  - Added Kristof's icon for the file installer. It's still a preliminary
-    version, though.
-  - TODO: after reconfiguring the username, re-initialize all components
-    in kpilot, to get the new databases.
-  - Switched the ToolTips in the address viewer to use <qt>
-  - TODO: ditch the toolbar; perhaps add the select-kind-of-sync
-    functionality to the logWidget.
-
-KPilot Developer's notes for december 27th 2001
-===============================================
-
-So I never posted the previous notes. And besides Maarten's little comment
-on the odd jobs, no response either --- but then again, it was Xmas and
-maybe people had more important things to do. I know I had enough dinners
-that I can fast & hack for the rest of the week.
-
-Things fixed now:
-
-* conduits/vcalconduit/
-  - All the configuration dialogs now look ok, after a little fiddling
-  about with the .ui files, and the configuration is saved as well.
-  A sync is out of the question right now.
-
-Yet another odd job: someone (David?) needs to check all the ToolTips
-in the .ui files for the conduits with Qt *2*'s designer. And we need
-to check that all the configurations are in fact saved properly. Testers?
-
-KPilot Developer's notes for december 23rd 2001
-===============================================
-
-HoHoHo. Let's look back in the ChangeLog to see where we were one year ago.
-Struggling with the vcal conduit (it's *still* wonky); missing the 2.1
-release deadine (was it that long ago?); cleaning up code.
-
-In these complex modern final days, (to quote Pogo), what's up?
-
-2001-12-18  Adriaan de Groot
-* conduits/expense/*
-* conduits/null/*
-  - These two conduits now have a full configure dialog that's sized
-  correctly (afaict without messing around with font settings), that
-  saves the settings, and have a working sync action. Whee!
-
-2001-12-20  Adriaan de Groot
-* conduits/abbrowser/*
-  - This conduit now has a working config dialog and does a sync, although
-  I haven't really looked at the sync code itself to check for bugs.
-* conduits/knotes/*
-  - Ditto; it configures and syncs, although the sync is rather sparse.
-  I discovered that const char * const is a useful type, though. It saves
-  an accessor function for KConfig entry keys.
-
-The bad conduits:
-
-* conduits/popmail/*
-  - Still no .ui file and not many tooltips, but you *can* configure
-  this conduit. No sync though.
-* conduits/todoconduit/
-  - This one is seriously deprecated and I'll try to remove it soon.
-* conduits/vcalconduit/*
-  - It's got a .ui file which is used badly and which is missing layouts.
-  Not a hint of saving configurations though.
-
-OPEN JOBS:
-
-Are you bored? Is your love life lackluster? Do you want to MAKE MONEY FAST?
-Do you want to FIND OUT WHAT MICROSOFT DOESNT WANT YOU to KNOW? ... um ...
-back to reality: If you'd like to help out with KPilot but don't really know
-where to start, and would like to get a little acquainted with the code,
-the coding style, and some of the conventions used in KPilot, read on!
-If you have grep and a text editor, read on!
-
-The code, and particularly the debugging code, has gone though a number
-of phases. For a while, there was that --debug 1023 stuff. I've decided
-that that's actually kinda cumbersome for a GUI program, and debugging
-has switched back to an all-or-nothing kinda thing. So some things need
-to be changed all over the source code, and that's just the kind of
-exploratory job for someone with grep and vi. In particular:
-
-* kdDebug() everywhere needs to change into DEBUGCONDUIT, DEBUGKPILOT,
-  or one of the other DEBUG* macros defined in kpilot/lib/options.h.
-  This will send the debugging output to the sensible debug area.
-  Which one you choose depends on where the file lives -- choose wisely.
-
-* DEBUG* calls everywhere need to be surrounded by #ifdef DEBUG #endif.
-  This is because some compilers don't optimize away unused strings,
-  leading to big bulky (well, sorta) executables. Adding the #ifdefs
-  makes sure that there's nothing at all left over from the debugging code
-  when debugging is turned off.
-
-* __FUNCTION__ needs to be replaced by k_funcinfo. The popmail conduit is
-  bad for that one, at the very least.
-
-* if (debug_level) and its cousin if (debug_level & SOMETHING) need to be
-  removed, along with the set of brackets they introduce. The debugging
-  statement (usually just a kdDebug() << whatever << endl;) needs to be
-  out-dented one tabstop, to line it up properly.
-
-These are, in one sense, rotten little jobs. But they'll take you to all
-the corners of the KPilot code, show you some ugly (and some not-so-ugly)
-code, and give you a feel for "the lay of the land." After that, fixing
-all the remaining off-by-one bugs in the vcal conduit should be a breeze.
-
-KPilot Developer's notes for december 16th 2001
-===============================================
-
-Worked on some conduits for danimo, who has UI updates. So more conduits
-compile now, but I haven't tested them. However, they do get installed
-if you do make install, and they may eat your Pilot, you Buick, or New York
-when run. USE EXTREME CAUTION.
-
-I think the NULL conduit is safe, though :)
-
-Abbrowser Conduit: it compiles, and it has but a setup dialog and a
-sync part which has not been tested at all.
-
-* Makefile.am
-  - Fixed up includes, removed old PISOCK_INCLUDE.
-* abbrowser-conduit.cc
-  - Changed kdDebug() to DEBUGCONDUIT, applied indent style, #ifdef DEBUGs
-  - Replaced static QString objects by const char * (KConfig keys)
-  - Removed old files
-  - Assume FirstTime is always *true*, this is at least partly broken,
-    but it makes the conduit compile at least.
-
-The other conduits all compile and have config dialogs but don't do anything.
-
-And in other news, little bugfixes and other neat stuff sometimes shows up
-in my mailbox. Martin Junius is a long-time contributor, and he's volunteered
-(again) to make new KPilot rpms for RH 7.2 once the system is stable again.
-
-* kpilot/addressWidget.cc
-  setupWidget() - Martin Junius found a display bug and sent a patch.
-* conduits/vcalconduit/vcal-conduit.cc
-  setRepetition() - Philipp Hullmann noticed that the Pilot's week starts
-  on day 0 = sunday, and in KDE day 0 = monday.
-
-KPilot Developer's notes for december 2nd 2001
-===============================================
-
-More work on the expense conduit. In conduits/expense:
-
-* setupDialog.h
-  - Added an #include <qwidget.h> to make header self-contained.
-* setupDialog.cc
-  - Disabled MySQL button, since there's no code to make it work.
-  - Disabled "logRotate" stuff, since I can't remember what was
-    wanted there and there's no code for it.
-* expense.cc
-  - Reordered #includes, removed extra #ifdeffing. Removed extra #includes.
-  - Split up actions into CSV, MySQL and Postgres specific parts.
-  - Made the other-db methods also write CSV files if needed.
-  - Support both overwrite and append modes for CSV.
-  - TODO: create the mysql code.
-  - TODO: patch possible security hole in echo passwd |
-  - TODO: spawn fewer processes for psql.
-  - TODO? use klocale's date formatting, not US-specific code.
-* expense.h
-  - Changes reflecting the above, and
-  - Documenting what's going on.
-
-In other news:
-
-* conduits/knotes/knotes-action.cc
-  listNotes() - Removed spurious #ifdef DEBUG. Test mode should always work.
-
-And oh, wow, thanks to messing around with the logWidget for KPilot,
-KPilotTest now also has a funky splash screen :)
-
-* kpilot/main-test.cc
-  main() - connect signals from the test action to the log widget.
-
-KPilot Developer's notes for november 25th 2001
-===============================================
-
-More work on the Expense conduit.
-
-In other news:
-
-* kpilot/logWidget.{h,cc}
-  Nifty feature for the sync log: clear the log. Save the log. ToolTips.
-
-
-KPilot Developer's notes for november 18th 2001
-===============================================
-
-Kudos to Marko Hollomon for spotting a pointer error in the KPilot daemon
-and fixing it. The patch changes pilotDaemon.{h,cc}.
-
-Thanks too to Palle Girgensohn, who made an icon for the internal memo-
-viewer and the KNotes conduit. This looks really neat in the new IconView
-mode of the main KJanusWidget.
-
-Shuffling the DCOP interfaces and cleaning up the UI, by [ade]:
-
-* logWidget.{h,cc}
-  Made the splash more like a splash, removed some ugliness, moved the
-  progress bar into the SyncLog widget.
-* kpilotDCOP.h
-  Removed the spurious filesChanged() call -- use KDirWatcher instead.
-* kpilot.{h,cc}
-  Removed the inheritance from kpilotDCOP.h, moved the DCOP interface to
-  LogWidget. Removed the status bar, since it's all in the LogWidget anyway.
-* pilotDaemon.cc
-  Renamed KPilotDCOP interface, removed filesChanged DCOP signal.
-* Makefile.am
-  Now logWidget requires kpilotDCOP, so moved that.
-
-Now that conduits are .so's, the conduitConfigDialog needs to have some
-strings changed to reflect that they're not executed anymore [ade].
-
-* conduitConfigDialog.{h,cc}
-  Added a warnNoLibrary function, moved warnings to Qt richtext.
-
-The FileInstallerWidget has some lousy strings with \n, and it needs
-a KDirWatcher [ade].
-
-* fileInstallWidget.{h,cc}
-  Changed the i18n strings to remove \n's. The Watcher remains a TODO.
-
-Attacked the expense conduit, finally. Maybe *this* one won't run aground on
-things like fundamental API changes in the stuff it syncs against.
-
-* Makefile.am
-  Removed spurious LIBPISOCK_PATH, moved files around a little.
-* setupDialog.{h,cc}
-  Ported to UIDialog classes, layout fixups. This is the one conduit that
-  still uses hard-coded layouts. It's possible, see? This isn't really the
-  way to go, I'd much rather have David B. make dialogs with Qt designer.
-  Added a break; in ExpenseDBPage::slotPolicyChanged() to avoid warnings.
-
-KPilot Developer's notes for november 11th 2001
-===============================================
-
-Much messing-about with hardware, OSsen and the like has delayed many
-things. I've discovered that the configure.in.in and Makefile.am for
-KPilot were really badly broken under anything non-Linux.
-
-* configure.in.in
-  Possibly fixed all kinds of shell-script breakage (under Solaris)
-  and not-finding pilot-link under FreeBSD. You will have to pass in
-  the --with-extra-libs and --with-extra-includes flags; configure now
-  looks there correctly.
-* All the Makefile.am's
-  Removed the extra spurious $(LIBPISOCK_PATH) which was breaking
-  things under FreeBSD.
-* lib/uiDialog.{h,cc}
-  Added a virtual bool function validate() so that when Okaying a
-  dialog, you can check first for valid settings. The default implementation
-  is return true;
-* kpilot/kpilotConfigDialog.{h,cc}
-  Added validate(), check that string for Pilot device doesn't overflow
-  the buffer for it. Also enforce the length restriction for the device
-  name. This is all conditioned on pilot-link < 1.0.0.
-* kpilot/kpilot.{h,cc}
-  Use a KJanusWidget instead of a QWidgetStack and deprecate the View
-  menu to make it clearer which views / actions / things KPilot actually
-  *has*. Moved the Spash Screen to the log widget, and made it a real splash.
-
-
-KPilot Developer's notes for october 28th 2001
-==============================================
-
-So fun to have distributions release broken versions of an application.
-It sometimes makes me wish I didn't have to commit stuff to CVS at all
-until the application is totally right according to me (which is then
-sure to run into trouble with the KDE release schedule).
-
-Another fun thing is wrestling with broken hardware. But it's finally fixed
-now. So I hope the pace picks up again now. I've been working on the
-abbrowser conduti sporadically, so we now have at least three conduits
-partially ported to the new setup.
-
-KPilot Developer's notes for october 21st 2001
-==============================================
-
-2001-10-21  Adriaan de Groot
-
-Since to do the popmail conduit I first need to learn about IOSlaves
-and the KNotes conduit is hard, I spent some time playing with the
-abbrowser / KAddressbook conduit.
-
-* conduits/abbrowser/*
-  () Removed all the old files for the setup dialog, now using David Bishop's
-     .ui files with some polish from me (like putting his name in the "Author"
-     field in the .ui file).
-  () Fixed up the Makefile.am to make the library and the test apps.
-  () Added a factory function.
-  () Removed all the palettes from the deconflict dialog. This takes 150k out
-     of the .ui file. Next challenge is to make it respect the KDE system
-     settings.
-
-2001-10-20  Adriaan de Groot
-
-Worse is when your AGP bus turns out to be broken instead.
-
-* conduits/knotes/knotes-action.{h,cc}
-  () Added method resetIndexes which should be called at the end of every phase
-  of the sync, basically to reset the counter and list iterator to the
-  beginning of the list of KNotes.
-  () Added method modifyNoteOnPilot which does the modified-notes-to Pilot
-  work. It isn't very robust yet, since it doesn't handle weird cases
-  (modified yet unknown on Pilot, for example) at all.
-
-2001-10-19  Adriaan de Groot
-
-Dern. Having your video card break and being thrown back to a 4MB SiS card
-fit only for a firewall with no monitor is *no* fun. Where's a 24-hour
-computer store when you need one? Not only that, but I realise I'm
-going to have to put some serious thought into the KNotes conduit and
-how it is supposed to sync. So since that's hard, I'm going to look at
-the Mail conduit instead, since the functionality there is pretty much
-complete.
-
-2001-10-18  Adriaan de Groot
-
-* kpilot/Icons/
-  () Incorporated most of Kristof Borrey's fantastic new icons for KPilot.
-* conduits/knotes/
-  () Removed old files setupDialog.{h,cc}
-* conduits/knotes/knotes-action.{h,cc}
-  () Added new function getConfigInfo that reads the config file for
-     the lists of Ids (matching KNote ids to memo ids).
-
-2001-10-16  Adriaan de Groot
-
-* lib/options.h
-  Upped the version number to 4.2.9b just because.
-* kpilot/kpilot.cc
-  Changed some credits around, copyright notice, etc.
-* kpilot/Makefile.am kpilot/Makefile-standalone
-  Fixed some breakage caused by all the moving around of files. You may
-  need to make clean ; make in KPilot some time to get things back to normal.
-
-KPilot Developer's notes for october 16th 2001
-==============================================
-
-2001-10-16  Adriaan de Groot
-
-Well, the b-day party got in the way of actually releasing something,
-and there's quite a lot of polish still to apply -- ie. the KNotes conduit
-still does nothing more than install new notes to the Pilot. So I'm going
-to start keeping the TODO list more up to date, including assignments for
-various people, and keeping the ChangeLog more up-to-date according to
-the ChangeLog standard, instead of these long rambling stories.
-
-2001-10-14  Adriaan de Groot
-
-Whee! It's KDE's birthday today. What a fitting day to finally release
-a version of KPilot that actually works, has useful features, and
-doesn't gum up your Pilot hopelessly.
-
-2001-10-10  Adriaan de Groot
-
-* Actually add new KNotes to the memo pad. This means conduit syncing is
-  actually coming closer. Works from kpilotTest.
-* Renamed --test --list in kpilotTest, added option --notest to force a
-  conduit to *really* run (may be hazardous!) from the tester.
-* Moved many things into lib/ -- whatever is shared between KPilot and
-  conduits, basically.
-* Wow! There's stuff in PilotAddress I'd never noticed before that deserves
-  to be moved to a superclass -- like setCategory. Kudos to Greg.
-* Updated the TODO list.
-* Added a nicer credits section in the about page of dialogs.
-
-2001-10-09  Adriaan de Groot
-
-* nothing! Fixed old compile issues on KDE 2.2 iob Solaris.
-
-2001-10-08  Adriaan de Groot
-
-* Added lots of things in lib/ to enforce some kind of uniformity on
-  conduits and factories. Utility functions, too.
-* Added an app-icon for the KNotes conduit. It's ugly as all get-out.
-* Added a test-conduits and a list-conduits mode to kpilotTest.
-* Went back and tested all the stuff we already had, since this
-  re-architecting carries risks. This showed that not everything had
-  gone right: I'd lost track of the pilot socket somewhere. Hmph.
-  Two rounds of re-writing headers, all the parameters finally end
-  up in the right place.
-* The knotes conduit now lists new knotes but doesn't install them.
-
-KPilot Developer's notes for october 7th 2001
-=============================================
-
-Ah, post-KDE3-alpha1. And that when KPilot remains completely 2.1 and 2.2
-compatible. A new release of KPilot for 2.2 is imminent, say oct. 14th or so.
-KDE 2.2.2 was just released, but contains no changes to KPilot at all --
-all the bugfixes were not of the kind that would fit in the 2.2.2 plan.
-
-2001-10-07  Adriaan de Groot
-
-Hmm. Missed a few days. What I remember:
-
-* Implemented the Null- and KNotes-conduits setup dialogs in plugin
-  libraries using David's UI files. That was fun and easy to do.
-* Make the new-style conduit configurator handle plugin libraries.
-  This was less fun, but it works. I haven't had any feedback on
-  which of the two config dialogs is easier to use, but right now
-  I'm leaning towards the new-style one (two columns + some buttons,
-  just like it was *long* ago.) D'nD would be nice though.
-* The new-style thingy doesn't handle saving which conduits are enabled.
-* Made a new subdir lib/, since the plugins need to share some code
-  with KPilot and you need a .so to make it link properly.
-* Wrestled with sensible layout of the about page.
-
-2001-10-01  Adriaan de Groot
-
-* Picked up David's new UI file for the conduit configuration dialog
-  and gave that a whirl. The results can be found in kpilotConfig,
-  use --help to find out which options to use.
-
-KPilot Developer's notes for september 30th 2001
-================================================
-
-2001-09-30  Adriaan de Groot
-
-Last minute sneak-it-in-for-the-alpha things. More code and layout cleanup,
-although the big commit changing to tabs & the KPilot style was yesterday.
-Fixed some minor display bugs, made preHotSync more useful, normalized
-some strings. The kpilot/Icons/ directory now contains only those icons
-actually needed and used, and they're all in PNG format. Saves lots of space,
-in the sense that the KPilot binary is 300k smaller now than it was, due to
-dumping XPMs.
-
-I added a private-d-ptr to kpilot.h, but haven't moved all the data
-members there. For an app it doesn't matter so much, but this will reduce
-the amount of recompiling and who knows what the plugin API will look like
-eventually.
-
-The conduit configuration is different -- again -- and easier to understand.
-
-2001-09-27  Adriaan de Groot
-* Added FUNCTIONSETUP everywhere.
-* Replaced email addresses with kde-pim@kde.org or groot@kde.org.
-* Removed qDebug everywhere.
-
-2001-09-26  Adriaan de Groot
-
-* Surrounded much debugging output with #ifdef DEBUG.
-* Replaced remaining calls to kdDebug() by macros with debug areas.
-* Applied indent everywhere.
-* Added some () where needed to resolve ambiguity.
-
-2001-09-25  Adriaan de Groot
-
-Wrestled with crashes (cerr << i ; debugstatement ; cerr << i ; gave
-two different values for i) caused by mixing debug conde and non-debug
-code. Discovered that qglobal.h defines DEBUG unless NO_DEBUG is
-set. Hmph. Also found that gcc does a poor job in optimizing away
-debugging statements with NDEBUG defined. Therefore, debugging statements
-will be once again surrounded by #ifdefs. The plan is that I'll get all
-the code formatting and this kind of silly issues out of the way in the
-next few days and then start to deal with the next problem, namely the
-existing conduits.
-
-2001-09-24  Adriaan de Groot
-* kpilot/uiDialog.{h,cc}
-* kpilot/kpilotConfigDialog.cc
-* kpilot/kpilotConfigDialog_base.ui
-  Minor changes to get the dialog to size correctly when other fonts / other
-  settings are used. This solves David's complaint about ugly dialogs.
-* kpilot/hotSync.{h,cc}
-  () Removed lots of commented out code from previous incarnations.
-  () Added a cleanup action.
-  () Removed a heap-corruption bug caused by using QStringList & and
-  then deleting what it points to in FileInstallAction.
-  () Removed deadlock when last file to install couldn't be read.
-  () Moved RestoreAction to interactiveSync.{h,cc}, since I feel it
-  needs to ask "Are you sure?" at the very least.
-* kpilot/interactiveSync.{h,cc}
-  New files with support for, and some types of, interactive syncing.
-  Used for asking the user questions during a sync, for example confirm
-  dialogs. This means we can now update user settings &c, since we needed
-  some interaction for that. Moved RestoreAction to here.
-* kpilot/kpilotlink.{h,cc}
-  Made exec() pure virtual for SyncActions, since that makes more sense
-  than having an empty default action.
-* kpilot/Makefile.am
-  Added interactiveSync.cc to the list of sources.
-* kpilot/pilotUser.h
-  Squashed a buffer overflow. Squashed several buffer overflows. Yowk!
-  This code has been around since 1996?
-* kpilot/main-test.h
-  Added some extra code to make the sync cleaner; handled the move of
-  RestoreAction.
-
-KPilot Developer's notes for september 23rd 2001
-================================================
-
-My current development platform is RH 7.1 with KDE 2.1.1 -- even so I'm
-committing things into HEAD.  I'm sure this will explode sometime and
-I'll be forced to upgrade to KDE 2.2 or worse, but for now, that's the
-platform I'm aiming for.
-
-I'd like to take a moment to thank David Bishop, for sending me .ui files,
-for causing noise on the mailing lists, and for being a pleasure to work
-with. Together we've wrestled with Qt designer, uic, and replacing the
-KPilot dialogs with something sensible made with designer.
-
-* kpilot/options.h
-* kpilot/kpilotConfig.{h,cc}
-* kpilot/kpilot.cc kpilot/kpilotDaemon.cc kpilot/main-*.cc
-  Factored out the --debug flags from each individual app, now in
-  options.cc. This means each file with a main() was modified too.
-  I must say it was a real bitch figuring out exactly which sequence of
-  calls were needed for KCmdLineArgs::addCmdLineOptions(), and then
-  finding out that ParsedArgs() also needed help.
-* kpilot/kpilotDaemon.cc
-  Sneaking in the QStack<> stuff just under the wire was a bad idea.
-  Fixed an uninitialized pointer bug.
-* kpilot/hotSync.cc
-  Fixed missing syncDone() signal in FileInstallAction; added some
-  logProgress() calls, extra debugging.
-* kpilot/kpilot.cc
-  Added KillDaemonOnExit logic to KPilotInstaller.
-
-2001-09-23  Adriaan de Groot
-* kpilot/uiDialog.{h,cc}
-* kpilot/kpilotConfigDialog.{h,cc}
-* kpilot/kpilotConfigDialog_base.ui
-  New files -- the .ui file is from David Bishop -- re-implementing the
-  configuration dialog using modern technology. uiDialog.{h,cc} are
-  abstract base classes, suitable for reuse. kpilotConfigDialog.{h,cc}
-  contains the behavior of the dialog, and the .ui file the UI.
-* kpilot/kpilotConfig.{h,cc}
-  Switched around #ifdef and #ifndef. This disabled setting debug levels
-  in code with debugging on. Duh. Getting it right then showed all kinds
-  of bugs in the other code. Added some documentation explaining possible
-  crashes due to missing KApplication instance.
-  FINALLY did something sensible about code duplication -- added get and
-  set methods to a subclass of KConfig for all KPilot settings.
-* kpilot/kpilotOptions.{h,cc}
-  Is deprecated and removed. Say hello to the new world of .ui files.
-* kpilot/kpilot.{h,cc}
-* kpilot/memoWidget.cc
-* kpilot/addressWidget.cc
-* kpilot/conduitSetup.cc
-  Lots of little changes to reflect the KPilotConfig changes. Mostly
-  removing calls to setGroup() and readEntry(), which are now safely
-  encapsulated.
-* kpilot/pilotDaemon.{h,cc}
-* kpilot/pilotDaemonDCOP.h
-  Removed cruft, adapted to KPilotConfigSettings, and adapted to SyncActions.
-  Changed silly startHotSync(int) DCOP method to requestSync(int).
-
-
-2001-09-21  Adriaan de Groot
-* kpilot/hotSync.{h,cc}
-  Added an InstallFilesAction class, to run during a HotSync.
-
-2001-09-20  Adriaan de Groot
-* kpilot/kpilotlink.{h,cc}
-* kpilot/main-test.{h,cc}
-  All these files changed because of yet another re-architecting. Now we
-  have HotSyncActions, which have direct access to the PilotDeviceLink,
-  and which do "something". The test action just lists the databases
-  present on the device. This has been tested with USB and with serial
-  devices.
-* kpilot/hotSync.{h,cc}
-  Changed again to split the actions away from the device link (really,
-  how I ever decided on that is a mystery to me now).
-* kpilot/Makefile-standalone
-  A Makefile that can be tweaked, that does not use autoconf, and is
-  useful for making standalone tarballs.
-
-2001-09-17  Adriaan de Groot
-* kpilot/Makefile-kpilotConfig
-  () New file for building a standalone config program.
-* kpilot/main-config.{h,cc}
-  () New .h file, new classes for implementing some behavior. The behavior
-  is very minimal right now, but as an illustration for David (hey, now
-  he needs to learn C++ coding) it's fine.
-* TODO
-  () Thought of lots of new things to do.
-
-KPilot Developer's notes for september 16th 2001
-================================================
-
-KPilot now compiles completely again, at least on a KDE 2.1.1 platform.
-I'll check w/ KDE 2.2 as soon as I get that working here, and then we'll
-take another look at Qt3 -- I saw Cornelius has already put some changes in.
-
-2001-09-15  Adriaan de Groot
-* TODO
-  () Added a TODO file. I didn't copy all the TODO's from the ChangeLog
-  into it, though, since many make no sense right now.
-
-2001-09-13  Adriaan de Groot
-* kpilot/kpilotlink.{h,cc}
-  () Changed fTransientDevice into fDeviceType since we have lots of
-  variants to deal with.
-  () Added functions installFiles() and installFile() to handle
-  the installation (!) of files to the Pilot.
-* kpilot/pilotDaemon.cc
-  () Finally dealt with all the changed classes and methods of the
-  device link.
-  (slotEndHotSync) No need to tell the link to end the Sync, since
-  it's the one that's telling *us*.
-
-2001-09-08  Adriaan de Groot
-* kpilot/options.h
-  () I've installed RH 7.1 and gone back to KDE 2.1.1. Whee. They've
-  somehow utterly broken kdDebug() and kdWarning(). Added compile flag
-  DEBUG_CERR to make all the debugging info go to cerr instead.
-* kpilot/kpilot.cc
-  () Startup notification was added to startService...() in 2.2, so now
-  there's an #ifdef handling that case.
-
-2001-09-07  Adriaan de Groot
-* kpilot/pilotComponent.h
-  () Fixed up #ifdefs for new style
-* kpilot/kpilotlink.h
-  () Make many data members private with protected access functions.
-  (statusString) Made into a virtual function.
-
-2001-09-06  Adriaan de Groot
-
-* kpilot/Makefile.am
-  () Forgot to add logWidget.cc to kpilot_SOURCES
-* kpilot/kpilotOptions.cc
-  () Added more tooltips, switched most to <qt></qt> rich text.
-  () Changed default value for SyncFiles to true.
-* kpilot/kpilotlink.{h,cc}
-  () Added new state CreatedSocket and member fRetries
-  (open) Allow for retries on pi_bind(), since it may fail on
-  USB style devices.
-  () Added ASSERT() and member fDeviceLink to enforce singleton=ness.
-* kpilot/main-test.{h,cc}
-  () Added ASSERT() to enforce singleton-ness.
-* kpilot/hotSync.{h,cc}
-  () New files, containing most of the old HotSync code from
-  kpilotlink.{h,cc}, now using the new KPilotDeviceLink base class.
-
-KPilot Developer's notes for september 5th 2001
-===============================================
-
-It's tough keeping this ChangeLog up-to-date, since I'm doing
-lots of work but not committing much to CVS. But I'll try to
-keep things documented nonetheless.
-
-
-2001-09-05  Adriaan de Groot
-
-A new application, kpilotTest, has been added. It does a very basic
-test of the pilot-link library and some device handling for KPilot.
-It is *not* installed by default, since it's pretty much useless for
-normal use, but useful to get some feedback about whether the
-new architecture works as expected.
-
-A new widget, LogWidget (logWidget.{h,cc}) is now included for, yup,
-logging stuff. It's used to long things during a sync.
-
-pilotListener is no longer built or needed.
-
-A new application, kpilotConfig, has been added. It is not installed
-by default. It just calls up a config dialog for KPilot, much like
-kpilot --config does. It's useful mostly because it exercises a clear
-subset of the code.
-
-I've tooltipified (?) the whole hardware setup dialog. I think it really
-needs more work, since the distribution of options is really unclear.
-And why are exactly *these* things grouped together? The "Address" tab
-really should go.
-
-The compilation of everything besides kpilotTest and kpilotConfig
-is now seriously broken (tm).
-
-KPilot Developer's notes for september 3rd 2001
-===============================================
-
-Hoo doggies. This is a *big* set of changes. I finally sat down
-to do some of the serious rework that KPilot has been needing for
-a long time. In essence:
-
-* Use DCOP for as much communication as possible, and
-* Support USB devices and other transient device nodes.
-
-Basically PilotDaemon and KPilotLink have been completely rewritten.
-
-What more is there to say? Almost every file has changed, even the
-coding guidelines have been relaxed (I'm not going to put #ifdefs
-around #include anymore, not since it turns out that the gnu cpp
-handles this situation efficiently anyway).
-
-Comments and documentation in most files have been vastly improved.
-
-
-KPilot Developer's notes for august 27th 2001
-=============================================
-
-Hm. Long time no notes. Which is not to say that nothing happened,
-since while I was away at a conference in Finland I dropped in at
-Marko G's place (see patches listed way down below) and we had a great
-time talking about KPilot, hacking, etc. I forget what I patched
-there, though.
-
-2001-08-27  Adriaan de Groot
-* kpilot/addressWidget.*
-  Fixed up Martin's patch to make it comply with the KPilot coding
-  style, added some more docs, did a bunch of re-layouting. I read
-  somewhere that there is a direct correlation between shoddy indenting
-  style and bug density.
-* kpilot/pilotDaemon.h
-  Added a missing class declaration for KServerSocket.
-* kpilot/kpilot.{h,cc}
-  Removed all remaining KPilotLink cruft. KPilot now communicates with
-  the daemon through DCOP only.
-
-Still very much on the TODO list:
-- actually make the daemon quit when that's relevant
-- ditch pilotListener (backport from kitchensync)
-
-KPilot Developer's notes for august 2nd 2001
-============================================
-
-Vacation good. Bugs bad. Received a wonderful patch in the mail from
-Martin Junius, which proves once again that he's really dedicated to
-making KPilot look good and work well. Martin's patch "pushes the envelope"
-udirng the freeze, so it may not get in into KDE 2.2.
-
-2001-08-01  Adriaan de Groot
-
-* kpilot/pilotDaemon.cc
-  (PilotSystemTray) Fix for bug #29764 -- I'd forgotten to initialize some
-  pointers in the constuctor again.
-* conduits/abbrowser/abbrowser-conduit.cc
-  (main) Workaround for bug #28104 allowing abbrowser to start from the conduit.
-* conduits/abbrowser/Makefile.am
-  Minuscule change enabling --enable-final builds here.
-
-2001-07-23  Martin Junius  <mj@m-j-s.net>
-
-* kpilot/addressEditor.cc (MakeField, MakeFieldL): removed i18n(),
-  now done in initLayout().
-  (initLayout): use i18n() for label strings passed to
-  MakeField. This is IMHO a cleaner approach than using I18N_NOOP()
-  as before.
-  (phoneLabelText): new function, get text for phone label,
-  basically fAppInfo->phoneLabels[] featuring some sanity checking.
-  (fillFields): use phoneLabelText().
-  (initLayout): dito.
-  (initLayout): argument addressInfo removed, no longer needed.
-
-2001-07-21  Martin Junius  <mj@m-j-s.net>
-
-* kpilot/addressEditor.cc (initLayout): use m_phoneLabel[] for
-  display phone labels because this change from entry to entry and
-  cannot be set to fixed texts.
-  (fillFields): update phone labels for editor dialog.
-  (initLayout): reworked and hopefully ;-) improved spacing.
-
-* kpilot/addressWidget.cc (setupWidget): replaced QMultiLineEdit
-  with QTextView for address info widget.
-  (slotShowAddress): function totally rewritten to use QTextView
-  and the Qt pseudo-XHTML code for formatted display of the
-  address entry. The sequence and formatting is more or less what
-  my Palm IIIxe does.
-
-KPilot Developer's notes for june 15th 2001
-===========================================
-
-The 2.2b1 tarballs are packaged real soon now. Whee!
-This marks the release of KPilot 4.2.3 (KDE 2.2, third
-subpackage release (alpha1, alpha2, beta1)). This version
-scheme makes it much easier to keep track of what was
-released when.
-
-Many bugs were fixed after Cornelius sent a message
-asking about the KPilot code; the abbrowser conduit
-has been renamed the KAddressBook conduit (it's still in
-conduits/abbrowser), some little stuff in the vcal conduit
-was fixed, much dead code was removed from KPilot and
-some code was simplified.
-
-Cornelius' mail also somehow pushed me into reading the
-KDE-PIM server suggestions. I'm sure you've noticed how
-much mail *that* has caused.
-
-KPilot Developer's notes for june 5th 2001
-==========================================
-
-[ade]: Well, I'm back from my conference -- which was pretty neat -- and lo!
-In my mailbox are many patches to be applied. Thanks guys. This keeps
-KPilot moving forward even when all of the "regular" developers are
-doing silly things (like moving).
-
-2001-06-05  Palle Girgensohn
-
-* */Makefile.am
-  I had to tweak some Makefiles to get kpilot working on FreeBSD.
-  KPilot must include LIBPISOCK_PATH in its INCLUDES setup.
-  [Newer CVS versions already did, but I would like to note my
-  appreciation for sent-in patches that aid in portability -- ade]
-
-2001-06-02  Philipp Hullmann
-
-* conduits/vcalconduit/*.{h,cc}
-  This is a new version of my large todoconduit/vcalconduit patch,
-  hopefully more suitable for human consumption than the previous one. It
-  mostly splits the large sync functions into smaller pieces, simplifies the
-  code for recurring events a lot, and moves some more code to vcalBase.
-
-* kpilot/pilot*Entry.cc
-  ... and one more patch to PilotDateEntry and PilotTodoEntry: replace
-  notes of length 0 with empty ones.
-
-2001-05-23  Philipp Hullmann
-
-* kpilot/pilot{Date,Todo}Entry.{h,cc}
-  Many fixes realted to accidental freeing of unallocated memory
-  and some pointer ugliness. Fixes rare crashes on machines where
-  malloc() doesn't zero the memory.
-
-2001-05-25  Adriaan de Groot
-
-* *.cc, options.h
-  Simplified the debugging code, no more #ifdef DEBUG if (debug_level &)
-  stuff, just straightforward DEBUGXXX statements which get optimized
-  aay for free when debugging is turned off.
-
-
-KPilot Developer's notes for may 14th 2001
-==========================================
-
-Not a lot of movement on the coding front for me [ade]; I
-did remember mothers' day though. Changes relevant to KPilot:
-
-* abbrowser has moved into kdebase, so the abbrowser conduit will
-  now be available to everyone, not just those that also compile
-  all of kdepim.
-
-2001-05-08  Marko Gronroos
-
-* conduits/popmail/*
-  Totally revamped the mail conduits with a new, well designed
-  setup. This solves most of the smtp and sendmail problems
-  we've been having.
-
-
-KPilot Developer's notes for may 7th 2001
-=========================================
-
-It's been great to receive patches from all over the place in the
-past two weeks. What has been fixed is listed below; I have the nasty
-feeling that one set of patches has slipped through the cracks. If
-you've sent me a patch in the past two weeks and don't find yourself
-listed here, please let me know.
-
-2001-04-27  Adriaan de Groot <adridg@cs.kun.nl>
-
-* I actually worked on the docs. Stephan Kulow's meinproc
-  HTMLizer was wonderfully useful here. The docs aren't
-  completely up-to-date yet, but they're moving.
-
-2001-04-28  Martin Junius  <mj@m-j-s.net>
-
-* kpilot/kpilot.cc
-  (initMenu): use KToggleAction and setExclusiveGroup for view menu.
-  (addComponentPage): same here for the other components.
-  (initMenu): setChecked for view_kpilot action.
-
-2001-05-07  Philipp Hullmann
-
-* conduits/vcalconduit/todo-conduit.cc
-  (): fixed missing due-date bugs
-
-
-
-
-
-KPilot Developer's notes for april 26th 2001
-============================================
-
-Ahh, spring is in the air; the time when a young man's mind turns
-to nights of C++ hacking. This has been a great few weeks for open-
-source collaboration. I've had useful and helpful mail from Philipp
-Hullmann, Martin Junius, and Marko Gronoos (maybe more -- if i've
-forgotten you please complain privately) with patches, hints, and
-offers of help. Thanks guys!
-
-* Fixed the non-initialization of the conduitCombo pointer by
-  removing it completely. (Thanks Martin!) At compile-time you can
-  choose between XML and traditional UI style. [19-4]
-* Greg's abbrowser conduit is (almost) ready for the prime-time! [23-4]
-* Fixed bug where absent executables could hang the conduit
-  setup dialog. [23-4]
-* Fixed small UI bug where toggling toolbar didn't resize the contents
-  of the main KPilot window. [23-4]
-* Removed unnecessary connection to (serial) pilot database when
-  conduits are started in --info or --setup mode. [23-4]
-* Discovered many i18n bugs in the sendmail conduit. Ouch. Some fixed. [23-4]
-* In a flash, implemented sending-via-KMail in the sendmail conduit.
-  This is utterly untested and possibly hazardous. I'd appreciate it
-  if some people used a test account for KMail and tried it out.
-  I will too, soon. [23-4]
-* Looked for the right place to force KPilot conduits to use the KPilot
-  .po file. The TLs are now OK. Thanks to Marko for prodding me to sort
-  this bug out (conduit in Finnish is "siirtokanava"). [24-4]
-* Added QToolTips and buddies to the NULL conduit setup. [24-4]
-* Fixed a bug in the KMail sending if you use a different outbox
-  from "outbox". [26-4]
-* Made KPilotLink::addSyncLogEntry marginally more useful -- this
-  is to work towards a read log window. As a side effect (which
-  obscures what I've done a little) I've reformatted kpilotlink.h
-  according to the coding style guide, and added docs. [26-4]
-
-Todo:
-
-* Found out why the vcal and todo conduits are so slow -- they
-  really do read in the whole Pilot database through the serial
-  line *twice* each sync. This needs fixing. [19-4]
-* Add QToolTips to the remaining conduits. [24-4]
-* Add "buddies" to relevant entry fields (usually QLineEdits). [24-4]
-* Remove all the UI stuff from KPilotLink and put it somewhere sensible. [26-4]
-* Split KPilotLink into the client and server ends. [26-4]
-
-The following list is stuff from the ChangeLog that was once on
-the Todo list; I'm repeating it here because it was time we went
-through it again to see how things stand. I've added comments in
-[ ] after each.
-
-* Split KPilotLink into its separate functionalities: config management,
-  local database management, and link from daemon to conduits. [partly
-  done, but kpilotlink still serves both ends of a client-server link]
-* Make KPilot and KPilotDaemon communicate only through DCOP. [bad idea -
-  causes extra overhead, and the kpilotlink protocol is pretty good]
-* Add an extra message concerning NULL user on hotsync.
-* Make the progress bar show something during a conduit sync.
-* Should just use the KPilotLink::config object to store all kinds
-  of user settings instead of copying them from the config file to
-  local variables, since this is just asking for inconsistency.
-  [dunno -- as long as KPilot is the app for configuring what the
-  daemon does, we just have to get KPilot to tell the daemon to re-
-  read the config file when something changes.]
-* Clean up more of the butt-ugly parts of the code base [less of this now!]
-* KPilot is an i18n nightmare [less of this now!]
-* The password dialog in the popmail conduit is probably a very bad idea
-  I think kdesud should come into play here. [not looked into]
-* The messages need validation - Pilot vs pilot, HotSync vs whatever
-* Actually *doing* a fast sync for Heiko
-* More and better information in the progress bar
-* KPilot should display the sync log as well, just like the Pilot
-  does. This is useful for reporting the result of a sync to the
-  user (who then doesn't need to look at the Pilot)
-* I noticed Thomas Zander has submitted an official wishlist item:
-  DateBk3 (the new date book format in PalmOS3.5) support. I think
-  I'll get back to him on that when Mirko pans out with the free
-  hardware goodies from Palm :)
-
-KPilot Developer's notes for april 19th 2001
-============================================
-
-* Martin Junius has contributed an XML GUI framework for KPilot, so
-  it now finally uses the "modern" way of doing GUIs. This *does*
-  mean it's time for yet-another set of screenshots for the docs
-  and yet-another set of menus for users to get used to. [14-4]
-* Disposed of reported bug: bad category selection. [15-4]
-* Moved the todo-conduit into the vcalconduit directory. This makes
-  building much simpler. [15-4]
-* Fixed up more #include shenanigans for --enable-final. (Don't
-  forget the #ifndef conventions from HOWTO-CODE.txt!) KPilot now
-  builds without warnings with --enable-final --disable-debug. [15-4]
-
-Things to do:
-
-* Fixup the documentation.
-* Add QToolTips to the conduits setups, KPilot's setup, and the conduit setup.
-  This is already partially done, but someone else needs to finish this off.
-* Make KPilot installation and run easier -- JPilot seems to work out-of-the
-  box on systems where KPilot doesn't.
-* Look into bugs #23385 (crash in VCalConduit), #20318 (munged 8-bit chars)
-  and #24291 (doubled appointments).
-
-KPilot Developer's notes for april 8th 2001
-===========================================
-
-It seems like only yesterday that KDE 2.1.1 was out, and we're already
-in KDE 2.2b1. Thoreau said "Simplify, Simplify". Anyway, this week's
-feature creep:
-
-* Bugfix for infinite loop when changing categories. [1-4]
-* Some xpms could profitably be removed, since we use pngs now. [1-4]
-* I normalized some more header-file #ifdef / #defines. [1-4]
-* Incorporated patches from Aaron Seigo. [1-4]
-* The todo conduit didn't compile due to changes in vcalBase. [1-4]
-* The vcal conduit's test mode has been expanded. [1-4]
-* KPilot's version number has been upped (again) to 4.2.1 for the
-  KDE 2.2a1 release; I hope we can up the revision number with every
-  release of KDE 2.2 move on to KPilot 4.3 with KDE 2.3. [9-4]
-* Messed around with some of the icons and images. [9-4]
-
-
-KPilot Developer's notes for march 24th 2001
-============================================
-
-KDE 2.1.1! With bugfixes and translation fixes! So only some of the
-bugfixes listed under march 10th have made it into there. On the
-western front though, we have:
-
-* Chris Molnar has started work on DB integration for the expense conduit,
-  so that you can actually do something useful with it. The CSV export seems
-  to be done, too. Thanks Chris!
-* Greg Stern has pretty much finished the abbrowser conduit (which a *lot*
-  of people have wanted for a long time). It hasn't been committed yet, but
-  will be soon.
-* The memo viewer has been very slightly beautified.
-* Some work for bugs #22112 and #21908, fixing deficiencies in the todo-
-  conduit and in selecting categories under other locales. This isn't
-  done yet, though -- some attempts have been checking into CVS for testing.
-
-
-KPilot Developer's notes for march 10th 2001
-============================================
-
-This weeks "cleanup" action is to normalize the #ifdef thingies in
-the header files so that they follow some kind of plan. And then reduce
-the number of #includes actually included by adding #ifdefs areound most
-of them, to prevent redundant #includes. This is a pain, but some say
-it's worth it in compile time. (See Documentation/HOWTO-CODE.txt for info).
-
-* Removed yet another silly struct tm issue. [4-3]
-* Added FileInstaller to KPilotDaemon. [4-3]
-* Added DCOP to KPilot. Files dropped on daemon show up in KPilot. [4-3]
-* Added a #define KPILOT_VERSION to unify all the version strings. [5-3]
-* Added Documentation/HOWTO-CODE.txt for the source code conventions. [5-3]
-* Fixed a bunch of Solaris compile issues. [5-3]
-* Factored out a bunch of generic vcal code from the vcal conduit into
-  a new base class VCalBaseConduit; the todo conduit also inherits from
-  there. [10-3]
-* Yet another stab at the "latin1 chars munged in KOrganizer" bug. [10-3]
-
-The double-sync problem still exists though, which is bad. I suspect that
-some extra bytes are left waiting in the serial port queue after slotEndSync
-but I haven't got that sorted out yet.
-
-The web-site has been updated, finally, which means you can finally check
-for new releases and info there again:
-
-	http://www.slac.com/~pilone/kpilot_home/
-
-And, I've started to use KDevelop 1.4 for maintaining KPilot. I'm still
-making the transition from vi / make / 4 konsole windows, but so far I've
-been mostly pleased by the effect it has.
-
-Bugs that are still open in the bug database: (Dan? you bored?)
-
-* Todo conduit doesn't take due dates into account
-* Double sync
-* Address edit window doesn't follow addressDB custom fields & layout
-
-Things to think about:
-
-* Usability. I've swept all the menu items into one "File" menu that
-  contains two configure wrenches, 4 actions, and a quit button. I'm
-  wondering whether this is the right way to go or whether separate
-  "file", "sync" and "conduit" menu items would be better.
-
-
-
-KPilot Developer's notes for march 4th 2001
-===========================================
-
-So after "the big cleanup" I've continued doing cleanup code in smaller
-chunks with more commits, mostly for reasons of bug-tracking. Dates in []
-indicate when the fix or change was committed.
-
-* Removed a really stupid crash from KPilotConfig::fixed().		[23-2]
-* The internal conduits' names weren't reported properly anymore. This
-  is a binary and source incompatible change. 				[23-2]
-* Extra debugging while starting the listener process. 			[26-2]
-* Changed exit(-1) to exit(3) in the daemon. 				[26-2]
-* Use Qt layout classes in fileInstallWidget. 				[26-2]
-* Removed some null-conduit comments from the KNotes conduit.		[26-2]
-* Removed some #include <getopt.h> for Solaris. Cleaned up other
-  includes as well, just a little.					[26-2]
-* Started a change to KActions.						[ 1-3]
-* Added a new FileInstaller for use in the daemon and the widget.	[ 1-3]
-  It's currently only used by the widget.
-* Added listItems.{h,cc} in response to bug #21392; changed address
-  and memo widgets to use them.						[ 4-3]
-
-KPilot Developer's notes for february 19th 2001
-===============================================
-
-Yay! KDE 2.1 is out. Which means we can commit all kinds of changes
-to KPilot again, not just well-thought-out bugfixes. That means that
-we can get to work on cleaning up the code base again.
-
-* Split all the config-file stuff out of KPilotLink into a new class
-  KPilotConfig. Fixed all the resulting include dependencies.
-* The function fixed() in KPilotInstaller obviously belongs to KPilotConfig.
-* The {address,memo,fileInstall} widgets all had unnecessary dependencies
-  on KPilotInstaller. Removed. KPilotInstaller now adds the widgets it
-  creates itself.
-* Removed as many dependencies on kpilot.h and kpilotlink.h as possible.
-* Removed a bunch of char[] buffer stupidities from pilotLocalDatabase &c.
-* Removed the database open and close functions from kpilotlink.
-
-All the sensible fixes, like those listed under feb. 4th, will come later.
-
-KPilot Developer's notes for february 4th 2001
-==============================================
-
-Nick Papadonis spent hours tracking down the vcal conduit crash and
-we found at least one bug in kpilotlink. It's been removed and I
-hope this quashes all the vcal crashes. Other than that there's simply
-not much we *can* do with the message and feature freeze and all.
-This is why the todo-immediately-after-freeze list exists:
-
-* Split KPilotLink into its separate functionalities: config management,
-  local database management, and link from daemon to conduits.
-* Make KPilot and KPilotDaemon communicate only through DCOP.
-* Add an extra message concerning NULL user on hotsync.
-* Sort out all the icon issues.
-* Make the progress bar show something during a conduit sync.
-
-
-
-KPilot Developer's notes for january 6th 2001
-=============================================
-
-Happy Millennium. I ([ade]) am off on a two-week vacation to
-Calgary, so no KPilot news from me till (almost) february.
-
-There have been several troublesome bugreports this week,
-ranging from "all the conduits crash" to "daemon dies on
-hotsync." That don't make me happy at all.
-
-
-Done this week:
-
-* Built POSE, the Palm Emulator, so this may help in testing
-  stuff for the OS versions that I don't actually have.
-  POSE is a real $#*%^ to build, but I can now actually use my
-  PalmV on-screen (with a PalmIII skin, which is kinda weird).
-* Replaced the addressEditor widget with something less stone-age.
-* Added a nifty feature so that you can edit one address in two
-  windows and they keep semi-in-sync. abbrowser doesn't have this
-  (which means abbrowser has a bug :( ).
-* #&$%#$ conduitApp doesn't turn the GUI on by default, so recent
-  vcal crashes can be blamed on trying to create a KMessageBox without
-  a GUI :( Changed the default values.
-* Tried fixing some ugly icons. I'm no artist though.
-* Teeny-tiny layout change in Address page of setup dialog.
-* If you try to add records to the address book before you've done
-  a HotSync / Backup KPilot has an empty AddressDB and doesn't deal
-  with the address very well. Added a sorry() there.
-* Added a doTest() to vcal-conduit.
-* More cleanups in the debugging code. There's still a weird mix of
-  code controlled by --debug and kdebugdialog style stuff. Functions
-  kdWarning() and kdError() should be given __FUNCTION__ as their
-  << argument, while kdDebug() should get fname as first argument.
-  This will make all the debugs optimize away painlessly while keeping
-  the warnings and error messages. Since messages may change status some
-  time there's now a #define TEST_DEBUG that makes fname a weird object
-  that can only be passed to kndbgstreams. So sensible combinations are:
-  	production:	NDEBUG defined, DEBUG undefined, TEST_DEBUG undefined
-  	test nodebug:	NDEBUG defined, DEBUG undefined, TEST_DEBUG defined
-  	testing:	NDEBUG undefined, DEBUG defined, TEST_DEBUG defined
-* Actually KPilotLink::doFullBackup wasn't all that bad. Still, all the
-  code needs going-over for i18n yuckiness. doFullRestore() was worse;
-  also fixed up directory yuckiness.
-	  Note to self: text for user is i18n()ed, kdDebug() &c. is in
-	  english ('cause Dan or I have to read it :) )
-* Finished integrating Heiko's patches. I believe that both HotSync and
-  FastSync now do what the ought to do.
-* Started adding a DCOP interface to the daemon.
-
-
-Other stuff:
-
-* It's a HotSync and a Pilot. I'll change strings in the source as
-  I come across them. As for conjugations: I HotSynced, it HotSyncs.
-
-Todo:
-
-* Should just use the KPilotLink::config object to store all kinds
-  of user settings instead of copying them from the config file to
-  local variables, since this is just asking for inconsistency.
-* Close bug 16457.html in some way.
-* More vcal work
-* Clean up more of the butt-ugly parts of the code base (less of this now!)
-* Tell the KOrganizer docs people about KPilot
-* KPilot is an i18n nightmare
-  - The const char *s in the pilot databases can be addressed most
-    easily, I think.
-  - get rid of most of the strcpy, strcat, etc. But not all!
-    We're stuck with pilot-link, after all.
-* The password dialog in the popmail conduit is probably a very bad idea
-  I think kdesud should come into play here. Anyway, a KMail conduit would
-  be much cooler and safer. Sigh.
-
-
-Things-to-be-considered:
-
-* Splitting kpilotlink up into its various functionalities
-
-
-KPilot Developer's notes for december 30th 2000
-===============================================
-
-Ho ho ho. Merry Christmas. Happy new year. Last week started out
-with Thomas Zander reporting that he *still* has the totally bizzarre
-and inexplicable crash in KPilot that he's had ever since KPilot was
-ported to KDE2 (+).  That pretty much colors this week's work. The rest
-of the week was used for the KNotes conduit. After a pleasant exchange
-of ideas with Wynn Wilkes (of KNotes) we got a DCOP interface working and
-this make the KNotes conduit more useful. Talked to Greg about the
-kab conduit and he's enthusiastic about the possibilities there,
-we hope to have a framework in CVS soon.
-
-Done:
-
-* Claimed some debug areas (5510,5511,5512).
-* KNotes rereads the notes dir after a sync, so new notes (which
-  have come from Pilot memos) appear there.
-* KNotes conduit --test now displays all the notes (on screen) that
-  knotes shares with the pilot. This is a test (!) of the DCOP stuff,
-  mostly.
-* KNotes conduit now has a checksum function (md5) to reduce the
-  number of notes that has to be copied between KNotes and the
-  Pilot.
-* Applied Dag Nygren's vcal patches so that repeating events now
-  show up in KOrganizer properly.
-* Fixed the button-enabling in the address app
-* Added more debugging output for Thomas.
-* Added more debugging output for Nick.
-
-Todo:
-
-* More vcal work
-* Clean up more of the butt-ugly parts of the code base
-* Tell the KOrganizer docs people about KPilot
-* KPilot is an i18n nightmare
-  - The const char *s in the pilot databases can be addressed most
-    easily, I think.
-  - KPilotLink::doFullBackup should cause i18n people to run away
-  - get rid of most of the strcpy, strcat, etc. But not all!
-    We're stuck with pilot-link, after all.
-* The messages need validation - Pilot vs pilot, HotSync vs whatever
-* The password dialog in the popmail conduit is probably a very bad idea
-
-+ Thomas' crash produces the following (partial) backtrace:
-
-#4  0x408960b7 in read_png_image () from /usr/kde2/source/qt-copy/lib/libqt.so.2
-#5  0x40838dd9 in QImageIO::read () from /usr/kde2/source/qt-copy/lib/libqt.so.2
-#6  0x40836cf1 in QImage::load () from /usr/kde2/source/qt-copy/lib/libqt.so.2
-#7  0x408305b2 in QImage::QImage () from /usr/kde2/source/qt-copy/lib/libqt.so.2
-#8  0x40483fcf in KIconLoader::loadIcon () from /usr/kde2/lib/libkdecore.so.3
-#9  0x805a166 in KPilotInstaller::initIcons ()
-
-  which is weird since the only possible png image being read is the
-  quit icon, which is standard in KDE2. Maybe some weird combo of options?
-
-KPilot Developer's notes for december 18th 2000
-===============================================
-
-It looks like kdepim and KPilot aren't going to make the 2.1 release.
-Darn. This does give us more time to deal with docs and bugfixes.
-Every time I get something done though I find I've discovered two
-new things to do :(. I hope Lukas will help out with a lot of the
-i18n stuff though.
-
-Done:
-
-* Moved all the (english) docs to the correct place.
-* More doc fixes: use &kpilot; and &pilot; properly, added screen shots for
-  various conduit setups. The docs still aren't complete but they're a
-  darn sight better than they were.
-* Modal dialogs need exec() instead of show()
-* Changes in kdelibs caused some dialogs to hang in slotCancel()
-* Changes in includes means we have to include kdebug.h ourselves
-* Get rid of cerr and use kdDebug or kdWarning or kdError as appropriate.
-  There are still a very few cerrs left in places where we can't rely on
-  kdDebug().
-* Added #ifdef DEBUG to the debug sections of code. So KPilot now compiles
-  without debugging stuff. I realise now that I should have stuck to the
-  KDE kdDebug() guidelines, but, um, I didn't know they existed when the
-  port from KDE1 to KDE2 started. Darn.
-
-ToDo:
-
-* More vcal work
-* Clean up more of the butt-ugly parts of the code base
-* Detect memo-too-large in knotes conduit
-* Try to reduce number of updates in knotes conduit
-* Figure out a nice DCOP interface with Wynn (KNotes)
-* Finally take a look at kab or whatever for the address book conduit.
-  Should probably talk to Greg about this one too.
-* Tell the KOrganizer docs people about KPilot
-* Fix the button-enabling in the address app
-* KPilot is an i18n nightmare
-  - The const char *s in the pilot databases can be addressed most
-    easily, I think.
-  - KPilotLink::doFullBackup should cause i18n people to run away
-  - get rid of most of the strcpy, strcat, etc. But not all!
-    We're stuck with pilot-link, after all.
-* The messages need validation - Pilot vs pilot, HotSync vs whatever
-* The password dialog in the popmail conduit is probably a very bad idea
-
-
-KPilot Developer's notes for december 10th 2000
-===============================================
-
-Lots of internal stuff going on:
-
-* The sense of the debugging flags was the wrong way around,
-  so using --debug 4 gave you all the UI debugging messages
-  as opposed to just the major and minor ones. This is what
-  you get from suggesting debug 1023 all the time.
-* BaseConduit had some weird debugging output -- not controlled
-  by --debug -- so patched that up. And there was ugliness in the
-  icon loading function. This changes the interface to BaseConduit
-  slightly, 3rd party conduit authors beware.
-* Finally fixed up the Makefile.ams for the standard conduits so
-  that they run properly (without setting LD_LIBRARY_PATH).
-
-Visible changes:
-
-* Fixed up the documentation, the screenshots, the descriptions of the
-  conduits, etc. etc. It's still not complete but at least it matches
-  what happens when you run KPilot.
-
-Still on the todo-list:
-
-* Really fix the vcal conduit. I've patched some things up and once
-  again I hope it works, but since I can't reproduce the error I'm
-  a little stuck here.
-
-Still on the wish-list:
-
-* Actually *doing* a fast sync for Heiko
-* More and better information in the progress bar
-* The PilotMemo class is butt-ugly and filled with weird C-string
-  manipulations.
-* KPilot should display the sync log as well, just like the Pilot
-  does. This is useful for reporting the result of a sync to the
-  user (who then doesn't need to look at the Pilot)
-* I noticed Thomas Zander has submitted an official wishlist item:
-  DateBk3 (the new date book format in PalmOS3.5) support. I think
-  I'll get back to him on that when Mirko pans out with the free
-  hardware goodies from Palm :)
-
-
-KPilot Developer's notes for december 2nd 2000
-===============================================
-
-Almost Sinterklaas, so I'd like to wish all the KPilot users in
-.nl a Happy Sinterklaas en Weg met de Kerstman.
-
-UI Changes:
-
-* Added Heiko's Fast-Sync icon .. but it's ugly and hard to
-  distinguish from the regular icon. This needs fixing by an artist.
-* Added an ugly restore icon as well.
-* Added an undocumented config-file option. You can now add the
-  following line to kpilotrc in the null group if you really want to:
-
-	ToolbarIcons=list
-
-  where list is a comma-separated list of icons to appear on the
-  KPilot toolbar. You can choose from HotSync,FastSync,Backup and
-  Restore. The standard setting is:
-
-	ToolbarIcons=HotSync,Backup
-
-  That's not a lot but it should keep Heiko happy for a while and
-  it reminds us that we should move towards a more modern method
-  of setting up the UI -- or not?
-* Tried to fix some UI weirdneses like:
-	- Delete Memo button enabled when no memo selected
-  but QListBox has the nasty habit of always having *something*
-  selected, even if you can't see what it is.
-
-  Now I know that the internal conduits -- memoWidget and addressWidget
-  will probably die out soon when we have a real working kab2 conduit
-  as well as a KNotes conduit, but till then it's nice to have something
-  that at least obeys basic UI design rules.
-* The following bugs in QListBox and QListView made me ditch the old
-  two column layout with movement buttons for something else. Let me
-  know which one you prefer.
-	- There is some *bizzarre* behavior in the handling of
-	  conduits being selected: select the top item in
-	  the left column, the top item in the right column
-	  (um, so install a conduit first) and then the top
-	  item in the left column again.
-  The new layout allows you to drag conduits from one state (available)
-  to another (active). Click on a conduit to set it up -- you may have
-  to doubleclick depending on you KDE settings.
-
-
-Internal Changes:
-
-* Conduits that crash no longer hang KPilot and the entire sync.
-* Made a lot of static const int members of various classes
-  enum values instead, and added a function write() to CStatusMessages
-  for a clean way to write status messages to the link.
-* Replaced several if else if ... constructions with switch()
-* Added a sensibleTitle() and shortTitle() to PilotMemo for use
-  by the KNotes conduit (and maybe others)
-
-Documentation:
-
-* Spent a little time on the (english) documentation and brought a few
-  parts of it back up-to-date. It needs up-to-date URL's, probably we
-  should move the mailing list to kde-pim@kde.org, and we need new
-  screenshots.
-
-Wishlist:
-
-* More and better information in the progress bar
-* The PilotMemo class is butt-ugly and filled with weird C-string
-  manipulations.
-* KPilot should display the sync log as well, just like the Pilot
-  does. This is useful for reporting the result of a sync to the
-  user (who then doesn't need to look at the Pilot)
-
-KPilot Developer's notes for november 25th 2000
-===============================================
-
-Spent most of the week at a conference, but managed to get
-the KNotes conduit almost fully functional. New memos (KNotes)
-are copied to the desktop (Pilot). Memos changed on the pilot
-are changed on the desktop. However, not all deleted memos are
-deleted on the other side, nor are modified memos copied
-from the desktop to the Pilot.
-
-I don't know what the desired action for KPilot is in the
-cases of deleted memos. Any suggestions? There's now a config
-option in the KNotes conduit setup, but maybe that should be
-subsumed by the global Local Overrides Pilot setting. Anyway,
-if a memo is deleted on the Pilot the corresponding KNote is
-deleted as well.
-
-If KNotes is running and the KNotes conduit makes changes,
-these aren't picked up by KNotes. There are also some
-obvious race conditions caused by the conduit writing KNotes
-config files. This basically means that we need to talk to
-the KNotes maintainer to resolve these coordination problems.
-
-As for the code, I wrote this:
-	class KNotesOptions : public setupDialog { Q_OBJECT
-	protected: static const QString KNotesGroup; };
-[with better layout, of course] But there's a static QString
-there, and I read somewhere that Static Objects Are Evil (tm).
-I could use a const char * there, since it's just the name of
-a group in the config file, but what's the consensus on things
-like this?
-
-I did handle some more of Heiko's patches. From last week's list:
-	- Some phone number magic I don't understand yet
-	- Some changes in the address import function
-	- getShowPhone() -- don't understand that yet either
-	- Fix bad repeat-n-times handling in vcal-conduit
-This leaves just the Fast Sync capability still unimplemented.
-
-Given the release schedule that has been discussed recently
-(and we really do want to have KPilot in KDE 2.1, so as to add
-a nifty feature to the desktop as a whole) I think feature creep
-should be abandoned for the time being and we should try to
-fix as many bugs in what we have before the release (around the
-middle of december, IIRC). This means testing, lots of it. So
-people, take the plunge, give it a try, compile the latest kdepim
-CVS stuff with KPilot in it and then complain when your Pilot
-catches fire, OK? O yeah .. when you *do* give it a try, make
-sure you do something like:
-
-	$ export LD_LIBRARY_PATH=$QTDIR/lib:
-	$ kpilot --debug 1023
-
-To make sure none of the conduits crashes with library loading
-problems and with all the debugging messages turned on.
-
-
-KPilot Developer's notes for november 19th 2000
-===============================================
-
-Fixes:
-
-* Added most of Heiko's patches to the vcal-conduit
-* Added convention to conduits --info handling: return "<none>" for
-  no databases. Handled in conduitSetup as well.
-* Made some minor changes to the info page presented in dialogs
-  (generally the setup dialog of a conduit) so that it gracefully
-  handles weird settings and handles its own resizing properly.
-* Added some const-qualifiers to various char *s
-* Add a "kill daemon on exit" feature -- there was already some code
-  for this, but not complete.
-* Changed all the boolean config entries to booleans as opposed to
-  0-or-1 ints.
-* Removed all the "const char * id defined but not used" warnings
-* Added some extra robustness in PilotDaemon::setupConnections
-* Made the daemon obey the "show in system tray" setting -- this was
-  broken during the first port to KDE2
-* Handle reconfiguration through the settings dialog properly --
-  at least KPilot picks up the changes to "Kill Daemon on Exit"
-* (re)Added --test option to conduits, though not all of them
-  will support actual tests.
-* KNotes conduit is now functional in the sense that notes you write
-  on your desktop are in fact copied to the Pilot.
-
-Some general comments:
-
-* Suggestion: call the desktop files for conduits
-	conduit-pilot-appname.desktop
-  and the conduit executables themselves
-  	conduit-pilot-Appname
-  This at least gives conduits some consistent naming scheme and
-  the addition of -pilot leaves some namespace for conduits for
-  other PDA's.
-
-  Well, actually this naming scheme isn't much good. But we *do*
-  need to think about how to handle sync-programs for various
-  PDA's in a nice fashion -- I can imagine having a Nokia phone,
-  a Psion and a Pilot and wanting to sync them all.
-
-Still on the todo-list:
-
-* Fix bad repeat-n-times handling in vcal-conduit
-* Dealing with the rest of Heiko's patches
-	- Some phone number magic I don't understand yet
-	- Some changes in the address import function
-	- Fast-sync capability (this is different from SyncLast)
-	- getShowPhone() -- don't understand that yet either
-* More and better information in the progress bar
-* The PilotMemo class is butt-ugly and filled with weird C-string
-  manipulations.
-
-
-KPilot Developer's notes for november 14th 2000
-===============================================
-
-Lots of things have changed in the class hierarchy.
-
-* Jorg's bug in the memo-import function was handled OK in addressWidget,
-  but it seemed clumsy to deal with the same problem in two different
-  places. Moved findSelectedCategory() to PilotComponent. Added some
-  other convenience functions there for the category combo box.
-
-* The getConfig() change was very poorly done, sorry about that.
-  Added some (semi-) bizarre debugging functions into options.{h,cc}
-  that are #ifdeffed out.
-
-* Ditched all the #ifdef KDE2 stuff and dropped the KDE1 backport.
-
-* Added a .desktop file for the NULL conduit (with some translations
-  of my own)
-
-* Added Qt2 layout code to the address and memo widgets so that they
-  become easier to i18n() (ie. they display properly when the string
-  lengths change).
-
-* Adopted some of Heiko's patches:
-	- New feature ForceFirst causes every conduit to behave
-	  as if FirstTime=true every time (this is off by default,
-	  which matches previous behavior)
-	- New feature SyncLastPC causes a slow sync if the Pilot
-	  is synced with a different PC than the last time it
-	  was synced (this is on by default, matching old behavior)
-	- "fixed" font in address and memo editor replaced by the
-	  user's system preference
-	- In some cases the title (first name+last name or something
-	  similar) in an address was empty. This now gives the title
-	  [unknown]
-	- Similar for memos
-
-Let's sum up the current wishlist:
-
-* KNotes conduit
-* Dealing with the rest of Heiko's patches
-	- Proper multi-day appointments in the vcal conduit
-	- Some phone number magic I don't understand yet
-	- Some changes in the address import function
-	- Fast-sync capability (this is different from SyncLast)
-	- getShowPhone() -- don't understand that yet either
-  These patches are quite useful but it takes a lot of work to
-  unsnarl them, which is why they're taking so long.
-
-
-
-Developer's notes for november 9th 2000
-=======================================
-
-What's new? Lots of little bugs found by code review, some new (trivial?)
-features. KPilot 4 is in Mandrake cooker so it receives a little more
-attention now than before.
-
-* Jorg Habenicht found a bug in the memo-import function. It causes
-  array-bounds overruns. The same bug was present in many other parts
-  of the memo widget. I think I got them all.
-
-* Added some robustness checking in the daemon to cover weird cases
-  like running conduits by hand.
-
-* Added better handling of the "first time" dialog in the vcal conduit.
-
-* The NULL-conduit now has an extra configuration field "Databases" which
-  you can attach it to. This allows you to do a bogus conduit sync with
-  a database (almost equivalent to putting it in the "backup only" entry
-  of the global KPilot settings, except you run the external conduit.
-
-* Made KPilotLink::getConfig return a reference instead of a pointer, to
-  avoid new()ing and delete()ing the config data structure all the time.
-  I hope this increases consistency as well. This has caused lots of
-  little type changes throughout the conduit system, so third-party
-  conduit authors beware :) -- all the changes cause compile failures though.
-
-* Jorg brought in a patch so that KPilot uses the pilot-link environment
-  variables to set initial values.
-
-
-Some wishlist-style items:
-
-* The memo and address internal conduits are (a) ugly and (b) impossible
-  to i18n properly, because they have hard-coded sizes. Need to spend some
-  time cleaning that up.
-
-* Really, it's time to write a conduit that syncs with KNotes. It's
-  not that hard, but KNotes has some silly bugs that need fixing first :(
-
-* A patch to introduce a notion of "fast sync" has been produced for
-  KPilot 3.2.1 -- we're now looking into how to integrate that into
-  the KPilot 4.x series. The idea is you only run a sync on the databases
-  you have a conduit for.
-
-Developer's notes for october 29th 2000
-=======================================
-
-* Thomas Zander pointed out that KPilot doesn't write a config file
-  the first time it is run, leading it to *still* believe it's the
-  first time it's run the next time. Fixed.
-
-* In PilotDaemon::setupConnections() things have been reorganized so that
-  a failure on opening the Pilot device will not allow KPilot to start.
-
-* Added an undocumented Debug= entry to conduit's configuration, to
-  ease debugging. Conduits will have to read this themselves.
-
-* Added a "Run KPilot" menu item to the daemon.
-
-And there's some really strange behavior that I've noticed: when I run
-the setup for an external conduit -- which is a separate process --
-KPilot always "jumps in front" of that conduits setup dialog when I
-give KPilot the focus. This is very irritating.
-
-Bugs noted still remaining:
-
-* Much weirdness in conduit startup (mode must be set before running
-  the conduit's constructor, but mode wasn't set till after) has been
-  looked at but not repaired.
-
-* The vcal-conduit had trouble running a sync the first time (you really
-  should do a backup instead). We're working on this one.
-
-
-
-Developer's notes for october 26th 2000
-=======================================
-
-OK, I admit it:
-
-	code,commit,announce,test
-
-is the *wrong* way to do things. I made some mistakes in the code that
-looks up conduits in the .desktop files, so conduits *still* won't run
-with this morning's commits. This has been fixed now, and the conduits
-run. Of course, vcalconduit just SIGSEGV'ed on me, so ...
-
-This brings me to a couple of wishlist items for KPilot:
-
-* A "Cancel" button. I just clicked on Backup when I was aiming for
-  HotSync, and there's nothing I can do about it.
-
-* A timeout when running conduits so that badly behaved conduits don't
-  hang up the KPilot system.
-
-Some other minor issues have been fixed as well:
-
-* Boatloads of compiler warnings in the included .xpm files
-* Some i18n stuff
-
-And new questions raised for people who know the code (I'm thinking
-Preston or Cornelius may be able to explain):
-
-* vcal-conduit.cc line 522, what's the purpose of voStatus there?
-
-
-
-Developer's notes for october 23rd 2000
-=======================================
-
-It's been a week where I couldn't bring myself to tackle
-really big problems, like an address-book conduit for
-kab or pine. So I sat back and polished things, wandered
-through the code finding little bugs (if I was an OpenBSD
-kinda guy I'd call it a proactive code audit). This has
-led to:
-
-A whole slew of minor fixes:
-
-* Updated Help menu in main menu bar
-* Removed superfluous about tab in kpilot setup dialog
-* Fixed config-doesn't-change bug
-* Disable autostart-daemon option if .desktop file unavailable
-* Added quit icon into file menu
-* Added hotsync and backup icons into file menu
-* Cleaned up include files in conduitSetup.h
-* Cleaned up dialog code in conduitSetup.cc for KDE2 compliance
-* Fixed conduits-not-running-during-sync bug in kpilotlink.cc
-* Fixed a minor Qt2 incompatibility in messageDialog.cc
-* Fixed some i18n issues in kpilotlink.cc
-* Replaced sprintf stuff with QString operations in kpilotlink.cc
-* Added hot-sync to file menu for consistency (it's in the toolbar)
-* Added logic in showTitlePage in kpilot.cc to reduce flicker
-
-Some remaining issues:
-
-* The icon for "About KPilot" in the help menu is the wrong one
-* We still need pretty icons for various things (like external conduits)
-
-Some questions:
-
-* Is there a memory leak with the config file in kpilotOptions.cc?
-* Do we really want to be new() and delete()ing the config file so
-  often? Perhaps getConfig() should do some caching.
-* Should we add icons for the other menu items?
-* Is there an entry iterator in KConfig so that you can iterate over
-  entries in a certain group (and possibly delete them?)
-
-Some philosophical stuff:
-
-* Maybe it's time to ditch the internal conduits altogether and work
-  on external conduits for kab and knotes? Although that would still
-  leave the file installer. Maybe a splash of the kpilot logo and then
-  an icon view of what has been dropped into the file installer?
-
-
-
-As far as I can tell KPilot 4 now has the same functionality and bugs
-as KPilot 3.2.1 did (with some polishing). So you still have to be
-careful with KOrganizer. But I think the framework is sufficiently
-OK to make it worthwhile to really write some conduits for various
-KDE 2 apps. Like a kab conduit and a knotes conduit.
diff --git a/kpilot/Documentation/ConduitProgrammingTutorial/ConduitStructure.eps b/kpilot/Documentation/ConduitProgrammingTutorial/ConduitStructure.eps
deleted file mode 100644
index 1559b365..00000000
--- a/kpilot/Documentation/ConduitProgrammingTutorial/ConduitStructure.eps
+++ /dev/null
@@ -1,500 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%BoundingBox: 88 4 608 264
-%%HiResBoundingBox: 88 4 608 264
-%.........................................
-%%Creator: GNU Ghostscript 705 (epswrite)
-%%CreationDate: 2003/01/12 00:28:24
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 2
-%%EndComments
-%%BeginProlog
-% This copyright applies to everything between here and the %%EndProlog:
-% Copyright (C) 2002 artofcode LLC, Benicia, CA.  All rights reserved.
-%%BeginResource: procset GS_epswrite_2_0_1001
-/GS_epswrite_2_0_1001 80 dict dup begin
-/PageSize 2 array def/setpagesize{ PageSize aload pop 3 index eq exch
-4 index eq and{ pop pop pop}{ PageSize dup  1
-5 -1 roll put 0 4 -1 roll put dup null eq {false} {dup where} ifelse{ exch get exec}
-{ pop/setpagedevice where
-{ pop 1 dict dup /PageSize PageSize put setpagedevice}
-{ /setpage where{ pop PageSize aload pop pageparams 3 {exch pop} repeat
-setpage}if}ifelse}ifelse}ifelse} bind def
-/!{bind def}bind def/#{load def}!/N/counttomark #
-/rG{3{3 -1 roll 255 div}repeat setrgbcolor}!/G{255 div setgray}!/K{0 G}!
-/r6{dup 3 -1 roll rG}!/r5{dup 3 1 roll rG}!/r3{dup rG}!
-/w/setlinewidth #/J/setlinecap #
-/j/setlinejoin #/M/setmiterlimit #/d/setdash #/i/setflat #
-/m/moveto #/l/lineto #/c/rcurveto #
-/p{N 2 idiv{N -2 roll rlineto}repeat}!
-/P{N 0 gt{N -2 roll moveto p}if}!
-/h{p closepath}!/H{P closepath}!
-/lx{0 rlineto}!/ly{0 exch rlineto}!/v{0 0 6 2 roll c}!/y{2 copy c}!
-/re{4 -2 roll m exch dup lx exch ly neg lx h}!
-/^{3 index neg 3 index neg}!
-/f{P fill}!/f*{P eofill}!/s{H stroke}!/S{P stroke}!
-/q/gsave #/Q/grestore #/rf{re fill}!
-/Y{P clip newpath}!/Y*{P eoclip newpath}!/rY{re Y}!
-/|={pop exch 4 1 roll 3 array astore cvx exch 1 index def exec}!
-/|{exch string readstring |=}!
-/+{dup type/nametype eq{2 index 7 add -3 bitshift 2 index mul}if}!
-/@/currentfile #/${+ @ |}!
-/B{{2 copy string{readstring pop}aload pop 4 array astore cvx
-3 1 roll}repeat pop pop true}!
-/Ix{[1 0 0 1 11 -2 roll exch neg exch neg]exch}!
-/,{true exch Ix imagemask}!/If{false exch Ix imagemask}!/I{exch Ix image}!
-/Ic{exch Ix false 3 colorimage}!
-/F{/Columns counttomark 3 add -2 roll/Rows exch/K -1/BlackIs1 true>>
-/CCITTFaxDecode filter}!/FX{<</EndOfBlock false F}!
-/X{/ASCII85Decode filter}!/@X{@ X}!/&2{2 index 2 index}!
-/@F{@ &2<<F}!/@C{@X &2 FX}!
-/$X{+ @X |}!/&4{4 index 4 index}!/$F{+ @ &4<<F |}!/$C{+ @X &4 FX |}!
-/IC{3 1 roll 10 dict begin 1{/ImageType/Interpolate/Decode/DataSource
-/ImageMatrix/BitsPerComponent/Height/Width}{exch def}forall
-currentdict end image}!
-/~{@ read {pop} if}!
-end readonly def
-%%EndResource
-/pagesave null def
-%%EndProlog
-%%Page: 1 1
-%%BeginPageSetup
-GS_epswrite_2_0_1001 begin
-/pagesave save store 100 dict begin
-0.1 0.1 scale
-%%EndPageSetup
-gsave mark
-K
-0 0 0 0 rf
-Q q
-880 40 5200 2600 re
-Y
-5 w
-1 J
-1 j
-K
-2418.78 2362.79 2122.43 215.332 re
-S
-2864 2440 63 63 /6D
-$C
--3EVIp"uqN5ELN^?[CSCot>e>HM_jXp?V&3fCu2HmZ[P:9D@;0n%C7OH<:+%0E&IhlJB9uI=8N=~>
-,
-2932 2437 58 68 /1O
-$C
-,fPr)6kD=D_K6eZFQe8qk_91a60SU<2lEJ.TCeWPT""Y_s')E$s8W-!s8,Fgs0_gkC\qgqBj4l>
-D/Fs1_V"uN=K>K)=A[L$TYX7*+9~>
-,
-2999 2440 15 87 /6H
-$X
-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-
-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-
-#Q=u-#Q=]'zzzzz#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=~>
-,
-3026 2437 56 90 /1S
-$C
-+U+!Y`"6m?4sG5I:JXbS1\9Z](skRsH?>aL-`p^glX+u<ea*88s8W,romcG^g\&82p=@d%[;B?+
-A2En8"<Q.Fef*1CCBb.i"ipZCs8W,7~>
-,
-3122 2444 48 46 /6L
-$C
-.LMgJhd;Ndc+8!;-[M\kHGaj,dSSd3.F;?%K6ek00^s[H&IK@TKH)2kmLBP>*"pp2^m;gQ/VcsQ
-Xm&4(osJPPfN;QN7t9.Jg40~>
-,
-3180 2440 6H ,
-3207 2440 55 65 /1W
-$C
-3"UXos8W-!s8W-!s8W-!s8W-!s8W,rs8N&qm=*X`9-OiapgJLR$$JMaCUMmTY/5uKUhE:~>
-,
-3274 2440 6H ,
-3292 2437 35 83 /6P
-$C
-.Ktq8KaY&rJp]/"s8W-!s8W-!s8W-!s8W-!oAQ,;q:$els8W-!qu~>
-,
-3326 2419 74 6 /2A
-$C
-/dI=7J,~>
-,
-3401 2440 15 87 /6T
-$X
-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-
-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-
-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=u-#Q=~>
-,
-3427 2440 6H ,
-3454 2437 60 90 /2E
-$C
--3]Y7`"6tk+S\7pqL(Q"6o!"!6nlUlD[H'mS(%*'qYPU9qpYTFpJ:hhs8W,m^Xr>Ns%@iIf%7(Q
-g?gFJYeoHDi6MUV`Hpop\8/=Y@;s*GTm6V;s8W-!s8RT~>
-,
-3521 2440 88 65 /6X
-$C
-3"Vkk8VI-Ds8W-!s8W-!s8W-!s8W-!s8W-!s8W-!s8W-!s8VNes1@Z"^=-<#dn=DX(dY;m*#Kf+
-]nlq5=)%Q>g2"(I%0jENKb.Yp$:)QW"b6~>
-,
-3621 2437 61 68 /2I
-$C
-,6]P%3WfA5KFL6W64HlBiMq2H`5IGP,H*PoK3Ae`U`[=CrVQWls*oLp&&[`UA2[Mp)/%V,SCn>p
-nAc%M,6L\4L1H,FaX@Qb_u'Hn'E@h,XhSYYXf`LF#&"-L[;+2K$n,OMJsBbP~>
-,
-3687 2440 6T ,
-3714 2437 54 68 /7B
-$C
-.`IMM6kF<iT]%qRl-TPmd0p6KK@4[68\I86s%Dg]?D%6D@Cke)s8W,nJ,[M+9E3mlhpT"$D5FYK
-Q%g'jJlo'STrV#,L(l=>TL]~>
-,
-3774 2437 1O ,
-3841 2440 1W ,
-3907 2437 1S ,
-3974 2437 55 66 /2M
-$C
--,l=(Ld9o'Ag2PI%o6LsNd;k!ha*86FJ!l/Vr.N(rVuots8W-!s8W-!s8W-!s8W-!s82~>
-,
-4041 2440 6H ,
-4059 2437 6P ,
-3480 2362.79 0 -215.33 S
-2418.78 1716.79 2122.43 430.664 re
-S
-2864 1970 12 87 /7F
-$X
-J+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sW
-J+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sW
-J+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+.sWJ+*~>
-,
-2889 1970 1W ,
-2956 1967 52 68 /2Q
-$C
--,NABU'M_]E1I5/SN7pcD]t"F&8t?82m6$E-ia2]eL4NNJVK".$7$I"b&D$G$5/"++K-"VU';""
-%FrN2"G'sg93V7W$31$@IquEnXr(@ca/i;.>)'+,@6oL,@3>~>
-,
-3008 1967 6P ,
-3050 1967 2I ,
-3116 1970 1W ,
-3183 1967 7B ,
-3243 1967 59 68 /7J
-$C
-,fGl)Se,j,cu=W8:7VsBcA4(p#WG$RkrtT4qJZ"u=5LZHqYbp7$O4AtrujfqrVuQJlKc4Ydb<Qd
-[aNf4%4_i5@)6YZX&]t6@7(A1'U'.~>
-,
-3340 1967 1O ,
-3399 1970 36 87 /2U
-$C
-2$EsZs8W-!s8W-!s8W-!s8W-!s8V9"2uiJG:]LIprr*q"c>2k9iPE;~>
-,
-3473 1970 76 87 /7N
-$C
-4qs<8p!W0lV:,B:V>cfSYHF4!>qVK?>qbi]?g2[D?eS^WIaZqSp6O.a['l:dCQP<Km<@r@]CrjB
-^>Ek<g[4_3ID4TW\(g<DqgH39Dn"KgpA99Phf$!YmIpF*^>Ef~>
-,
-3553 1970 61 87 /2Y
-$C
-4pN20r.Q^%s8W-!s8W-!s8W-!s8W-!s8W-!s8W-!s8W,g~>
-,
-3620 1970 6H ,
-3646 1967 2E ,
-3721 1970 58 87 /0C
-$C
--D>qhs8W-!s8W-!s8W-!s,]1cs8W*B6GNR#s8W-!s8W+\=Z-6Z^]~>
-,
-3786 1967 2I ,
-3853 1967 7B ,
-3905 1967 6P ,
-3947 1967 1O ,
-4013 1970 36 65 /3C
-$C
-3"u>ls8W-!s8W-!s8W-!huA1UHf"LZ#7nZE6U@mT^AIB5*(,>c~>
-,
-4053 1944 54 89 /0G
-$C
-4=h%+4lQA.mRRJ8mr.*4qnE%'HLK>^TCi/]pI$G.Id6e.eb/Y%lMK2`pTLXd>M%`@Vu:O0qVIk#
-I6Y=Aol^.XlMgJ,rTgN]X8~>
-,
-2856 1829 2Q ,
-2916 1829 2M ,
-2983 1829 2E ,
-3050 1829 7B ,
-3110 1832 6T ,
-3136 1829 2I ,
-3203 1829 2Q ,
-3263 1829 2Q ,
-2065.03 1393.82 1414.97 322.97 1414.97 -322.97 S
-1003.81 855.516 2122.43 538.304 re
-S
-1349 1235 7F ,
-1374 1235 1W ,
-1441 1232 2Q ,
-1493 1232 6P ,
-1534 1232 2I ,
-1601 1235 1W ,
-1667 1232 7B ,
-1727 1232 7J ,
-1825 1232 1O ,
-1884 1235 2U ,
-1957 1232 78 91 /3G
-$C
-,/If')o3*1/dOF&cu>N\:(s?/-Lr&?F9iq>DLr>GI5aaih']%FIrq=TTAI0UIt#(XjNojOYQ+Y&
-s8UjRrSRR8YdaB"^Ugkg[[-f+]!f4CfLj%c$kfdPQ8iX0WsTc"'JQ2r8<@M8~>
-,
-2044 1232 1O ,
-2111 1235 1W ,
-2177 1232 1S ,
-2244 1232 2M ,
-2311 1235 6H ,
-2330 1232 6P ,
-2371 1232 71 91 /0K
-$C
-,@P,M.$.ic#TOuG#78b!l-TY>d/j?[#TKFhiAX@#h(MLNJ*ZKurI=kDNg4BPYcp_+6"HWDjA6a?
-BH#f\Pl[p0"'uO85c>A@)JTigUBhSGb7m>PPX/+s'a:^;f@M<W5QCELDsR@uIqrmP0XfEI$!8lc
-'l)5PX[<F4:gg+BBRg~>
-,
-2451 1232 7J ,
-2510 1232 6P ,
-2551 1232 2M ,
-2618 1209 60 91 /3K
-$C
-2A?,js8W-!s8V7ZGsF%!"6_o^kWYV7VhkQ>Jg#k&K6hH3VY'_'^9>8bht6sK\psb[s8W,tDSQ1_
-rH7#LFk:>EG*^`oA3n*>GVd1.Z!FNaCTt<aL(luY+@<j~>
-,
-1341 1091 2Q ,
-1401 1091 2M ,
-1467 1091 2E ,
-1534 1091 7B ,
-1594 1094 6T ,
-1621 1091 2I ,
-1687 1091 2Q ,
-1747 1091 2Q ,
-0.2 i
-1870.92 1075.76 m
--16.8 11.16 -18.92 31.44 -18.92 50.04 c
-0 17.64 4.23 35.4 18.68 46.56 c
--1.32 2.04 p
--3.12 -2.28 -6.36 -4.44 -9.36 -6.96 c
--12.48 -10.2 -18 -25.68 -18 -41.52 c
-0 -24.12 6.84 -39.24 27.48 -52.32 c
-h
-f*
-1877 1087 86 95 @C
-,
-44QZ?V^2?WOW\P3&29Uc1nb,<+OYomJqU+#"Vap'6?&k74Tl^sPG"7.3_@aq8:uu!Jo=W]C@t@o
-K\pR@dsQR,DdS"Fo`+sWFT;C@s8W-!CA%W,C\u^hpT:XdV>FtDDO106D/H+c-&/kF<Z"HFKWH":
-@]`!)eV+H"$5b0F;C3:>~>
-1978 1094 69 87 /0Q
-$C
--D9%R<*'<[LPNS%mib9u!s1G@_gT8t^AYeE^\7]bhu!H2J,fQ9s8W-!s8W-!l$ra5?XNh??%:<&
-9<VZg9<V!A\1],D^+3C(eeYJl/;%=A~>
-,
-2057 1094 6H ,
-2083 1091 2I ,
-2150 1094 6T ,
-2177 1091 1O ,
-2243 1068 56 91 /3Q
-$C
--,Cq4DZh%&FQ!I"SIf2t":md&kr5NhFJ$:N^Z0P;64]30NY$R\lmJ^/K_s.$3Tq%`2B[Y$V"En7
-H_p17]mmf#?iU0+s8W,.rkEgVhWoWmp8tHtC;U=2*sN+X>?b<9=CGWlL(Q$WOFk7~>
-,
-2341 1091 7B ,
-2401 1094 55 87 /0U
-$C
-3"UXos8W-!s8W-!s8W-!s8W-!s8W,rs8N&qm=+q:9+>jWj<3C,!?I6/g?j'q>VNZA\Yr7fs8W-!
-s8W,W~>
-,
-2467 1094 6H ,
-2494 1094 6T ,
-2521 1091 1S ,
-2616 1125.92 m
-0 15.96 -5.54 31.2 -18.48 41.52 c
--3 2.52 -6.24 4.68 -9.36 6.96 c
--1.32 -2.04 p
-14.64 -11.16 19.16 -28.92 19.16 -46.56 c
-0 -18.72 -2.41 -38.76 -19.4 -50.04 c
-1.44 -2.16 p
-20.64 13.08 27.96 28.2 27.96 52.32 c
-h
-f*
-2649 1094 2U ,
-2690 1091 1O ,
-2757 1094 3C ,
-1341 950 7B ,
-1401 950 1O ,
-1467 953 1W ,
-1534 950 1S ,
-1601 950 2M ,
-1667 953 6H ,
-1686 950 6P ,
-1758 950 7B ,
-1818 950 1O ,
-1885 953 1W ,
-1943 953 2U ,
-1985 953 6H ,
-2011 927 3Q ,
-2078 950 2M ,
-2145 953 3C ,
-2185 950 2I ,
-2244 950 6P ,
-2285 953 6H ,
-2312 950 1O ,
-2378 953 1W ,
-1 i
-2065.03 855.52 0 -215.33 S
-1357.57 101.88 1414.97 538.304 re
-S
-1718 478 7J ,
-1776 481 61 63 /3U
-$C
-4rfOcF_r_\f%jP'Xh(s->BOd8[d)RPD:Q"r];oXOG?-3i[=)5mWVU`83dCumX4"SgVknNS:J0p/
-Ss@j>2bU2tDO4Drh(GhoYQ~>
-,
-1844 478 7J ,
-1911 478 7B ,
-0.2 i
-2001.92 462.76 m
--16.8 11.16 -18.92 31.44 -18.92 50.04 c
-0 17.64 4.23 35.4 18.68 46.56 c
--1.32 2.04 p
--3.12 -2.28 -6.36 -4.44 -9.36 -6.96 c
--12.48 -10.2 -18 -25.68 -18 -41.52 c
-0 -24.12 6.84 -39.24 27.48 -52.32 c
-h
-f*
-2038 512.92 m
-0 15.96 -5.54 31.2 -18.48 41.52 c
--3 2.52 -6.24 4.68 -9.36 6.96 c
--1.32 -2.04 p
-14.64 -11.16 19.16 -28.92 19.16 -46.56 c
-0 -18.72 -2.41 -38.76 -19.4 -50.04 c
-1.44 -2.16 p
-20.64 13.08 27.96 28.2 27.96 52.32 c
-h
-f*
-2080 478 2Q ,
-2140 481 0U ,
-2206 478 1O ,
-2265 481 90 63 /0Y
-$C
-.KYlDpXO]kT@_nIrBJokOU%dj64a+nX4+7ZJ,d*k:;?Q'Id<fqs)7pC02;K?s7E\4hgaLtlV$X>
-rTjHiYIF3!rEcnshuA2Vl9;BN^KiM\s1MK@qgJ<@rr'V~>
-,
-2360 478 2Q ,
-1710 339 6P ,
-1751 342 0U ,
-1818 339 7J ,
-1916 339 7B ,
-1976 339 1O ,
-2043 342 1W ,
-2102 342 2U ,
-2143 342 6H ,
-2170 316 3Q ,
-1718 199 1S ,
-1784 202 6H ,
-1811 199 2I ,
-1878 202 6T ,
-1904 199 1O ,
-1971 176 3Q ,
-1 i
-3833.76 855.516 2122.43 538.304 re
-S
-4226 1231 7F ,
-4252 1231 1W ,
-4318 1228 2Q ,
-4370 1228 6P ,
-4412 1228 2I ,
-4478 1231 1W ,
-4545 1228 7B ,
-4605 1228 7J ,
-4703 1228 1O ,
-4761 1231 2U ,
-4835 1228 3G ,
-4922 1228 1O ,
-4989 1231 1W ,
-5055 1228 1S ,
-5122 1228 2M ,
-5189 1231 6H ,
-5207 1228 6P ,
-5241 1231 83 87 /3Y
-$C
-4rgSXFh7OZp%rOjp=IjnYH.P-='aGFYHQ\f<^3Y`?g>^2*gZ^#9)nUMs6V?:g/n;k0CH!Xh-GNA
-])QnqrOV=lFk:bcY3Q!L?eYM2p:L~>
-,
-5329 1228 7B ,
-5381 1228 6P ,
-5422 1231 6H ,
-5449 1228 1O ,
-5515 1231 1W ,
-4218 1090 2Q ,
-4278 1090 2M ,
-4345 1090 2E ,
-4412 1090 7B ,
-4472 1093 6T ,
-4498 1090 2I ,
-4565 1090 2Q ,
-4625 1090 2Q ,
-4708 1090 6P ,
-4750 1090 1O ,
-4849 1090 1S ,
-4916 1090 1O ,
-5007 1090 6P ,
-5048 1093 0U ,
-5115 1090 7J ,
-5213 1090 2I ,
-5280 1090 7B ,
-5332 1090 6P ,
-5373 1090 2M ,
-5440 1090 2I ,
-5507 1093 6T ,
-4218 953 2Q ,
-4278 930 0G ,
-4338 956 1W ,
-4405 953 7B ,
-4465 956 3C ,
-4505 953 1O ,
-4572 956 1W ,
-4638 956 6H ,
-4665 956 52 63 /1C
-$C
-,D)Qfr.c\<h7_\$]6<pqG4"&?mG#*ggUD(V]C+LeG43%dmG#ABgUAjDs8W,g~>
-,
-4725 953 2I ,
-4784 953 6P ,
-4825 956 6H ,
-4852 953 1O ,
-4918 956 1W ,
-4894.97 855.52 0 -215.33 S
-4187.46 101.88 1414.97 538.304 re
-S
-4488 407 7J ,
-4547 410 3U ,
-4615 407 7J ,
-4682 407 7B ,
-0.2 i
-4772.92 391.76 m
--16.8 11.16 -18.92 31.44 -18.92 50.04 c
-0 17.64 4.23 35.4 18.68 46.56 c
--1.32 2.04 p
--3.12 -2.28 -6.36 -4.44 -9.36 -6.96 c
--12.48 -10.2 -18 -25.68 -18 -41.52 c
-0 -24.12 6.84 -39.24 27.48 -52.32 c
-h
-f*
-4809 441.92 m
-0 15.96 -5.54 31.2 -18.48 41.52 c
--3 2.52 -6.24 4.68 -9.36 6.96 c
--1.32 -2.04 p
-14.64 -11.16 19.16 -28.92 19.16 -46.56 c
-0 -18.72 -2.41 -38.76 -19.4 -50.04 c
-1.44 -2.16 p
-20.64 13.08 27.96 28.2 27.96 52.32 c
-h
-f*
-4850 407 1S ,
-4917 407 1O ,
-4984 407 7J ,
-5050 407 2Q ,
-5134 407 6P ,
-5175 410 0U ,
-5242 407 7J ,
-4488 269 2Q ,
-4548 246 0G ,
-4608 272 1W ,
-4675 269 7B ,
-cleartomark end end pagesave restore showpage
-%%PageTrailer
-%%Trailer
-%%Pages: 1
diff --git a/kpilot/Documentation/ConduitProgrammingTutorial/Makefile b/kpilot/Documentation/ConduitProgrammingTutorial/Makefile
deleted file mode 100644
index 1dd8b068..00000000
--- a/kpilot/Documentation/ConduitProgrammingTutorial/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Makefile for the conduit programming tutorial
-
-# This will probably go horribly wrong because all of the
-# files have been reduced to just the sources, and so
-# pdflatex can't read the required embedded pdf / eps
-# pictures that should be created from the png's.
-
-
-all : index.dvi index.pdf
-
-
-
-# latex index && pdflatex index && latex2html -local_icons index && latex2rtf index && dvips index 
-#
-# We'll need to create the required pdf files in pictures/ as well.
-
-
-ConduitStructures.pdf : ConduitStructure.eps
-	epstopdf ConduitStructure.eps
-
-index.dvi : index.tex
-	latex index
-
-index.pdf : ConduitStructures.pdf index.tex index.dvi
-	pdflatex index
diff --git a/kpilot/Documentation/ConduitProgrammingTutorial/index.tex b/kpilot/Documentation/ConduitProgrammingTutorial/index.tex
deleted file mode 100644
index aed082ef..00000000
--- a/kpilot/Documentation/ConduitProgrammingTutorial/index.tex
+++ /dev/null
@@ -1,1708 +0,0 @@
-\documentclass[10pt,a4paper]{article}
-%\usepackage{hyperlatex}
-\usepackage{graphicx}
-\usepackage{listings}
-\usepackage{geometry}
-\usepackage{html}
-\usepackage{verbatim}
-
-\geometry{left=2.5cm, right=2.5cm, bottom=2cm, top=2cm}
-%\htmltitle{KPilot Conduits programming tutorial}
-%\htmladdress{\xlink{Reinhold Kainhofer}{mailto:reinhold@kainhofer.com}, 
-%\htmladdnormallink{http://reinhold.kainhofer.com}{http://reinhold.kainhofer.com/} \today}
-%\htmlattributes{BODY}{BGCOLOR=#ffffee text=#000000 link=#0000FF vlink=#000099 alink=#000099}
-
-
-%\setcounter{htmldepth}{2}
-%\setcounter{secnumdepth}{4}
-
-\title{KPilot conduit programming tutorial}
-\author{\htmladdnormallink{Reinhold Kainhofer}{mailto:reinhold@kainhofer.com}, with help of 
-\htmladdnormallink{A. de Groot}{mailto:groot@kde.org} and \htmladdnormallink{Dan Pilone}{mailto:pilone@slac.com}}
-\date{\today}
-
-%\W \newcommand{\texttrademark}{}
-\newcommand{\code}[1]{{\small\texttt{#1}}}
-\newcommand{\file}[1]{{\small\texttt{#1}}}
-\newcommand{\class}[1]{{\small\em\texttt{#1}}}
-
-\newcommand{\codesize}[0]{\scriptsize}
-
-\begin{document}
-
-\maketitle
-
-
-%\htmlmenu{3} 
-
-\tableofcontents 
-
-
-
-\section{Introduction and General}
-
-\subsection{Introduction}
-    One of the greatest assets of the handheld computers is their ability to
-interconnect with other applications.  KPilot supports this capability
-through conduits.  A conduit is a small separate program that talks to
-KPilot during the hot sync.  The conduit translates between the Palm
-Pilot and the application you're syncing with.
-
-For KPilot to be a really usable synchronization application, it depends
-on third-party developers to enlarge the conduit gallery to other applications. In particular, I want to encourage developers of Palm applications to provide not only a Windows\texttrademark conduit, but at the same time put some effort in providing also a conduit for Linux and other platforms.
-This is also the reason why I'm writing this tutorial: 
-To encourage third-party developers to write conduits for KPilot. 
-
-I will show the process at several examples: \\
-First, the general framework (library, factory etc.) for a conduit is presented 
-in section \ref{FactorySection}, then in section \ref{SetupSection}. 
-I will describe how you can write a configuration dialog for your conduit. These 
-two sections will use the malconduit (AvantGo conduit) as an example. 
-The synchronization part (the conduit class) will be described in the next few 
-sections. Section \ref{SectionSimpleConduit} will show a very simple 
-synchronization at the example of the AvantGo conduit, where we will use the 
-functions of an external library which will do the synchronization for us. 
-In section \ref{SectionDatabasesConduit} I will show a synchronization process 
-where one file on disk corresponds to one database on the palm, and where no conflict 
-resolution and no record comparison needs to be done, because we have to copy the 
-whole database either from or to the handheld. The particular example there will be the docconduit which 
-synchronizes text files on the harddisk with PalmDOC documents for AportisDoc, TealDoc, MobiPocket Reader, Gutenpalm etc. 
-on the Palm.
-Finally, I wanted to show an example of a record-based conduit, but then decided it 
-would be too extensive to replicate all the complex sync and conflict resolution code.
-Instead I refer to the addressbook conduit, which you should be able to understand 
-quite well after studying the other conduits explained in the previous chapters of this How-To.
-Using KDE's KitchenSync general synchronization framework for syncing will be the topic of section 
-\ref{SectionKitchenSync}, where I give some argument why we do not yet switch to kitchensync yet.
-
-\subsection{Further information and links}
-
-There are loads of information about the PalmOS\texttrademark Database format 
-out there:
-\begin{itemize}
-\item Palm's official Developer Knowledge Base document: \htmladdnormallink{http://oasis.palm.com/dev/kb/faq/FileFormat/PDB+PRCFormat.cfm}{http://oasis.palm.com/dev/kb/faq/FileFormat/PDB+PRCFormat.cfm}
-\item PilotRecord Databse format: \htmladdnormallink{http://www.pda-parade.com/prog/palm/doc/pdb.html}{http://www.pda-parade.com/prog/palm/doc/pdb.html}
-\item EBNF representation of the database format: \htmladdnormallink{http://obermuhlner.com/public/Projects/Palm/PDBC/Documentation/pdbc\_file.html}{http://obermuhlner.com/public/Projects/Palm/PDBC/Documentation/pdbc\_file.html}
-\item A list of several Palm databse formats: \htmladdnormallink{http://myfileformats.com/search.php?name=Palm}{http://myfileformats.com/search.php?name=Palm}
-\end{itemize}
-
-\subsection{Legal}
-You can skip this chapter if you are familiar with HOWTOs,
-or just hate to read all this assembly-unrelated crap.
-
-\subsubsection{Legal Blurb}
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU \htmladdnormallink{Free Documentation
-License}{http://www.gnu.org/copyleft/fdl.html}  Version 1.1;
-with no Invariant Sections, with no Front-Cover Texts, and no Back-Cover texts.
-A copy of the license is included in the \htmladdnormallink{Free Documentation
-License}{http://www.gnu.org/copyleft/fdl.html} appendix.
-
-
-The most recent official version of this document is available from
-\htmladdnormallink{my homepage}{http://reinhold.kainhofer.com/Linux/KPilot/ConduitTutorial}.
-If you are reading a few-months-old copy,
-consider checking the above URLs for a new version.
-
-
-
-\section{The general conduit framework}\label{FactorySection}
-
-\subsection{How conduits work in general}
-    KPilot is divided into three major components: the GUI, the
-syncing daemon, and the conduits.  When the GUI is started it attempts
-to make a connection to the syncing daemon.  If it can't it starts the
-daemon then makes the socket connection.  When the user hits the
-hot-sync button on the cradle the daemon checks to see if the GUI is
-connected.  If it is, the daemon notifies the GUI that a hot-sync has
-started.  The daemon then steps through all activated conduits and lets them
-do their sync. When the conduit is started it
-makes a connection back to the daemon and asks the daemon to read and
-write entries into the database.  When the conduit finishes it exits
-and the daemon continues on to the next conduit.  Once all the
-conduits have run the daemon alerts the GUI that it has
-finished and goes back to waiting for a sync to start. Note that the backup 
-of the Handheld is also done by a conduit, which is not visible to the user, though.
-
-
-    The basic conduit implements three important features:
-info/setup, backup, and normal hot-sync.  If the user clicks the setup 
-button in KPilot's conduit menu the conduit is started and requested
-to show a settings dialog.  If the conduit doesn't have any settings
-to adjust then it should simply display an about dialog.  When the
-dialog is closed the conduit will exit.  Next, if the user requested
-KPilot back up the pilot the conduit will be given the opportunity to
-grab everything off the pilot.  This is useful if this is the first
-time the conduit is being used.  For example if the user had never
-synced before this would be a good time to copy the data into the
-calendar, money database, etc.  Lastly, the conduit is requested to
-hot-sync whenever KPilot is hot-syncing with the pilot. 
-
-
-
-\subsection{A conduit is a KDE shared library}
-
-From your system's point of view, a conduit is a shared library which is loaded 
-on demand by KPilot. This means that as long as you don't do a sync, the conduit will not 
-be in memory. Once a hotsync is initiated, kpilotDaemon (the process running in 
-the background that does the actual sync) loads the conduit, let's say its name 
-is "malconduit" and it is installed as /opt/kde3/lib/kde3/libmalconduit.so. It 
-then calls the function \code{init\_libmalconduit} (the name after init\_ is the 
-filename of the library), which needs to return a pointer to an instance 
-of a \class{KLibFactory} subclass. 
-
-{\small\begin{verbatim}
-extern "C" {
-
-void *init_libmalconduit() {
-    return new MALConduitFactory;
-}
-
-};
-\end{verbatim}
-}
-
-Whenever the conduit needs to do some action 
-(show the configure dialog or do a sync), the \code{createObject(...)} method 
-of this instance is called with the appropriate values to specify the action. It either returns an instance 
-of a \class{ConduitConfig} subclass to show the configuration dialog, or an 
-instance of an \class{ConduitAction} subclass which will later do the actual sync 
-with the handheld. Figure \ref{ConduitStructure} shows this as a diagram:
-
-\begin{figure}
-\begin{center}
-\includegraphics[width=13cm]{ConduitStructure}
-\caption{The general structure of a conduit}\label{ConduitStructure}
-\end{center}
-\end{figure}
-
-
-\subsection{Makefile.am and KDE build process}
-
-Before we delve into programming details, let us look a bit at the compilation framework.
-
-If you develop your conduit inside the \file{kdepim/kpilot/conduits} directory of KDE's 
-CVS tree, all you need to do is to provide a Makefile.am in your conduit directory 
-(e.g. \file{kdepim/kpilot/conduits/malconduit}), and add the name of your 
-directory (\file{malconduit} in this example) to the variable \code{SUBDIRS} 
-in \file{kdepim/kpilot/conduits/Makefile.am}:
-{\small
-\begin{verbatim}
-SUBDIRS = knotes expense null vcalconduit \
-          popmail timeconduit malconduit
-\end{verbatim}
-}
-\vspace{1em}
-
-The \file{Makefile.am} in your conduit's directory will look similar to the following one 
-(taken from the malconduit). Since this is a tutorial on KPilot conduits, and not 
-on automake/conf, make and Makefiles, I will not explain it in detail. However, 
-it should be easy to adapt it to your conduit's needs:
-
-{\footnotesize
-\begin{verbatim}
-### Makefile for the AvantGo conduit
-###
-### The mal conduit is Copyright (C) 2002 by Reinhold Kainhofer
-
-
-INCLUDES= $(PISOCK_INCLUDE)  $(MAL_INCLUDE) \
-  -I$(top_srcdir)/kpilot/lib $(all_includes)
-METASOURCES = AUTO
-
-servicedir = $(kde_servicesdir)
-service_DATA = mal_conduit.desktop
-
-kde_module_LTLIBRARIES = libmalconduit.la
-
-libmalconduit_la_SOURCES = \
-        mal-factory.cc \
-        mal-setup.cc \
-        mal-conduit.cc \
-        mal-setup_dialog.ui
-libmalconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib
-libmalconduit_la_LIBADD = -lkpilot $(MAL_LIB)
-\end{verbatim}
-}
-
-Here is a short table of the variables used in \file{Makefile.am}:
-
-\begin{tabular}{ll}
-\code{service\_DATA} & name of the desktop file of your conduit \\
-        &(tells KDE which library it needs to load)\\
-\code{kde\_module\_LTLIBRARIES} & tell make which libraries to compile\\
-\code{libraryname\_SOURCES} & a list of all source files to be compiled into \\
-        &libraryname (where a . is replaced by a \_)\\
-\code{libraryname\_LDFLAGS} & linker flags when linking your conduit \\
-\code{libraryname\_LIBADD} & additional libraries the conduit links to \\
-        &(-lkpilot is the KPilot base library and\\
-        & needs to be linked to every conduit)
-\end{tabular}
-
-\vspace{0.5em}
-
-Both \code{MAL\_INCLUDE} and \code{MAL\_LIB} are special variables 
-pointing to the headers and the library of libmal, and are set by 
-\file{configure.in.in} (see below).
-
-\vspace{1em}
-
-If you have special library requirements (e.g. the malconduit needs libmal to work), 
-you need to add special configure checks to the autoconf file \file{kdepim/kpilot/conduits/configure.in.in} (for an 
-example, you should look at the checks the malconduit added to the file in CVS) 
-and include the directory only if the appropriate libraries and header files are installed. 
-One way to achieve this is to add the following line after your configure checks, which set 
-the variable \code{HAVE\_MAL} to \code{1}. This automake command in 
-\file{configure.in.in} defines "\code{include\_malconduit}" for use 
-in Makefile.am, if \code{HAVE\_MAL==1}:
-{\small\begin{verbatim}
-AM_CONDITIONAL(include_malconduit, test "$HAVE_MAL" = "1")
-\end{verbatim}
-}
-
-You can then use "\code{include\_malconduit}" in the KPilot conduit 
-directory's makefile \file{kdepim/kpilot/conduits/Makefile.am}:
-{\footnotesize
-\begin{verbatim}
-MALSUBDIR=
-if include_malconduit
-    MALSUBDIR = malconduit
-endif
-
-SUBDIRS = knotes expense null vcalconduit popmail timeconduit $(MALSUBDIR)
-\end{verbatim}
-}
-
-\subsection{The conduit factory}
-
-In KDE's dynamic library system, the library factory plays a crucial rule. The \code{init\_libraryname()} function 
-always returns a pointer to a \class{KLibFactory} instance. Whenever a program needs a special action by 
-the conduit, it calls the \code{createObject} of the \class{KLibFactory} to get an appropriate object.
-Furthermore, the conduit factory initializes the about dialog of the conduit. 
-
-The factories of all conduits are very similar, so you best just copy the .h and .cc file of an existing conduit 
-for your conduit. All you need to do is to change the copyright notices for the about dialog, and 
-change the class names of the \class{ConduitAction} and \class{ConduitSetup} to your own class names. Also, 
-the factory is a good place to define the strings for the config settings' entries to the config file.
-If you define them like:
-{\footnotesize\begin{verbatim}
-class MALConduitFactory : public KLibFactory
-{
-...
-public:
-    static const char *configSetting1() {return fConfigSetting1;};
-private:
-    static const char *fConfigSetting1;
-} ;
-\end{verbatim}
-}
-and in the .cc file
-{\small\begin{verbatim}
-const char*MALConduitFactory::fConfigSetting1="NameOfSetting";
-\end{verbatim}
-}
-you can use them as \code{MALConduitFactory::configSetting1()} in 
-both the configuration dialog and the sync routine without running the risk of misspelling
-them.
-
-Everything else in the factory can stay as it is.
-
-Here is an example of the malsync's factory:
-\begin{htmlonly}
-  \htmladdnormallink{Source code of mal-factory.h}{mal-factory.h}
-  \htmladdnormallink{Source code of mal-factory.cc}{mal-factory.cc}
-\end{htmlonly}
-
-
-\begin{latexonly}
-\subsubsection{mal-factory.h}
-{\scriptsize
- \verbatiminput{mal-factory.h}
-}
-\subsubsection{mal-factory.cc}
-{\scriptsize
- \verbatiminput{mal-factory.cc}
-}
-\end{latexonly}
-
-\subsection{Debugging conduits}
-
-Debugging KPilot conduits is not an easy task, as one cannot use a debugger 
-(because conduits are shared libraries and kpilotDaemon forks itself 
-in the background when it is started).
-
-So printing debug output is the only way to get any information about what 
-the conduit is doing. If you don't configure kdepim it with \code{--no-debug}, or don't add 
-\code{--NDEBUG} in Makefile.am, then you can easily print out debug messages
-using the \code{DEBUGCONDUIT} stream. However, at the beginning of each 
-function where you want to use it, you need to add the macro \code{FUNCTIONSETUP;}, 
-which prints out a debug message with the current function name. Additionally, 
-it sets several variables like \code{fname} which holds the name of the current function.
-
- As an example, the following code
-{\footnotesize\begin{verbatim}
-void YourConduit::somefunction() {
-    FUNCTIONSETUP;
-    int i=5;
-#ifdef DEBUG
-    DEBUGCONDUIT<<fname<<": Value of i="<<i<<endl;
-#endif
-}
-\end{verbatim}
-}
-prints out the following debug message to stdout:
-{\small\begin{verbatim}
-kpilotdaemon: somefunction: Value of i=5
-\end{verbatim}
-}
-
-
-
-\section{The Conduit Setup Dialog}\label{SetupSection}
-
-In this section I will shortly describe how you can implement a configuration dialog for your conduit. 
-There is nothing Palm- or KPilot-specific about this. All the configuration dialog does is to read the 
-configuration settings from the config file (using the \class{KConfig} class from kdelibs), and let 
-the user change them in the dialog. If the user exists the dialog by pressing OK, the new values are 
-read from the dialog controls and written back to the configuration file.
-
-To provide a consistent experience to KPilot users, there already 
-exists a class \class{ConduitConfig} which is a subclass of \class{KDialog}. 
-This dialog does most of the basic work for you.
-
-\subsection{The dialog template, using QT Designer}
-Of course, first we need to have a dialog template in the form of a QT 
-Designer file (which has an extension .ui). Start up \file{designer} and 
-create a new widget (no dialogbox, i.e. no OK or cancel buttons, these will be added automatically). The dialogbox should contain a QTabWidget, even if you only need one tab. A second tab "About" will be added more or less automatically by the conduit listing the copyright and the authors of your conduit. A typical example of the coknduit setup widget dialog is shown in the following screenshot:
-\includegraphics[width=14cm]{pictures/ProxyTab}
-
-
-\subsection{Using the dialog template for your conduit}
-
-Now that we have the dialog template, we can include it in the configuration dialog box. 
-First, create a subclass of \class{ConduitConfig}, where we only have to implement the con- and 
-destructor as well as the methods
-\begin{itemize}
-\item \code{virtual void readSettings()} 
-\item \code{virtual void commitChanges()}
-\end{itemize}
-This class \class{ConduitConfig} will do most of the work for us, all 
-that is left to us is to read the config settings from the config file 
-and set the values of the controls in the dialog (in the 
-\code{readSettings()} method). Also, when \code{commitChanges()} is 
-called, this means that the dialog was existed with the OK button, so 
-we need to read the new values from the controls and store them to the 
-configuration file.
-
-The whole class declaration is:
-{\footnotesize\begin{verbatim}
-class MALWidget;
-
-class MALWidgetSetup : public ConduitConfig 
-{
-Q_OBJECT
-public:
-    MALWidgetSetup(QWidget *,const char *,const QStringList &);
-    virtual ~MALWidgetSetup() {};
-    virtual void readSettings();
-protected:
-    virtual void commitChanges();
-private:
-    MALWidget *fConfigWidget;
-} ;
-\end{verbatim}
-}
-
-This class implements the dialog box itself, and our dialog template 
-will be inserted into this dialog by the constructor:
-{\footnotesize\begin{verbatim}
-MALWidgetSetup::MALWidgetSetup(QWidget *w, const char *n,
-    const QStringList & a) :
-    ConduitConfig(w,n,a)
-{
-    FUNCTIONSETUP;
-
-    fConfigWidget = new MALWidget(widget());
-    setTabWidget(fConfigWidget->tabWidget);
-    addAboutPage(false,MALConduitFactory::about());
-
-    fConfigWidget->tabWidget->adjustSize();
-    fConfigWidget->resize(fConfigWidget->tabWidget->size());
-}
-\end{verbatim}
-}
-
-The first two lines create an instance of our dialog template and add it 
-as the tab widget to the dialog. Since we will have to set and read the 
-values of the controls in that tab widget, we need to store a pointer to 
-the instance in the variable \code{fConfigWidget} which is of the same type 
-(\code{MALWidget}) we assigned to our dialog template in QT Designer. The 
-third line of code adds the about page (which is created by the factory, 
-see last section) to the tab widget, while the last two line just adjust 
-the size of the dialog box and are not always needed.
-
-As mentioned above, we only need to implement \code{MALWidgetSetup::readSettings()} 
-and \code{MALWidgetSetup::commitChanges()}. The \class{ConduitConfig} class 
-already stores an instance named fConfig to KPilot's configuration facility. 
-We only have to set the correct configuration group name (I suggest, you 
-store the name of the configuration group for you conduit in a \code{static 
-char*} variable of the conduit factory class), and then we can use the methods
-\begin{itemize}
-\item \code{fConfig->readNumEntry("entryname", \em{defaultNumericValue})}
-\item \code{fConfig->readEntry("entryname", \em{defaultstring})}
-\item \code{fConfig->readBoolEntry("entryname", \em{defaultBoolValue})}
-\end{itemize}
-to retrieve the settings from the configuration file. We then use the methods of the QT and KDE widgets to assign the text or value to the controls:
-
-{\footnotesize\begin{verbatim}
-/* virtual */ void MALWidgetSetup::readSettings()
-{
-    FUNCTIONSETUP;
-
-    if (!fConfig) return;
-    KConfigGroupSaver s(fConfig,MALConduitFactory::group());
-    
-    fConfigWidget->syncTime->setButton(fConfig->readNumEntry(MALConduitFactory::syncTime(), 0));
-    
-    // Proxy settings
-    fConfigWidget->proxyType->setButton(
-        fConfig->readNumEntry(MALConduitFactory::proxyType(), 0));
-    fConfigWidget->proxyServerName->setEditText(
-        fConfig->readEntry(MALConduitFactory::proxyServer(), ""));
-    int proxyPortNr=fConfig->readNumEntry(MALConduitFactory::proxyPort(), 0);
-    if (proxyPortNr>0 && proxyPortNr<65536) 
-    {
-        fConfigWidget->proxyCustomPortCheck->setChecked(true);
-        fConfigWidget->proxyCustomPort->setEnabled(true);
-        fConfigWidget->proxyCustomPort->setValue(proxyPortNr);
-    }
-    fConfigWidget->proxyUserName->setText(fConfig->readEntry(
-        MALConduitFactory::proxyUser(), ""));
-    fConfigWidget->proxyPassword->setText(fConfig->readEntry(
-        MALConduitFactory::proxyPassword(), ""));
-}
-\end{verbatim}
-}
-
-In this example, we don't store to the configuration file if a custom proxy port should be used. Instead, we just store a port number, and if the port number is 0 this means to use the default port. In this case, the custom port CheckBox needs to stay unchecked, and the port NumEntry control will stay disabled as it is in the dialog template. In all other cases, however, the custom port CheckBox should be checked, and the port NumEntry control will be enabled and filled with the correct custom port.
-
-
-The KPilot user can then change all the settings in the dialogbox without any intervention from KPilot, so we don't need to write any code for that. Only the \code{commitChanges()} method remains to be done, which does the opposite of the readSettings() method. It reads the values of the controls and stores them to the configuration file. The \class{KConfig} class (the \code{fConfig} variable, resp.) has only one method \code{KConfig::writeEntry("entryname", valueOfWhateverType)} to write a value to the configuration file. However, this method has several overloaded implementations so that you can write numeric, string, boolean, date and many more variable types with the same syntax. First, we need to set the correct configuration group again, and then we just read each of the settings and write it out immediately using the \code{writeEntry} method:
-
-{\footnotesize\begin{verbatim}
-/* virtual */ void MALWidgetSetup::commitChanges()
-{
-    FUNCTIONSETUP;
-
-    if (!fConfig) return;
-    KConfigGroupSaver s(fConfig,MALConduitFactory::group());
-    
-    fConfig->writeEntry(MALConduitFactory::syncTime(),
-        fConfigWidget->syncTime->id(fConfigWidget->syncTime->selected()));
-    
-    // Proxy settings
-    fConfig->writeEntry(MALConduitFactory::proxyType(),
-        fConfigWidget->proxyType->id(fConfigWidget->proxyType->selected()));
-    fConfig->writeEntry(MALConduitFactory::proxyServer(), 
-        fConfigWidget->proxyServerName->currentText() );
-
-    if (fConfigWidget->proxyCustomPortCheck->isChecked() ) 
-    {
-        fConfig->writeEntry(MALConduitFactory::proxyPort(), 
-            fConfigWidget->proxyCustomPort->value());
-    }
-    else 
-    {
-        fConfig->writeEntry(MALConduitFactory::proxyPort(), 0);
-    }
-    fConfig->writeEntry(MALConduitFactory::proxyUser(), 
-        fConfigWidget->proxyUserName->text() );
-    fConfig->writeEntry(MALConduitFactory::proxyPassword(), 
-        fConfigWidget->proxyPassword->text() );
-}
-\end{verbatim}
-}
-
-This was all that is needed to implement the configuration for your conduit. Simple, isn't it?
-
-
-
-\section{How the conduits work}
-
-    First a little background on pilot databases would be useful.
-Each database on the pilot is divided into multiple records.  Each
-record is a specific entry into the database.  For example, one
-address in the Address Book corresponds to one record in AddressDB.
-Each record has a unique id assigned by the pilot when the record is
-created, and an index number in the database.  The index numbers get
-reused, for example if you delete the second record from the database
-then create a new one it will fill in the empty slot and become index
-number two.  However, it will have a unique ID number.  (The moral of
-this story is only use index numbers when you need to iterate through
-the whole Database, otherwise use the unique record id.)
-
-    When a new record is created by the user on the local side, it 
-is inserted into the backed up copy of the databases but given a
-unique ID of 0.  When the syncing occurs this record is installed on
-the pilot and the pilot will return with the new unique id for it.
-This same process happens with a conduit.  If two records have the
-same unique id they will overwrite each other.
-
-    Lastly, the conduit is requested to
-hot-sync whenever KPilot is hot-syncing with the pilot.  During this
-time the conduit asks KPilot if there are any modified records on the
-pilot and should back them up into the program the conduit syncs
-with.   Then, the conduit checks to see if there are any locally
-modified records and asks KPilot to put those on the pilot.  Once
-finished, it exits gracefully by a 
-{\small\begin{verbatim}
-emit syncDone();
-\end{verbatim}
-}
-and KPilot will continue with the next conduit.
-
-In the next few sections I will present the most important classes KPilot provides to the conduit programmers, and after that I will show several examples of different conduits.
-
-
-\subsection{The \class{SyncAction} base class for conduits}
-
-All conduits are subclasses of \class{SyncAction}, which provides the following methods. The \code{exec} method is a pure virtual function and needs to be implemented by each conduit:
-
-\begin{itemize}
-\item
-    \code{virtual bool exec()=0} ... This function starts the actual processing done
-     by the conduit. It should return false if the
-     processing cannot be initiated, f.ex. because 
-     some parameters were not set or a needed library
-     is missing. This will be reported to the user.
-     It should return true if processing is started
-     normally. If processing starts normally, it is
-     the {\bf conduit's} responsibility to eventually
-     \code{emit syncDone();} if processing does not start
-     normally (ie. \code{exec()} returns false) then the
-     environment will deal with \code{syncDone()}.
-
-\item
-    \code{void addSyncLogEntry(const QString \&e,bool suppress=false)} ... Write a log entry to the pilot. Causes signal \code{logEntry(const char *)} to be emitted.
-\item
-    \code{int pilotSocket()}\qquad ... returns the pilot socket (needed if you use your own functions to talk to the handheld. This is not recommended, but necessary in some cases)
-\item
-    \code{int openConduit()}\qquad ... Notify the handheld which conduit is running now.
-\end{itemize}
-
-In addition to these functions the class also has some signals you can emit to display log messages and to indicate that the conduit has finished and KPilot should go on with the next conduit:\
-
-\begin{itemize}
-\item \code{void syncDone(SyncAction *)} ... tell KPilot that the conduit has finished. Every conduit that returns true in its \code{exec()} method needs to emit this signal, otherwise KPilot will wait forever for the conduit to return.
-
-\item \code{void logMessage(const QString \&)} ... Adds a message to KPilot's log, but not to the handheld's log.
-\item \code{void logError(const QString \&)} ... Adds an error message to KPilot's log
-\item \code{void logProgress(const QString \&,int)} ... Adds a log message and sets the progress bar to the given percentage.
-\end{itemize}
-
-
-If your conduit will have to ask the user some question, the handheld needs to be tickled to prevent a timeout while the message box or dialog window is shown. The \class{InteractiveAction} class (which is a subclass of \class{SyncAction}) can be used as a base class for your conduit in this case. Call \code{startTickle()} some time before showing a dialog to the user (we're assuming a local event loop here) so that while the dialog is up and the user is thinking, the pilot stays awake. Afterwards, call \code{stopTickle()}. The parameter to \code{startTickle} indicates the timeout, in seconds, before signal timeout is emitted. You can connect to that signal, to take down the user interface part if the user isn't reacting.
-In addition to \class{SyncAction}'s methods it adds the following methods:
-
-\begin{itemize}
-\item\code{void tickle()} ... Tickles the handheld to reset the timeout counter.
-\item \code{void startTickle(unsigned count=0)} ... start a timer to tickle 
-the handheld in regular intervals
-\item \code{void stopTickle()} ... stop the timer
-
-\item\code{int questionYesNo(const QString \&question ,
-        const QString \&caption = QString::null,
-        const QString \&key = QString::null,
-        unsigned timeout = 20000)} ... Ask a yes-no question of the user. 
-        This has a timeout so that you don't wait forever for inattentive users. 
-        It's much like \code{KMessageBox::questionYesNo()}, but with this extra 
-        timeout-on-no-answer feature. Returns a \code{KDialogBase::ButtonCode} 
-        value - Yes,No or Cancel on timeout. If there is a key set and the user 
-        indicates not to ask again, the selected answer (Yes or No) is 
-        remembered for future reference.
-\end{itemize}
-
-
-For conduits that sync one specific database (e.g. "AddressDB" or "TodoDB"), 
-there is the class \class{ConduitAction}, which is a child class of 
-\class{SyncAction}, and adds the following methods and members:
-
-\begin{itemize}
-\item\code{PilotDatabase *fDatabase,*fLocalDatabase;} ... Pointers to the 
-database on the handheld and the backup database on the harddisk. These are 
-set by openDatabases.
-\item\code{bool openDatabases(const char *dbName, bool*retrieved=0L)} ... 
-opens the database named \code{dbName} on the handheld and the backup database 
-on the harddisk (in the directory \file{\$KDEHOME/share/apps/kpilot/DBBackup/PalmUserName/}). 
-If the backup database does not exist, the current database from the palm is 
-fetched, and \code{*retrieved} is set to \code{true}.
-\end{itemize} 
-
-
-\subsection{The \class{KPilotDeviceLink} class for communicating with the handheld}
-For the communication with the handheld KPilot has a class 
-\class{KPilotDeviceLink}, and the ConduitAction class always stores an 
-instance of \class{KPilotDeviceLink} pointing to the current connection 
-in a variable called \code{fHandle}. The following list shows all members 
-of this class that you might need in your conduit:
-
-\begin{itemize}
-\item
-    \code{int getNextDatabase(int index,struct DBInfo *)}\qquad ... Returns 
-    the database at position index and stores its information to the DBInfo 
-     variable, which can then be used in other functions.
-\item
-    \code{int findDatabase(char*name, struct DBInfo*)}\qquad ... Finds a 
-    database with a given name like "AddressDB" and stores its information 
-    to the \code{DBInfo} variable, which can then be used in other functions.
-
-\item
-    \code{bool retrieveDatabase(const QString \&path, struct DBInfo *db)}
-    \qquad ... Retrieve the database indicated by \code{DBInfo *db} into 
-    the local file path.
-
-
-\item
-    \code{bool installFile(const QString \&, bool deleteFile=true)}\qquad ... Installs the .prc 
-    or .pdb database from the PC to the handheld. Returns true on success.
-    If deleteFile is set true or left out, the local file is deleted after successful installation.
-\item
-    \code{int installFiles(const QStringList \&, bool deleteFiles=true)}\qquad ... Installs 
-    several .prc or .pdb databases from the PC to the handheld. Returns 
-    the number of successfully installed databases. If deleteFiles is set true 
-    or left out, the local files are deleted after successful installation.
-
-
-
-\item
-    \code{static KPilotDeviceLink *link()}\qquad ... returns the current 
-    connection (only one can be open at the same time)
-
-\item
-    \code{void tickle()}\qquad ... Tickle the palm to reset the timeout. 
-    This is needed if you need to do a lengthy calculation or display a 
-    dialogbox where the user might not respond immediately.
-
-\item
-    \code{KPilotUser *getPilotUser()}\qquad ... Returns the user 
-    information as set on the handheld.
-
-
-\item
-    \code{QDateTime getTime()}\qquad ... Get the time from the handheld 
-    device into a \class{QDateTime}
-\item
-    \code{bool setTime(const time\_t \&pctime)}\qquad ... Set the time 
-    on the handheld to the give \code{time\_t} (\class{QDateTime} didn't 
-    work for me, so I implemented it with \code{time\_t})
-
-
-\item
-    \code{unsigned long ROMversion()}\qquad ... Get the version number 
-    from the handheld
-\item
-    \code{unsigned long majorVersion()}\qquad ... Get the major PalmOS 
-    version number (e.g. 3 for PalmOS 3.0 and 3.5, 4 for PalmOS 4.x etc.)
-
-\end{itemize}
-
-If you want to modify a database on the handheld, you can work with a 
-PilotDatabase instance (see next subsection), which does all the 
-communication for you.
-
-
-
-\subsection{The \class{PilotDatabase} classes for working with databases}
-KPilot's class library knows two types of databases: local databases from 
-a .pdb file on your PC's harddisk, and serial databases on a PalmOS device 
-connected through a serial or USB cable. To work with a database, you just 
-create an instance of either a \class{PilotLocalDatabase} or a 
-\class{PilotSerialDatabase}, both of which are derived from 
-\class{PilotDatabase}. This base class has the following important members:
-
-\begin{itemize}
-\item\code{virtual int recordCount()} ... returns the number of records 
-in the database
-\item\code{virtual QValueList<recordid\_t> idList()} ... Returns a list 
-of all record ids in the database.
-\item\code{virtual PilotRecord* readRecordById(recordid\_t id)} ... Reads 
-a record from database by id.
-\item\code{virtual PilotRecord* readRecordByIndex(int index)} ... Reads a 
-record from database.
-\item\code{virtual PilotRecord* readNextRecInCategory(int category)} ... 
-Reads the next record from database in category 'category'
-\item\code{virtual PilotRecord* readNextModifiedRec()} ... Reads the next 
-record from database that has the dirty flag set.
-\item\code{virtual recordid\_t writeRecord(PilotRecord* newRecord)} ... Writes 
-a new record to database (if 'id' == 0 for a serial database, one will be 
-assigned to newRecord)
-\item\code{virtual int resetSyncFlags()} ... Resets all records in the 
-database to not dirty.
-\item\code{virtual int resetDBIndex()} ... Resets next record index to beginning
-\item\code{virtual int cleanup()} ... Purges all Archived/Deleted records 
-from Palm Pilot database
-\item\code{bool isOpen()} ... Returns false if the database could not be 
-opened, e.g. no connection to the handheld or file could not be created.
-\item\code{virtual QString dbPathName()} ... Returns some sensible human-readable 
-identifier for the database. Serial databases get Pilot:, local databases 
-return the full path.
-\item\code{virtual int readAppBlock(unsigned char* buffer, int maxLen)} ... 
-Reads the application block info, returns size.
-\item\code{virtual int writeAppBlock(unsigned char* buffer, int len)} ... 
-Writes the application block info.
-\end{itemize}
-
-
-The constructors of \class{PilotLocalDatabase} and \class{PilotSerialDatabase} are:
-\begin{itemize}
-\item\code{PilotSerialDatabase(int linksocket, const char* dbName)} ... linksocket
-\item\code{PilotLocalDatabase( const QString\& path, const QString\& name)}
-\item\code{PilotLocalDatabase(const QString \&name)} ... open database by name only
-(no explicit path). The path \file{\$KDEHOME/share/apps/kpilot/DBBackup/PalmUserName/} 
-is set by KPilot automatically.
-\end{itemize}
-
-
-
-\subsection{The \class{PilotRecord} classes for working with records}
-
-Each database consists of several database records, so we also need a 
-class \class{PilotRecord} to work with records. A PilotRecord is just 
-a long string of binary data, without any meaning so far. You will 
-have to implement your own classes that take the data from the record 
-and turn it into usable values (use the database format specification 
-for the database you are working with). The class \class{PilotAppCategory} 
-can be used as base class for this, and the \code{pack()} method packs 
-the human-readable variable values into one whole binary string that 
-is then sent to the handheld as the data of the record. Usually you 
-don't create an instance of \class{PilotRecord} yourself, but either 
-get a \code{PilotRecord*} from one of the methods of the \class{PilotDatabase} 
-class, or you pack your own subclass of \class{PilotAppCategory} (e.g. 
-PilotTodoEntry, PilotAddress, PilotDateEntry) with a call to \code{pack()}.
-
-The \class{PilotRecord} class has the following important methods:
-
-\begin{itemize}
-\item\code{char* getData()} ... gets the binary data directly from the 
-database. You need to "unpack" the data yourself.
-\item\code{void setData(const char* data, int len)} ... sets the packed 
-binary data of the record.
-\item\code{int   getLen()} ... Returns the length of the record data.
-\item\code{int   getAttrib(} ... Returns the attributes of the record 
-(e.g. modified, archived, deleted, secret etc.). For possible values 
-see the pilot-link header files.
-\item\code{void  setAttrib(int attrib)} ... Sets the record attributes.
-
-\item\code{int   getCat()} ... Returns the category of the record (0-15). 
-The names of the categories are stored in the database's header.
-\item\code{void  setCat(int cat)} ... Sets the category of the record. 
-\code{cat} needs to be in the range 0-15.
-
-\item\code{unsigned long getID()} ... Returns the unique record ID.
-\item\code{void setID(unsigned long id)} ... Sets the record ID. If you 
-already have a record with that ID, it will be overwritten!
-
-\item\code{bool isDeleted()} ... Self-explaining
-\item\code{bool isSecret()} ... Self-explaining
-\item\code{bool isArchived()} ... Self-explaining
-\item\code{void makeDeleted()} ... Self-explaining
-\item\code{void makeSecret()} ... Self-explaining
-\end{itemize}
-
-
-
-
-\section{A very simple conduit: malconduit}\label{SectionSimpleConduit}
-
-To have a working conduit, we still have to implement the synchronization 
-itself. For the AvantGo conduit there already exists a library named 
-"libmal" which does all the synchronization for us. In the section on 
-autoconf and automake I already described the configure commands to check 
-for the library and to link to the library on runtime (the \code{-lmal} 
-flag stored in the variable \code{\$(MAL\_LIB)} ).
-
-When using the libmal library, all we have to do is to make some proxy settings, and then call the function \texttt{malsync( pilotSocket(), pInfo);}, which will do the actual sync for us:
-{\footnotesize
-\begin{verbatim}
-void MALConduit::readConfig() {
-  FUNCTIONSETUP;
-  QDateTime dt;
-  KConfigGroupSaver g(fConfig, MALConduitFactory::group());
-  fLastSync = fConfig->readDateTimeEntry(MALConduitFactory::lastSync(), &dt);
-  DEBUGCONDUIT<<"Last sync was "<<fLastSync.toString()<<endl;
-
-  eSyncTime=fConfig->readNumEntry(MALConduitFactory::syncTime(), 0);
-  
-  // Proxy settings
-  eProxyType=fConfig->readNumEntry(MALConduitFactory::proxyType(), 0);
-  fProxyServer=fConfig->readEntry(MALConduitFactory::proxyServer(), "");
-
-  fProxyPort=fConfig->readNumEntry(MALConduitFactory::proxyPort(), 0);
-  fProxyUser=fConfig->readEntry(MALConduitFactory::proxyUser(), "");
-  fProxyPassword=fConfig->readEntry(MALConduitFactory::proxyPassword(), "");
-}
-
-
-
-void MALConduit::saveConfig() {
-  FUNCTIONSETUP;
-  KConfigGroupSaver g(fConfig, MALConduitFactory::group());
-  fConfig->writeEntry(MALConduitFactory::lastSync(), QDateTime::currentDateTime());
-}
-
-
-
-bool MALConduit::skip() {
-  QDateTime now=QDateTime::currentDateTime();
-  if (!fLastSync.isValid() || !now.isValid()) return false;
-
-  switch (eSyncTime) {
-    case eEveryHour:
-        if ( (fLastSync.secsTo(now)<=3600) && (fLastSync.time().hour()==now.time().hour()) ) return true;
-        else return false;
-    case eEveryDay:
-        if ( fLastSync.date() == now.date() ) return true;
-        else return false;
-    case eEveryWeek:
-        if ( (fLastSync.daysTo(now)<=7)  && ( fLastSync.date().dayOfWeek()<=now.date().dayOfWeek()) ) return true;
-        else return false;
-    case eEveryMonth:
-        if ( (fLastSync.daysTo(now)<=31) && (fLastSync.date().month()==now.date().month()) ) return true;
-        else return false;
-    case eEverySync:
-    default:
-        return false;
-  }
-  return false;
-}
-
-
-
-/* virtual */ bool MALConduit::exec() {
-  FUNCTIONSETUP;
-
-  if (!fConfig) {
-    kdWarning() << k_funcinfo << ": No config file was set!" << endl;
-    return false;
-  }
-
-  readConfig();
-  
-  if (skip())  {
-    emit logMessage(i18n("Skipping MAL sync, because last synchronization was not long enough ago."));
-    emit syncDone(this);
-    return true;
-  }
-  
-  // Set all proxy settings
-  switch (eProxyType) {
-    case eProxyHTTP:
-        if (fProxyServer.isEmpty()) break;
-        setHttpProxy(fProxyServer.latin1());
-        if (fProxyPort>0 && fProxyPort<65536) setHttpProxyPort( fProxyPort );
-        else setHttpProxyPort(80);
-      
-        if (!fProxyUser.isEmpty()) {
-          setProxyUsername( fProxyUser.latin1() );
-          if (!fProxyPassword.isEmpty()) setProxyPassword( fProxyPassword.latin1() );
-        }
-        break;
-    case eProxySOCKS:
-        setSocksProxy( fProxyServer.latin1() );
-        if (fProxyPort>0 && fProxyPort<65536) setSocksProxyPort( fProxyPort );
-        else setSocksProxyPort(1080);
-        break; 
-    default:
-        break;
-  }
-
-
-  // Now initiate the sync.
-  PalmSyncInfo* pInfo=syncInfoNew();
-  if (!pInfo) {
-    kdWarning() << k_funcinfo << ": Could not allocate SyncInfo!" << endl;
-    emit logError(i18n("MAL synchronization failed (no SyncInfo)."));
-    return false;
-  }
-  malsync( pilotSocket(), pInfo);
-  syncInfoFree(pInfo);
-
-  saveConfig();
-  emit syncDone(this);
-  return true;
-}
-
-\end{verbatim}
-}
-
-When you use an external library to do the sync, the external functions need a reference to the current connection to the handheld. In the pilot-link library, which is the base for all of KPilot's communication with the handheld, this is implemented via an integer identifier, which can be obtained by the function \texttt{pilotSocket()} of the SyncAction class.
-
-The libmal also needs some internal data structed "PalmSyncInfo", which is obtained by its own syncInfoNew() function, but this part is libmal-specific.
-
-Another issue is how to propagate log messages from the external library to KPilot's log window. SyncAction provides slots logError, logMessage and logProgress to put messages into KPilot's sync log. All you have to do is to call
-\begin{verbatim}
-emit logMessage(i18n("My own log message"));
-\end{verbatim}
-
-The problem with these slots is that they are Qt-specific, while most libraries are written in C, and expect a hook function that will be called whenever a message needs to be written out. Unfortunately you cannot pass a member of your SyncAction-derived class, either, so the way out is to store a pointer to the current conduit instance (only one will be active at any time, anyway) in a static variable, and call the member method from this pointer:
-
-{\footnotesize
-\begin{verbatim}
-// static pointer to the current conduit instance
-static MALConduit *conduitInstance=0L;
-
-// The hook function which will be called by the library
-int malconduit_logf(const char *format, ...) {
-  FUNCTIONSETUP;
-  va_list val;
-  int rval;
-  va_start(val, format);
-#define WRITE_MAX_BUF  4096
-  char msg[WRITE_MAX_BUF];
-  msg[0]='\0';
-  rval=vsnprintf(&msg[0], sizeof(msg), format, val);
-  va_end(val);
-  if (rval == -1) {
-    msg[WRITE_MAX_BUF-1] = '\0';
-    rval=WRITE_MAX_BUF-1;
-  }
-  if (conduitInstance) {
-    conduitInstance->printLogMessage(msg);
-  } else {
-    // write out to stderr
-    kdWarning()<<msg<<endl;
-  }
-  return rval;
-}
-
-void MALConduit::printLogMessage(QString msg) {
-  FUNCTIONSETUP;
-  emit logMessage(msg);
-}
-
-// Here we have to set the hooks for libmal to call.
-MALConduit::MALConduit(KPilotDeviceLink * o,
-  const char *n, 
-  const QStringList & a) :
-  ConduitAction(o, n, a)
-{
-  FUNCTIONSETUP;
-  register_printStatusHook(malconduit_logf);
-  register_printErrorHook(malconduit_logf);
-  conduitInstance=this;
-  (void) MAL_conduit_id;
-}
-\end{verbatim}
-}
-
-
-
-\section{A per-file conduit: docconduit}\label{SectionDatabasesConduit}
-
-The PalmDoc conduit of KPilot takes a directory of text files and synchronized them with PalmDOC databases on the handheld. These PalmDOC documents can be read with AportisDoc, TealReader, and modified with applications like QED. Optionally, the conduit can also keep local copies of the pdb handheld databases in a local directory.
-
-The conduit just needs to find out if a document has changed either on the handheld or on the pc (or on both sides), and then copy the text either to or from the handheld. The docconduit has a class \class{DOCConverter} which does the actual conversion. You only have to set the local path to the text file, and give a pointer to an opened \class{PilotDatabase} (either \class{PilotLocalDatabase} or \class{PilotSerialDatabase}), and then call 
-\code{docconverter.convertPDBtoDOC();} or \code{docconverter.convertDOCtoPDB();}. I will not explain this class here, but rather the algorithm to determine the sync direction and the actual calls of the DOCConverter. 
-
-The conduit has to find out 
-\begin{itemize}
-\item which PalmDoc databases on the handheld have been changed or edited (using the modified flag of the records inside the database)
-\item which text files on disk have changed (using an md5 checksum on the text)
-\item if a local copy is kept, if the local copy of a database has been changed or added (again using the modified flat of the records inside the database).
-\end{itemize}
-
-To assure a responsive user interface, we will once again use \texttt{QTimer::singleShot(this, 0, SLOT(whatever()));} for each of these steps.
-
-The \code{DOCConduit::exec()} function is just the entry point and calls syncNextDB, which will go through all PalmDOC databases on the handheld and determine if any of them has been changed:
-
-{\footnotesize
-\begin{verbatim}
-/* virtual */ bool DOCConduit::exec() {
-  FUNCTIONSETUP;
-  readConfig();
-  dbnr=0;
-  QTimer::singleShot(0, this, SLOT(syncNextDB()));
-  return true;
-}
-\end{verbatim}
-}
-
-
-
-syncNextDB then walks through all PalmDoc databases on the handheld and decides if they are supposed to be synced to the PC. The function needsSync (which we will describe later), checks which files have actually changed or were added or deleted and so determines the sync direction. The docSyncInfo is just an internal structure to store all information about the text:
-
-{\footnotesize
-\begin{verbatim}
-void DOCConduit::syncNextDB() {
-  FUNCTIONSETUP;
-  DBInfo dbinfo;
-
-  if (eSyncDirection==eSyncPCToPDA || fHandle->findDatabase(NULL, &dbinfo, dbnr, dbtype(), dbcreator() /*, cardno */ ) < 0) {
-    // no more databases available, so check for PC->Palm sync
-    QTimer::singleShot(0, this, SLOT(syncNextDOC()));
-    return;
-  }
-  dbnr=dbinfo.index+1;
-  DEBUGCONDUIT<<"Next Palm database to sync: "<<dbinfo.name<<", Index="<<dbinfo.index<<endl;
-
-  // if creator and/or type don't match, go to next db
-  if (!isCorrectDBTypeCreator(dbinfo) || fDBNames.contains(dbinfo.name)) {
-    QTimer::singleShot(0, this, SLOT(syncNextDB()));
-    return;
-  }
-
-  QString docfilename=constructDOCFileName(dbinfo.name);
-  QString pdbfilename=constructPDBFileName(dbinfo.name);
-
-  docSyncInfo syncInfo(dbinfo.name, docfilename, pdbfilename, eSyncNone);
-  syncInfo.dbinfo=dbinfo;
-  needsSync(syncInfo);
-  fSyncInfoList.append(syncInfo);
-  fDBNames.append(dbinfo.name);
-  
-  QTimer::singleShot(0, this, SLOT(syncNextDB()));
-  return;
-}
-\end{verbatim}
-}
-
-To go through all .txt files on disk, we use a QStringList::Iterator, again set the fields of the docSyncInfo for each text, and call \code{needsSync} to do the actual comparison of the local and handheld text to the versions of the previous sync. If a local copy of the pdb files should be kept, we proceed similar using the slot \code{checkPDBFiles}:
-
-{\footnotesize
-\begin{verbatim}
-void DOCConduit::syncNextDOC() {
-  FUNCTIONSETUP;
-  
-  if (eSyncDirection==eSyncPDAToPC  ) {
-    // We don't sync from PC to PDB, so start the conflict resolution and then the actual sync process
-    docnames.clear();
-    QTimer::singleShot(0, this, SLOT(checkPDBFiles()));
-    return;
-  }
-  
-  // if docnames isn't initialized, get a list of all *.txt files in fDOCDir
-  if (docnames.isEmpty()/* || dociterator==docnames.end() */) {
-    docnames=QDir(fDOCDir, "*.txt").entryList() ;
-    dociterator=docnames.begin();
-  }
-  if (dociterator==docnames.end()) {
-    // no more databases available, so start the conflict resolution and then the actual sync proces
-    docnames.clear();
-    QTimer::singleShot(0, this, SLOT(checkPDBFiles()));
-    return;
-  }
-
-  QString fn=(*dociterator);
-
-  QDir dr(fDOCDir);
-  QFileInfo fl(dr, fn );
-  QString docfilename=fl.absFilePath();
-  QString pdbfilename;
-  dociterator++;
-  
-  DBInfo dbinfo;
-  // Include all "extensions" except the last. This allows full stops inside the database name (e.g. abbreviations)
-  // first fill everything with 0, so we won't have a buffer overflow.
-  memset(&dbinfo.name[0], 0, 33);
-  strncpy(&dbinfo.name[0], fl.baseName(TRUE), 30);
-
-  bool alreadySynced=fDBNames.contains(dbinfo.name);
-  if (!alreadySynced) {
-    docSyncInfo syncInfo(dbinfo.name, docfilename, pdbfilename, eSyncNone);
-    syncInfo.dbinfo=dbinfo;
-    needsSync(syncInfo);
-    fSyncInfoList.append(syncInfo);
-    fDBNames.append(dbinfo.name);
-  }
-  
-  QTimer::singleShot(0, this, SLOT(syncNextDOC()));
-  return;
-}
-
-
-/** This slot will only be used if fKeepPDBLocally to check if new doc databases have been copied to the pdb directory.
- *  If so, install it to the handheld and sync it to the PC */
-void DOCConduit::checkPDBFiles() {
-  FUNCTIONSETUP;
-  
-  if (fLocalSync || !fKeepPDBLocally || eSyncDirection==eSyncPCToPDA )
-  {
-    // no more databases available, so check for PC->Palm sync
-    QTimer::singleShot(0, this, SLOT(resolve()));
-    return;
-  }
-  
-  // Walk through all files in the pdb directory and check if it has already been synced.
-  // if docnames isn't initialized, get a list of all *.pdb files in fPDBDir
-  if (docnames.isEmpty()/* || dociterator==docnames.end() */) {
-    docnames=QDir(fPDBDir, "*.pdb").entryList() ;
-    dociterator=docnames.begin();
-  }
-  if (dociterator==docnames.end()) {
-    // no more databases available, so start the conflict resolution and then the actual sync proces
-    docnames.clear();
-    QTimer::singleShot(0, this, SLOT(resolve()));
-    return;
-  }
-
-  QString fn=(*dociterator);
-
-  QDir dr(fPDBDir);
-  QFileInfo fl(dr, fn );
-  QString pdbfilename=fl.absFilePath();
-  dociterator++;
-  
-  //  Get the doc title and check if it has already been synced (in the synced docs list of in fDBNames to be synced)
-  // If the doc title doesn't appear in either list, install it to the Handheld, and add it to the list of dbs to be synced.
-  QString dbname=fl.baseName(TRUE).left(30);
-  if (!fDBNames.contains(dbname) && !fDBListSynced.contains(dbname)) {
-    if (fHandle->installFiles(pdbfilename )) {
-      DBInfo dbinfo;
-      // Include all "extensions" except the last. This allows full stops inside the database name (e.g. abbreviations)
-      // first fill everything with 0, so we won't have a buffer overflow.
-      memset(&dbinfo.name[0], 0, 33);
-      strncpy(&dbinfo.name[0], dbname, 30);
-
-      docSyncInfo syncInfo(dbinfo.name, constructDOCFileName(dbname), pdbfilename, eSyncNone);
-      syncInfo.dbinfo=dbinfo;
-      needsSync(syncInfo);
-      fSyncInfoList.append(syncInfo);
-      fDBNames.append(dbinfo.name);
-    } else {
-      DEBUGCONDUIT<<"Could not install database "<<dbname<<" ("<<pdbfilename<<") to the handheld"<<endl;
-    }
-  }
-  
-  QTimer::singleShot(0, this, SLOT(checkPDBFiles()));
-}
-\end{verbatim}
-}
-
-After all databases have been identified, we possibly need to do some conflict resolution in the slot \code{resolve()}. The conflict resolution dialog just displays the list of databases and lets the user choose the sync direction for each database. When the user presses Ok, the direction field of each docSyncInfo object is set to the chosen value.
-
-{\footnotesize
-\begin{verbatim}
-void DOCConduit::resolve() {
-  FUNCTIONSETUP;
-  
-  for (fSyncInfoListIterator=fSyncInfoList.begin(); fSyncInfoListIterator!=fSyncInfoList.end(); fSyncInfoListIterator++) {
-    // Walk through each database and apply the conflictResolution option. 
-    // the remaining conflicts will be resolved in the resolution dialog
-    if ((*fSyncInfoListIterator).direction==eSyncConflict){
-      DEBUGCONDUIT<<"We have a conflict for "<<(*fSyncInfoListIterator).handheldDB<<", default="<<eConflictResolution<<endl;
-      switch (eConflictResolution)
-      {
-        case eSyncPDAToPC:
-          DEBUGCONDUIT<<"PDA overrides for database "<<(*fSyncInfoListIterator).handheldDB<<endl;
-          (*fSyncInfoListIterator).direction = eSyncPDAToPC;
-          break;
-        case eSyncPCToPDA:
-          DEBUGCONDUIT<<"PC overrides for database "<<(*fSyncInfoListIterator).handheldDB<<endl;
-          (*fSyncInfoListIterator).direction = eSyncPCToPDA;
-          break;
-        case eSyncNone:
-          DEBUGCONDUIT<<"No sync for database "<<(*fSyncInfoListIterator).handheldDB<<endl;
-          (*fSyncInfoListIterator).direction = eSyncNone;
-          break;
-        case eSyncDelete:
-        case eSyncConflict:
-        default:
-          DEBUGCONDUIT<<"Conflict remains due to default resolution setting for database "<<(*fSyncInfoListIterator).handheldDB<<endl;
-          break;
-      }
-    }
-  }
-  
-  // Show the conflict resolution dialog and ask for the action for each database
-  ResolutionDialog*dlg=new ResolutionDialog( 0,  i18n("Conflict Resolution"), &fSyncInfoList , fHandle);
-  bool show=fAlwaysUseResolution || (dlg && dlg->hasConflicts);
-  if (show) {
-    if (!dlg || !dlg->exec() ) {
-      KPILOT_DELETE(dlg)
-      emit logMessage(i18n("Sync aborted by user."));
-      QTimer::singleShot(0, this, SLOT(cleanup()));
-      return;
-    }
-  }
-  KPILOT_DELETE(dlg)
-  
-
-  // fDBNames will be filled with the names of the databases that are actually synced (not deleted), so I can write the list to the config file
-  fDBNames.clear();
-  fSyncInfoListIterator=fSyncInfoList.begin();
-  QTimer::singleShot(0,this, SLOT(syncDatabases()));
-  return;
-}
-\end{verbatim}
-}
-
-
-Finally, the actual sync of the databases is done again with \code{QTimer::singleShot}s in the slot \code{syncDatabases()}. Each entry in the list is processed in one pass of \code{syncDatabases}, and then \code{syncDatabases} is again called using a \code{QTimer::singleShot}, until all databases have been synced.
-
-{\footnotesize
-\begin{verbatim}
-void DOCConduit::syncDatabases() {
-  FUNCTIONSETUP;
-  if (fSyncInfoListIterator==fSyncInfoList.end()) {
-    QTimer::singleShot(0, this, SLOT(cleanup()));
-    return;
-  }
-  
-  docSyncInfo sinfo=(*fSyncInfoListIterator);
-  fSyncInfoListIterator++;
-  
-  switch (sinfo.direction) {
-    case eSyncConflict:
-      DEBUGCONDUIT<<"Entry "<<sinfo.handheldDB<<"( docfilename: "<<sinfo.docfilename<<
-        ", pdbfilename: "<<sinfo.pdbfilename<<") had sync direction eSyncConflict!!!"<<endl;
-      break;
-    case eSyncDelete:
-    case eSyncPDAToPC:
-    case eSyncPCToPDA:
-      emit logMessage(i18n("Synchronizing text \"%1\"").arg(sinfo.handheldDB));
-      if (!doSync(sinfo)) {
-        // The sync could not be done, so inform the user (the error message should probably issued inside doSync)
-        DEBUGCONDUIT<<"There was some error syncing the text \""<<sinfo.handheldDB<<"\" with the file "<<sinfo.docfilename<<endl;
-      }
-      break;
-    case eSyncNone:
-//    case eSyncAll:
-      break;
-  }
-  if (sinfo.direction != eSyncDelete) fDBNames.append(sinfo.handheldDB);
-  
-  QTimer::singleShot(0,this, SLOT(syncDatabases()));
-  return;
-}
-\end{verbatim}
-}
-
-The actual sync is done by the function \code{doSync(docSyncInfo\&)}, which first checks for deletion of the database as a special case. Otherwise, it uses the \class{DOCConverter} class to copy the text file to or from the handheld, and then recalculates the md5 checksum of the text file on disk and stores it in KPilot's config.
-
-{\footnotesize
-\begin{verbatim}
-bool DOCConduit::doSync(docSyncInfo &sinfo) {
-  bool res=false;
-  
-  if (sinfo.direction==eSyncDelete) {
-    if (!sinfo.docfilename.isEmpty()) {
-      if (!QFile::remove(sinfo.docfilename)) {
-        kdWarning()<<i18n("Unable to delete the text file \"%1\" on the PC").arg(sinfo.docfilename)<<endl;
-      }
-      QString bmkfilename = sinfo.docfilename;
-      if (bmkfilename.endsWith(".txt")){
-        bmkfilename.remove(bmkfilename.length()-4, 4);
-      }
-      bmkfilename+=PDBBMK_SUFFIX;
-      if (!QFile::remove(bmkfilename)) {
-        DEBUGCONDUIT<<"Could not remove bookmarks file "<<bmkfilename<<" for database "<<sinfo.handheldDB<<endl;
-      }
-    }
-    if (!sinfo.pdbfilename.isEmpty() && fKeepPDBLocally) {
-      PilotLocalDatabase*database=new PilotLocalDatabase(fPDBDir, sinfo.dbinfo.name, false);
-      if (database) {
-        if ( database->deleteDatabase() !=0 ) {
-          kdWarning()<<i18n("Unable to delete database \"%1\" on the PC").arg(sinfo.dbinfo.name)<<endl;
-        }
-        KPILOT_DELETE(database);
-      }
-    }
-    if (!fLocalSync) {
-      PilotDatabase *database=new PilotSerialDatabase(pilotSocket(), sinfo.dbinfo.name);
-      if ( database->deleteDatabase() !=0 ) {
-        kdWarning()<<i18n("Unable to delete database \"%1\" from the handheld").arg(sinfo.dbinfo.name)<<endl;
-      }
-      KPILOT_DELETE(database);
-    }
-    return true;
-  }
-  // preSyncAction should initialize the custom databases/files for the
-  // specific action chosen for this db and return a pointer to a docDBInfo
-  // instance which points either to a local database or a database on the handheld.
-  PilotDatabase *database = preSyncAction(sinfo);
-
-  if (database && ( !database->isOpen() ) ) {
-    DEBUGCONDUIT<<"Database "<<sinfo.dbinfo.name<<" does not yet exist. Creating it:"<<endl;
-    if (!database->createDatabase(dbcreator(), dbtype()) ) {
-      DEBUGCONDUIT<<"Failed"<<endl;
-    }
-  }
-
-  if (database && database->isOpen()) {
-    DOCConverter docconverter;
-    connect(&docconverter, SIGNAL(logError(const QString &)), SIGNAL(logError(const QString &)));
-    connect(&docconverter, SIGNAL(logMessage(const QString &)), SIGNAL(logMessage(const QString &)));
-
-    docconverter.setDOCpath(fDOCDir, sinfo.docfilename);
-    docconverter.setPDB(database);
-    docconverter.setBookmarkTypes(fBookmarks);
-    docconverter.setCompress(fCompress);
-
-    switch (sinfo.direction) {
-      case eSyncPDAToPC:
-        res = docconverter.convertPDBtoDOC();
-        break;
-      case eSyncPCToPDA:
-        res = docconverter.convertDOCtoPDB();
-        break;
-      default:
-        break;
-    }
-    
-    // Now calculate the md5 checksum of the PC text and write it to the config file
-    {
-      KConfigGroupSaver g(fConfig, DOCConduitFactory::fGroup);
-      KMD5 docmd5;
-      QFile docfile(docconverter.docFilename());
-      if (docfile.open(IO_ReadOnly)) {
-        docmd5.update(docfile);
-        QString thisDigest(docmd5.hexDigest().data());
-        fConfig->writeEntry(docconverter.docFilename(), thisDigest);
-        fConfig->sync();
-        DEBUGCONDUIT<<"MD5 Checksum of the text "<<sinfo.docfilename<<" is "<<thisDigest<<endl;
-      } else {
-        DEBUGCONDUIT<<"couldn't open file "<<docconverter.docFilename()<<" for reading!!!"<<endl;
-      }
-    }
-    
-    if (!postSyncAction(database, sinfo, res)) 
-      emit logError(i18n("Unable to install the locally created PalmDOC %1 to the handheld.").arg(sinfo.dbinfo.name));
-    if (!res)
-      emit logError(i18n("Conversion of PalmDOC \"%1\" failed.").arg(sinfo.dbinfo.name));
-//    disconnect(&docconverter, SIGNAL(logError(const QString &)), SIGNAL(logError(const QString &)));
-//    disconnect(&docconverter, SIGNAL(logMessage(const QString &)), SIGNAL(logMessage(const QString &)));
-//    KPILOT_DELETE(database);
-  }
-  else
-  {
-    emit logError(i18n("Unable to open or create the database %1").arg(sinfo.dbinfo.name));
-  }
-  return res;
-}
-
-\end{verbatim}
-}
-
-
-After the sync is done, just call cleanup and emit the \code{syncDone} signal:
-
-{\footnotesize
-\begin{verbatim}
-void DOCConduit::cleanup() {
-  FUNCTIONSETUP;
-  
-  KConfigGroupSaver g(fConfig, DOCConduitFactory::fGroup);
-  fConfig->writeEntry(DOCConduitFactory::fDOCList, fDBNames);
-  fConfig->sync();
-
-  emit syncDone(this);
-}
-\end{verbatim}
-}
-
-
-
-The worst part about the conduit is to find out which side has been changed (and how), and what needs to be done about this. The function \code{needsSync} does exactly this. If the database was not included in the last sync, it is new, so it will be synced from the side where it was added. 
-
-First, we find out, how each of the two sides have changed.
-If the database was already included, check if it was changed using the function \code{textChanged} to compare the md5 checksum of the current text on disk with the checksum of the last sync (stored in kpilot's config). The handheld side is a bit trickier: A PalmDOC on the handheld contains of a header record, several text records, and finally several bookmark records. Each of these records can have the dirty flag set, so we first get the number of text records from the header record. Then we search for the index of the first changed record (i.e. dirty flag set) after the header record. If no text record (but a bookmark record) was changed, a config setting determines if the PalmDOC should still be considered as changed.
-
-Finally, from the status of the two sides, determine the sync direction:
-
-{\footnotesize
-\begin{verbatim}
-bool DOCConduit::needsSync(docSyncInfo &sinfo)
-{
-  FUNCTIONSETUP;
-  sinfo.direction = eSyncNone;
-  
-  PilotDatabase*docdb=openDOCDatabase(sinfo.dbinfo.name);
-  if (!fDBListSynced.contains(sinfo.handheldDB)) {
-    // the database wasn't included on last sync, so it has to be new.
-    DEBUGCONDUIT<<"Database "<<sinfo.dbinfo.name<<" wasn't included in the previous sync!"<<endl;
-
-    if (QFile::exists(sinfo.docfilename)) sinfo.fPCStatus=eStatNew;
-    else sinfo.fPCStatus=eStatDoesntExist;
-    if (docdb && docdb->isOpen()) sinfo.fPalmStatus=eStatNew;
-    else sinfo.fPalmStatus=eStatDoesntExist;
-    KPILOT_DELETE(docdb);
-    
-    if (sinfo.fPCStatus==eStatNew && sinfo.fPalmStatus==eStatNew) {
-      sinfo.direction=eSyncConflict;
-      return true;
-    };
-    if (sinfo.fPCStatus==eStatNew) {
-      sinfo.direction=eSyncPCToPDA;
-      return true;
-    }
-    if (sinfo.fPalmStatus==eStatNew) {
-      sinfo.direction=eSyncPCToPDA;
-      return true;
-    }
-    return true;
-  }
-  
-  // Text was included in the last sync, so if one side doesn't exist, it was deleted and needs to be deleted from the other side, too
-  if (!QFile::exists(sinfo.docfilename)) sinfo.fPCStatus=eStatDeleted;
-  else if(textChanged(sinfo.docfilename)) {
-    sinfo.fPCStatus=eStatChanged;
-    DEBUGCONDUIT<<"PC side has changed!"<<endl;
-    // TODO: Check for changed bookmarks on the PC side
-  } else {
-    DEBUGCONDUIT<<"PC side has NOT changed!"<<endl;
-  }
-  if (!docdb || !docdb->isOpen()) sinfo.fPalmStatus=eStatDeleted;
-  else {
-    PilotRecord *firstRec = docdb->readRecordByIndex(0);
-    PilotDOCHead docHeader(firstRec);
-    KPILOT_DELETE(firstRec);
-
-    int storyRecs = docHeader.numRecords;
-
-    // determine the index of the next modified record (does it lie beyond the actual text records?)
-    int modRecInd=-1;
-    PilotRecord*modRec=docdb->readNextModifiedRec(&modRecInd);
-    DEBUGCONDUIT<<"Index of first changed record: "<<modRecInd<<endl;
-    
-    KPILOT_DELETE(modRec);
-    // if the header record was changed, find out which is the first changed real document record:
-    if (modRecInd==0) {
-      modRec=docdb->readNextModifiedRec(&modRecInd);
-      DEBUGCONDUIT<<"Reread Index of first changed records: "<<modRecInd<<endl;
-      KPILOT_DELETE(modRec);
-    }
-  
-    // The record index starts with 0, so only a negative number means no modified record was found
-    if (modRecInd >= 0) {
-//      sinfo.fPalmStatus=eStatBookmarksChanged;
-      DEBUGCONDUIT<<"Handheld side has changed!"<<endl;
-      if ((!fIgnoreBmkChangesOnly) || (modRecInd <= storyRecs)) 
-        sinfo.fPalmStatus=eStatChanged;
-      DEBUGCONDUIT<<"PalmStatus="<<sinfo.fPalmStatus<<", condition="<<((!fIgnoreBmkChangesOnly) || (modRecInd <= storyRecs))<<endl;
-    } else {
-      DEBUGCONDUIT<<"Handheld side has NOT changed!"<<endl;
-    }
-  }
-  KPILOT_DELETE(docdb);
-
-  if (sinfo.fPCStatus == eStatNone && sinfo.fPalmStatus==eStatNone) {
-    DEBUGCONDUIT<<"Nothing has changed, not need for a sync."<<endl;
-    return false;
-  }
-  // if either is deleted, and the other is not changed, delete
-  if ( ((sinfo.fPCStatus == eStatDeleted) && (sinfo.fPalmStatus!=eStatChanged)) ||
-       ((sinfo.fPalmStatus == eStatDeleted) && (sinfo.fPCStatus!=eStatChanged)) ) {
-    DEBUGCONDUIT<<"Database was deleted on one side and not changed on the other -> Delete it."<<endl;
-    sinfo.direction=eSyncDelete;
-    return true;
-  }
-  
-  // eStatDeleted (and both not changed) have already been treated, for all 
-  // other values in combination with eStatNone, just copy the texts.
-  if (sinfo.fPCStatus==eStatNone) {
-    DEBUGCONDUIT<<"PC side has changed!"<<endl;
-    sinfo.direction=eSyncPDAToPC;
-    return true;
-  }
-
-  if (sinfo.fPalmStatus==eStatNone) {
-    sinfo.direction=eSyncPCToPDA;
-    return true;
-  }
-  
-  // All other cases (deleted,changed), (changed, deleted), (changed,changed) create a conflict:
-  sinfo.direction=eSyncConflict;
-  return true;
-}
-
-\end{verbatim}
-}
-
-
-These code pieces from the docconduit are supposed to give you an insight into how to structure a conduit. 
-
-
-
-
-
-
-\section{A record-based conduit}\label{SectionRecordBasedConduit}
-If you work with record-based conduits (e.g. addressbook, calendar conduits etc.), you might proceed similar to a document-based conduit (where records correspond to documents, of course), although you probably want to do the synchronization step immediately instead of storing all information about the states in a big list and only later sync the data. To dig deeper into the structure of such conduits (which I admit are the most common ones, but also the most complex), take a look at the addressbook conduit of KDE 3.1 (e.g. using KDE's webcvs at \htmladdnormallink{http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdepim/kpilot/conduits/abbrowserconduit/}{http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdepim/kpilot/conduits/abbrowserconduit/}).
-%TODO
-
-
-
-\section{Using KitchenSync in your conduit} \label{SectionKitchenSync}
-
-Currently none of the KPilot conduits use the KitchenSync framework, which 
-is intended to be KDE's synchronization application of the future. Thus I cannot and will not 
-describe how to use it for your conduits. In the future, however, 
-KPilot will probably 's conduits will be ported to KitchenSync. For a quick overview over 
-KitchenSync see Cornelius Schumacher's original proposal at \htmladdnormallink{http://pim.kde.org/development/ksync.php}{http://pim.kde.org/development/ksync.php}.
-
-Currently, the KitchenSync framework doesn't seem to be mature enough to replace KPilot's already very sophisticated conduits and their conflict resolution. 
-Some time ago I mailed Holger Freyther (one of the KitchenSync authors) about the current state of KitschenSync, and asked several important questions. His answer is printed below. In my eyes, KitchenSync is just lacking too many important features to be able to replace KPilot soon (or rather port KPilot to KitchenSync):
-
-{\footnotesize
-\begin{verbatim}
-Re: [Kitchensync] [Kde-pim] Some Kitchensync questions
-From:  Holger Freyther <XXXXXX@XXXXX.XXX>  (Opie)
-To: Reinhold Kainhofer <reinhold@kainhofer.com>
-Date: 05.10.2002 00:01
-
-
-On Wednesday 18 September 2002 19:57, Reinhold Kainhofer wrote:
-> Hello,
-> Yesterday night I took a quick look at the kitchensync sources to find out
-> how kpilot might use it or how kpilot might need to be changed. Please
-> forgive me if some questions might  be obvious or stupid, but I this is my
-> first look at kitchensync/ksync, and I didn't have too much time. Just give
-> me a hint on where to look. Additionally, it was very late at night, so my
-> brain wasn't working properly any more ;-))
->
-> My questions will of course be from a Palm/handheld syncing view, so they
-> are quite specific concerning the current functionality of the conduits. I
-> wouldn't like switching to something that - in theory - has a better and
-> cleaner architecture, but for the next few years will provide less features
-> than we currently have.
-
-Thats good! so then we find problems because you look at it from a different 
-point of view
-
-> 1) Do I understand it right from the ksync proposal on pim.kde.org that
-> kitchensync is the application that does all the communication with the
-> "devices" (korganizer, palm, opie, kabc, local files etc.), while ksync is
-> just the abstract library with the sync algorithm framework?
-
-It's a bit more.
-KitchenSync is the name of the whole framework (hmm deutsch oder englisch? ;)
-Konnector sind die Plugins, die Sachen vom Geraet holen, MetaDaten sammeln und 
-schreiben
-KSync ist 1. ein Kontainer und 2. Syncing Interface
-und KitchenSyncApp ist ne part
-
-
-> 2) Do we have to ditch KPilot completely? So once again, once something in
-> kpilot seems to get stable, the underlying infrastructure changes, and
-> everything has to be completely rewritten from scratch.... That thought is
-> not very comforting to me, no matter how big the advantages of a unified
-> sync machinery seems.
-
-It would be a lost to just ditch KPilot. I would like to see a port of KPilot 
-to KitchenSync where we improve the framework.
-
-
-> 3a) How can one sync the palm where you also have the backup record
-> available, so you possibly know how the record looked like (on the pc and
-> the palm side) after the previous sync
-
-The Palm Konnector would only have to care for the Palm side. There is 
-something called MetaSyncing. If it is enabled the PalmKonnector is demanded 
-to save the backend. Otherwise you do first syncs (just fetch it )
-
-> 3b) How can one achieve a "smart merge", i.e. from the backup record the
-> fields which have changed on the handheld and the pc are determined, and
-> the fields are merged, instead of copying the whole record over.
-
-This is part of KSync. Currently we don't have it but it's planned including 
-intelligent conflict resolution.
-So what happens if the PC have a XYZ field but the Palm not. Now you change 
-anything on the palm and on the next sync you want the Palm to take advance 
-but not to lose the stuff in the other fields.
-So there needs to be this kind of merge. Fill the entry with all fields from 
-the other record with the same uid but do not overwrite
-And then there needs to be the smart merge. Which will also be part of the 
-KSync.
-But this is needed and will be added as soon as I find the time to do it. 
-
-
-> 4) How can one use plugins that just copy something to the device and don't
-> need any record-based sync and conflict resolution (e.g. using libmal to
-> copy the AvantGo content to the palm).
-
-The KonnectorManager does allow you to either push QByteArrays or files behind 
-filenames to the device. 
-There is one short coming with it. It's asynchronus and currently no success 
-or failure is emmitted.
-But when taking in consideration that you want to fetch anything from the 
-device. You will need a special layer in Konnector which loads plugins for 
-Konnectors which allow some sort of getting stuff from the device.
-This is also varpoware
-
-
-> 5) How about responsiveness of the front end? I realized there are no
-> QTimer::singleShot to let qt process the queue between syncing two records.
-> Or did I miss something?
-
-currenlty this is true. While we aim for ASYNC the syncing is currently 
-synchron. I first want to get it right.
-
-
-> 6) How can one do the sync when you only know the changed records on one
-> side, but not those that stayed the same? Especially when working with
-> serial devices, minimizing the traffic is of very high priority, so I don't
-> think we should always transfer the whole calendar/todo/addressbook
-> database from and to the handheld (On windows to my surprise the sync of
-> these needs only about 3 seconds. We have to compete with that ...).
-
-This is implementation detail of the Konnector again. I would store all the 
-records on my mighty PC
-
-
-> 7) What if the device (i.e. Palm) does not support timestamps in any form
-> for the records?
-
-This is a problem with Qtopia. QtopiaDesktop is using md5sums ( quite fast ) 
-for figuring changes.
-I've a copy of the files around and templates to do the diffing
-
-
-> 8) How can one achieve archived records (i.e. marked as quasi-deleted from
-> the palm and deleted after the sync, but they exist locally on the pc side.
-> They are NO LONGER synced to the device. As an example take past events.
-> You don't need them on the handheld any longer, but of course you don't
-> want to loose the history on the PC.).
-
-Not thought of ;)
-A field inside the SyncEntry and the KonnectorPlugin needs to honor that
-
-
-> 9) What if one side (handheld) does not support all features the pc side
-> supports? I.e. the palm only has 5 phone/email fields, while you can have
-> many more on the pc. The two addressbook items should still correspond and
-> even be equal, although one side has less information available.
-
-see above about merging
-
-
-> 10) Is there a daemon or does the whole app have to be in memory? (Sorry if
-> this should be obvious, it was very late when I looked through the code and
-> wrote down these questions)
-
-All in one for now
-
-
-> 11) Is it possible to sync a list of todos where the order of the entries
-> is important? (Needed for the Project Manager conduits). I realize that
-> korganizer disregards the order of the todos currently, but other
-> applications might use the ics file corretly (i.e. preserving the order)
-
-we're using Syncee's they should not sort
-
-
-I hope this helps
-
-regards Holger
-\end{verbatim}
-}
-
-
-%\section{Further ideas and thoughts}\label{SectionFurtherThoughts}
-%TODO
-
-
-
-
-\end{document}
-
diff --git a/kpilot/Documentation/ConduitProgrammingTutorial/mal-factory.cc b/kpilot/Documentation/ConduitProgrammingTutorial/mal-factory.cc
deleted file mode 100644
index a55a0e64..00000000
--- a/kpilot/Documentation/ConduitProgrammingTutorial/mal-factory.cc
+++ /dev/null
@@ -1,123 +0,0 @@
-/* Time-factory.cc                      KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This file defines the factory for the MAL-conduit plugin.
-*/
- 
-#include "options.h" 
-
-#include <kapplication.h>
-#include <kinstance.h>
-#include <kaboutdata.h>
-
-#include <time.h> // Needed by pilot-link include
-#include "mal-conduit.h"
-#include "mal-setup.h"
-
-#include "mal-factory.moc"
-
-
-extern "C"
-{
-
-void *init_libmalconduit()
-{
-    return new MALConduitFactory;
-}
-
-} ;
-
-
-// A number of static variables
-KAboutData *MALConduitFactory::fAbout = 0L;
-const char *MALConduitFactory::fGroup = "MAL-conduit";
-const char *MALConduitFactory::fLastSync = "Last MAL Sync";
-const char *MALConduitFactory::fSyncTime = "Sync Frequency";
-const char *MALConduitFactory::fProxyType = "Proxy Type";
-const char *MALConduitFactory::fProxyServer = "Proxy Server";
-const char *MALConduitFactory::fProxyPort = "Proxy Port";
-const char *MALConduitFactory::fProxyUser = "Proxy User";
-const char *MALConduitFactory::fProxyPassword = "Proxy Password";
-
-MALConduitFactory::MALConduitFactory(TQObject *p, const char *n) :
-    KLibFactory(p,n)
-{
-    FUNCTIONSETUP;
-
-    fInstance = new KInstance("MALconduit");
-    fAbout = new KAboutData("MALconduit",
-        I18N_NOOP("MAL Synchronization Conduit for KPilot"),
-        KPILOT_VERSION,
-        I18N_NOOP("Synchronizes the content from MAL Servers like AvantGo to the Handheld"),
-        KAboutData::License_GPL,
-        "(C) 2002, Reinhold Kainhofer");
-    fAbout->addAuthor("Reinhold Kainhofer",
-        I18N_NOOP("Primary Author"), "reinhold@kainhofer.com", "http://reinhold.kainhofer.com/");
-    fAbout->addAuthor("Jason Day",
-        I18N_NOOP("Author of libmal and the JPilot AvantGo conduit"), "jasonday@worldnet.att.net");
-    fAbout->addAuthor("Tom Whittaker",
-        I18N_NOOP("Author of syncmal"), "tom@tomw.org", "http://www.tomw.org/");
-    fAbout->addAuthor("AvantGo, Inc.",
-        I18N_NOOP("Authors of the malsync library (c) 1997-1999"), "www.avantgo.com", "http://www.avantgo.com/");
-}
-
-MALConduitFactory::~MALConduitFactory()
-{
-    FUNCTIONSETUP;
-
-    KPILOT_DELETE(fInstance);
-    KPILOT_DELETE(fAbout);
-}
-
-/* virtual */ TQObject *MALConduitFactory::createObject( TQObject *p,
-    const char *n,
-    const char *c,
-    const TQStringList &a)
-{
-    FUNCTIONSETUP;
-
-#ifdef DEBUG
-    DEBUGKPILOT << fname
-        << ": Creating object of class "
-        << c
-        << endl;
-#endif
-
-    if (qstrcmp(c,"ConduitConfig")==0)
-    {
-        TQWidget *w = dynamic_cast<TQWidget *>(p);
-
-        if (w)
-        {
-            return new MALWidgetSetup(w,n,a);
-        }
-        else 
-        {
-            kdError() << k_funcinfo
-                << ": Couldn't cast parent to widget."
-                << endl;
-            return 0L;
-        }
-    }
-
-    if (qstrcmp(c,"SyncAction")==0)
-    { 
-        KPilotDeviceLink *d = dynamic_cast<KPilotDeviceLink *>(p);
-
-        if (d)
-        {
-            return new MALConduit(d,n,a);
-        }
-        else
-        {
-            kdError() << k_funcinfo
-                << ": Couldn't cast parent to KPilotDeviceLink"
-                << endl;
-            return 0L;
-        }
-    }
-
-    return 0L;
-}
-
diff --git a/kpilot/Documentation/ConduitProgrammingTutorial/mal-factory.h b/kpilot/Documentation/ConduitProgrammingTutorial/mal-factory.h
deleted file mode 100644
index f38cb5c8..00000000
--- a/kpilot/Documentation/ConduitProgrammingTutorial/mal-factory.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef _TIME_FACTORY_H
-#define _TIME_FACTORY_H
-/* MAL-factory.h                       KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This file defines the factory for the mal-conduit plugin.
-*/
-
-#include <klibloader.h>
-
-class KInstance;
-class KAboutData;
-
-class MALConduitFactory : public KLibFactory
-{
-Q_OBJECT
-
-public:
-    MALConduitFactory(TQObject * = 0L,const char * = 0L);
-    virtual ~MALConduitFactory();
-
-    static KAboutData *about() { return fAbout; } ;
-    static const char *lastSync() { return fLastSync; };
-    static const char *syncTime() {return fSyncTime;};
-    static const char *proxyType() {return fProxyType;};
-    static const char *proxyServer() {return fProxyServer;};
-    static const char *proxyPort() {return fProxyPort;};
-    static const char *proxyUser() {return fProxyUser;};
-    static const char *proxyPassword() {return fProxyPassword;};
-    static const char *malServer() {return fMALServer;};
-    static const char *malPort() {return fMALPort;};
-    static const char *malUser() {return fMALUser;};
-    static const char *malPassword() {return fMALPassword;};
-    
-protected:
-    virtual TQObject* createObject( TQObject* parent = 0,
-        const char* name = 0,
-        const char* classname = "TQObject",
-        const TQStringList &args = TQStringList() );
-private:
-    KInstance *fInstance;
-    static KAboutData *fAbout;
-    // KConfig entry keys.
-    static const char *fGroup;
-    static const char *fLastSync, *fSyncTime, 
-        *fProxyType, *fProxyServer, *fProxyPort, *fProxyUser, *fProxyPassword;
-} ;
-
-extern "C" {
-  void *init_libmalconduit();
-} ;
-
-#endif
diff --git a/kpilot/Documentation/ConduitProgrammingTutorial/pictures/ConnectionsDialog.png b/kpilot/Documentation/ConduitProgrammingTutorial/pictures/ConnectionsDialog.png
deleted file mode 100644
index 0ed0997f..00000000
--- a/kpilot/Documentation/ConduitProgrammingTutorial/pictures/ConnectionsDialog.png
+++ /dev/null
diff --git a/kpilot/Documentation/ConduitProgrammingTutorial/pictures/NoLayoutDialog.png b/kpilot/Documentation/ConduitProgrammingTutorial/pictures/NoLayoutDialog.png
deleted file mode 100644
index 64e088a2..00000000
--- a/kpilot/Documentation/ConduitProgrammingTutorial/pictures/NoLayoutDialog.png
+++ /dev/null
diff --git a/kpilot/Documentation/ConduitProgrammingTutorial/pictures/ProxyTab.png b/kpilot/Documentation/ConduitProgrammingTutorial/pictures/ProxyTab.png
deleted file mode 100644
index 2cc9cd54..00000000
--- a/kpilot/Documentation/ConduitProgrammingTutorial/pictures/ProxyTab.png
+++ /dev/null
diff --git a/kpilot/Documentation/HOWTO-CODE.txt b/kpilot/Documentation/HOWTO-CODE.txt
deleted file mode 100644
index 99c093c6..00000000
--- a/kpilot/Documentation/HOWTO-CODE.txt
+++ /dev/null
@@ -1,112 +0,0 @@
-Coding Guidelines for KPilot
-============================
-
-Of course we can wage war about what constitutes "good programming
-practice". And agreeing on indentation style is difficult as well.
-Below you can find the guidelines I try to stick to when writing
-KPilot, split into "C++ Source Code" and "Header Files".
-
-(For actual coding information and some information about how
-KPilot works, see HOWTO-CONDUIT.txt)
-
-
-C++ Source Code
-===============
-
-There are coding guidelines for KDE somewhere. I think they say
-indent with 4 spaces, { on same line, } on separate line. I disagree,
-so code I write -- and code I maintain -- slowly mutates to
-
-	* Indent with tabs
-	* { and } on separate lines
-	* C comments only for the GPL header and KDoc stuff
-	* C++ before the stuff they document, same indent level,
-	  with possibly two extra lines with just // to set the
-	  comment off from the code.
-
-Whether or not anyone else follows is irrelevant, and I do try to
-avoid gratuitous reformatting. Honest.
-
-What I might do every now and then to get stuff "into shape" (and
-I'd really appreciate it if you did so too before sending me patches)
-is the following horrible invocation of indent:
-
-indent -kr \
-	--blank-lines-after-declarations \
-	--braces-after-if-line \
-	--dont-cuddle-else \
-	--dont-line-up-parentheses \
-	--honour-newlines \
-	--space-after-cast \
-	--brace-indent 0 \
-	--case-brace-indentation 0 \
-	--case-indentation 0 \
-	--continuation-indentation 8 \
-	--indent-level 8 \
-	--tab-size 8 \
-	--line-length 78
-
-This doesn't yield "perfect" code but it's close to my personal ideal.
-If this coding style gives you gas, just use your own favorite indent
-invocation to change it all back.
-
-NOTE: indent wreaks havoc with C++ class definitions in header files,
-so it's best not to touch those with it.
-
-
-Header Files
-============
-
-One thing we *do* need to agree on is how to protect
-.h files from double-inclusion. In Qt and KDE there's:
-
-	#ifndef QTCLASS_H
-	#ifndef _KDECLASS_H
-
-so for KPilot the convention will be
-
-	#ifndef _KPILOT_FILENAME_H
-
-where KPILOT is literal, ie. options.h is _KPILOT_OPTIONS_H and,
-unfortunately, kpilotOptions.h is _KPILOT_KPILOTOPTIONS_H. This is
-because the filename and the class don't always match up and not
-every file contains a class of interest.
-
-
-DEBUG Output
-============
-
-There are macros defined in options.h (which every source file
-should include) that provide some uniform debugging output.
-These are:
-
-	* FUNCTIONSETUP - Use this at the beginning of every function
-	  (or those that are vaguely interesting). This will print out
-	  a call trace indicator when debugging is on. It also defines
-	  a local symbol fname for use with DEBUG* below.
-	* FUNCTIONSETUPL(level) - Use this at the beginning of a function.
-	  It is like FUNCTIONSETUP but only prints if the debug level
-	  is at least @p level. This avoids excessive debug output from
-	  common functions.
-
-For regular debugging output, use one of the three DEBUG* macros:
-
-	* DEBUGLIBRARY in code in lib/
-	* DEBUGKPILOT in code in kpilot/
-	* DEBUGCONDUIT in code in conduits/
-
-This sends the debug output to the appropriate debug area. A typical
-debug output stream looks like this:
-
-	DEBUGKPILOT << fname << ": "
-		<< actual debug info
-		<< endl;
-
-Here, DEBUGKPILOT depends on what bit of code is being debugged; fname
-is defined by FUNCTIONSETUP and takes care of proper indentation for
-the call trace, the colon is for consistency and the actual debug
-info can be whatever you want.
-
-	Adriaan de Groot
-	March 5th 2001
-	September 5th 2001 (revised)
diff --git a/kpilot/Documentation/HOWTO-CONDUIT.txt b/kpilot/Documentation/HOWTO-CONDUIT.txt
deleted file mode 100644
index 7b6dccd0..00000000
--- a/kpilot/Documentation/HOWTO-CONDUIT.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-One of the greatest assets of the Palm Pilot is its ability to
-interconnect with other applications.  KPilot supports this capabilty
-through conduits.  A conduit is a small shared library that is loaded by
-the daemon during the hot sync.  The conduit translates between the Palm
-Pilot and the application you're syncing with.
-
-*** How it works
-
-KPilot is divided into three major components: the GUI, the
-syncing daemon, and the conduits.  The GUI part is actually irrelevant
-for the operation of the daemon, although it _is_ required for the
-configuration dialog (and possibly viewing databases). In theory
-you could run the daemon on a box without even starting X, although
-that is difficult (in particular, how would you do conflict resolution?).
-
-The daemon sits around and polls the configured device every second or
-so (there are devices where this should be more often, I think). Once
-data arrives (and the device exists, consider hotplug with USB), the
-daemon enters sync mode, and constructs a queue of SyncActions to perform.
-These vary from checking the Pilot's username to performing full backups
-to -- whatever sync actions the conduits provide. This means that during
-a sync the shared library containing a conduit is loaded, a factory
-function is called to produce an Action, this action is run, and the
-library unloaded.
-
-*** How the conduits work
-
-The conduits can actually be divided into two parts: the configuration
-widget, and the Action. Both are produced by a factory function in
-the shared library. The conduits have only one really interesting method
-that they must override, and that is exec(). When this is called the 
-conduit is already set up with a socket descriptor and the conduit should
-quickly do its thing. In particular, conduits can't just sleep(45) and
-continue, since the connection with the Pilot will time out.
-
-*** Write your very own conduit
-
-Writing a conduit is actually rather easy.  The conduit class
-should inherit from ConduitAction and override the exec() method
-(which actually comes from SyncAction).
-
-
-*** Debugging things
-
-lib/options.h contains two defines that are really important for
-debugging. These are
-
-	// #define DEBUG                        (1)
-	// #define DEBUG_CERR                   (1)
-
-Uncommenting DEBUG will enable most of the debug information in
-KPilot. Uncommenting DEBUG_CERR will make debug output go direct
-to stderr (cerr) instead of through kdDebug. If in addition, you
-pass --debug N (say, N=1 or N=4) to KPilot or the daemon when you
-start them, they will print call traces (that's what FUNCTIONSETUP
-does, which you will see at the beginning of every function).
-
-Another useful tool is kpilotTest, which is in kpilot/kpilot. It
-is an uninstalled binary, which behaves like the daemon with a
-log window and which will run a single conduit. Something like:
-
-	kpilotTest -p /dev/ucom0 \		# port
-		-E conduit_knotes \		# .desktop file
-		-T				# _really_ run
-
-use kpilotTest -L to list the installed conduits and their
-desktop files (look at the "In ..." lines).
diff --git a/kpilot/Documentation/README b/kpilot/Documentation/README
deleted file mode 100644
index 9810abc0..00000000
--- a/kpilot/Documentation/README
+++ /dev/null
@@ -1,17 +0,0 @@
-kpilot/Documentation
-====================
-
-This directory contains information pertinent to the design of
-KPilot -- which is therefore only really interesting for 
-developers of KPilot conduits, maintainers, etc.
-
-Files in this directory are:
-
-README			- This file
-README-3.2.1+		- The README for KPilot 3.2.1 with some changes
-			  that refer to KPilot 4 and KDE2, so it's quite
-			  confusing.
-README-4.0.0		- The real README for KPilot 4.0.0
-HOWTO-CONDUIT.txt	- An introduction to writing conduits, last
-			  updated for KPilot 3.1b9 (which is a LONG
-			  time ago)
diff --git a/kpilot/Documentation/README-3.2.1+ b/kpilot/Documentation/README-3.2.1+
deleted file mode 100644
index f32267b8..00000000
--- a/kpilot/Documentation/README-3.2.1+
+++ /dev/null
@@ -1,156 +0,0 @@
-KPILOT 4.0.0 by Dan Pilone
-===========================
-	Additional work by Robert Ambrose, 
-	Preston Brown, Adriaan de Groot, 
-	and probably many more.
-
-	KPilot is software for syncing the 3Com Palm Pilot and IBM Workpad
-(UNTESTED!) with a machine running some flavor of unix. The actual PC->PP
-communcations was originally based on pilot-link.0.8.7. By default it
-attempts to connnect using /dev/pilot which should be a link to the actual
-serial port, however this is configurable in the settings dialog. 
-
-	Additional release notes can be found in the user documentation.
-The user documentation (translations in: en and de) can be found
-under kpilot/doc in this directory or in the KDE documentation directory 
-under kpilot. Or run kpilot --htmlhelp to start the KDE help browser.
-
-
-Current features include:
-		* Now a KDE2 application.
-		o Plug in conduit support, currently including
-			KOrganizer, todolist, null and PopMail
-	        o Hot-Sync daemon.  - Now hot-sync with just the push of the
-          	  Hot-Sync button on your cradle.  No need to launch KPilot.
-	        o Add/Delete/Edit memos.
-                o Add/Delete/Edit addresses.
-                o Full Category support for both memos and addresses.
-                o KPilot now respects secret data.
-                o More configuration options including port speed and 
-		  docking control.
-                o Now supports signature files for email.
-                o Drag and drop to docked icon for file install.
-                o International Support
-		o Full Backup/Restore capabilities of Palm Pilot
-		o File (prc,pdb) installation
-		o Email syncing capabilities (via POP3 & sendmail)
-	        o SmartSync backing up modified data even
-			for databases KPilot doesn't recognize
-	        o Import/Export to/from virtually any text format for
-			Addresses.
-	        o Import/Export to/from text files for memos
-		o Sort and display addresses in different ways
-		o A null conduit (programming example)
-		o Syncing with UNIX mailboxes
-		o Database dispositions (sync, backup only, or ignore)
-
-	(* = new in this release)
-
-INSTALLATION
-============
-	KPilot 4.0.0 _REQUIRES_ KDE 2 (http://www.kde.org/) and
-v2.2.0 or better of the QT widget set (http://www.troll.no/). 
-KPilot also _REQUIRES_ pilot-link, which is not distributed with 
-all the linux distro's out there. You may have to go looking.
-
-	If you have these packages, a simple (see *NOTE*):
-
-	./configure
-	make
-	make install
-
-	from the kpilot-4.0.0 directory should configure and install KPilot.  
-If you are using KPanel (the panel that comes with KDE) restarting it
-should insert an icon into the Utilities submenu.  If you are not using
-KPanel, the executable is named kpilot and will be installed in either
-/opt/kde/bin/ or /usr/local/kde/bin (whichever is appropriate for your
-system).
-
-	In some cases KPilot will not compile due to configuration
-differences; in this case a less simple
-
-	autoconf
-	automake
-	./configure
-	make
-	make install
-
-should do the trick. If this fails as well, you can subscribe to the
-KPilot mailing list and state the nature of the failure there.
-
-	*NOTE* that KPilot makes assumptions about where pilot-link and
-the Qt libraries are; in particular it is important to set QTDIR correctly
-(to the Qt 1.44 directories) when compiling KPilot. On many systems the
-command to do this will be
-
-	export QTDIR=/usr/lib/qt-2*
-
-but your mileage may vary. RedHat 6.2 systems ship with Qt 1.45 and Qt 2.1,
-in which case it is doubly important to set QTDIR properly.
-
-USING THE SOFTWARE
-==================
-	The user's documentation in the kpilot/doc directory is the
-best source for information on using KPilot.
-	When KPilot is run for the first time it will display the settings
-dialog.  The default device is /dev/pilot (which should be a link to the
-proper device for the pilot) though this is configurable. Please verify
-this is correct.  
-	IMPORTANT NOTE: the KPilot installation DOES NOT setup the serial
-link; your OS installation may also require special handling. See the
-section "Troubleshooting," below.
-	Other settings can be configured at this time but are
-not mandatory (though HIGHLY recommended).  The one setting that you might
-want to take notice of is "Local overrides pilot".  Setting this to true
-means that if both the local record and the pilot record are modified,
-during the next hot sync the local record will be considered the valid one
-and both will be set to that. By default the Pilot is considered to be the
-valid record and if both the local record and the pilot record have been
-modified the local is overwritten by the pilot copy.  
-	Hitting "OK" will continue to the main KPilot screen.
-	It is recommended you preform a full backup of your Pilot at this
-point so that all of the data visible in KPilot is accurate and any
-importing or exporting is properly merged the next time you hot-sync.  
-You can do a full backup of your Pilot by selecting Backup from the File
-Menu.
-
-TROUBLESHOOTING
-===============
-	The default serial device (/dev/pilot) does not exist on
-most systems. Be SURE to either (a) use the actual serial port the Pilot
-is attached to (i.e. /dev/ttyS0 for the device DOS calls COM1:) OR (b) set
-up the link to the actual serial port by running (as root) "ln -s
-/dev/ttySx /dev/pilot", where x is the number of the serial port. Note
-that some older Linux setups use /dev/cuax instead of /dev/ttySx.
-	If you're running Mandrake 7 and having trouble getting the
-daemon to start or KPilot can't connect to the daemon, check the system
-security setting. Sometimes local processes can't connect to *any*
-local ports.
-	More information is available in the user documentation.
-
-
-
-
-STANDARD DISCLAIMER, WARNINGS, ETC..
-====================================
-	THIS SOFTWARE HAS BUGS.  Use at your own risk.  It has not even
-been tested anywhere but on my machine and only with my Palm Pilot.  I
-have been using it against XCopilot for development then verifying it
-works with a real pilot with my Palm Pilot Professional running OS v2.0.4.  
-I make no claims that it will work, or even try to work.  I take no
-responsibility for any data loss, damage, etc. done by this software.  
-ie:  Should your pilot burst into flames while trying to sync a new game..
-sorry.
-	That being said, I _really_ want comments regarding the software
-as well as suggestions.  Bug fixes are even snazzier and code
-contributions are welcome.  :)  
-
-	Dan Pilone
-	pilone@slac.com
-	http://www.slac.com/pilone/kpilot_home/
-	July 20, 2000
-
-	Adriaan de Groot
-	adridg@cs.kun.nl
-	http://www.cs.kun.nl/~adridg/kpilot-bugs.html
-	July 20, 2000
diff --git a/kpilot/Documentation/README-4.0.0 b/kpilot/Documentation/README-4.0.0
deleted file mode 100644
index f9fdccb1..00000000
--- a/kpilot/Documentation/README-4.0.0
+++ /dev/null
@@ -1,103 +0,0 @@
-KPILOT 4.0.0 by Dan Pilone
-===========================
-	Additional work by Robert Ambrose, 
-	Preston Brown, Adriaan de Groot, 
-	Heiko Purnhagen, Jorg Habenicht,
-	and probably many more.
-
-	KPilot is software for syncing the 3Com Palm Pilot, Palm III, IIIe,
-IIIc, IIIx, V, Vx, M100, Handspring Visor and IBM Workpad with a machine 
-running some flavor of unix. The actual PC->PP communcations was originally 
-based on pilot-link.0.8.7, though you should use pilot-link.0.9.3 now. 
-By default KPilot attempts to connnect using /dev/pilot which should be 
-a link to the actual serial port, however this is configurable in the 
-settings dialog. 
-
-	This is the first release of KPilot 4.x, the first version of
-KPilot that works with and under KDE2. It is released as part of KDE 2.1.
-
-INSTALLATION INSTRUCTIONS
-=========================
-
-	The file ../README contains minimal information on how to compile
-and install KPilot. Since KPilot is part of the kdepim package, you
-should also have the INSTALL file for kdepim, probably in ../../INSTALL.
-
-	This README file only contains the release notes for KPilot 4.0.0.
-
-UPGRADING FROM OLDER KPILOTS
-============================
-
-The first time you run KPilot 4.0.0, it will automatically display
-the setup screen and you can check all the configuration settings.
-If you used KPilot 3.x, you should also immediately configure all your
-conduits (again) because many things have changed there.
-
-CURRENT FEATURES
-================
-	* Conduit for KNotes.
-	* Now a KDE2 application.
-	o Plug in conduit support, currently including
-		KOrganizer, todolist, null and PopMail
-	o Hot-Sync daemon.  - Now hot-sync with just the push of the
-	  Hot-Sync button on your cradle.  No need to launch KPilot.
-	o Add/Delete/Edit memos.
-	o Add/Delete/Edit addresses.
-	o Full Category support for both memos and addresses.
-	o KPilot now respects secret data.
-	o More configuration options including port speed and 
-	  docking control.
-	o Now supports signature files for email.
-	o Drag and drop to docked icon for file install.
-	o International Support
-	o Full Backup/Restore capabilities of Palm Pilot
-	o File (prc,pdb) installation
-	o Email syncing capabilities (via POP3 & sendmail)
-	o SmartSync backing up modified data even
-		for databases KPilot doesn't recognize
-	o Import/Export to/from virtually any text format for
-		Addresses.
-	o Import/Export to/from text files for memos
-	o Sort and display addresses in different ways
-	o A null conduit (programming example)
-	o Syncing with UNIX mailboxes
-	o Database dispositions (sync, backup only, or ignore)
-
-(* = new in this release)
-
-
-KNOWN BUGS
-==========
-	All the known bugs in KPilot can be found in the KDE bugs database
-
-	http://bugs.kde.org/db/pa/lkpilot.html
-
-Please check with that database before reporting bugs.
-
-
-
-
-STANDARD DISCLAIMER, WARNINGS, ETC..
-====================================
-	THIS SOFTWARE HAS BUGS.  Use at your own risk.  It has not even
-been tested anywhere but on my machine and only with my Palm Pilot.  I
-have been using it against XCopilot for development then verifying it
-works with a real pilot with my Palm Pilot Professional running OS v2.0.4.  
-It works with Adriaan's Palm V running PalmOS 3.5 as well.
-I make no claims that it will work, or even try to work.  I take no
-responsibility for any data loss, damage, etc. done by this software.  
-ie:  Should your pilot burst into flames while trying to sync a new game..
-sorry.
-	That being said, I _really_ want comments regarding the software
-as well as suggestions.  Bug fixes are even snazzier and code
-contributions are welcome.  :)  
-
-	Dan Pilone
-	pilone@slac.com
-	http://www.slac.com/pilone/kpilot_home/
-	July 20, 2000
-
-	Adriaan de Groot
-	adridg@cs.kun.nl
-	http://www.cs.kun.nl/~adridg/kpilot-bugs.html
-	February 24, 2001
diff --git a/kpilot/Documentation/README-4.2.1 b/kpilot/Documentation/README-4.2.1
deleted file mode 100644
index 71db7285..00000000
--- a/kpilot/Documentation/README-4.2.1
+++ /dev/null
@@ -1,106 +0,0 @@
-KPILOT 4.2.1 by Dan Pilone
-===========================
-	Additional work by Robert Ambrose, 
-	Preston Brown, Adriaan de Groot, 
-	Heiko Purnhagen, Jorg Habenicht,
-	and probably many more.
-
-	KPilot is software for syncing the 3Com Palm Pilot, Palm III, IIIe,
-IIIc, IIIx, V, Vx, M100, Handspring Visor and IBM Workpad with a machine 
-running some flavor of unix. The actual PC->PP communcations was originally 
-based on pilot-link.0.8.7, though you should use pilot-link.0.9.3 now. 
-By default KPilot attempts to connnect using /dev/pilot which should be 
-a link to the actual serial port, however this is configurable in the 
-settings dialog. 
-
-	This is the second release of KPilot 4.x, the first version of
-KPilot that works with and under KDE2. It is released as part of KDE 2.2.
-
-INSTALLATION INSTRUCTIONS
-=========================
-
-	The file ../README contains minimal information on how to compile
-and install KPilot. Since KPilot is part of the kdepim package, you
-should also have the INSTALL file for kdepim, probably in ../../INSTALL.
-
-	This README file only contains the release notes for KPilot 4.2.1.
-
-UPGRADING FROM OLDER KPILOTS
-============================
-
-The first time you run KPilot 4.2.1, it will automatically display
-the setup screen and you can check all the configuration settings.
-If you used KPilot 3.x, you should also immediately configure all your
-conduits (again) because many things have changed there.
-
-CURRENT FEATURES
-================
-	* Conduit for abbrowser (experimental).
-	* Conduit for expenses (experimental).
-	* Improved international-character support.
-	o Conduit for KNotes (still experimental).
-	o Now a KDE2 application.
-	o Plug in conduit support, currently including
-		KOrganizer, todolist, null and PopMail
-	o Hot-Sync daemon.  - Now hot-sync with just the push of the
-	  Hot-Sync button on your cradle.  No need to launch KPilot.
-	o Add/Delete/Edit memos.
-	o Add/Delete/Edit addresses.
-	o Full Category support for both memos and addresses.
-	o KPilot now respects secret data.
-	o More configuration options including port speed and 
-	  docking control.
-	o Now supports signature files for email.
-	o Drag and drop to docked icon for file install.
-	o International Support
-	o Full Backup/Restore capabilities of Palm Pilot
-	o File (prc,pdb) installation
-	o Email syncing capabilities (via POP3 & sendmail)
-	o SmartSync backing up modified data even
-		for databases KPilot doesn't recognize
-	o Import/Export to/from virtually any text format for
-		Addresses.
-	o Import/Export to/from text files for memos
-	o Sort and display addresses in different ways
-	o A null conduit (programming example)
-	o Syncing with UNIX mailboxes
-	o Database dispositions (sync, backup only, or ignore)
-
-(* = new in this release)
-
-
-KNOWN BUGS
-==========
-	All the known bugs in KPilot can be found in the KDE bugs database
-
-	http://bugs.kde.org/db/pa/lkpilot.html
-
-Please check with that database before reporting bugs.
-
-
-
-
-STANDARD DISCLAIMER, WARNINGS, ETC..
-====================================
-	THIS SOFTWARE HAS BUGS.  Use at your own risk.  It has not even
-been tested anywhere but on my machine and only with my Palm Pilot.  I
-have been using it against XCopilot for development then verifying it
-works with a real pilot with my Palm Pilot Professional running OS v2.0.4.  
-It works with Adriaan's Palm V running PalmOS 3.5 as well.
-I make no claims that it will work, or even try to work.  I take no
-responsibility for any data loss, damage, etc. done by this software.  
-ie:  Should your pilot burst into flames while trying to sync a new game..
-sorry.
-	That being said, I _really_ want comments regarding the software
-as well as suggestions.  Bug fixes are even snazzier and code
-contributions are welcome.  :)  
-
-	Dan Pilone
-	pilone@slac.com
-	http://www.slac.com/pilone/kpilot_home/
-	July 20, 2000
-
-	Adriaan de Groot
-	adridg@cs.kun.nl
-	http://www.cs.kun.nl/~adridg/kpilot-bugs.html
-	April 11, 2001
diff --git a/kpilot/Documentation/README-4.2.2 b/kpilot/Documentation/README-4.2.2
deleted file mode 100644
index 604460fc..00000000
--- a/kpilot/Documentation/README-4.2.2
+++ /dev/null
@@ -1,108 +0,0 @@
-KPILOT 4.2.2 by Dan Pilone
-===========================
-	Additional work by Robert Ambrose, 
-	Preston Brown, Adriaan de Groot, 
-	Heiko Purnhagen, Jorg Habenicht,
-	and probably many more.
-
-	KPilot is software for syncing the 3Com Palm Pilot, Palm III, IIIe,
-IIIc, IIIx, V, Vx, M100, Handspring Visor and IBM Workpad with a machine 
-running some flavor of unix. The actual PC->PP communcations was originally 
-based on pilot-link.0.8.7, though you should use pilot-link.0.9.3 now. 
-By default KPilot attempts to connnect using /dev/pilot which should be 
-a link to the actual serial port, however this is configurable in the 
-settings dialog. 
-
-	This is the second release of KPilot 4.x, the first version of
-KPilot that works with and under KDE2. It is released as part of KDE 2.2.
-KPilot 4.2.2 is the revision released AFTER KDE 2.2 alpha 1.
-
-INSTALLATION INSTRUCTIONS
-=========================
-
-	The file ../README contains minimal information on how to compile
-and install KPilot. Since KPilot is part of the kdepim package, you
-should also have the INSTALL file for kdepim, probably in ../../INSTALL.
-
-	This README file only contains the release notes for KPilot 4.2.2.
-
-UPGRADING FROM OLDER KPILOTS
-============================
-
-The first time you run KPilot 4.2.2, it may automatically display
-the setup screen and you can check all the configuration settings.
-If you used KPilot 3.x, you should also immediately configure all your
-conduits (again) because many things have changed there.
-
-CURRENT FEATURES
-================
-	* XML GUI support (courtesy of Martin Junius).
-	* Conduit for abbrowser (experimental).
-	* Conduit for expenses (experimental).
-	* Improved international-character support.
-	o Conduit for KNotes (still experimental).
-	o Now a KDE2 application.
-	o Plug in conduit support, currently including
-		KOrganizer, todolist, null and PopMail
-	o Hot-Sync daemon.  - Now hot-sync with just the push of the
-	  Hot-Sync button on your cradle.  No need to launch KPilot.
-	o Add/Delete/Edit memos.
-	o Add/Delete/Edit addresses.
-	o Full Category support for both memos and addresses.
-	o KPilot now respects secret data.
-	o More configuration options including port speed and 
-	  docking control.
-	o Now supports signature files for email.
-	o Drag and drop to docked icon for file install.
-	o International Support
-	o Full Backup/Restore capabilities of Palm Pilot
-	o File (prc,pdb) installation
-	o Email syncing capabilities (via POP3 & sendmail)
-	o SmartSync backing up modified data even
-		for databases KPilot doesn't recognize
-	o Import/Export to/from virtually any text format for
-		Addresses.
-	o Import/Export to/from text files for memos
-	o Sort and display addresses in different ways
-	o A null conduit (programming example)
-	o Syncing with UNIX mailboxes
-	o Database dispositions (sync, backup only, or ignore)
-
-(* = new in this release)
-
-
-KNOWN BUGS
-==========
-	All the known bugs in KPilot can be found in the KDE bugs database
-
-	http://bugs.kde.org/db/pa/lkpilot.html
-
-Please check with that database before reporting bugs.
-
-
-
-
-STANDARD DISCLAIMER, WARNINGS, ETC..
-====================================
-	THIS SOFTWARE HAS BUGS.  Use at your own risk.  It has not even
-been tested anywhere but on my machine and only with my Palm Pilot.  I
-have been using it against XCopilot for development then verifying it
-works with a real pilot with my Palm Pilot Professional running OS v2.0.4.  
-It works with Adriaan's Palm V running PalmOS 3.5 as well.
-I make no claims that it will work, or even try to work.  I take no
-responsibility for any data loss, damage, etc. done by this software.  
-ie:  Should your pilot burst into flames while trying to sync a new game..
-sorry.
-	That being said, I _really_ want comments regarding the software
-as well as suggestions.  Bug fixes are even snazzier and code
-contributions are welcome.  :)  
-
-	Dan Pilone
-	pilone@slac.com
-	http://www.slac.com/pilone/kpilot_home/
-	July 20, 2000
-
-	Adriaan de Groot
-	adridg@cs.kun.nl
-	http://www.cs.kun.nl/~adridg/kpilot-bugs.html
-	April 14, 2001
diff --git a/kpilot/Documentation/UML/vcal-classdiagram.xmi.tgz b/kpilot/Documentation/UML/vcal-classdiagram.xmi.tgz
deleted file mode 100644
index 1e222f37..00000000
--- a/kpilot/Documentation/UML/vcal-classdiagram.xmi.tgz
+++ /dev/null
diff --git a/kpilot/Documentation/checkPlugin.sh b/kpilot/Documentation/checkPlugin.sh
deleted file mode 100644
index bc0b840c..00000000
--- a/kpilot/Documentation/checkPlugin.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#! /bin/sh
-##
-## checkPlugin.sh
-##
-## Copyright (C) 2002 by Adriaan de Groot
-##
-## Distributed under the GNU General Public License (GPL) Version 2.
-##
-
-##
-## Usage: checkPlugin.sh <app-path> <plugin-path> [<extra-lib> ...]
-##
-## <app-path> :    path to the application that will be loading the
-##                 plugin. This is used to get the list of library
-##                 dependencies.
-## <plugin-path> : path to the plugin (.so) that will be loaded.
-## <extra-lib> :   paths to additional libraries to get defined symbols from.
-##
-
-USAGE="Usage: checkPlugin.sh <app-path> <plugin-path> [<extra-lib> ...]"
-
-UNDEF_RE="^ *U "
-DEF_RE="^[0-9a-fA-F]* [TdWBVDR] "
-TMP="/tmp/$$"
-
-APP_PATH="$1"
-PLUGIN_PATH="$2"
-
-test -z "$APP_PATH" && echo "$USAGE"
-test -z "$APP_PATH" && exit 1
-test -f "$APP_PATH" || echo "$USAGE"
-test -f "$APP_PATH" || exit 1
-
-test -z "$PLUGIN_PATH" && echo "$USAGE"
-test -z "$PLUGIN_PATH" && exit 1
-test -f "$PLUGIN_PATH" || echo "$USAGE"
-test -f "$PLUGIN_PATH" || exit 1
-
-shift 2
-
-if nm --demangle "$PLUGIN_PATH" > "$TMP-1" ; then
-	echo `wc -l < "$TMP-1"` "symbols in $PLUGIN_PATH"
-else
-	echo "nm failed on $PLUGIN_PATH"
-	exit 1
-fi
-
-cat "$TMP-1" | grep "$UNDEF_RE" | sed "s/$UNDEF_RE//" | sort > "$TMP-undef"
-
-T=`ldd "$APP_PATH" | grep -v "$APP_PATH" | grep -v "not found" | sed -e 's/.*=> //' -e 's/ (.*) *$//' | sort | uniq`
-
-for LIBF in $T $* ; do
-	test -f "$LIBF" || echo "$LIBF: Not found"
-	test -f "$LIBF" || exit 1
-
-	if nm --demangle "$LIBF" > "$TMP-2" 2> /dev/null ; then
-		nm --demangle --dynamic "$LIBF" >> "$TMP-2" 2> /dev/null
-		# echo `wc -l < "$TMP-2"` "symbols defined in $LIBF"
-	else
-		echo "nm failed on $LIBF"
-		exit 1
-	fi
-
-	cat "$TMP-2" | grep "$DEF_RE" | sed "s/$DEF_RE//" | sort | uniq > "$TMP-def"
-	cat "$TMP-undef" "$TMP-def" | sort | uniq -d > "$TMP-now-defined"
-	cat "$TMP-undef" "$TMP-now-defined" | sort | uniq -u > "$TMP-still"
-
-	echo `wc -l < "$TMP-now-defined"` "symbols resolved by $LIBF"
-	
-	cat "$TMP-still" > "$TMP-undef"
-done
-
-echo `wc -l < "$TMP-undef"` "undefined symbols remain"
-
-cat "$TMP-undef"
-
-rm -f "$TMP" "$TMP-1" "$TMP-2" "$TMP-undef" "$TMP-def" "$TMP-now-defined" "$TMP-still"
diff --git a/kpilot/Documentation/merge-into-svn.sh b/kpilot/Documentation/merge-into-svn.sh
deleted file mode 100755
index c012deed..00000000
--- a/kpilot/Documentation/merge-into-svn.sh
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/bin/bash
-COPYTO=$1
-
-if [ "x$COPYTO" = "x" ] || [ ! -d "$COPYTO" ]
-then
-  echo "$(basename $0) <directory to merge to>"
-  exit 1
-fi
-
-STARTDIR=$(pwd)
-
-COPYFILES=""
-DELFILES=""
-NEWFILES=""
-
-function isversioned {
-  F=$1
-  svn info $F 2>&1 | grep Checksum > /dev/null
-  rc=$?
-  if [ $rc -eq 0 ]
-  then
-    echo 1
-  else
-    echo 0
-  fi
-}
-
-function checkCopy {
-
-echo "[-] Checking for files that need to be copied to: [$COPYTO]..."
-echo "-----------------------------------------------------"
-
-# first pass is to copy all files we care about from current to destination
-for f in $(find . | egrep -vi \
-"aap|build-|\.svn|\.libs|Makefile$|Makefile.in|~$|\.la$")
-do
-if [ -f $f ]; then
-  F=$(printf "%-60s\n" $f)
-  C=$(sum -r $f)
-  O=$(sum -r $COPYTO/$f 2>/dev/null)
-  if [ "$C" = "$O" ] ; then
-    S="SAME"
-  elif [ ! -f $COPYTO/$f ]; then
-    S="NEW"
-  else
-    S="DIFF"
-  fi
-
-  if [ "$S" != "SAME" ]; then
-    echo "file: [$F], status: [$S]"
-    if [ "$S" = "DIFF" ]; then
-      COPY="y"
-    elif [ "$S" = "NEW" ] ; then
-      V=$(isversioned $f)
-      if [ "$V" -eq 0 ]; then
-        echo " - new file, but not versioned, so ignoring."
-	COPY="n"
-      elif [ "$V" -eq 1 ]; then
-        echo -n " - new file.  versioned. copy this one? (Y/N) -> "
-        read ANS
-        ANS=$(echo $ANS | tr '[A-Z]' '[a-z]')
-        if [ "$ANS" = "y" ]; then
-          COPY="y"
-	  NEWFILES="$NEWFILES $f"
-        else
-          COPY="n"
-        fi
-      fi
-    fi
-    if [ "$COPY" = "y" ]; then
-      echo "  - copying this file..."
-      COPYFILES="$COPYFILES $f"
-    else 
-      echo "  - not copying it..."
-    fi
-  fi
-fi
-done
-}
-
-function checkDelete {
-
-echo "[-] Checking for files that should be deleted from: [$COPYTO] ..."
-echo "-----------------------------------------------------"
-
-# now see if there's anything that was in dest, but is not in new and
-# remove it
-cd $COPYTO
-for f in $(find . | egrep -vi \
-"aap|build|.svn|.libs|Makefile|~$|lib/pilot-link|.la$|.deps|.moc$|.lo$|\.o$")
-do
-if [ -f $f ]; then
-  F=$(printf "%-60s\n" $f)
-  if [ ! -f $STARTDIR/$f ] ; then
-    V=$(isversioned $f)
-    if [ "$V" -eq 1 ]; then
-      echo -n " - file: [$F] looks like it's been deleted. should I remove it?  (Y/N) -> "
-      read ANS
-      ANS=$(echo $ANS | tr '[A-Z]' '[a-z]')
-      if [ "$ANS" = "y" ]; then
-        echo "  - okay, I'll remove this one..."
-        DELFILES="$DELFILES $f"
-      fi
-    fi
-  fi
-fi
-done
-}
-
-checkCopy
-checkDelete
-
-cd "$STARTDIR"
-
-echo "okay, here are the files that I'll copy:"
-for f in $(echo $COPYFILES)
-do
-  echo " - $f"
-done
-
-echo "and here are the files that I'll do an svn remove on:"
-for f in $(echo $DELFILES)
-do
-  echo " - $f"
-done
-
-echo "and here are the files that I'll do an svn add on:"
-for f in $(echo $NEWFILES)
-do
-  echo " - $f"
-done
-
-echo -n "Okay to proceed? (y/n) -> "
-read ANS
-ANS=$(echo $ANS | tr '[A-Z]' '[a-z]')
-if [ "$ANS" != "y" ]; then
-  echo "  - okay, stopping."
-  exit
-fi
-
-cd "$STARTDIR"
-
-echo "okay, copying..."
-for f in $(echo $COPYFILES)
-do
-  cp --parents -v "$f" "$COPYTO"
-done
-
-cd "$COPYTO"
-
-echo "doing svn remove..."
-for f in $(echo $DELFILES)
-do
-  echo " - $f"
-  svn remove "$f"
-done
-
-cd "$COPYTO"
-
-echo "doing svn add..."
-for f in $(echo $NEWFILES)
-do
-  echo " - $f"
-  svn add "$f"
-done
diff --git a/kpilot/INSTALL b/kpilot/INSTALL
deleted file mode 100644
index 3fa5f0ff..00000000
--- a/kpilot/INSTALL
+++ /dev/null
@@ -1,56 +0,0 @@
-Basic Installation
-==================
-
-
-KPilot uses the CMake build system which is the native build system
-for KDE4; for KDE3 applications like KPilot, CMake is also useable.
-You need CMake installed on your system to compile KPilot, but CMake
-is becoming more widespread now. You can get it from www.cmake.org .
-
-First configure KPilot by running
-
-	./configure [options]
-
-If you run configure with no options it will tell you which ones
-are available; you *must* provide at least one for configure to
-work. A most-vanilla configure looks like this:
-
-	./configure --enable-tests=no
-
-Suggested options are at least:
-
-	./configure --enable-debug=yes --enable-tests=yes
-
-You may need to specify a prefix or a location where pilot-link
-is installed; run ./configure --show for a summary of options.
-
-Once configure is done, compile KPilot, by running
-
-	make -f Makefile.cmake
-
-in the KPilot source directory (that is the one containing this
-INSTALL file). This will run CMake to generate the real Makefiles,
-then run make again to build the project in a build-* subdirectory.
-Once it is done, you can run
-
-	make -f Makefile.cmake install
-
-to install KPilot in the KDE directory.
-
-
-
-
-Advanced Installation
-=====================
-
-In order to build KPilot somewhere else, or if the sources are on
-read-only media, use CMake directly instead of using the basic
-Makefile included with KPilot. To do this,
-	1) Create a build directory somewhere
-	2) cd into that build directory
-	3) Run cmake /path/to/kpilot/sources
-	4) Run make
-
-In order to install KPilot somewhere else, use -DCMAKE_INSTALL_PREFIX .
-
-
diff --git a/kpilot/Mainpage.dox b/kpilot/Mainpage.dox
deleted file mode 100644
index 7e0b086c..00000000
--- a/kpilot/Mainpage.dox
+++ /dev/null
@@ -1,31 +0,0 @@
-/** \mainpage %KPilot API Overview
-
-\section Architecture
-
-%KPilot consists of a core library of utility and communications
-classes which are used by two applications: KPilot itself
-(which is little more than a clumsy data viewer and
-configuration shell) and the KPilot daemon which does
-the actual communications with the hadheld.
-The daemon loads plugins (called conduits) on demand
-which are used for syncing specific data on the PC
-with the handheld.
-
-The lib/ directory holds the base library for KPilot.
-This boils down to a bunch of wrappers for pilot-link
-classes (not using p-l's C++ code because that isn't
-Qt-ish) and a few classes that do interesting things:
-KPilotDeviceLink for managing the device connection,
-and SyncAction for doing stuff during a sync.
-
-The kpilot/ directory houses several applications:
-kpilot and kpilotDaemon are installed, and kpilotTest
-which is not installed but which can function as a demon
-under closely-controlled circumstances from the command-line.
-
-Under conduits/ a bunch of directories hold the individual
-conduits; the "four button" apps are in vcalconduit/ (ToDo and
-Datebook), abbrowserconduit/ (Addresses, not the newer Contacts)
-and knotes/ or memofileconduit/ (Memos).
-
-*/
diff --git a/kpilot/Makefile.am b/kpilot/Makefile.am
deleted file mode 100644
index e787d42e..00000000
--- a/kpilot/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-## kdepim/kpilot/Makefile.am
-## (C) 1997 Stephan Kulow
-## Modified by Adriaan de Groot
-
-SUBDIRS = lib kpilot conduits
-
-messages:
-	$(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui"`  > rc.cpp
-	$(XGETTEXT) `find . -name "*.cc" -o -name "*.cpp"` -o $(podir)/kpilot.pot   
-	-rm -f rc.cpp
-
-DOXYGEN_REFERENCES = kpilot/lib kpilot/kpilot
-include $(top_srcdir)/admin/Doxyfile.am
-
-# Just for the KPilot developers: grab all the strings, for checking.
-devel-pot :
-	extractrc `find . -name "*.rc" -o -name "*.ui"` > /tmp/rc.cpp
-	xgettext -C --keyword=i18n --keyword=I18N_NOOP -o /tmp/kpilot.po \
-		`find . -name "*.cc"` /tmp/rc.cpp
-
diff --git a/kpilot/Makefile.cmake b/kpilot/Makefile.cmake
deleted file mode 100644
index 55dba5af..00000000
--- a/kpilot/Makefile.cmake
+++ /dev/null
@@ -1,65 +0,0 @@
-# This is a GNU makefile. You need GNU make to process it.
-# FreeBSD users should use gmake.
-#
-#
-
-# Unusual configuration things:
-#   CMAKE = path to cmake
-#   BUILD_DIR = directory to build things in
-#   CMAKE_FLAGS = extra flags to CMake.  These will get set by
-#      ./configure, saved to CMakeOptions.txt, and read in below...
-#
-
--include Makefile.cmake.in
-
-BUILD_DIR ?= build-$(shell uname -sr | tr -d [:space:] | tr -Cs a-zA-Z0-9 _ )
-# these come from CMakeOptions.txt (from ./configure)
-CMAKE_FLAGS ?=
-CMAKE ?= cmake
-
-all: build-check
-	@cd "$(BUILD_DIR)" && $(MAKE)
-
-check: lib tests
-	$(BUILD_DIR)/tests/testconstants
-	$(BUILD_DIR)/tests/testcategories --data-dir=tests/data
-	$(BUILD_DIR)/tests/testaddresses --data-dir=tests/data
-	$(BUILD_DIR)/tests/testdatebook --data-dir=tests/data
-
-install: build-check
-	@cd "$(BUILD_DIR)" && $(MAKE) install
-
-uninstall: 
-	@cd "$(BUILD_DIR)" && $(MAKE) uninstall
-
-lib: $(BUILD_DIR)/lib/libkpilot.so
-
-$(BUILD_DIR)/lib/libkpilot.so: build-check
-	@cd "$(BUILD_DIR)/lib" && $(MAKE)
-
-tests: build-check
-	@cd "$(BUILD_DIR)/tests" && $(MAKE)
-
-	
-build-check:
-	test -d "$(BUILD_DIR)" || mkdir -p "$(BUILD_DIR)"
-	test -d "$(BUILD_DIR)"
-	test -f "$(BUILD_DIR)/Makefile" || (cd "$(BUILD_DIR)" && $(CMAKE) .. )
-
-messages:
-	extractrc `find . -name *.rc` > rc.cc
-	extractrc `find . -name *.ui` >> rc.cc
-	xgettext -o kpilot.po --keyword=i18n rc.cc `find . -name *.h` `find . -name *.cc` 
-
-clean:
-	@rm -rf $(BUILD_DIR)
-
-svnclean:
-	@rm -rf `svn status --no-ignore | awk '/^[?I]/{print $2}'`
-
-help:
-	@echo "Usage: make ( all | install | uninstall | clean )"
-	@echo ""
-
-.PHONY : all check install uninstall lib build-check clean help 
-
diff --git a/kpilot/NEWS b/kpilot/NEWS
deleted file mode 100644
index 4e9a6983..00000000
--- a/kpilot/NEWS
+++ /dev/null
@@ -1,24 +0,0 @@
-KPilot news. This file lists only major releases &c.
-For more detailed information and musings, see the
-ChangeLog or the README files. There is also the
-history page on www.kpilot.org.
-
-* November 18, 2006: KDE 3.5.5 is getting KPilot backported
-  to it, and KPilot itself now uses CMake as its buildsystem.
-* November 4, 2004: KDE 3.3.1 contains KPilot 4.4.5; there is
-  a 4.4.6 available from the website, but it is of dubious
-  quality.
-* January 18, 2004: KDE 3.2 released, with KPilot 4.4.0. I'd
-  say 4.4.0 is dead in the water, there's too much new useful
-  stuff in 4.4.1 (for the PIM release).
-* August 19, 2002: License change for the lib part of KPilot to
-  LGPL and an exception made in the COPYING file for libmal to
-  allow the AvantGo (tm) conduit to use that library.
-* May 23, 2002: KPilot 4.3.2 seems ok now. It's too late for
-  KDE 3.0.1. It should still work for KDE 2.2.2.
-* January 20, 2002: KPilot 4.3.0b still isn't ready for release.
-* April 8, 2001: KPilot 4.2.2 released with KDE 2.2a1.
-* February 12, 2001: KPilot 4.0.0 released with KDE 2.1.
-* 2000: KPilot 3.2.1 released. This is the last KDE 1.x release.
-
-
diff --git a/kpilot/README b/kpilot/README
deleted file mode 100644
index bffacdbd..00000000
--- a/kpilot/README
+++ /dev/null
@@ -1,43 +0,0 @@
-KPILOT 4.9.1 by Adriaan de Groot
-=============================================
-	Additional work by Robert Ambrose,
-	Preston Brown, Adriaan de Groot,
-	Heiko Purnhagen, Joerg Habenicht,
-	David Bishop, Aaron Seigo,
-	Reinhold Kainhofer, Joern Ahrens,
-	Jason Kasper,
-	and probably many more.
-
-	KPilot is software for syncing PalmOS based handhelds
-such as the 3Com Palm Pilot with a machine running some flavor of UNIX.  
-
-	Developer's notes are listed in the file ChangeLog. This is
-probably only of interest if you want to see how certain features developed
-or if certain bugs have been reported before.
-
-	http://www.kpilot.org/
-
-
-
-STANDARD DISCLAIMER, WARNINGS, ETC..
-====================================
-	THIS SOFTWARE HAS BUGS.  Use at your own risk.  It has not even
-been tested anywhere but on my machine and only with my Palm Pilot.  I
-have been using it against XCopilot for development then verifying it
-works with a real Pilot with my Palm Pilot Professional running OS v2.0.4.
-I make no claims that it will work, or even try to work.  I take no
-responsibility for any data loss, damage, etc. done by this software.
-ie:  Should your Pilot burst into flames while trying to sync a new game..
-sorry.
-	That being said, I _really_ want comments regarding the software
-as well as suggestions.  Bug fixes are even snazzier and code
-contributions are welcome.  :)  Send mail to kde-pim@kde.org .
-
-	Dan Pilone
-	pilone@slac.com
-	July 20, 2000
-
-	Adriaan de Groot
-	groot@kde.org
-	November 18, 2006
-
diff --git a/kpilot/TODO b/kpilot/TODO
deleted file mode 100644
index 1729fafb..00000000
--- a/kpilot/TODO
+++ /dev/null
@@ -1,201 +0,0 @@
-This is a TODO file. Open issues are unmarked, partly resolved issues
-are marked with a *, ignored issues get an -, and resolved issues a +
-(or they are completely removed from the list). Check the ChangeLog
-for details on how an issue is resolved, since resolved issues are
- periodically purged from this list.
-
-
-* Import pilot-link 0.12 CVS again
-* Implement correct full syncing in memofile conduit.  honestly, we should
-  really have a generic sync engine that knows how to do all of the
-  different sync types and only calls conduits for comparisons, list
-  fetching, pilotid->whateverId persistence and retrieval, etc.  *sigh*  is
-  that what opensync gives us?
-
-Essential
-=========
-3b) Implement reset to last sync and ignore conflict resolution options in
-    vcal conduits (bug #59221)
-4a) Config troubles: Start kpilotDaemon and then kpilot. Configure a conduit
-    in kpilot, then do a sync (which writes something to the  config, e.g.
-    run the docconduit). Now configure another conduit in kpilot. The config
-    file will be changed again, but the changes from the sync are lost (i.e.
-    after a sync, kpilot needs to reload the config). (seems connected to bug #56115)
-*4b) Conduits should not use the backup databases, otherwise a backup run will
-    screw up the conduit's mechanism to detect changes. (bug #59219)
-4c) Need to find a better way to detect runs without a conduit, and switch to
-    full sync in that case to prevent data loss.
-4d) Need to find a good way to avoid a mess when implementing new features
-    (e.g. after implementing the correct category sync, how do I ensure that
-    no category settings are lost?)
-5)  After the special sync is done, ask if the next sync should again be the
-    same special sync, a fast or a hot sync. (wish #59218)
-
-
-Important (hight priority)
-============================
-6a) The abook conduit currently only syncs one email address and one
-    phone number of each type. I need to find a way to sync two email
-    addresses to and from the handheld. (Bug #56364)
-7)  Check the first-time syncing behavior of all the conduits.
-15) Add force-first-time to the KNotes conduit.
-17) Include a calendar viewer, or get rid of the internal viewers
-    altogether.
-19) GJJ: Replace newlines in TODO summaries (not allowed in libkcal),
-    also do the same for phone numbers etc. (bug #56379)
-19b)Make the doc conduit use the new global settings instead of its own 
-
-
-Medium (nice to have, but not essential)
-========================================
-18) VCal conduit: events going over midnight need to be split up
-    on the handheld (bug #59223)
-20) GJJ: Check all debug output, what should be put in the log (i.e.
-    be visible to the user) and what is just debug output to track
-    down problems.
-21) GJJ: Hunt down and kill printfs. Hunt down bad i18n.
-26) ABook conduit: sync with preferred address (not home or work address)
-27) Update the conduit programming howto (some changes in the database
-    and record classes)
-31) GJJ: Extend all conduits to allow arbitrary URLs instead of local
-    files.
-32) JPilot conduit: fix the configure.in.in checks for gtk/glibc
-    (although the conduit isn't even remotely finished)
-32a)Find a replacement for the NULL conduit (skip databases when
-    doing a backup)
-
-
-Unimportant (lowest priority)
-=============================
-33) JPilot conduit: Implement the conduit as an external GTK application,
-    that is embedded into kpilot using qxembed
-34) JJ: Add tooltips to all controls in all conduit configure dialogs
-35) Do not store the RecordID with the vcalendar entry, but in the kpilot
-    config
-37) JJ: Show the sync log as a KPassivePopup
-39) Make an application that just has a LogWidget and KPilot's dcop
-    interface (and registration!) so that you can follow the daemon's
-    log output without starting KPilot at all.
-40) Allow the todo conduit to use the manana database (see jpilot)
-41) Allow the memo conduit to use the pedit32 database (see jpilot)
-42) Use pdf2text application to also install pdb files with the palmdoc
-    conduit.
-
-
-
-
-
-
-FINISHED TODO jobs
-==================
-
-+(1)  VCal conduit: Currently using the ResourceCalendar (standard
-    calendar) doesn't work for some (unknown) reason. Every sync
-    happens with the filename given in the setup dialog. Probably
-    very easy to fix.
-+(2) 4d) Need to find a good way to avoid a mess when implementing new features
-    (e.g. after implementing the correct category sync, how do I ensure that
-    no category settings are lost?)
-+(3a) Implement the CopyToPC and CopyToHH directions in the addressbook conduit (bug #59220)
-5)  After the special sync is done, ask if the next sync should again be the
-    same special sync, a fast or a hot sync. (wish #59218)
-
- Redesign the config dialog of kpilot (get rid of deprecated
-    options, include conflict resolution, etc.)
-+(3)  Fix all conduits to use the new global options: conflict resolution,
-    emergency sync, sync mode etc.
-+(4)  VCal conduit: Fields not supported on the handheld are erased
-    in the calendar (e.g. categories). I need to get the Event
-    before I copy all fields over, and only overwrite the fields
-    from the handheld, so the others remain unchanged.
-	 RESOLUTION: Found out that this is not true any longer, and everything
-	 works just fine!
-+(5)  AvantGo conduit: fix the configure.in.in checks for libmal
-+(6)  ABook conduit: fix the first sync setting
-+(8)  Find out what's the reason of the "Invalid unique ID" crashes in
-    the calendar conduits (and the addresssbook conduit) (bug #51216)
--(9)  GJJ: PalmDOC conduit: kpalmdoc is run as a modal dialog, not as
-    a standalone dialog (e.g. create a link  on the desktop to
-    kpalmdoc and start kpalmdoc from there. You can't access the
-    desktop until you quit kpalmdoc)
-    RESOLUTION: This is a general KDE Bug!!!!
--(10) GJJ: Add a flag to the log{Error,Message} functions to prevent
-    the addition of the trailing <br> and the date to each output
-    (e.g. to put all output from the AvantGo conduit in one line,
-    instead of one separate line for each .)
-    RESOLUTION: This is not possible in a QTextEdit in LogText mode.
-    However, I got rid of the pseudoo-progressbar, so this i no longer
-    needed.
-+(11) Merge between HEAD and BRANCH (again).
-+(12) ABook conduit: Check all fields for differences before asking
-    for conflict resolution. (i.e. don't ask for conflict resolution
-    of single fields, just for the whole record) (bug #59222)
-+(13) ABook conduit: custom field sync doesn't work with birthdate
-    (how do I convert a date to a string and back in an arbitrary
-    format???) (Bug #50871)
-+(14) ABook conduit: Fix categories sync
-    RESOLUTION: Fixed for the abook and the todo conduit
-+(16) Remove the edit capabilities from the built-in viewers. (fixes bug #54765)
-    Or write a SyncAction childclass that merges  the changes from the internal
-    editors to the databases on the handheld before the sync takes place
-		RESOLUTION: Implemented the InternalEditorAction that syncs these modifications
-+(19a)Implement the internal editor sync
-+(19a)When syncing, also backup the databases (if option is set)
-+(19b)Add all codecs that are supported by Qt, automatically fill the
-    combobox in the config dialog. Change the combobox to an editable
-	 Combobox so that the user can also give other encodings (if he
-	 installed the corresponding plugins).
-+(22) Update README, TODO, NEWS, AUTHORS in HEAD.
-+(23) GJJ: Move the conduit configuration dialog (for the umpteenth time)
-    to a list of QCheckBoxes, like noatun's plain playlist or
-    kdebugdialog
-+(24) PalmDOC conduit: choosing the bookmark type of the pdb->txt
-    conversion is not yet implemented. Only create .bm file, if there
-    are bookmarks in the text.
--(25) ABook conduit: sync with multiple email addresses (space-separated
-    list received from handheld)
-		RESOLUTION: Duplicate of 6a)
-+(28) GJJ: The question asked when kpilot and the pilot's usernames don't
-    match isn't very intuitive. It should be changed to a yes/no/cancel
-    with "Use KPilot name" "Use Pilot name" "Cancel". This is in
-    interactiveSync.cc.
--(29) Fix the NULL conduit's tooltip - OR - make it actually do what the
-    current tooltip says.
-    RESOLUTION: The NULL conduit is no longer needed at all, so I disabled
-    it completely
--(30) GJJ: Create good icons for the kpalmdoc converter application.
-+(38) Should interactiveSync and syncStack be moved to lib/ ?
-
-
-
-
-
-Specific JOBS
-=============
-
-***
-*** PilotLocalDatabase fixups
-***
-
-The PilotLocalDatabase class is really ugly and clunky -- and far worse,
-it has a hard-coded limit of 10000 records per database. This may have hurt
-us once or twice already (consider that a Visor w/ 16Mb could *easily*
-hold 10000 addresses). It needs careful reworking.
-
-I think using a Q(Ptr)List is the way to go here -- well, maybe a QVector
-would work as well; that depends on whether QVectors resize well. The tricky
-part is implementing the "current record pointer" with the same behavior
-as the current fCurrentRecord member, since conduits may depend on it.
-
-
-***
-*** Popmail Conduit & IOSlaves
-***
-
-The popmail conduit duplicates a lot of code found elsewhere -- it does
-SMTP sending and POP3 retrieval of mail messages. That should really be
-left to IOSlaves, which are better debugged. Using tickle() will be
-necessary while waiting for responses from the slaves, since you must keep
-the pilot awake. (This opens the door to multi-threading conduits, with
-possibly an asynchronous "pre-sync" action).
-
diff --git a/kpilot/cmake/modules/FindMal.cmake b/kpilot/cmake/modules/FindMal.cmake
deleted file mode 100644
index 9439d277..00000000
--- a/kpilot/cmake/modules/FindMal.cmake
+++ /dev/null
@@ -1,62 +0,0 @@
-INCLUDE(CheckCXXSourceCompiles)
-
-set(CMAKE_INCLUDE_PATH "${MAL_BASE}/include")
-FIND_PATH(MAL_INCLUDE_DIR libmal.h 
-	${MAL_BASE}/include
-	${MAL_BASE}/include/libmal
-	/usr/include
-	/usr/include/libmal
-	/usr/local/include
-	/usr/local/include/libmal
-)
-set(CMAKE_LIBRARY_PATH "${MAL_BASE}/lib")
-FIND_LIBRARY(MAL_LIBRARY mal 
-	${MAL_BASE}/lib
-	/usr/lib
-	/usr/lib/libmal
-	/usr/local/lib
-	/usr/local/lib/libmal
-)
-
-IF (NOT MAL_INCLUDE_DIR)
-	MESSAGE(STATUS "Could not find libmal.h")
-ELSE (NOT MAL_INCLUDE_DIR)
-	MESSAGE(STATUS "Found libmal.h in ${MAL_INCLUDE_DIR}")
-ENDIF (NOT MAL_INCLUDE_DIR)
-
-IF (NOT MAL_LIBRARY)
-	MESSAGE(STATUS "Could not find libmal")
-ELSE (NOT MAL_LIBRARY)
-	MESSAGE(STATUS "Found libmal in ${MAL_LIBRARY}")
-ENDIF (NOT MAL_LIBRARY)
-
-IF (MAL_INCLUDE_DIR AND MAL_LIBRARY)
-	SET(MAL_FOUND TRUE)
-ENDIF (MAL_INCLUDE_DIR AND MAL_LIBRARY)
-
-IF (MAL_FOUND)
-	SET(CMAKE_REQUIRED_INCLUDES ${MAL_INCLUDE_DIR} ${PILOTLINK_INCLUDE_DIR})
-	CHECK_CXX_SOURCE_COMPILES("
-#include <libmal.h>
-#define LIBMAL_IS(a,b) ((LIBMAL_VERSION > a) || ((LIBMAL_VERSION == a) && ((LIBMAL_MAJOR > b) || (LIBMAL_MAJOR == b))))
-#if !LIBMAL_IS(0,40)
-#error \"Libmal version is < 0.40\"
-#else
-int main() { return 0; }
-#endif
-"
-		MAL_VERSION_OK)
-ENDIF (MAL_FOUND)
-
-IF (NOT MAL_VERSION_OK)
-	SET(MAL_FOUND FALSE)
-	MESSAGE(STATUS "Found mal, but it's not at least version 0.40.")
-ENDIF (NOT MAL_VERSION_OK)
-
-
-IF (MAL_FOUND)
-	MESSAGE(STATUS "Found mal: ${MAL_LIBRARY}")
-ELSE (MAL_FOUND)
-	MESSAGE(STATUS "Couldn't find acceptable mal version. Won't be able to build malconduit")
-ENDIF (MAL_FOUND)
-
diff --git a/kpilot/cmake/modules/FindPilotlink.cmake b/kpilot/cmake/modules/FindPilotlink.cmake
deleted file mode 100644
index 649419e6..00000000
--- a/kpilot/cmake/modules/FindPilotlink.cmake
+++ /dev/null
@@ -1,55 +0,0 @@
-INCLUDE(CheckCXXSourceCompiles)
-
-set(CMAKE_INCLUDE_PATH "${PILOTLINK_BASE}/include")
-FIND_PATH(PILOTLINK_INCLUDE_DIR pi-dlp.h 
-	/usr/include
-	/usr/include/libpisock
-	/usr/local/include
-	)
-set(CMAKE_LIBRARY_PATH "${PILOTLINK_BASE}/lib")
-FIND_LIBRARY(PILOTLINK_LIBRARY pisock 
-	/usr/lib
-	/usr/local/lib
-	)
-
-IF (NOT PILOTLINK_INCLUDE_DIR)
-	MESSAGE(STATUS "Could not find pilot-link (pi-dlp.h)")
-ELSE (NOT PILOTLINK_INCLUDE_DIR)
-	MESSAGE(STATUS "Found pilot-link includes in  ${PILOTLINK_INCLUDE_DIR}")
-ENDIF (NOT PILOTLINK_INCLUDE_DIR)
-
-IF (NOT PILOTLINK_LIBRARY)
-	MESSAGE(STATUS "Could not find pilot-link (libpisock.so)")
-ELSE (NOT PILOTLINK_LIBRARY)
-	MESSAGE(STATUS "Found pilot-link libraries in ${PILOTLINK_LIBRARY}")
-ENDIF (NOT PILOTLINK_LIBRARY)
-
-IF (PILOTLINK_INCLUDE_DIR AND PILOTLINK_LIBRARY)
-	SET(PILOTLINK_FOUND TRUE)
-ENDIF (PILOTLINK_INCLUDE_DIR AND PILOTLINK_LIBRARY)
-
-IF (PILOTLINK_FOUND)
-	SET(CMAKE_REQUIRED_INCLUDES ${PILOTLINK_INCLUDE_DIR})
-	CHECK_CXX_SOURCE_COMPILES("
-#include <pi-version.h>
-#if !PILOT_LINK_IS(0,12,0)
-#error \"Pilot-link version is < 0.12.0\"
-#else
-int main() { return 0; }
-#endif
-"
-		PILOTLINK_VERSION_OK)
-ENDIF (PILOTLINK_FOUND)
-
-IF (NOT PILOTLINK_VERSION_OK)
-	SET(PILOTLINK_FOUND FALSE)
-ENDIF (NOT PILOTLINK_VERSION_OK)
-
-
-IF (NOT PILOTLINK_FOUND)
-	IF (Pilotlink_FIND_REQUIRED)
-		MESSAGE(STATUS "KPilot requires pilot-link 0.12.0 or later. Pilot-link is available from pilot-link.org and is packaged by most distributions. Remember to install the development package with the compilation headers as well.")
-		MESSAGE(FATAL_ERROR "Could not find pilot-link.")
-	ENDIF (Pilotlink_FIND_REQUIRED)
-ENDIF (NOT PILOTLINK_FOUND)
-
diff --git a/kpilot/cmake/modules/KPilotCustom.cmake b/kpilot/cmake/modules/KPilotCustom.cmake
deleted file mode 100644
index 08b255dc..00000000
--- a/kpilot/cmake/modules/KPilotCustom.cmake
+++ /dev/null
@@ -1,53 +0,0 @@
-MACRO(KDE3_INSTALL_ICONS_CUSTOM _theme)
-   ADD_CUSTOM_TARGET(install_icons )
-   SET_TARGET_PROPERTIES(install_icons PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake )
-   FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "# icon installations rules\n")
-   FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "SET(CMAKE_BACKWARDS_COMPATIBILITY \"2.2\") \n")
-
-   FILE(GLOB _icons *.png)
-   FOREACH(_current_ICON ${_icons} )
-      STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\1" _size "${_current_ICON}")
-      STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\2" _group "${_current_ICON}")
-      STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\3" _name "${_current_ICON}")
-
-      SET(_icon_GROUP "unknown")
-
-      IF(${_group} STREQUAL "mime")
-         SET(_icon_GROUP  "mimetypes")
-      ENDIF(${_group} STREQUAL "mime")
-
-      IF(${_group} STREQUAL "filesys")
-         SET(_icon_GROUP  "filesystems")
-      ENDIF(${_group} STREQUAL "filesys")
-
-      IF(${_group} STREQUAL "device")
-         SET(_icon_GROUP  "devices")
-      ENDIF(${_group} STREQUAL "device")
-
-      IF(${_group} STREQUAL "app")
-         SET(_icon_GROUP  "apps")
-      ENDIF(${_group} STREQUAL "app")
-
-      IF(${_group} STREQUAL "action")
-         SET(_icon_GROUP  "actions")
-      ENDIF(${_group} STREQUAL "action")
-
-      IF( NOT ${_icon_GROUP} STREQUAL "unknown")
-#        message(STATUS "icon: ${_current_ICON} size: ${_size} group: ${_group} name: ${_name}" )
-         SET(_ICON_INSTALL_NAME ${CMAKE_INSTALL_PREFIX}/share/icons/${_theme}/${_size}x${_size}/${_icon_GROUP}/${_name})
-         FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "message(STATUS \"Installing ${_ICON_INSTALL_NAME}\") \n")
-         FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "CONFIGURE_FILE( ${_current_ICON} ${_ICON_INSTALL_NAME} COPYONLY) \n")
-      ELSE( NOT ${_icon_GROUP} STREQUAL "unknown")
-         message(STATUS "icon: ${_current_ICON} doesn't fit naming conventions. ignoring." )
-      ENDIF( NOT ${_icon_GROUP} STREQUAL "unknown")
-
-   ENDFOREACH (_current_ICON)
-ENDMACRO(KDE3_INSTALL_ICONS_CUSTOM)
-
-
-MACRO(KPILOT_RPATH _thing)
-	set_target_properties(${_thing} PROPERTIES 
-		INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib;${KDE3_DIR}/lib;${PILOTLINK_LIBRARY}
-		INSTALL_RPATH_USE_LINK_PATH true
-	)
-ENDMACRO(KPILOT_RPATH _thing)
diff --git a/kpilot/cmake_uninstall.cmake.in b/kpilot/cmake_uninstall.cmake.in
deleted file mode 100644
index 397e3aa7..00000000
--- a/kpilot/cmake_uninstall.cmake.in
+++ /dev/null
@@ -1,23 +0,0 @@
-IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-  MESSAGE(FATAL_ERROR "Cannot find install manifest: 
-\"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
-ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-
-FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
-STRING(REGEX REPLACE "\n" ";" files "${files}")
-FOREACH(file ${files})
-  MESSAGE(STATUS "Uninstalling \"${file}\"")
-  IF(EXISTS "${file}")
-    EXEC_PROGRAM(
-      "@CMAKE_COMMAND@" ARGS "-E remove \"${file}\""
-      OUTPUT_VARIABLE rm_out
-      RETURN_VALUE rm_retval
-      )
-    IF("${rm_retval}" STREQUAL 0)
-    ELSE("${rm_retval}" STREQUAL 0)
-      MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"")
-    ENDIF("${rm_retval}" STREQUAL 0)
-  ELSE(EXISTS "${file}")
-    MESSAGE(STATUS "File \"${file}\" does not exist.")
-  ENDIF(EXISTS "${file}")
-ENDFOREACH(file)
diff --git a/kpilot/conduits/CMakeLists.txt b/kpilot/conduits/CMakeLists.txt
deleted file mode 100644
index e8f49e53..00000000
--- a/kpilot/conduits/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-include_directories(
-	${CMAKE_BINARY_DIR}/lib
-	${CMAKE_SOURCE_DIR}/lib
-	${CMAKE_CURRENT_BINARY_DIR}
-)
-
-add_subdirectory(abbrowserconduit)
-add_subdirectory(docconduit)
-add_subdirectory(knotes)
-add_subdirectory(memofileconduit)
-add_subdirectory(notepadconduit)
-add_subdirectory(null)
-add_subdirectory(popmail)
-add_subdirectory(sysinfoconduit)
-add_subdirectory(timeconduit)
-
-FIND_PATH( HAVE_CALENDARLOCAL_H "libkcal/calendarlocal.h" ${KDE3_INCLUDE_DIR} )
-
-IF (HAVE_CALENDARLOCAL_H)
-	add_subdirectory(vcalconduit)
-ELSE (HAVE_CALENDARLOCAL_H)
-	MESSAGE(STATUS "No KDE PIM development headers were found.")
-ENDIF (HAVE_CALENDARLOCAL_H)
-
-###
-#
-# MAL seems to be broken, or the MAL API has changed somewhat
-# since the last time that the conduit was compiled by the development
-# team. Since we don't use the conduit it is disabled. 
-IF (MAL_FOUND)
- 	add_subdirectory(malconduit)
-ELSE (MAL_FOUND)
-	MESSAGE(STATUS "Couldn't find mal. Won't be able to build malconduit")
-ENDIF (MAL_FOUND)
-
diff --git a/kpilot/conduits/Makefile.am b/kpilot/conduits/Makefile.am
deleted file mode 100644
index fed44984..00000000
--- a/kpilot/conduits/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-###
-### The NULL conduit is a neat programming example, but shouldn't be
-### installed on user systems.
-###
-
-if include_malconduit
-MAL_SUBDIR = malconduit
-else
-MAL_SUBDIR = 
-endif
-
-SUBDIRS = \
-	  abbrowserconduit \
-	  docconduit \
-	  knotes \
-	  $(MAL_SUBDIR) \
-	  memofileconduit \
-	  notepadconduit \
-	  popmail \
-	  sysinfoconduit \
-	  timeconduit \
-	  vcalconduit
-
-###
-### Subdirs you might have for experimental purposes:
-###
-###	null             - a conduit that just logs a single message.
-###	$(PERL_SUBDIR)   - fires off a perl interpreter in a thread.
-###	$(PYTHON_SUBDIR) - starts a python interpreter in a thread.
-###
diff --git a/kpilot/conduits/abbrowserconduit/CMakeLists.txt b/kpilot/conduits/abbrowserconduit/CMakeLists.txt
deleted file mode 100644
index 2459d1db..00000000
--- a/kpilot/conduits/abbrowserconduit/CMakeLists.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
-)
-
-set(conduit_abbrowser_SRCS
-	resolutionDialog.cc
-	abbrowser-factory.cc
-	abbrowser-setup.cc
-	kabcRecord.cc
-	abbrowser-conduit.cc
-)
-
-set(conduit_abbrowser_UIS
-	resolutionDialog_base.ui
-	kaddressbookConduit.ui
-)
-
-set(conduit_abbrowser_KCFGS
-	abbrowserSettings.kcfgc
-)
-
-kde3_add_kcfg_files(conduit_abbrowser_SRCS ${conduit_abbrowser_KCFGS})
-kde3_add_ui_files(conduit_abbrowser_SRCS ${conduit_abbrowser_UIS})
-kde3_automoc(${conduit_abbrowser_SRCS})
-add_library(conduit_address SHARED ${conduit_abbrowser_SRCS})
-target_link_libraries(conduit_address kabc_file kabc)
-set_target_properties(conduit_address PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
-	PREFIX ""
-)
-
-kde3_install_libtool_file(conduit_address)
-
-install(
-	TARGETS conduit_address
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-)
-
-install(
-	FILES abbrowser_conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
-)
-
-install(
-	FILES abbrowserconduit.kcfg DESTINATION ${KDE3_KCFG_DIR}
-)
-
diff --git a/kpilot/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui b/kpilot/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui
deleted file mode 100644
index d4bb9078..00000000
--- a/kpilot/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui
+++ /dev/null
@@ -1,276 +0,0 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
-<class>KPilotCustomFields</class>
-<comment>This form lets you edit the custom fields synced from PalmOS handhelds by the addressbook conduit of KPilot.</comment>
-<author>Reinhold Kainhofer &lt;reinhold@kainhofer.com&gt;</author>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>KPILOT</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>461</width>
-            <height>409</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>KPilot Custom Fields</string>
-    </property>
-    <vbox>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <widget class="QGroupBox">
-            <property name="name">
-                <cstring>mCustomFieldsGroups</cstring>
-            </property>
-            <property name="title">
-                <string>KPilot Custom Fields</string>
-            </property>
-            <property name="whatsThis" stdset="0">
-                <string>On your handheld, each address also provides four custom fields for your personal use. KPilot can sync these either to birthdate, URL, IM address, or just store them as a custom field on your PC with no special meaning. In the last case, you can change the values here. Note, however, that for all other settings the values entered here will have no effect.</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="QLabel" row="3" column="0">
-                    <property name="name">
-                        <cstring>mCustom3Label</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Custom &amp;3:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>X_CUSTOM3</cstring>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Edit or enter the value of the third custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="4" column="0">
-                    <property name="name">
-                        <cstring>mCustom4Label</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Custom &amp;4:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>X_CUSTOM3</cstring>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Edit or enter the value of the fourth custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QLineEdit" row="3" column="1">
-                    <property name="name">
-                        <cstring>X_CUSTOM2</cstring>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Edit or enter the value of the third custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QLineEdit" row="2" column="1">
-                    <property name="name">
-                        <cstring>X_CUSTOM1</cstring>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Edit or enter the value of the second custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QLineEdit" row="4" column="1">
-                    <property name="name">
-                        <cstring>X_CUSTOM3</cstring>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Edit or enter the value of the fourth custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="2" column="0">
-                    <property name="name">
-                        <cstring>mCustom2Label</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Custom &amp;2:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>X_CUSTOM2</cstring>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Edit or enter the value of the second custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="1" column="0">
-                    <property name="name">
-                        <cstring>mCustom1Label</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Custom &amp;1:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>X_CUSTOM1</cstring>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Edit or enter the value of the first custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QLineEdit" row="1" column="1">
-                    <property name="name">
-                        <cstring>X_CUSTOM0</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>3</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Edit or enter the value of the first custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
-                    <property name="name">
-                        <cstring>mCustomFieldsExplanation</cstring>
-                    </property>
-                    <property name="text">
-                        <string>If you let KPilot sync the handheld's custom fields as custom fields on the PC, you can change the values here. Note, however, that for all other settings the values entered here will have no effect.</string>
-                    </property>
-                    <property name="alignment">
-                        <set>WordBreak|AlignVCenter</set>
-                    </property>
-                </widget>
-            </grid>
-        </widget>
-        <widget class="QGroupBox">
-            <property name="name">
-                <cstring>mMetaSyncGroup</cstring>
-            </property>
-            <property name="enabled">
-                <bool>true</bool>
-            </property>
-            <property name="title">
-                <string>KPilot's Private (meta-sync) Settings</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="QLabel" row="1" column="0">
-                    <property name="name">
-                        <cstring>mRecordIDLabel</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Record&amp;ID:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>X_RecordID</cstring>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="1" column="3">
-                    <property name="name">
-                        <cstring>mSyncFlagLabel</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Sync &amp;flag:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>X_Flag</cstring>
-                    </property>
-                </widget>
-                <spacer row="1" column="5">
-                    <property name="name">
-                        <cstring>spacer2</cstring>
-                    </property>
-                    <property name="orientation">
-                        <enum>Horizontal</enum>
-                    </property>
-                    <property name="sizeType">
-                        <enum>Expanding</enum>
-                    </property>
-                    <property name="sizeHint">
-                        <size>
-                            <width>41</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>
-                <spacer row="1" column="2">
-                    <property name="name">
-                        <cstring>spacer3</cstring>
-                    </property>
-                    <property name="orientation">
-                        <enum>Horizontal</enum>
-                    </property>
-                    <property name="sizeType">
-                        <enum>Expanding</enum>
-                    </property>
-                    <property name="sizeHint">
-                        <size>
-                            <width>31</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>
-                <widget class="QLabel" row="0" column="0" rowspan="1" colspan="6">
-                    <property name="name">
-                        <cstring>mMetaSyncSettingsWarning</cstring>
-                    </property>
-                    <property name="text">
-                        <string>These values indicate the state of the record for KPilot, and connect an entry on the handheld with an entry on the PC.
-Do NOT change these values: doing so will almost certainly result in data loss when you next do a sync.</string>
-                    </property>
-                    <property name="alignment">
-                        <set>WordBreak|AlignVCenter</set>
-                    </property>
-                </widget>
-                <widget class="QSpinBox" row="1" column="1">
-                    <property name="name">
-                        <cstring>X_RecordID</cstring>
-                    </property>
-                    <property name="enabled">
-                        <bool>false</bool>
-                    </property>
-                    <property name="maxValue">
-                        <number>2147483647</number>
-                    </property>
-                </widget>
-                <widget class="QSpinBox" row="1" column="4">
-                    <property name="name">
-                        <cstring>X_Flag</cstring>
-                    </property>
-                    <property name="enabled">
-                        <bool>false</bool>
-                    </property>
-                    <property name="maxValue">
-                        <number>3</number>
-                    </property>
-                </widget>
-            </grid>
-        </widget>
-        <spacer>
-            <property name="name">
-                <cstring>spacer1</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Vertical</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>20</width>
-                    <height>210</height>
-                </size>
-            </property>
-        </spacer>
-    </vbox>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/kpilot/conduits/abbrowserconduit/Makefile.am b/kpilot/conduits/abbrowserconduit/Makefile.am
deleted file mode 100644
index b012765f..00000000
--- a/kpilot/conduits/abbrowserconduit/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
-
-kde_module_LTLIBRARIES = conduit_address.la
-
-conduit_address_la_SOURCES = \
-	resolutionDialog_base.ui \
-	kaddressbookConduit.ui \
-	abbrowserSettings.kcfgc \
-	resolutionDialog.cc \
-	abbrowser-factory.cc \
-	abbrowser-setup.cc \
-	kabcRecord.cc \
-	abbrowser-conduit.cc
-conduit_address_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lkdecore -lkio -lkdeui
-conduit_address_la_LIBADD = ../../lib/libkpilot.la -lkabc -lkabc_file
-
-servicedir = $(kde_servicesdir)
-service_DATA = abbrowser_conduit.desktop
-kde_kcfg_DATA = abbrowserconduit.kcfg
-
-kabcustompagedir = $(kde_datadir)/kaddressbook/contacteditorpages
-kabcustompage_DATA = KPilotCustomFieldEditor.ui
-
-METASOURCES = AUTO
diff --git a/kpilot/conduits/abbrowserconduit/abbrowser-conduit.cc b/kpilot/conduits/abbrowserconduit/abbrowser-conduit.cc
deleted file mode 100644
index 11e25f2d..00000000
--- a/kpilot/conduits/abbrowserconduit/abbrowser-conduit.cc
+++ /dev/null
@@ -1,1897 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2000,2001 by Dan Pilone
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-** Copyright (C) 2007 by Adriaan de Groot <groot@kde.org>
-**
-** The abbrowser conduit copies addresses from the Pilot's address book to
-** the KDE addressbook maintained via the kabc library.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org.
-*/
-
-
-
-#include "options.h"
-
-#include <tqtimer.h>
-#include <tqtextcodec.h>
-#include <tqfile.h>
-#include <tqregexp.h>
-
-#include <kabc/stdaddressbook.h>
-#include <kabc/resourcefile.h>
-#include <kio/netaccess.h>
-#include <ksavefile.h>
-
-#include <pilotSerialDatabase.h>
-#include <pilotLocalDatabase.h>
-
-#include "resolutionDialog.h"
-#include "resolutionTable.h"
-#include "abbrowserSettings.h"
-#include "kabcRecord.h"
-
-#include "abbrowser-conduit.moc"
-
-// Something to allow us to check what revision
-// the modules are that make up a binary distribution.
-//
-//
-extern "C"
-{
-unsigned long version_conduit_address = Pilot::PLUGIN_API;
-}
-
-
-/* This is partly stolen from the boost libraries, partly from
-*  "Modern C++ design" for doing compile time checks; we need
-*  to make sure that the enum values in KABCSync:: and in the
-*  AbbrowserSettings class are the same so that both interpret
-*  configuration values the same way.
-*/
-template<bool> struct EnumerationMismatch;
-template<> struct EnumerationMismatch<true>{};
-
-#define CHECK_ENUM(a) (void)sizeof(EnumerationMismatch<((int)KABCSync::a)==((int)AbbrowserSettings::a)>)
-
-static inline void compile_time_check()
-{
-	// Mappings for other phone
-	CHECK_ENUM(eOtherPhone);
-	CHECK_ENUM(eOtherPhone);
-	CHECK_ENUM(eAssistant);
-	CHECK_ENUM(eBusinessFax);
-	CHECK_ENUM(eCarPhone);
-	CHECK_ENUM(eEmail2);
-	CHECK_ENUM(eHomeFax);
-	CHECK_ENUM(eTelex);
-	CHECK_ENUM(eTTYTTDPhone);
-
-	// Mappings for custom fields
-	CHECK_ENUM(eCustomField);
-	CHECK_ENUM(eCustomBirthdate);
-	CHECK_ENUM(eCustomURL);
-	CHECK_ENUM(eCustomIM);
-}
-
-inline int faxTypeOnPC()
-{
-	return KABC::PhoneNumber::Fax |
-		( (AbbrowserSettings::pilotFax()==0) ?
-			KABC::PhoneNumber::Home :
-			KABC::PhoneNumber::Work );
-}
-
-
-using namespace KABC;
-
-/*********************************************************************
-                        C O N S T R U C T O R
- *********************************************************************/
-
-
-AbbrowserConduit::AbbrowserConduit(KPilotLink * o, const char *n, const TQStringList & a):
-		ConduitAction(o, n, a),
-		aBook(0L),
-		fAddressAppInfo(0L),
-		addresseeMap(),
-		syncedIds(),
-		abiter(),
-		fTicket(0L),
-		fCreatedBook(false),
-		fBookResource(0L)
-{
-	FUNCTIONSETUP;
-	fConduitName=i18n("Addressbook");
-}
-
-
-
-AbbrowserConduit::~AbbrowserConduit()
-{
-	FUNCTIONSETUP;
-
-	if (fTicket)
-	{
-		DEBUGKPILOT << fname << ": Releasing ticket" << endl;
-		aBook->releaseSaveTicket(fTicket);
-		fTicket=0L;
-	}
-
-	_cleanupAddressBookPointer();
-	// unused function warnings.
-	compile_time_check();
-}
-
-
-
-/*********************************************************************
-                L O A D I N G   T H E   D A T A
- *********************************************************************/
-
-
-
-/* Builds the map which links record ids to uid's of Addressee
-*/
-void AbbrowserConduit::_mapContactsToPilot(TQMap < recordid_t, TQString > &idContactMap)
-{
-	FUNCTIONSETUP;
-
-	idContactMap.clear();
-
-	for(AddressBook::Iterator contactIter = aBook->begin();
-		contactIter != aBook->end(); ++contactIter)
-	{
-		Addressee aContact = *contactIter;
-		TQString recid = aContact.custom(KABCSync::appString, KABCSync::idString);
-		if(!recid.isEmpty())
-		{
-			recordid_t id = recid.toULong();
-			// safety check:  make sure that we don't already have a map for this pilot id.
-			// if we do (this can come from a copy/paste in kaddressbook, etc.), then we need
-			// to reset our Addressee so that we can assign him a new pilot Id later and sync
-			// him properly.  if we don't do this, we'll lose one of these on the pilot.
-			if (!idContactMap.contains(id))
-			{
-				idContactMap.insert(id, aContact.uid());
-			}
-			else
-			{
-		DEBUGKPILOT << fname << ": found duplicate pilot key: ["
-						<< id << "], removing pilot id from addressee: ["
-						<< aContact.realName() << "]" << endl;
-				aContact.removeCustom(KABCSync::appString, KABCSync::idString);
-				aBook->insertAddressee(aContact);
-				abChanged = true;
-			}
-		}
-	}
-	DEBUGKPILOT << fname << ": Loaded " << idContactMap.size() <<
-	    " addresses from the addressbook. " << endl;
-}
-
-
-
-bool AbbrowserConduit::_prepare()
-{
-	FUNCTIONSETUP;
-
-	readConfig();
-	syncedIds.clear();
-	pilotindex = 0;
-
-	return true;
-}
-
-
-
-void AbbrowserConduit::readConfig()
-{
-	FUNCTIONSETUP;
-	AbbrowserSettings::self()->readConfig();
-
-	// Conflict page
-	SyncAction::ConflictResolution res = (SyncAction::ConflictResolution)AbbrowserSettings::conflictResolution();
-	setConflictResolution(res);
-
-	DEBUGKPILOT << fname
-		<< ": Reading addressbook "
-		<< ( AbbrowserSettings::addressbookType() == AbbrowserSettings::eAbookFile ?
-			AbbrowserSettings::fileName() : CSL1("Standard") )
-		<< endl;
-	DEBUGKPILOT << fname
-		<< ": "
-		<< " fConflictResolution=" << getConflictResolution()
-		<< " fArchive=" << AbbrowserSettings::archiveDeleted()
-		<< " fFirstTime=" << isFirstSync()
-		<< endl;
-	DEBUGKPILOT << fname
-		<< ": "
-		<< " fPilotStreetHome=" << AbbrowserSettings::pilotStreet()
-		<< " fPilotFaxHome=" << AbbrowserSettings::pilotFax()
-		<< " eCustom[0]=" << AbbrowserSettings::custom0()
-		<< " eCustom[1]=" << AbbrowserSettings::custom1()
-		<< " eCustom[2]=" << AbbrowserSettings::custom2()
-		<< " eCustom[3]=" << AbbrowserSettings::custom3()
-		<< endl;
-}
-
-
-
-bool isDeleted(const PilotAddress *addr)
-{
-	if (!addr)
-	{
-		return true;
-	}
-	if (addr->isDeleted() && !addr->isArchived())
-	{
-		return true;
-	}
-	if (addr->isArchived())
-	{
-		return !AbbrowserSettings::archiveDeleted();
-	}
-	return false;
-}
-
-bool isArchived(const PilotAddress *addr)
-{
-	if (addr && addr->isArchived())
-	{
-		return AbbrowserSettings::archiveDeleted();
-	}
-	else
-	{
-		return false;
-	}
-}
-
-
-
-bool AbbrowserConduit::_loadAddressBook()
-{
-	FUNCTIONSETUP;
-
-	startTickle();
-	switch ( AbbrowserSettings::addressbookType() )
-	{
-		case AbbrowserSettings::eAbookResource:
-			DEBUGKPILOT<<"Loading standard addressbook"<<endl;
-			aBook = StdAddressBook::self( true );
-			fCreatedBook=false;
-			break;
-		case AbbrowserSettings::eAbookFile:
-		{ // initialize the abook with the given file
-			DEBUGKPILOT<<"Loading custom addressbook"<<endl;
-			KURL kurl(AbbrowserSettings::fileName());
-			if(!KIO::NetAccess::download(AbbrowserSettings::fileName(), fABookFile, 0L) &&
-				!kurl.isLocalFile())
-			{
-				emit logError(i18n("You chose to sync with the file \"%1\", which "
-							"cannot be opened. Please make sure to supply a "
-							"valid file name in the conduit's configuration dialog. "
-							"Aborting the conduit.").arg(AbbrowserSettings::fileName()));
-				KIO::NetAccess::removeTempFile(fABookFile);
-				stopTickle();
-				return false;
-			}
-
-			aBook = new AddressBook();
-			if (!aBook)
-			{
-				stopTickle();
-				return false;
-			}
-			fBookResource = new ResourceFile(fABookFile, CSL1("vcard") );
-
-			bool r = aBook->addResource( fBookResource );
-			if ( !r )
-			{
-				DEBUGKPILOT << "Unable to open resource for file " << fABookFile << endl;
-				KPILOT_DELETE( aBook );
-				stopTickle();
-				return false;
-			}
-			fCreatedBook=true;
-			break;
-		}
-		default: break;
-	}
-	// find out if this can fail for reasons other than a non-existent
-	// vcf file. If so, how can I determine if the missing file was the problem
-	// or something more serious:
-	if ( !aBook || !aBook->load() )
-	{
-		// Something went wrong, so tell the user and return false to exit the conduit
-		emit logError(i18n("Unable to initialize and load the addressbook for the sync.") );
-		addSyncLogEntry(i18n("Unable to initialize and load the addressbook for the sync.") );
-		WARNINGKPILOT << "Unable to initialize the addressbook for the sync." << endl;
-		_cleanupAddressBookPointer();
-		stopTickle();
-		return false;
-	}
-	abChanged = false;
-
-	fTicket=aBook->requestSaveTicket();
-	if (!fTicket)
-	{
-		WARNINGKPILOT << "Unable to lock addressbook for writing " << endl;
-		emit logError(i18n("Unable to lock addressbook for writing.  Can't sync!"));
-		addSyncLogEntry(i18n("Unable to lock addressbook for writing.  Can't sync!"));
-		_cleanupAddressBookPointer();
-		stopTickle();
-		return false;
-	}
-
-	fCtrPC->setStartCount(aBook->allAddressees().count());
-
-	// get the addresseMap which maps Pilot unique record(address) id's to
-	// a Abbrowser Addressee; allows for easy lookup and comparisons
-	if(aBook->begin() == aBook->end())
-	{
-		setFirstSync( true );
-	}
-	else
-	{
-		_mapContactsToPilot(addresseeMap);
-	}
-	stopTickle();
-	return(aBook != 0L);
-}
-
-bool AbbrowserConduit::_saveAddressBook()
-{
-	FUNCTIONSETUP;
-
-	bool saveSuccessful = false;
-
-	fCtrPC->setEndCount(aBook->allAddressees().count());
-
-	Q_ASSERT(fTicket);
-
-	if (abChanged)
-	{
-		saveSuccessful = aBook->save(fTicket);
-	}
-	else
-	{
-		DEBUGKPILOT << fname
-			<< "Addressbook not changed, no need to save it" << endl;
-	}
-	// XXX: KDE4: release ticket in all cases (save no longer releases it)
-	if ( !saveSuccessful ) // didn't save, delete ticket manually
-	{
-		aBook->releaseSaveTicket(fTicket);
-	}
-	fTicket=0L;
-
-	if ( AbbrowserSettings::addressbookType()!= AbbrowserSettings::eAbookResource )
-	{
-		KURL kurl(AbbrowserSettings::fileName());
-		if(!kurl.isLocalFile())
-		{
-			DEBUGKPILOT << fname << "Deleting local addressbook tempfile" << endl;
-			if(!KIO::NetAccess::upload(fABookFile, AbbrowserSettings::fileName(), 0L)) {
-				emit logError(i18n("An error occurred while uploading \"%1\". You can try to upload "
-					"the temporary local file \"%2\" manually")
-					.arg(AbbrowserSettings::fileName()).arg(fABookFile));
-			}
-			else {
-				KIO::NetAccess::removeTempFile(fABookFile);
-			}
-			TQFile backup(fABookFile + CSL1("~"));
-			backup.remove();
-		}
-
-	}
-
-	// now try to remove the resource from the addressbook...
-	if (fBookResource) 
-	{
-		bool r = aBook->removeResource( fBookResource );
-		if ( !r )
-		{
-			DEBUGKPILOT << fname <<": Unable to close resource." << endl;
-		}
-	}
-
-	return saveSuccessful;
-}
-
-
-
-void AbbrowserConduit::_getAppInfo()
-{
-	FUNCTIONSETUP;
-
-	delete fAddressAppInfo;
-	fAddressAppInfo = new PilotAddressInfo(fDatabase);
-	fAddressAppInfo->dump();
-}
-
-void AbbrowserConduit::_setAppInfo()
-{
-	FUNCTIONSETUP;
-	if (fDatabase) fAddressAppInfo->writeTo(fDatabase);
-	if (fLocalDatabase) fAddressAppInfo->writeTo(fLocalDatabase);
-}
-
-
-void AbbrowserConduit::_cleanupAddressBookPointer()
-{
-        if (fCreatedBook)
-        {
-                KPILOT_DELETE(aBook);
-                fCreatedBook=false;
-        }
-        else
-        {
-                aBook=0L;
-	}												         
-}
-
-
-
-
-/*********************************************************************
-                     D E B U G   O U T P U T
- *********************************************************************/
-
-
-
-
-
-void AbbrowserConduit::showPilotAddress(const PilotAddress *pilotAddress)
-{
-	FUNCTIONSETUPL(3);
-	if (debug_level < 3)
-	{
-		return;
-	}
-	if (!pilotAddress)
-	{
-		DEBUGKPILOT<< fname << "| EMPTY"<<endl;
-		return;
-	}
-	DEBUGKPILOT << fname << "\n"
-			<< pilotAddress->getTextRepresentation(
-				fAddressAppInfo,Qt::PlainText) << endl;
-}
-
-
-void AbbrowserConduit::showAddresses(
-	const Addressee &pcAddr,
-	const PilotAddress *backupAddr,
-	const PilotAddress *palmAddr)
-{
-	FUNCTIONSETUPL(3);
-	if (debug_level >= 3)
-	{
-		DEBUGKPILOT << fname << "abEntry:" << endl;
-		KABCSync::showAddressee(pcAddr);
-		DEBUGKPILOT << fname << "pilotAddress:" << endl;
-		showPilotAddress(palmAddr);
-		DEBUGKPILOT << fname << "backupAddress:" << endl;
-		showPilotAddress(backupAddr);
-		DEBUGKPILOT << fname << "------------------------------------------------" << endl;
-	}
-}
-
-
-
-/*********************************************************************
-                S Y N C   S T R U C T U R E
- *********************************************************************/
-
-
-
-/* virtual */ bool AbbrowserConduit::exec()
-{
-	FUNCTIONSETUP;
-
-	_prepare();
-
-	bool retrieved = false;
-	if(!openDatabases(CSL1("AddressDB"), &retrieved))
-	{
-		emit logError(i18n("Unable to open the addressbook databases on the handheld."));
-		return false;
-	}
-	setFirstSync( retrieved );
-
-	_getAppInfo();
-
-	// Local block
-	{
-		TQString dbpath = fLocalDatabase->dbPathName();
-		DEBUGKPILOT << fname << ": Local database path " << dbpath << endl;
-	}
-
-	if ( syncMode().isTest() )
-	{
-		TQTimer::singleShot(0, this, TQT_SLOT(slotTestRecord()));
-		return true;
-	}
-
-	if(!_loadAddressBook())
-	{
-		emit logError(i18n("Unable to open the addressbook."));
-		return false;
-	}
-	setFirstSync( isFirstSync() || (aBook->begin() == aBook->end()) );
-
-	DEBUGKPILOT << fname << ": First sync now " << isFirstSync()
-		<< " and addressbook is "
-		<< ((aBook->begin() == aBook->end()) ? "" : "non-")
-		<< "empty." << endl;
-
-	// perform syncing from palm to abbrowser
-	// iterate through all records in palm pilot
-
-	DEBUGKPILOT << fname << ": fullsync=" << isFullSync() << ", firstSync=" <<    isFirstSync() << endl;
-	DEBUGKPILOT << fname << ": "
-		<< "syncDirection=" << syncMode().name() << ", "
-		<< "archive = " << AbbrowserSettings::archiveDeleted() << endl;
-	DEBUGKPILOT << fname << ": conflictRes="<< getConflictResolution() << endl;
-	DEBUGKPILOT << fname << ": PilotStreetHome=" << AbbrowserSettings::pilotStreet() << ", PilotFaxHOme" << AbbrowserSettings::pilotFax() << endl;
-
-	if (!isFirstSync())
-	{
-		allIds=fDatabase->idList();
-	}
-
-	TQValueVector<int> v(4);
-	v[0] = AbbrowserSettings::custom0();
-	v[1] = AbbrowserSettings::custom1();
-	v[2] = AbbrowserSettings::custom2();
-	v[3] = AbbrowserSettings::custom3();
-
-	fSyncSettings.setCustomMapping(v);
-	fSyncSettings.setFieldForOtherPhone(AbbrowserSettings::pilotOther());
-	fSyncSettings.setDateFormat(AbbrowserSettings::customDateFormat());
-	fSyncSettings.setPreferHome(AbbrowserSettings::pilotStreet()==0);
-	fSyncSettings.setFaxTypeOnPC(faxTypeOnPC());
-
-	/* Note:
-	   if eCopyPCToHH or eCopyHHToPC, first sync everything, then lookup
-	   those entries on the receiving side that are not yet syncced and delete
-	   them. Use slotDeleteUnsyncedPCRecords and slotDeleteUnsyncedHHRecords
-	   for this, and no longer purge the whole addressbook before the sync to
-	   prevent data loss in case of connection loss. */
-
-	TQTimer::singleShot(0, this, TQT_SLOT(slotPalmRecToPC()));
-
-	return true;
-}
-
-
-
-void AbbrowserConduit::slotPalmRecToPC()
-{
-	FUNCTIONSETUP;
-	PilotRecord *palmRec = 0L, *backupRec = 0L;
-
-	if ( syncMode() == SyncMode::eCopyPCToHH )
-	{
-		DEBUGKPILOT << fname << ": Done; change to PCtoHH phase." << endl;
-		abiter = aBook->begin();
-		TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm()));
-		return;
-	}
-
-	if(isFullSync())
-	{
-		palmRec = fDatabase->readRecordByIndex(pilotindex++);
-	}
-	else
-	{
-		palmRec = fDatabase->readNextModifiedRec();
-	}
-
-	// no record means we're done going in this direction, so switch to
-	// PC->Palm
-	if(!palmRec)
-	{
-		abiter = aBook->begin();
-		TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm()));
-		return;
-	}
-
-	// already synced, so skip:
-	if(syncedIds.contains(palmRec->id()))
-	{
-		KPILOT_DELETE(palmRec);
-		TQTimer::singleShot(0, this, TQT_SLOT(slotPalmRecToPC()));
-		return;
-	}
-
-	backupRec = fLocalDatabase->readRecordById(palmRec->id());
-	PilotRecord*compareRec=(backupRec)?(backupRec):(palmRec);
-	Addressee e = _findMatch(PilotAddress(compareRec));
-
-	PilotAddress*backupAddr=0L;
-	if (backupRec)
-	{
-		backupAddr=new PilotAddress(backupRec);
-	}
-
-	PilotAddress*palmAddr=0L;
-	if (palmRec)
-	{
-		palmAddr=new PilotAddress(palmRec);
-	}
-
-	syncAddressee(e, backupAddr, palmAddr);
-
-	syncedIds.append(palmRec->id());
-	KPILOT_DELETE(palmAddr);
-	KPILOT_DELETE(backupAddr);
-	KPILOT_DELETE(palmRec);
-	KPILOT_DELETE(backupRec);
-
-	TQTimer::singleShot(0, this, TQT_SLOT(slotPalmRecToPC()));
-}
-
-
-
-void AbbrowserConduit::slotPCRecToPalm()
-{
-	FUNCTIONSETUP;
-
-	if ( (syncMode()==SyncMode::eCopyHHToPC) ||
-		abiter == aBook->end() || (*abiter).isEmpty() )
-	{
-		DEBUGKPILOT << fname << ": Done; change to delete records." << endl;
-		pilotindex = 0;
-		TQTimer::singleShot(0, this, TQT_SLOT(slotDeletedRecord()));
-		return;
-	}
-
-	PilotRecord *palmRec=0L, *backupRec=0L;
-	Addressee ad = *abiter;
-
-	abiter++;
-
-	// If marked as archived, don't sync!
-	if (KABCSync::isArchived(ad))
-	{
-		DEBUGKPILOT << fname << ": address with id " << ad.uid() <<
-			" marked archived, so don't sync." << endl;
-		TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm()));
-		return;
-	}
-
-
-	TQString recID(ad.custom(KABCSync::appString, KABCSync::idString));
-	bool ok;
-	recordid_t rid = recID.toLong(&ok);
-	if (recID.isEmpty() || !ok || !rid)
-	{
-		DEBUGKPILOT << fname << ": This is a new record." << endl;
-		// it's a new item(no record ID and not inserted by the Palm -> PC sync), so add it
-		syncAddressee(ad, 0L, 0L);
-		TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm()));
-		return;
-	}
-
-	// look into the list of already synced record ids to see if the addressee hasn't already been synced
-	if (syncedIds.contains(rid))
-	{
-		DEBUGKPILOT << ": address with id " << rid << " already synced." << endl;
-		TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm()));
-		return;
-	}
-
-
-	backupRec = fLocalDatabase->readRecordById(rid);
-	// only update if no backup record or the backup record is not equal to the addressee
-
-	PilotAddress*backupAddr=0L;
-	if (backupRec)
-	{
-		backupAddr=new PilotAddress(backupRec);
-	}
-	if(!backupRec || isFirstSync() || !_equal(backupAddr, ad)  )
-	{
-		DEBUGKPILOT << fname << ": Updating entry." << endl;
-		palmRec = fDatabase->readRecordById(rid);
-		PilotAddress *palmAddr = 0L;
-		if (palmRec)
-		{
-			palmAddr = new PilotAddress(palmRec);
-		}
-		else
-		{
-		DEBUGKPILOT << fname << ": No HH record with id " << rid << endl;
-		}
-		syncAddressee(ad, backupAddr, palmAddr);
-		// update the id just in case it changed
-		if (palmRec) rid=palmRec->id();
-		KPILOT_DELETE(palmRec);
-		KPILOT_DELETE(palmAddr);
-	}
-	else
-	{
-		DEBUGKPILOT << fname << ": Entry not updated." << endl;
-	}
-	KPILOT_DELETE(backupAddr);
-	KPILOT_DELETE(backupRec);
-	
-	DEBUGKPILOT << fname << ": adding id:["<< rid << "] to syncedIds." << endl;
-
-	syncedIds.append(rid);
-	// done with the sync process, go on with the next one:
-	TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm()));
-}
-
-
-
-void AbbrowserConduit::slotDeletedRecord()
-{
-	FUNCTIONSETUP;
-
-	PilotRecord *backupRec = fLocalDatabase->readRecordByIndex(pilotindex++);
-	if(!backupRec || isFirstSync() )
-	{
-		KPILOT_DELETE(backupRec);
-		TQTimer::singleShot(0, this, TQT_SLOT(slotDeleteUnsyncedPCRecords()));
-		return;
-	}
-
-	recordid_t id = backupRec->id();
-
-	TQString uid = addresseeMap[id];
-	Addressee e = aBook->findByUid(uid);
-
-		DEBUGKPILOT << fname << ": now looking at palm id: ["
-					<< id << "], kabc uid: [" << uid << "]." << endl;
-
-	PilotAddress*backupAddr=0L;
-	if (backupRec)
-	{
-		backupAddr=new PilotAddress(backupRec);
-	}
-	PilotRecord*palmRec=fDatabase->readRecordById(id);
-
-	if ( e.isEmpty() )
-	{
-		DEBUGKPILOT << fname << ": no Addressee found for this id." << endl;
-		DEBUGKPILOT << fname << "\n"
-			<< backupAddr->getTextRepresentation( 
-				fAddressAppInfo,Qt::PlainText) << endl;
-
-		if (palmRec) {
-		DEBUGKPILOT << fname << ": deleting from database on palm." << endl;
-			fDatabase->deleteRecord(id);
-			fCtrHH->deleted();
-		}
-		DEBUGKPILOT << fname << ": deleting from backup database." << endl;
-		fLocalDatabase->deleteRecord(id);
-
-		// because we just deleted a record, we need to go back one
-		pilotindex--;
-	}
-
-	KPILOT_DELETE(palmRec);
-	KPILOT_DELETE(backupAddr);
-	KPILOT_DELETE(backupRec);
-	TQTimer::singleShot(0, this, TQT_SLOT(slotDeletedRecord()));
-}
-
-
-
-void AbbrowserConduit::slotDeleteUnsyncedPCRecords()
-{
-	FUNCTIONSETUP;
-	if ( syncMode()==SyncMode::eCopyHHToPC )
-	{
-		TQStringList uids;
-		RecordIDList::iterator it;
-		TQString uid;
-		for ( it = syncedIds.begin(); it != syncedIds.end(); ++it)
-		{
-			uid=addresseeMap[*it];
-			if (!uid.isEmpty()) uids.append(uid);
-		}
-		// TODO: Does this speed up anything?
-		// qHeapSort( uids );
-		AddressBook::Iterator abit;
-		for (abit = aBook->begin(); abit != aBook->end(); ++abit)
-		{
-			if (!uids.contains((*abit).uid()))
-			{
-				DEBUGKPILOT<<"Deleting addressee "<<(*abit).realName()<<" from PC (is not on HH, and syncing with HH->PC direction)"<<endl;
-				abChanged = true;
-				// TODO: Can I really remove the current iterator???
-				aBook->removeAddressee(*abit);
-				fCtrPC->deleted();
-			}
-		}
-	}
-	TQTimer::singleShot(0, this, TQT_SLOT(slotDeleteUnsyncedHHRecords()));
-}
-
-
-
-void AbbrowserConduit::slotDeleteUnsyncedHHRecords()
-{
-	FUNCTIONSETUP;
-	if ( syncMode()==SyncMode::eCopyPCToHH )
-	{
-		RecordIDList ids=fDatabase->idList();
-		RecordIDList::iterator it;
-		for ( it = ids.begin(); it != ids.end(); ++it )
-		{
-			if (!syncedIds.contains(*it))
-			{
-				DEBUGKPILOT<<"Deleting record with ID "<<*it<<" from handheld (is not on PC, and syncing with PC->HH direction)"<<endl;
-				fDatabase->deleteRecord(*it);
-				fCtrHH->deleted();
-				fLocalDatabase->deleteRecord(*it);
-			}
-		}
-	}
-	TQTimer::singleShot(0, this, TQT_SLOT(slotCleanup()));
-}
-
-
-void AbbrowserConduit::slotCleanup()
-{
-	FUNCTIONSETUP;
-
-	// Set the appInfoBlock, just in case the category labels changed
-	_setAppInfo();
-	if(fDatabase)
-	{
-		fDatabase->resetSyncFlags();
-		fDatabase->cleanup();
-	}
-	if(fLocalDatabase)
-	{
-		fLocalDatabase->resetSyncFlags();
-		fLocalDatabase->cleanup();
-	}
-
-	// Write out the sync maps
-	TQString syncFile = fLocalDatabase->dbPathName() + CSL1(".sync");
-	DEBUGKPILOT << fname << ": Writing sync map to " << syncFile << endl;
-	KSaveFile map( syncFile );
-	if ( map.status() == 0 )
-	{
-		DEBUGKPILOT << fname << ": Writing sync map ..." << endl;
-		(*map.dataStream()) << addresseeMap ;
-		map.close();
-	}
-	// This also picks up errors from map.close()
-	if ( map.status() != 0 )
-	{
-		WARNINGKPILOT << "Could not make backup of sync map." << endl;
-	}
-
-	_saveAddressBook();
-	delayDone();
-}
-
-
-
-/*********************************************************************
-              G E N E R A L   S Y N C   F U N C T I O N
-         These functions modify the Handheld and the addressbook
- *********************************************************************/
-
-
-
-bool AbbrowserConduit::syncAddressee(Addressee &pcAddr, PilotAddress*backupAddr,
-		PilotAddress*palmAddr)
-{
-	FUNCTIONSETUP;
-	showAddresses(pcAddr, backupAddr, palmAddr);
-
-	if ( syncMode() == SyncMode::eCopyPCToHH )
-	{
-		if (pcAddr.isEmpty())
-		{
-			return _deleteAddressee(pcAddr, backupAddr, palmAddr);
-		}
-		else
-		{
-			return _copyToHH(pcAddr, backupAddr, palmAddr);
-		}
-	}
-
-	if ( syncMode() == SyncMode::eCopyHHToPC )
-	{
-		if (!palmAddr)
-		{
-			return _deleteAddressee(pcAddr, backupAddr, palmAddr);
-		}
-		else
-		{
-			return _copyToPC(pcAddr, backupAddr, palmAddr);
-		}
-	}
-
-	if ( !backupAddr || isFirstSync() )
-	{
-			DEBUGKPILOT<< fname << ": Special case: no backup." << endl;
-		/*
-		Resolution matrix (0..does not exist, E..exists, D..deleted flag set, A..archived):
-		  HH    PC  | Resolution
-		  ------------------------------------------------------------
-		   0     A  |  -
-		   0     E  |  PC -> HH, reset ID if not set correctly
-		   D     0  |  delete (error, should never occur!!!)
-		   D     E  |  CR (ERROR)
-		   E/A   0  |  HH -> PC
-		   E/A   E/A|  merge/CR
-		 */
-		if  (!palmAddr && KABCSync::isArchived(pcAddr) )
-		{
-			return true;
-		}
-		else if (!palmAddr && !pcAddr.isEmpty())
-		{
-			DEBUGKPILOT << fname << ": case: 1a"<<endl;
-			// PC->HH
-			bool res=_copyToHH(pcAddr, 0L, 0L);
-			return res;
-		}
-		else if (!palmAddr && pcAddr.isEmpty())
-		{
-			DEBUGKPILOT << fname << ": case: 1b"<<endl;
-			// everything's empty -> ERROR
-			return false;
-		}
-		else if ( (isDeleted(palmAddr) || isArchived(palmAddr)) && pcAddr.isEmpty())
-		{
-			DEBUGKPILOT << fname << ": case: 1c"<<endl;
-			if (isArchived(palmAddr))
-				return _copyToPC(pcAddr, 0L, palmAddr);
-			else
-				// this happens if you add a record on the handheld and delete it again before you do the next sync
-				return _deleteAddressee(pcAddr, 0L, palmAddr);
-		}
-		else if ((isDeleted(palmAddr)||isArchived(palmAddr)) && !pcAddr.isEmpty())
-		{
-			DEBUGKPILOT << fname << ": case: 1d"<<endl;
-			// CR (ERROR)
-			return _smartMergeAddressee(pcAddr, 0L, palmAddr);
-		}
-		else if (pcAddr.isEmpty())
-		{
-			DEBUGKPILOT << fname << ": case: 1e"<<endl;
-			// HH->PC
-			return _copyToPC(pcAddr, 0L, palmAddr);
-		}
-		else
-		{
-			DEBUGKPILOT << fname << ": case: 1f"<<endl;
-			// Conflict Resolution
-			return _smartMergeAddressee(pcAddr, 0L, palmAddr);
-		}
-	} // !backupAddr
-	else
-	{
-			DEBUGKPILOT << fname << ": case: 2"<<endl;
-		/*
-		Resolution matrix:
-		  1) if HH.(empty| (deleted &! archived) ) -> { if (PC==B) -> delete, else -> CR }
-		     if HH.archied -> {if (PC==B) -> copyToPC, else -> CR }
-		     if PC.empty -> { if (HH==B) -> delete, else -> CR }
-		     if PC.archived -> {if (HH==B) -> delete on HH, else CR }
-		  2) if PC==HH -> { update B, update ID of PC if needed }
-		  3) if PC==B -> { HH!=PC, thus HH modified, so copy HH->PC }
-		     if HH==B -> { PC!=HH, thus PC modified, so copy PC->HH }
-		  4) else: all three addressees are different -> CR
-		*/
-
-		if (!palmAddr || isDeleted(palmAddr) )
-		{
-			DEBUGKPILOT << fname << ": case: 2a"<<endl;
-			if (_equal(backupAddr, pcAddr) || pcAddr.isEmpty())
-			{
-				return _deleteAddressee(pcAddr, backupAddr, 0L);
-			}
-			else
-			{
-				return _smartMergeAddressee(pcAddr, backupAddr, 0L);
-			}
-		}
-		else if (pcAddr.isEmpty())
-		{
-			DEBUGKPILOT << fname << ": case: 2b"<<endl;
-			if (*palmAddr == *backupAddr)
-			{
-				return _deleteAddressee(pcAddr, backupAddr, palmAddr);
-			}
-			else
-			{
-				return _smartMergeAddressee(pcAddr, backupAddr, palmAddr);
-			}
-		}
-		else if (_equal(palmAddr, pcAddr))
-		{
-			DEBUGKPILOT << fname << ": case: 2c"<<endl;
-			// update Backup, update ID of PC if neededd
-			return _writeBackup(palmAddr);
-		}
-		else if (_equal(backupAddr, pcAddr))
-		{
-			DEBUGKPILOT << fname << ": case: 2d"<<endl;
-			DEBUGKPILOT << fname << ": Flags: "<<palmAddr->attributes()<<", isDeleted="<<
-				isDeleted(palmAddr)<<", isArchived="<<isArchived(palmAddr)<<endl;
-			if (isDeleted(palmAddr))
-				return _deleteAddressee(pcAddr, backupAddr, palmAddr);
-			else
-				return _copyToPC(pcAddr, backupAddr, palmAddr);
-		}
-		else if (*palmAddr == *backupAddr)
-		{
-			DEBUGKPILOT << fname << ": case: 2e"<<endl;
-			return _copyToHH(pcAddr, backupAddr, palmAddr);
-		}
-		else
-		{
-			DEBUGKPILOT << fname << ": case: 2f"<<endl;
-			// CR, since all are different
-			return _smartMergeAddressee(pcAddr, backupAddr, palmAddr);
-		}
-	} // backupAddr
-	return false;
-}
-
-
-
-bool AbbrowserConduit::_copyToHH(Addressee &pcAddr, PilotAddress*backupAddr,
-		PilotAddress*palmAddr)
-{
-	FUNCTIONSETUP;
-
-	if (pcAddr.isEmpty()) return false;
-	PilotAddress*paddr=palmAddr;
-	bool paddrcreated=false;
-	if (!paddr)
-	{
-		paddr=new PilotAddress();
-		paddrcreated=true;
-		fCtrHH->created();
-	}
-	else
-	{
-		fCtrHH->updated();
-	}
-	KABCSync::copy(*paddr, pcAddr, *fAddressAppInfo, fSyncSettings);
-
-	DEBUGKPILOT << fname << "palmAddr->id=" << paddr->id()
-		<< ", pcAddr.ID=" << pcAddr.custom(KABCSync::appString, KABCSync::idString) << endl;
-
-	if(_savePalmAddr(paddr, pcAddr))
-	{
-		_savePCAddr(pcAddr, backupAddr, paddr);
-	}
-	if (paddrcreated) KPILOT_DELETE(paddr);
-	return true;
-}
-
-
-
-bool AbbrowserConduit::_copyToPC(Addressee &pcAddr, PilotAddress*backupAddr,
-		PilotAddress*palmAddr)
-{
-	FUNCTIONSETUP;
-	if (!palmAddr)
-	{
-		return false;
-	}
-	// keep track of CUD's...
-	if (pcAddr.isEmpty())
-	{
-		fCtrPC->created();
-	}
-	else
-	{
-		fCtrPC->updated();
-	}
-	showPilotAddress(palmAddr);
-
-	KABCSync::copy(pcAddr, *palmAddr, *fAddressAppInfo, fSyncSettings);
-	if (isArchived(palmAddr))
-	{
-		KABCSync::makeArchived(pcAddr);
-	}
-
-	_savePCAddr(pcAddr, backupAddr, palmAddr);
-	_writeBackup(palmAddr);
-	return true;
-}
-
-
-
-bool AbbrowserConduit::_writeBackup(PilotAddress *backup)
-{
-	FUNCTIONSETUP;
-	if (!backup) return false;
-
-	showPilotAddress(backup);
-
-	PilotRecord *pilotRec = backup->pack();
-	fLocalDatabase->writeRecord(pilotRec);
-	KPILOT_DELETE(pilotRec);
-	return true;
-}
-
-
-
-bool AbbrowserConduit::_deleteAddressee(Addressee &pcAddr, PilotAddress*backupAddr,
-		PilotAddress*palmAddr)
-{
-	FUNCTIONSETUP;
-
-	if (palmAddr)
-	{
-		if (!syncedIds.contains(palmAddr->id())) {
-		DEBUGKPILOT << fname << ": adding id:["<< palmAddr->id() << "] to syncedIds." << endl;
-			syncedIds.append(palmAddr->id());
-		}
-		fDatabase->deleteRecord(palmAddr->id());
-		fCtrHH->deleted();
-		fLocalDatabase->deleteRecord(palmAddr->id());
-	}
-	else if (backupAddr)
-	{
-		if (!syncedIds.contains(backupAddr->id())) {
-		DEBUGKPILOT << fname << ": adding id:["<< backupAddr->id() << "] to syncedIds." << endl;
-			syncedIds.append(backupAddr->id());
-		}
-		fLocalDatabase->deleteRecord(backupAddr->id());
-	}
-	if (!pcAddr.isEmpty())
-	{
-		DEBUGKPILOT << fname << " removing " << pcAddr.formattedName() << endl;
-		abChanged = true;
-		aBook->removeAddressee(pcAddr);
-		fCtrPC->deleted();
-	}
-	return true;
-}
-
-
-
-/*********************************************************************
-                 l o w - l e v e l   f u n c t i o n s   f o r
-                   adding / removing palm/pc records
- *********************************************************************/
-
-
-
-bool AbbrowserConduit::_savePalmAddr(PilotAddress *palmAddr, Addressee &pcAddr)
-{
-	FUNCTIONSETUP;
-
-	DEBUGKPILOT << fname << ": Saving to pilot " << palmAddr->id()
-		<< " " << palmAddr->getField(entryFirstname)
-		<< " " << palmAddr->getField(entryLastname)<< endl;
-
-	PilotRecord *pilotRec = palmAddr->pack();
-	DEBUGKPILOT << fname << ": record with id=" << pilotRec->id()
-		<< " len=" << pilotRec->size() << endl;
-	recordid_t pilotId = fDatabase->writeRecord(pilotRec);
-	DEBUGKPILOT << fname << ": Wrote "<<pilotId<<": ID="<<pilotRec->id()<<endl;
-	fLocalDatabase->writeRecord(pilotRec);
-	KPILOT_DELETE(pilotRec);
-
-	// pilotId == 0 if using local db, so don't overwrite the valid id
-	if(pilotId != 0)
-	{
-		palmAddr->setID(pilotId);
-		if (!syncedIds.contains(pilotId)) {
-		DEBUGKPILOT << fname << ": adding id:["<< pilotId << "] to syncedIds." << endl;
-			syncedIds.append(pilotId);
-		}
-	}
-
-	recordid_t abId = 0;
-	abId = pcAddr.custom(KABCSync::appString, KABCSync::idString).toUInt();
-	if(abId != pilotId)
-	{
-		pcAddr.insertCustom(KABCSync::appString, KABCSync::idString, TQString::number(pilotId));
-		return true;
-	}
-
-	return false;
-}
-
-
-
-bool AbbrowserConduit::_savePCAddr(Addressee &pcAddr, PilotAddress*,
-	PilotAddress*)
-{
-	FUNCTIONSETUP;
-
-	DEBUGKPILOT<<"Before _savePCAddr, pcAddr.custom="<<pcAddr.custom(KABCSync::appString, KABCSync::idString)<<endl;
-	TQString pilotId = pcAddr.custom(KABCSync::appString, KABCSync::idString);
-	long pilotIdL = pilotId.toLong();
-	if(!pilotId.isEmpty())
-	{
-		// because we maintain a mapping between pilotId -> kabc uid, whenever we add
-		// a new relationship, we have to remove any old mapping that would tie a different
-		// pilot id -> this kabc uid
-		TQMap < recordid_t, TQString>::iterator it;
-		for ( it = addresseeMap.begin(); it != addresseeMap.end(); ++it ) {
-			TQString kabcUid = it.data();
-			if (kabcUid == pcAddr.uid()) {
-				addresseeMap.remove(it);
-				break;
-			}
-		}
-
-		// now put the new mapping in
-		addresseeMap.insert(pilotIdL,  pcAddr.uid());
-	}
-
-	aBook->insertAddressee(pcAddr);
-
-	abChanged = true;
-	return true;
-}
-
-
-
-
-/*********************************************************************
-                   C O P Y   R E C O R D S
- *********************************************************************/
-
-
-
-bool AbbrowserConduit::_equal(const PilotAddress *piAddress, const Addressee &abEntry,
-	enum eqFlagsType flags) const
-{
-	FUNCTIONSETUP;
-
-	// empty records are never equal!
-	if (!piAddress) {
-		DEBUGKPILOT << fname  << ": no pilot address passed" << endl;
-		return false;
-	}
-	if (abEntry.isEmpty()) {
-		DEBUGKPILOT << fname  << ":abEntry.isEmpty()" << endl;
-		return false;
-	}
-	//  Archived records match anything so they won't be copied to the HH again
-	if (flags & eqFlagsFlags)
-		if (isArchived(piAddress) && KABCSync::isArchived(abEntry) ) return true;
-
-	if (flags & eqFlagsName)
-	{
-		if(!_equal(abEntry.familyName(), piAddress->getField(entryLastname)))
-		{
-		DEBUGKPILOT << fname  << ": last name not equal" << endl;
-			return false;
-		}
-		if(!_equal(abEntry.givenName(), piAddress->getField(entryFirstname)))
-		{
-		DEBUGKPILOT << fname  << ": first name not equal" << endl;
-			return false;
-		}
-		if(!_equal(abEntry.prefix(), piAddress->getField(entryTitle)))
-		{
-		DEBUGKPILOT << fname  << ": title/prefix not equal" << endl;
-			return false;
-		}
-		if(!_equal(abEntry.organization(), piAddress->getField(entryCompany)))
-		{
-		DEBUGKPILOT << fname  << ": company/organization not equal" << endl;
-			return false;
-		}
-	}
-	if (flags & eqFlagsNote)
-		if(!_equal(abEntry.note(), piAddress->getField(entryNote)))
-	{
-		DEBUGKPILOT << fname  << ": note not equal" << endl;
-			return false;
-	}
-
-	if (flags & eqFlagsCategory)
-	{
-		// Check that the name of the category of the HH record
-		// is one matching the PC record.
-		TQString addressCategoryLabel = fAddressAppInfo->categoryName(piAddress->category());
-		TQString cat = KABCSync::bestMatchedCategoryName(abEntry.categories(),
-			*fAddressAppInfo, piAddress->category());
-		if(!_equal(cat, addressCategoryLabel))
-		{
-			DEBUGKPILOT << fname  << ": category not equal" << endl;
-			return false;
-		}
-	}
-
-	if (flags & eqFlagsPhones)
-	{
-		// first, look for missing e-mail addresses on either side
-		TQStringList abEmails(abEntry.emails());
-		TQStringList piEmails(piAddress->getEmails());
-
-		if (abEmails.count() != piEmails.count())
-		{
-		DEBUGKPILOT << fname  << ": email count not equal" << endl;
-			return false;
-		}
-		for (TQStringList::Iterator it = abEmails.begin(); it != abEmails.end(); it++) {
-			if (!piEmails.contains(*it))
-			{
-		DEBUGKPILOT << fname  << ": pilot e-mail missing" << endl;
-			return false;
-			}
-		}
-		for (TQStringList::Iterator it = piEmails.begin(); it != piEmails.end(); it++) {
-			if (!abEmails.contains(*it))
-			{
-		DEBUGKPILOT << fname  << ": kabc e-mail missing" << endl;
-			return false;
-			}
-		}
-
-		// now look for differences in phone numbers.  Note:  we can't just compare one
-		// of each kind of phone number, because there's no guarantee that if the user
-		// has more than one of a given type, we're comparing the correct two.
-
-		PhoneNumber::List abPhones(abEntry.phoneNumbers());
-		PhoneNumber::List piPhones = KABCSync::getPhoneNumbers(*piAddress);
-		// first make sure that all of the pilot phone numbers are in kabc
-		for (PhoneNumber::List::Iterator it = piPhones.begin(); it != piPhones.end(); it++) {
-			PhoneNumber piPhone = *it;
-			bool found=false;
-			for (PhoneNumber::List::Iterator it = abPhones.begin(); it != abPhones.end(); it++) {
-				PhoneNumber abPhone = *it;
-				// see if we have the same number here...
-				// * Note * We used to check for preferred number matching, but
-				//     this seems to have broke in kdepim 3.5 and I don't have time to
-				//     figure out why, so we won't check to see if preferred number match
-				if ( _equal(piPhone.number(), abPhone.number()) ) {
-					found = true;
-					break;
-				}
-			}
-			if (!found) {
-		DEBUGKPILOT << fname  << ": not equal because kabc phone not found." << endl;
-				return false;
-			}
-		}
-		// now the other way.  *cringe*  kabc has the capacity to store way more addresses
-		// than the Pilot, so this might give false positives more than we'd want....
-		for (PhoneNumber::List::Iterator it = abPhones.begin(); it != abPhones.end(); it++) {
-			PhoneNumber abPhone = *it;
-			bool found=false;
-			for (PhoneNumber::List::Iterator it = piPhones.begin(); it != piPhones.end(); it++) {
-				PhoneNumber piPhone = *it;
-				if ( _equal(piPhone.number(), abPhone.number()) ) {
-					found = true;
-					break;
-				}
-			}
-			if (!found)
-			{
-				DEBUGKPILOT << fname  << ": not equal because pilot phone not found." << endl;
-				return false;
-			}
-		}
-
-		if(!_equal(KABCSync::getFieldForHHOtherPhone(abEntry,fSyncSettings),
-			piAddress->getPhoneField(PilotAddressInfo::eOther)))
-		{
-			DEBUGKPILOT << fname  << ": not equal because of other phone field." << endl;
-		   	return false;
-		}
-	}
-
-	if (flags & eqFlagsAdress)
-	{
-		KABC::Address address = KABCSync::getAddress(abEntry,fSyncSettings);
-		if(!_equal(address.street(), piAddress->getField(entryAddress)))
-		{
-			DEBUGKPILOT << fname  << ": address not equal" << endl;
-			return false;
-		}
-		if(!_equal(address.locality(), piAddress->getField(entryCity)))
-		{
-			DEBUGKPILOT << fname  << ": city not equal" << endl;
-			return false;
-		}
-		if(!_equal(address.region(), piAddress->getField(entryState)))
-		{
-		DEBUGKPILOT << fname  << ": state not equal" << endl;
-			return false;
-		}
-		if(!_equal(address.postalCode(), piAddress->getField(entryZip)))
-		{
-		DEBUGKPILOT << fname  << ": zip not equal" << endl;
-			return false;
-		}
-		if(!_equal(address.country(), piAddress->getField(entryCountry)))
-		{
-		DEBUGKPILOT << fname  << ": country not equal" << endl;
-			return false;
-		}
-	}
-
-	if (flags & eqFlagsCustom)
-	{
-		unsigned int customIndex = 0;
-		unsigned int hhField = entryCustom1;
-
-		for ( ; customIndex<4; ++customIndex,++hhField )
-		{
-			if (!_equal(KABCSync::getFieldForHHCustom(customIndex, abEntry, fSyncSettings),
-				piAddress->getField(hhField)))
-			{
-				DEBUGKPILOT << fname << ": Custom field " << customIndex
-					<< " (HH field " << hhField << ") differs." << endl;
-				return false;
-			}
-		}
-	}
-
-	// if any side is marked archived, but the other is not, the two
-	// are not equal.
-	if ( (flags & eqFlagsFlags) && (isArchived(piAddress) || KABCSync::isArchived(abEntry) ) )
-	{
-		DEBUGKPILOT << fname  << ": archived flags don't match" << endl;
-		return false;
-	}
-
-	return true;
-}
-
-
-
-
-
-
-
-
-
-
-/*********************************************************************
- C O N F L I C T   R E S O L U T I O N   a n d   M E R G I N G
- *********************************************************************/
-
-
-
-/** smartly merge the given field for the given entry. use the backup record to determine which record has been modified
-	@pc, @backup, @palm ... entries of the according databases
-	@returns string of the merged entries.
-*/
-TQString AbbrowserConduit::_smartMergeString(const TQString &pc, const TQString & backup,
-	const TQString & palm, ConflictResolution confRes)
-{
-	FUNCTIONSETUP;
-
-	// if both entries are already the same, no need to do anything
-	if(pc == palm) return pc;
-
-	// If this is a first sync, we don't have a backup record, so
-	if(isFirstSync() || backup.isEmpty()) {
-		if (pc.isEmpty() && palm.isEmpty() ) return TQString::null;
-		if(pc.isEmpty()) return palm;
-		if(palm.isEmpty()) return pc;
-	} else {
-		// only one side modified, so return that string, no conflict
-		if(palm == backup) return pc;
-		if(pc == backup) return palm;
-	}
-
-	DEBUGKPILOT<<"pc="<<pc<<", backup="<<backup<<", palm="<<
-		palm<<", ConfRes="<<confRes<<endl;
-	DEBUGKPILOT<<"Use conflict resolution :"<<confRes<<
-		", PC="<<SyncAction::ePCOverrides<<endl;
-	switch(confRes) {
-		case SyncAction::ePCOverrides: return pc; break;
-		case SyncAction::eHHOverrides: return palm; break;
-		case SyncAction::ePreviousSyncOverrides: return backup; break;
-		default: break;
-	}
-	return TQString::null;
-}
-
-
-
-bool AbbrowserConduit::_buildResolutionTable(ResolutionTable*tab, const Addressee &pcAddr,
-	PilotAddress *backupAddr, PilotAddress *palmAddr)
-{
-	FUNCTIONSETUP;
-	if (!tab) return false;
-	tab->setAutoDelete( TRUE );
-	tab->labels[0]=i18n("Item on PC");
-	tab->labels[1]=i18n("Handheld");
-	tab->labels[2]=i18n("Last sync");
-	if (!pcAddr.isEmpty())
-		tab->fExistItems=(eExistItems)(tab->fExistItems|eExistsPC);
-	if (backupAddr)
-		tab->fExistItems=(eExistItems)(tab->fExistItems|eExistsBackup);
-	if (palmAddr)
-		tab->fExistItems=(eExistItems)(tab->fExistItems|eExistsPalm);
-
-#define appendGen(desc, abfield, palmfield) \
-	tab->append(new ResolutionItem(desc, tab->fExistItems, \
-		(!pcAddr.isEmpty())?(abfield):(TQString::null), \
-		(palmAddr)?(palmAddr->palmfield):(TQString::null), \
-		(backupAddr)?(backupAddr->palmfield):(TQString::null) ))
-#define appendAddr(desc, abfield, palmfield) \
-	appendGen(desc, abfield, getField(palmfield))
-#define appendGenPhone(desc, abfield, palmfield) \
-	appendGen(desc, abfield, getPhoneField(PilotAddressInfo::palmfield))
-#define appendPhone(desc, abfield, palmfield) \
-	appendGenPhone(desc, pcAddr.phoneNumber(PhoneNumber::abfield).number(), palmfield)
-
-
-	appendAddr(i18n("Last name"), pcAddr.familyName(), entryLastname);
-	appendAddr(i18n("First name"), pcAddr.givenName(), entryFirstname);
-	appendAddr(i18n("Organization"), pcAddr.organization(), entryCompany);
-	appendAddr(i18n("Title"), pcAddr.prefix(), entryTitle);
-	appendAddr(i18n("Note"), pcAddr.note(), entryNote);
-
-	appendAddr(i18n("Custom 1"), KABCSync::getFieldForHHCustom(0, pcAddr, fSyncSettings), entryCustom1);
-	appendAddr(i18n("Custom 2"), KABCSync::getFieldForHHCustom(1, pcAddr, fSyncSettings), entryCustom2);
-	appendAddr(i18n("Custom 3"), KABCSync::getFieldForHHCustom(2, pcAddr, fSyncSettings), entryCustom3);
-	appendAddr(i18n("Custom 4"), KABCSync::getFieldForHHCustom(3, pcAddr, fSyncSettings), entryCustom4);
-
-	appendPhone(i18n("Work Phone"), Work, eWork);
-	appendPhone(i18n("Home Phone"), Home, eHome);
-	appendPhone(i18n("Mobile Phone"), Cell, eMobile);
-	appendGenPhone(i18n("Fax"), pcAddr.phoneNumber(faxTypeOnPC()).number(), eFax);
-	appendPhone(i18n("Pager"), Pager, ePager);
-	appendGenPhone(i18n("Other"), KABCSync::getFieldForHHOtherPhone(pcAddr,fSyncSettings), eOther);
-	appendGenPhone(i18n("Email"), pcAddr.preferredEmail(), eEmail);
-
-	KABC::Address abAddress = KABCSync::getAddress(pcAddr,fSyncSettings);
-	appendAddr(i18n("Address"), abAddress.street(), entryAddress);
-	appendAddr(i18n("City"), abAddress.locality(), entryCity);
-	appendAddr(i18n("Region"), abAddress.region(), entryState);
-	appendAddr(i18n("Postal code"), abAddress.postalCode(), entryZip);
-	appendAddr(i18n("Country"), abAddress.country(), entryCountry);
-
-	TQString palmAddrCategoryLabel;
-	if (palmAddr)
-	{
-		 palmAddrCategoryLabel = fAddressAppInfo->categoryName(palmAddr->category());
-	}
-	TQString backupAddrCategoryLabel;
-	if (backupAddr)
-	{
-		backupAddrCategoryLabel = fAddressAppInfo->categoryName(backupAddr->category());
-	}
-	int category = palmAddr ? palmAddr->category() : 0;
-	tab->append(new ResolutionItem(
-		i18n("Category"),
-		tab->fExistItems,
-		!pcAddr.isEmpty() ?
-			KABCSync::bestMatchedCategoryName(pcAddr.categories(), *fAddressAppInfo, category) :
-			TQString::null,
-		palmAddrCategoryLabel,
-		backupAddrCategoryLabel));
-#undef appendGen
-#undef appendAddr
-#undef appendGenPhone
-#undef appendPhone
-
-	return true;
-}
-
-
-/// This function just sets the phone number of type "type" to "phone"
-static inline void setPhoneNumber(Addressee &abEntry, int type, const TQString &nr)
-{
-	PhoneNumber phone = abEntry.phoneNumber(type);
-	phone.setNumber(nr);
-	abEntry.insertPhoneNumber(phone);
-}
-
-
-bool AbbrowserConduit::_applyResolutionTable(ResolutionTable*tab, Addressee &pcAddr,
-	PilotAddress *backupAddr, PilotAddress *palmAddr)
-{
-	FUNCTIONSETUP;
-	if (!tab) return false;
-	if (!palmAddr) {
-		WARNINGKPILOT << "Empty palmAddr after conflict resolution." << endl;
-		return false;
-	}
-
-	ResolutionItem*item=tab->first();
-#define SETGENFIELD(abfield, palmfield) \
-	if (item) {\
-		abfield; \
-		palmAddr->setField(palmfield, item->fResolved); \
-	}\
-	item=tab->next();
-#define SETFIELD(abfield, palmfield) \
-	SETGENFIELD(pcAddr.set##abfield(item->fResolved), palmfield)
-#define SETCUSTOMFIELD(abfield, palmfield) \
-	SETGENFIELD(KABCSync::setFieldFromHHCustom(abfield, pcAddr, item->fResolved, fSyncSettings), palmfield)
-#define SETGENPHONE(abfield, palmfield) \
-	if (item) { \
-		abfield; \
-		palmAddr->setPhoneField(PilotAddressInfo::palmfield, item->fResolved, PilotAddress::Replace); \
-	}\
-	item=tab->next();
-#define SETPHONEFIELD(abfield, palmfield) \
-	SETGENPHONE(setPhoneNumber(pcAddr, PhoneNumber::abfield, item->fResolved), palmfield)
-#define SETADDRESSFIELD(abfield, palmfield) \
-	SETGENFIELD(abAddress.abfield(item->fResolved), palmfield)
-
-	SETFIELD(FamilyName, entryLastname);
-	SETFIELD(GivenName, entryFirstname);
-	SETFIELD(Organization, entryCompany);
-	SETFIELD(Prefix, entryTitle);
-	SETFIELD(Note, entryNote);
-
-	SETCUSTOMFIELD(0, entryCustom1);
-	SETCUSTOMFIELD(1, entryCustom2);
-	SETCUSTOMFIELD(2, entryCustom3);
-	SETCUSTOMFIELD(3, entryCustom4);
-
-	SETPHONEFIELD(Work, eWork);
-	SETPHONEFIELD(Home, eHome);
-	SETPHONEFIELD(Cell, eMobile);
-	SETGENPHONE(setPhoneNumber(pcAddr, faxTypeOnPC(), item->fResolved), eFax);
-	SETPHONEFIELD(Pager, ePager);
-	SETGENPHONE(KABCSync::setFieldFromHHOtherPhone(pcAddr, item->fResolved, fSyncSettings), eOther);
-
-	// TODO: fix email
-	if (item)
-	{
-		palmAddr->setPhoneField(PilotAddressInfo::eEmail, item->fResolved, PilotAddress::Replace);
-		if (backupAddr)
-		{
-			pcAddr.removeEmail(backupAddr->getPhoneField(PilotAddressInfo::eEmail));
-		}
-		pcAddr.removeEmail(palmAddr->getPhoneField(PilotAddressInfo::eEmail));
-		pcAddr.insertEmail(item->fResolved, true);
-	}
-	item=tab->next();
-
-	KABC::Address abAddress = KABCSync::getAddress(pcAddr, fSyncSettings);
-	SETADDRESSFIELD(setStreet, entryAddress);
-	SETADDRESSFIELD(setLocality, entryCity);
-	SETADDRESSFIELD(setRegion, entryState);
-	SETADDRESSFIELD(setPostalCode, entryZip);
-	SETADDRESSFIELD(setCountry, entryCountry);
-	pcAddr.insertAddress(abAddress);
-
-	// TODO: Is this correct?
-	if (item)
-	{
-		palmAddr->setCategory( fAddressAppInfo->findCategory(item->fResolved) );
-		KABCSync::setCategory(pcAddr, item->fResolved);
-	}
-
-
-#undef SETGENFIELD
-#undef SETFIELD
-#undef SETCUSTOMFIELD
-#undef SETGENPHONE
-#undef SETPHONEFIELD
-#undef SETADDRESSFIELD
-
-	return true;
-}
-
-
-
-bool AbbrowserConduit::_smartMergeTable(ResolutionTable*tab)
-{
-	FUNCTIONSETUP;
-	if (!tab) return false;
-	bool noconflict=true;
-	ResolutionItem*item;
-	for ( item = tab->first(); item; item = tab->next() )
-	{
-		// try to merge the three strings
-		item->fResolved=_smartMergeString(item->fEntries[0],
-			item->fEntries[2], item->fEntries[1], getConflictResolution());
-		// if a conflict occurred, set the default to something sensitive:
-		if (item->fResolved.isNull() && !(item->fEntries[0].isEmpty() &&
-			item->fEntries[1].isEmpty() && item->fEntries[2].isEmpty() ) )
-		{
-			item->fResolved=item->fEntries[0];
-			noconflict=false;
-		}
-		if (item->fResolved.isNull()) item->fResolved=item->fEntries[1];
-		if (item->fResolved.isNull()) item->fResolved=item->fEntries[2];
-	}
-	return  noconflict;
-}
-
-
-
-/** Merge the palm and the pc entries with the additional information of
- *  the backup.
- *  return value: no meaning yet
- */
-bool AbbrowserConduit::_smartMergeAddressee(Addressee &pcAddr,
-	PilotAddress *backupAddr, PilotAddress *palmAddr)
-{
-	FUNCTIONSETUP;
-
-	// Merge them, then look which records have to be written to device or abook
-	int res = SyncAction::eAskUser;
- 	bool result=true;
-	ResolutionTable tab;
-
-	result &= _buildResolutionTable(&tab, pcAddr, backupAddr, palmAddr);
-	// Now attempt a smart merge. If that fails, let conflict resolution do the job
-	bool mergeOk=_smartMergeTable(&tab);
-
-	if (!mergeOk)
-	{
-		TQString dlgText;
-		if (!palmAddr)
-		{
-			dlgText=i18n("The following address entry was changed, but does no longer exist on the handheld. Please resolve this conflict:");
-		}
-		else if (pcAddr.isEmpty())
-		{
-			dlgText=i18n("The following address entry was changed, but does no longer exist on the PC. Please resolve this conflict:");
-		}
-		else
-		{
-			dlgText=i18n("The following address entry was changed on the handheld as well as on the PC side. The changes could not be merged automatically, so please resolve the conflict yourself:");
-		}
-		ResolutionDlg*resdlg=new ResolutionDlg(0L, fHandle, i18n("Address conflict"), dlgText, &tab);
-		resdlg->exec();
-		KPILOT_DELETE(resdlg);
-	}
-	res=tab.fResolution;
-
-	// Disallow some resolution under certain conditions, fix wrong values:
-	switch (res) {
-		case SyncAction::eHHOverrides:
-			if (!palmAddr) res=SyncAction::eDelete;
-			break;
-		case SyncAction::ePCOverrides:
-			if (pcAddr.isEmpty()) res=SyncAction::eDelete;
-			break;
-		case SyncAction::ePreviousSyncOverrides:
-			if (!backupAddr) res=SyncAction::eDoNothing;
-			break;
-	}
-
-	PilotAddress*pAddr=palmAddr;
-	bool pAddrCreated=false;
-	// Now that we have done a possible conflict resolution, apply the changes
-	switch (res) {
-		case SyncAction::eDuplicate:
-			// Set the Palm ID to 0 so we don't overwrite the existing record.
-			pcAddr.removeCustom(KABCSync::appString, KABCSync::idString);
-			result &= _copyToHH(pcAddr, 0L, 0L);
-			{
-			Addressee pcadr;
-			result &= _copyToPC(pcadr, backupAddr, palmAddr);
-			}
-			break;
-		case SyncAction::eDoNothing:
-			break;
-		case SyncAction::eHHOverrides:
-				result &= _copyToPC(pcAddr, backupAddr, palmAddr);
-				break;
-		case SyncAction::ePCOverrides:
-			result &= _copyToHH(pcAddr, backupAddr, pAddr);
-			break;
-		case SyncAction::ePreviousSyncOverrides:
-			KABCSync::copy(pcAddr, *backupAddr, *fAddressAppInfo, fSyncSettings);
-			if (palmAddr && backupAddr) *palmAddr=*backupAddr;
-			result &= _savePalmAddr(backupAddr, pcAddr);
-			result &= _savePCAddr(pcAddr, backupAddr, backupAddr);
-			break;
-		case SyncAction::eDelete:
-			result &= _deleteAddressee(pcAddr, backupAddr, palmAddr);
-			break;
-		case SyncAction::eAskUser:
-		default:
-			if (!pAddr)
-			{
-				pAddr=new PilotAddress();
-				pAddrCreated=true;
-			}
-			result &= _applyResolutionTable(&tab, pcAddr, backupAddr, pAddr);
-showAddresses(pcAddr, backupAddr, pAddr);
-			// savePalmAddr sets the RecordID custom field already
-			result &= _savePalmAddr(pAddr, pcAddr);
-			result &= _savePCAddr(pcAddr, backupAddr, pAddr);
-			if (pAddrCreated) KPILOT_DELETE(pAddr);
-			break;
-	}
-
-	return result;
-}
-
-
-
-// TODO: right now entries are equal if both first/last name and organization are
-//  equal. This rules out two entries for the same person(e.g. real home and weekend home)
-//  or two persons with the same name where you don't know the organization.!!!
-Addressee AbbrowserConduit::_findMatch(const PilotAddress & pilotAddress) const
-{
-	FUNCTIONSETUP;
-	// TODO: also search with the pilotID
-	// first, use the pilotID to UID map to find the appropriate record
-	if( !isFirstSync() && (pilotAddress.id() > 0) )
-	{
-		TQString id(addresseeMap[pilotAddress.id()]);
-		DEBUGKPILOT << fname << ": PilotRecord has id " << pilotAddress.id() << ", mapped to " << id << endl;
-		if(!id.isEmpty())
-		{
-			Addressee res(aBook->findByUid(id));
-			if(!res.isEmpty()) return res;
-			DEBUGKPILOT << fname << ": PilotRecord has id " << pilotAddress.id() << ", but could not be found in the addressbook" << endl;
-		}
-	}
-
-	for(AddressBook::Iterator iter = aBook->begin(); iter != aBook->end(); ++iter)
-	{
-		Addressee abEntry = *iter;
-		TQString recID(abEntry.custom(KABCSync::appString, KABCSync::idString));
-		bool ok;
-		if (!recID.isEmpty() )
-		{
-			recordid_t rid = recID.toLong(&ok);
-			if (ok && rid)
-			{
-				if (rid==pilotAddress.id()) return abEntry;// yes, we found it
-				// skip this addressee, as it can an other corresponding address on the handheld
-				if (allIds.contains(rid)) continue;
-			}
-		}
-
-		if (_equal(&pilotAddress, abEntry, eqFlagsAlmostAll))
-		{
-			return abEntry;
-		}
-	}
-	DEBUGKPILOT << fname << ": Could not find any addressbook enty matching " << pilotAddress.getField(entryLastname) << endl;
-	return Addressee();
-}
-
-void AbbrowserConduit::slotTestRecord()
-{
-	FUNCTIONSETUP;
-
-	// Get a record and interpret it as an address.
-	PilotRecord *r = fDatabase->readRecordByIndex( pilotindex );
-	if (!r)
-	{
-		delayDone();
-		return;
-	}
-	PilotAddress a(r);
-	KPILOT_DELETE(r);
-
-	// Process this record.
-	showPilotAddress(&a);
-
-	// Schedule more work.
-	++pilotindex;
-	TQTimer::singleShot(0, this, TQT_SLOT(slotTestRecord()));
-}
diff --git a/kpilot/conduits/abbrowserconduit/abbrowser-conduit.h b/kpilot/conduits/abbrowserconduit/abbrowser-conduit.h
deleted file mode 100644
index 22e94469..00000000
--- a/kpilot/conduits/abbrowserconduit/abbrowser-conduit.h
+++ /dev/null
@@ -1,222 +0,0 @@
-#ifndef _ABBROWSER_CONDUIT_H
-#define _ABBROWSER_CONDUIT_H
-/* abbrowser-conduit.h                           KPilot
-**
-** Copyright (C) 2000,2001 by Dan Pilone
-** Copyright (C) 2000 Gregory Stern
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include <kabc/addressbook.h>
-
-#include <pilotAddress.h>
-#include <plugin.h>
-
-#include "kabcRecord.h"
-
-
-class ResolutionTable;
-namespace KABC
-{
-class Addressee;
-class Address;
-class PhoneNumber;
-class Ticket;
-}
-
-using namespace KABC;
-
-typedef TQValueList<recordid_t> RecordIDList;
-
-class AbbrowserConduit : public ConduitAction
-{
-Q_OBJECT
-public:
-	AbbrowserConduit(KPilotLink *o,const char *n = 0L,
-		const TQStringList &a = TQStringList() );
-	virtual ~AbbrowserConduit();
-
-/*********************************************************************
-                S Y N C   S T R U C T U R E
- *********************************************************************/
-	virtual bool exec();
-protected slots:
-	void slotPalmRecToPC();
-	void slotPCRecToPalm();
-	void slotDeletedRecord();
-	void slotDeleteUnsyncedPCRecords();
-	void slotDeleteUnsyncedHHRecords();
-	void slotCleanup();
-
-	void slotTestRecord();
-
-private:
-
-	/********************************************************/
-	/* Handle the configuration                             */
-	/********************************************************/
-
-	/* Read the global KPilot config file for settings
-	 * particular to the AbbrowserConduit conduit. */
-	void readConfig();
-
-	void showPilotAddress(const PilotAddress *pilotAddress);
-	void showAddresses(
-		const Addressee &pcAddr,
-		const PilotAddress *backupAddr,
-		const PilotAddress *palmAddr);
-
-
-	/********************************************************/
-	/* Loading and saving the addressbook and database      */
-	/********************************************************/
-
-
-	/* Given a list of contacts, creates the pilot id to contact key map
-	 * and a list of new contacts in O(n) time (single pass) */
-	void _mapContactsToPilot( TQMap < recordid_t, TQString> &idContactMap);
-	/* Do the preperations before doSync or doBackup.
-	 * Load contacts, set the pilot */
-	bool _prepare();
-	/* Load the contacts from the addressbook.
-	 * @return true if successful, false if not */
-	bool _loadAddressBook();
-	/* Save the contacts back to the addressbook.
-	 * @return true if successful, false if not */
-	bool _saveAddressBook();
-	void _getAppInfo();
-	void _setAppInfo();
-
-	void _cleanupAddressBookPointer();
-
-
-
-/*********************************************************************
-              G E N E R A L   S Y N C   F U N C T I O N
-         These functions modify the Handheld and the addressbook
- *********************************************************************/
-	bool syncAddressee(Addressee &pcAddr, PilotAddress*backupAddr,
-		PilotAddress*palmAddr);
-	bool _copyToHH(Addressee &pcAddr, PilotAddress*backupAddr,
-		PilotAddress*palmAddr);
-	bool _copyToPC(Addressee &pcAddr, PilotAddress*backupAddr,
-		PilotAddress*palmAddr);
-	bool _writeBackup(PilotAddress *backup);
-	bool _deleteAddressee(Addressee &pcAddr, PilotAddress*backupAddr,
-		PilotAddress*palmAddr);
-
-
-/*********************************************************************
-                 l o w - l e v e l   f u n c t i o n s   f o r
-                   adding / removing palm/pc records
- *********************************************************************/
-	bool _savePalmAddr(PilotAddress *palmAddr, Addressee &pcAddr);
-	bool _savePCAddr(Addressee &pcAddr, PilotAddress*backupAddr,
-		PilotAddress*palmAddr);
-
-
-/*********************************************************************
-                   C O P Y   R E C O R D S
- *********************************************************************/
-	inline bool _equal(const TQString & str1, const TQString & str2) const
-	{
-		return (str1.isEmpty() && str2.isEmpty()) || (str1 == str2);
-	} ;
-	typedef enum eqFlagsType
-	{
-		eqFlagsName=0x1,
-		eqFlagsAdress=0x2,
-		eqFlagsPhones=0x4,
-		eqFlagsNote=0x8,
-		eqFlagsCategory=0x10,
-		eqFlagsFlags=0x20,
-		eqFlagsCustom=0x40,
-		eqFlagsAll=0xFFFF,
-		eqFlagsAlmostAll=eqFlagsName|eqFlagsAdress|eqFlagsPhones|eqFlagsNote|eqFlagsCustom
-	};
-	bool _equal(const PilotAddress *piAddress, const Addressee &abEntry,
-		enum eqFlagsType flags=eqFlagsAll) const;
-
-/*********************************************************************
- C O N F L I C T   R E S O L U T I O N   a n d   M E R G I N G
- *********************************************************************/
-	/** smartly merge the given field for the given entry. use the
-	 *  backup record to determine which record has been modified
-	 *  @pc, @backup, @palm ... entries of the according databases
-	 *  @returns string of the merged entries.
-	 */
-	TQString _smartMergeString(const TQString &pc, const TQString & backup,
-		const TQString & palm, ConflictResolution confRes);
-	bool _buildResolutionTable(ResolutionTable*tab, const Addressee &pcAddr,
-		PilotAddress *backupAddr, PilotAddress *palmAddr);
-	bool _applyResolutionTable(ResolutionTable*tab, Addressee &pcAddr,
-		PilotAddress *backupAddr, PilotAddress *palmAddr);
-	bool _smartMergeTable(ResolutionTable*tab);
-	/** Merge the palm and the pc entries with the additional
-	 *  information of the backup record. Calls _smartMerge
-	 *  which does the actual syncing of the data structures.
-	 *  According to the return value of _smartMerge, this function
-	 *  writes the data back to the palm/pc.
-	 *  return value: no meaning yet
-	 */
-	bool _smartMergeAddressee(Addressee &pcAddr, PilotAddress *backupAddr,
-		PilotAddress *palmAddr);
-	Addressee _findMatch(const PilotAddress & pilotAddress) const;
-
-
-/********************************************************/
-/*   D A T A   M E M B E R S ,   S E T T I N G S        */
-/********************************************************/
-
-	AddressBook* aBook;
-
-	PilotAddressInfo *fAddressAppInfo;
-
-	KABCSync::Settings fSyncSettings;
-
-	int pilotindex;
-	bool abChanged;
-	/** addresseeMap maps record ids to IDs of Addressees. This is used to speed up searching the local addressbook */
-	TQMap < recordid_t, TQString> addresseeMap;
-	RecordIDList syncedIds, allIds;
-	TQString fABookFile;
-	AddressBook::Iterator abiter;
-	/** For a local file resource, we need to obtain a saveTicket 
-	*   when opening the abook, just in case we want to modify it
-	*   at all.
-	*/
-	Ticket *fTicket;
-	bool fCreatedBook;
-
-	/** if we add a resource from the addressbook, track it to remove it
-	 *  later...
-	 */
-	KABC::Resource *fBookResource;
-
-
-} ;
-
-#endif
diff --git a/kpilot/conduits/abbrowserconduit/abbrowser-factory.cc b/kpilot/conduits/abbrowserconduit/abbrowser-factory.cc
deleted file mode 100644
index 9a845084..00000000
--- a/kpilot/conduits/abbrowserconduit/abbrowser-factory.cc
+++ /dev/null
@@ -1,45 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2001 by Dan Pilone
-** Copyright (C) 2002-2003 Reinhold Kainhofer
-**
-** This file defines the factory for the abbrowser-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include "pluginfactory.h"
-
-#include "abbrowser-conduit.h"
-#include "abbrowser-setup.h"
-
-extern "C"
-{
-
-void *init_conduit_address()
-{
-	return new ConduitFactory<AbbrowserWidgetSetup,AbbrowserConduit>(0,"abbrowserconduit");
-}
-
-}
diff --git a/kpilot/conduits/abbrowserconduit/abbrowser-factory.h b/kpilot/conduits/abbrowserconduit/abbrowser-factory.h
deleted file mode 100644
index bbf573c7..00000000
--- a/kpilot/conduits/abbrowserconduit/abbrowser-factory.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef _ABBROWSER_FACTORY_H
-#define _ABBROWSER_FACTORY_H
-/* abbrowser-factory.h                       KPilot
-**
-** Copyright (C) 2001 by Dan Pilone
-** Copyright (C) 2002-2003 Reinhold Kainhofer
-**
-** This file defines the factory for the abbrowser-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-extern "C"
-{
-
-void *init_conduit_address();
-
-}
-
-#endif
-
diff --git a/kpilot/conduits/abbrowserconduit/abbrowser-setup.cc b/kpilot/conduits/abbrowserconduit/abbrowser-setup.cc
deleted file mode 100644
index f4d80d2c..00000000
--- a/kpilot/conduits/abbrowserconduit/abbrowser-setup.cc
+++ /dev/null
@@ -1,195 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2001 by Dan Pilone
-** Copyright (C) 2002-2003 Reinhold Kainhofer
-**
-** This file defines the setup dialog for the abbrowser-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <tqcheckbox.h>
-#include <tqcombobox.h>
-#include <tqbuttongroup.h>
-
-#include <kurlrequester.h>
-#include <kaboutdata.h>
-
-#include "kaddressbookConduit.h"
-#include "abbrowser-setup.h"
-#include "abbrowserSettings.h"
-
-
-
-static KAboutData *createAbout()
-{
-	KAboutData *fAbout = new KAboutData("abbrowserconduit",
-		I18N_NOOP("Abbrowser Conduit for KPilot"),
-		KPILOT_VERSION,
-		I18N_NOOP("Configures the Abbrowser Conduit for KPilot"),
-		KAboutData::License_GPL,
-		"(C) 2001, Dan Pilone\n(C) 2002-2003, Reinhold Kainhofer");
-	fAbout->addAuthor("Greg Stern",
-		I18N_NOOP("Primary Author"));
-	fAbout->addAuthor("Adriaan de Groot",
-		I18N_NOOP("Maintainer"),
-		"groot@kde.org",
-		"http://www.cs.kun.nl/~adridg/kpilot");
-	fAbout->addAuthor("Reinhold Kainhofer", I18N_NOOP("Maintainer"),
-		"reinhold@kainhofer.com", "http://reinhold.kainhofer.com");
-	fAbout->addCredit("David Bishop", I18N_NOOP("UI"));
-	return fAbout;
-}
-
-AbbrowserWidgetSetup::AbbrowserWidgetSetup(TQWidget *w, const char *n) :
-	ConduitConfigBase(w,n),
-	fConfigWidget(new AbbrowserWidget(w))
-{
-	FUNCTIONSETUP;
-
-	fConduitName=i18n("Addressbook");
-	fAbout = createAbout();
-	ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,fAbout);
-	fWidget=fConfigWidget;
-	fConfigWidget->fAbookFile->setMode(KFile::File);
-#define CM(a,b) connect(fConfigWidget->a,b,this,TQT_SLOT(modified()));
-	CM(fSyncDestination,TQT_SIGNAL(clicked(int)));
-	CM(fAbookFile,TQT_SIGNAL(textChanged(const TQString &)));
-	CM(fArchive,TQT_SIGNAL(toggled(bool)));
-	CM(fConflictResolution,TQT_SIGNAL(activated(int)));
-	CM(fOtherPhone,TQT_SIGNAL(activated(int)));
-	CM(fAddress,TQT_SIGNAL(activated(int)));
-	CM(fFax,TQT_SIGNAL(activated(int)));
-	CM(fCustom0,TQT_SIGNAL(activated(int)));
-	CM(fCustom1,TQT_SIGNAL(activated(int)));
-	CM(fCustom2,TQT_SIGNAL(activated(int)));
-	CM(fCustom3,TQT_SIGNAL(activated(int)));
-	CM(fCustomDate, TQT_SIGNAL(activated(int)));
-	CM(fCustomDate, TQT_SIGNAL(textChanged(const TQString&)));
-#undef CM
-}
-
-AbbrowserWidgetSetup::~AbbrowserWidgetSetup()
-{
-	FUNCTIONSETUP;
-}
-
-/* virtual */ void AbbrowserWidgetSetup::commit()
-{
-	FUNCTIONSETUP;
-
-	TQButtonGroup*grp=fConfigWidget->fSyncDestination;
-	AbbrowserSettings::setAddressbookType(grp->id(grp->selected()));
-	AbbrowserSettings::setFileName(fConfigWidget->fAbookFile->url());
-	AbbrowserSettings::setArchiveDeleted(fConfigWidget->fArchive->isChecked());
-
-	// Conflicts page
-	AbbrowserSettings::setConflictResolution(
-		fConfigWidget->fConflictResolution->currentItem()+SyncAction::eCROffset);
-
-	// Fields page
-	AbbrowserSettings::setPilotOther(fConfigWidget->fOtherPhone->currentItem());
-	AbbrowserSettings::setPilotStreet(fConfigWidget->fAddress->currentItem());
-	AbbrowserSettings::setPilotFax(fConfigWidget->fFax->currentItem());
-
-	// Custom fields page
-	AbbrowserSettings::setCustom0(fConfigWidget->fCustom0->currentItem());
-	AbbrowserSettings::setCustom1(fConfigWidget->fCustom1->currentItem());
-	AbbrowserSettings::setCustom2(fConfigWidget->fCustom2->currentItem());
-	AbbrowserSettings::setCustom3(fConfigWidget->fCustom3->currentItem());
-#ifdef DEBUG
-	DEBUGKPILOT <<fname<<
-	  "Custom0: "<<fConfigWidget->fCustom0->currentItem()<<"   "<<
-	  "Custom1: "<<fConfigWidget->fCustom1->currentItem()<<"   "<<
-	  "Custom2: "<<fConfigWidget->fCustom2->currentItem()<<"   "<<
-	  "Custom3: "<<fConfigWidget->fCustom3->currentItem()<<"   "
-		<< " eCustom[0]=" << AbbrowserSettings::custom0()<<"    "
-		<< " eCustom[1]=" << AbbrowserSettings::custom1()<<"    "
-		<< " eCustom[2]=" << AbbrowserSettings::custom2()<<"    "
-		<< " eCustom[3]=" << AbbrowserSettings::custom3()<<"    "<<
-		endl;
-#endif
-	int fmtindex=fConfigWidget->fCustomDate->currentItem();
-	AbbrowserSettings::setCustomDateFormat(
-	  (fmtindex==0)?(TQString::null):fConfigWidget->fCustomDate->currentText() );
-
-	AbbrowserSettings::self()->writeConfig();
-	unmodified();
-}
-
-/* virtual */ void AbbrowserWidgetSetup::load()
-{
-	FUNCTIONSETUP;
-	AbbrowserSettings::self()->readConfig();
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Settings "
-		<< " fPilotStreetHome=" << AbbrowserSettings::pilotStreet()
-		<< " fPilotFaxHome=" << AbbrowserSettings::pilotFax()
-		<< " fArchive=" << AbbrowserSettings::archiveDeleted()
-		<< " eCustom[0]=" << AbbrowserSettings::custom0()
-		<< " eCustom[1]=" << AbbrowserSettings::custom1()
-		<< " eCustom[2]=" << AbbrowserSettings::custom2()
-		<< " eCustom[3]=" << AbbrowserSettings::custom3()
-		<< endl;
-#endif
-
-	// General page
-	fConfigWidget->fSyncDestination->setButton(AbbrowserSettings::addressbookType());
-	fConfigWidget->fAbookFile->setURL(AbbrowserSettings::fileName());
-	fConfigWidget->fArchive->setChecked(AbbrowserSettings::archiveDeleted());
-
-	// Conflicts page
-	fConfigWidget->fConflictResolution->setCurrentItem(
-	  AbbrowserSettings::conflictResolution() - SyncAction::eCROffset );
-
-	// Fields page
-	fConfigWidget->fOtherPhone->setCurrentItem(AbbrowserSettings::pilotOther());
-	fConfigWidget->fAddress->setCurrentItem(AbbrowserSettings::pilotStreet());
-	fConfigWidget->fFax->setCurrentItem(AbbrowserSettings::pilotFax());
-
-	// Custom fields page
-	fConfigWidget->fCustom0->setCurrentItem(AbbrowserSettings::custom0());
-	fConfigWidget->fCustom1->setCurrentItem(AbbrowserSettings::custom1());
-	fConfigWidget->fCustom2->setCurrentItem(AbbrowserSettings::custom2());
-	fConfigWidget->fCustom3->setCurrentItem(AbbrowserSettings::custom3());
-	TQString datefmt=AbbrowserSettings::customDateFormat();
-	if (datefmt.isEmpty())
-	{
-		fConfigWidget->fCustomDate->setCurrentItem(0);
-	}
-	else
-	{
-		fConfigWidget->fCustomDate->setCurrentText(datefmt);
-	}
-
-	unmodified();
-}
-
-/* static */ ConduitConfigBase *AbbrowserWidgetSetup::create(TQWidget *w, const char *n)
-{
-	return new AbbrowserWidgetSetup(w,n);
-}
-
diff --git a/kpilot/conduits/abbrowserconduit/abbrowser-setup.h b/kpilot/conduits/abbrowserconduit/abbrowser-setup.h
deleted file mode 100644
index 47eff1cf..00000000
--- a/kpilot/conduits/abbrowserconduit/abbrowser-setup.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef _ABBROWSER_ABBROWSER_SETUP_H
-#define _ABBROWSER_ABBROWSER_SETUP_H
-/* knotes-setup.h                       KPilot
-**
-** Copyright (C) 2001 by Dan Pilone
-** Copyright (C) 2002-2003 Reinhold Kainhofer
-**
-** This file defines the widget and behavior for the config dialog
-** of the KNotes conduit.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "plugin.h"
-
-class AbbrowserWidget;
-class KAboutData;
-
-class AbbrowserWidgetSetup : public ConduitConfigBase
-{
-public:
-	AbbrowserWidgetSetup(TQWidget *,const char *);
-	virtual ~AbbrowserWidgetSetup();
-	virtual void load();
-	virtual void commit();
-	static ConduitConfigBase *create(TQWidget *,const char *);
-private:
-	AbbrowserWidget *fConfigWidget;
-	KAboutData *fAbout;
-} ;
-
-#endif
-
diff --git a/kpilot/conduits/abbrowserconduit/abbrowserSettings.kcfgc b/kpilot/conduits/abbrowserconduit/abbrowserSettings.kcfgc
deleted file mode 100644
index f6ea2097..00000000
--- a/kpilot/conduits/abbrowserconduit/abbrowserSettings.kcfgc
+++ /dev/null
@@ -1,7 +0,0 @@
-File=abbrowserconduit.kcfg
-ClassName=AbbrowserSettings
-Singleton=true
-ItemAccessors=true
-Mutators=true
-GlobalEnums=true
-SetUserTexts=true
diff --git a/kpilot/conduits/abbrowserconduit/abbrowser_conduit.desktop b/kpilot/conduits/abbrowserconduit/abbrowser_conduit.desktop
deleted file mode 100644
index 5c95db5d..00000000
--- a/kpilot/conduits/abbrowserconduit/abbrowser_conduit.desktop
+++ /dev/null
@@ -1,113 +0,0 @@
-[Desktop Entry]
-Type=Service
-Comment=This conduit syncs the handheld addressbook with KDE's addressbook.
-Comment[af]=Hierdie pad sinkroniseer die draagbare toestel adresboek met KDE se adresboek.
-Comment[bg]=Синхронизаци� на адре�ника на KDE � мобилни у�трой�тва
-Comment[bs]=Ovaj conduit sinhronizuje adresar ru�nog ra�unara sa KDEovim adresarom.
-Comment[ca]=Aquest conducte sincronitza la llibreta d'adreces de la vostra agenda electrònica amb la llibreta d'adreces de KDE.
-Comment[cs]=Toto propojení synchronizuje vašeho Pilota Knihou adres
-Comment[cy]=Mae'r cwndid yma yn cydamseru llyfr cyfeiriadau'r llawiadur efo llyfr cyfeiriadau KDE.
-Comment[da]=Denne kanal synkroniserer din håndholdte med KDE's adressebog.
-Comment[de]=Abgleich der Adressbücher von Taschencomputer und KDE.
-Comment[el]=Αυτός ο σ�νδεσμος συγχ�ονίζει το βιβλίο διευθ�νσεων του υπολογιστή παλάμης με το βιβλίο διευθ�νσεων του KDE.
-Comment[eo]=Tiu kanalo sinkronigas vian po�komputil-adreslibron kun la KDE-aadreslibro.
-Comment[es]=Este conducto sincroniza la libreta de direcciones de su agenda electrónica con la de KDE
-Comment[et]=See kanal sünkroniseerib pihuarvuti ja KDE aadressiraamatu.
-Comment[eu]=Kanal honek agenda-elektronikoaren helbide-liburua KDE-ren helbide-liburuarekin sinkronizatzen du.
-Comment[fa]=این لوله، کتاب نشانی دستی را با کتاب نشانی KDE همگام می‌سازد.
-Comment[fi]=Tämä yhdyskäytävä synkronoi taskutietokoneen KDE:n osoitekirjan kanssa
-Comment[fr]=Ce canal synchronise le carnet d'adresses du périphérique avec celui de KDE.
-Comment[fy]=Dit conduit syngronisearret jo handheld mei KDE's adresboek.
-Comment[gl]=Este conducto sincroniza o caderno de enderezos do seu aparello portátil co caderno de enderezos de KDE.
-Comment[hi]=यह कन�ड�यूइट हैंडहेल�ड पता-प�स�तिका को केडीई के पता-प�स�तिका से सिंक करती है.
-Comment[hu]=Ezzel a csatolóval egy kéziszámítógép és a KDE címjegyzéke között lehet szinkronizálást végezni.
-Comment[is]=Þessi rás samstillir póstfangaskrár KDE og lófatölvunnar
-Comment[it]=Questo condotto sincronizza il tuo palmare con la rubrica indirizzi di KDE
-Comment[ja]=��コンジット��ンドヘルド�アドレス帳をKDE�アドレス帳��期����。
-Comment[kk]=Қалта құрылғыдағы адре�тік кітапшамен KDE-нің адре�тік кітапшаларды қадамда�тыру арна�ы.
-Comment[km]=បំពង់​ន�ះ​អាច​ឲ្យ​សៀវភៅ​អាសយដ្ឋាន​របស់​ឧបករណ�​យួរដៃ ធ្វើ​សមកាលកម្ម​ជាមួយ​នឹង​សៀវភៅ​អាសយដ្ឋាន​របស់ KDE
-Comment[lt]=Šis kanalas sinchronizuoja nešiojamą adresų knygelę su KDE adresų knygele.
-Comment[mk]=Овој канал ги �инхронизира адре�арите од рачниот уред и од KDE.
-Comment[ms]=Saluran ini mensegerakkan buku alamat komputer telapak dengan buku alamat KDE.
-Comment[nb]=Denne kanalen synkroniserer Pilotens adressebok med KDEs adressebok.
-Comment[nds]=Synkroniseert de Adressböker vun Handreekners un KDE.
-Comment[ne]=यो कन�ड�य�टले केडीई को ठेगाना प�स�तकमा ह�यान�डल गरि�का ठेगाना प�स�तिका सिन�क गर�दछ ।
-Comment[nl]=Dit conduit synchroniseert uw handheld met KDE's adresboek.
-Comment[nn]=Denne koplinga synkroniserer den handheldte adresseboka med med KDE-adresseboka.
-Comment[pl]=Ten łącznik synchronizuje książkę adresową palmtopa z książką adresową KDE.
-Comment[pt]=Esta conduta sincroniza o livro de endereços ou agenda do seu dispositivo com a agenda do KDE.
-Comment[pt_BR]=Este conduíte sincroniza o livro de endereços do handheld com o livro de endereços do KDE.
-Comment[ru]=Канал �инхронизации адре�ных книг КПК и KDE.
-Comment[sk]=Táto spojka synchronizuje adresár vášho prenosného zariadenia s adresárom KDE.
-Comment[sl]=Ta veznik usklajuje adresar v ro�nem ra�unalniku z adresarjem v KDE.
-Comment[sr]=Овај провод �инхронизује адре�ар ручног рачунара �а KDE-овим адре�аром
-Comment[sr@Latn]=Ovaj provod sinhronizuje adresar ru�nog ra�unara sa KDE-ovim adresarom
-Comment[sv]=Den här kanalen synkroniserar handdatorns adressbok med KDE:s adressbok.
-Comment[ta]=இந�த க�ழாய� கையில� உள�ள ம�கவரிப�ப�த�தகத�தை கேடிஇயின� ம�கவரிப�ப�த�தகத�தோட� ஒத�திசைக�கிறத�
-Comment[tg]=Канали �инхронизат�и�и китоби адре�ии Pilot ва KDE.
-Comment[tr]=Bu bileşen el bilgisayarı adres defteri ile KDE'ninkini birleştirir.
-Comment[uk]=Цей акведук �инхронізує адре�ну книгу кишенькового при�трою з адре�ною книгою KDE.
-Comment[zh_CN]=此管�会将您的手�设备与 KDE 的地�簿�步。
-Comment[zh_TW]=此軟體讓您把 KDE 通訊錄與手邊通訊錄�步。
-Name=Addressbook
-Name[af]=Adresboek
-Name[ar]=د�تر العناوين
-Name[az]=Ünvan Dəftəri
-Name[be]=�дра�на� кніга
-Name[bg]=�дре�ник
-Name[br]=Karned chomlec'hioù
-Name[bs]=Adresar
-Name[ca]=Llibreta d'adreces
-Name[cs]=Kniha adres
-Name[cy]=Llyfr Cyfeiriadau
-Name[da]=Adressebog
-Name[de]=Adressbuch
-Name[el]=Βιβλίο διευθ�νσεων
-Name[eo]=Adresaro
-Name[es]=Libreta de direcciones
-Name[et]=Aadressiraamat
-Name[eu]=Helbide-liburua
-Name[fa]=کتاب نشانی
-Name[fi]=Osoitekirja
-Name[fr]=Carnet d'adresses
-Name[fy]=Adresboek
-Name[ga]=Leabhar Seoltaí
-Name[gl]=Libro de enderezos
-Name[hi]=पता-प�स�तिका
-Name[hr]=Adresar
-Name[hu]=Címjegyzék
-Name[id]=Buku alamat
-Name[is]=Póstfangaskrá
-Name[it]=Rubrica degli indirizzi
-Name[ja]=アドレス帳
-Name[kk]=�дре�тік кітапша�ы
-Name[km]=សៀវភៅ​អាសយដ្ឋាន
-Name[lt]=Adresų knygelė
-Name[mk]=�дре�ар
-Name[ms]=Buku Alamat
-Name[nb]=Addressebok
-Name[nds]=Adressbook
-Name[ne]=ठेगाना प�स�तिका
-Name[nl]=Adresboek
-Name[nn]=Adressebok
-Name[pl]=Książka adresowa
-Name[pt]=Livro de Endereços
-Name[pt_BR]=Livro de Endereços
-Name[ro]=Carte de adrese
-Name[ru]=�дре�на� книга
-Name[se]=ÄŒujuhusgirji
-Name[sk]=Adresár
-Name[sl]=Adresar
-Name[sr]=�дре�ар
-Name[sr@Latn]=Adresar
-Name[sv]=Adressbok
-Name[ta]=ம�கவரிப�ப�த�தகம�
-Name[tg]=Китоби адре�ӣ
-Name[tr]=Adresdefteri
-Name[uk]=�дре�на книга
-Name[uz]=Манзиллар дафтари
-Name[zh_CN]=地�簿
-Name[zh_TW]=通訊錄
-Implemented=file
-ServiceTypes=KPilotConduit
-X-KDE-Library=conduit_address
diff --git a/kpilot/conduits/abbrowserconduit/abbrowserconduit.kcfg b/kpilot/conduits/abbrowserconduit/abbrowserconduit.kcfg
deleted file mode 100644
index aed77064..00000000
--- a/kpilot/conduits/abbrowserconduit/abbrowserconduit.kcfg
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
-      http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <kcfgfile name="kpilot_addressconduitrc"/> 
-  <group name="General">
-    <entry name="AddressbookType" key="Addressbook type" type="Enum">
-				<choices>
-						<choice name="eAbookResource"/>
-						<choice name="eAbookFile"/>
-				</choices>
-        <default>eAbookFile</default>
-    </entry>
-    <entry name="FileName" type="Path">
-        <default>$HOME/.kde/share/apps/kabc/std.vcf</default>
-    </entry>
-		<entry name="ArchiveDeleted" type="Bool">
-        <default>true</default>
-    </entry>
-    <entry name="ConflictResolution" key="ConflictResolve" type="Int">
-        <default>-1</default>
-    </entry>
-    <entry name="PilotOther" type="Enum">
-				<choices>
-						<choice name="eOtherPhone"/>
-						<choice name="eAssistant"/>
-						<choice name="eBusinessFax"/>
-						<choice name="eCarPhone"/>
-						<choice name="eEmail2"/>
-						<choice name="eHomeFax"/>
-						<choice name="eTelex"/>
-						<choice name="eTTYTTDPhone"/>
-				</choices>
-        <default>eOtherPhone</default>
-    </entry>
-    <entry name="PilotStreet" type="Enum">
-				<choices>
-						<choice name="ePilotStreetHome"/>
-						<choice name="ePilotStreetWork"/>
-				</choices>
-        <default>ePilotStreetHome</default>
-    </entry>
-    <entry name="PilotFax" type="Enum">
-				<choices>
-						<choice name="ePilotFaxHome"/>
-						<choice name="ePilotFaxWork"/>
-				</choices>
-        <default>ePilotFaxHome</default>
-    </entry>
-    <entry name="Custom0" key="Custom 0" type="Enum">
-				<choices label="eCustomEnum">
-						<choice name="eCustomField"/>
-						<choice name="eCustomBirthdate"/>
-						<choice name="eCustomURL"/>
-						<choice name="eCustomIM"/>
-				</choices>
-        <default>eCustomField</default>
-    </entry>
-    <entry name="Custom1" key="Custom 1" type="Enum">
-				<choices label="eCustomEnum">
-				</choices>
-        <default>eCustomField</default>
-    </entry>
-   <entry name="Custom2" key="Custom 2" type="Enum">
-				<choices label="eCustomEnum">
-				</choices>
-        <default>eCustomField</default>
-    </entry>
-   <entry name="Custom3" key="Custom 3" type="Enum">
-				<choices label="eCustomEnum">
-				</choices>
-        <default>eCustomField</default>
-    </entry>
-    <entry name="CustomDateFormat" type="String">
-        <default></default>
-    </entry>
-  </group>
-	
-</kcfg>
diff --git a/kpilot/conduits/abbrowserconduit/kabcRecord.cc b/kpilot/conduits/abbrowserconduit/kabcRecord.cc
deleted file mode 100644
index 9b49a2ca..00000000
--- a/kpilot/conduits/abbrowserconduit/kabcRecord.cc
+++ /dev/null
@@ -1,710 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2000,2001 by Dan Pilone
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-** Copyright (C) 2007 by Adriaan de Groot <groot@kde.org>
-**
-** The abbrowser conduit copies addresses from the Pilot's address book to
-** the KDE addressbook maintained via the kabc library. This file
-** deals with the actual copying of HH addresses to KABC addresses
-** and back again.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org.
-*/
-
-#include "options.h"
-
-#include <tqregexp.h>
-
-#include <kglobal.h>
-#include <kabc/addressee.h>
-
-#include "kabcRecord.h"
-
-/**
- * Okay, this is so that we can map the Pilot phone types to Phone Number
- * types. Email addresses are NOT included in this map, and are handled
- * separately (not in PhoneNumber at all). The Pilot has 8 different kinds
- * of phone numbers (which may be *labeled* however you like). These
- * need to be mapped to the things that KABC::PhoneNumber handles.
- *
- * From KABC::PhoneNumber
- *		enum Types { Home = 1, Work = 2, Msg = 4, Pref = 8, Voice = 16, Fax = 32,
- *				Cell = 64, Video = 128, Bbs = 256, Modem = 512, Car = 1024,
- *				Isdn = 2048, Pcs = 4096, Pager = 8192 };
- *
- *
- * From PilotAddress:
- * enum EPhoneType {
- *		eWork=0, eHome, eFax, eOther, eEmail, eMain,
- *		ePager, eMobile
- *		};
- *
- * This array must have as many elements as PilotAddress::PhoneType
- * and its elements must be KABC::PhoneNumber::Types.
- */
-
-static KABC::PhoneNumber::Types pilotToPhoneMap[8] = {
-	KABC::PhoneNumber::Work,  // eWork
-	KABC::PhoneNumber::Home,  // eHome,
-	KABC::PhoneNumber::Fax,   // eFax,
-	(KABC::PhoneNumber::Types)0, // eOther -> wasn't mapped properly,
-	(KABC::PhoneNumber::Types)0, // eEmail -> shouldn't occur,
-	KABC::PhoneNumber::Home,  // eMain
-	KABC::PhoneNumber::Pager, // ePager,
-	KABC::PhoneNumber::Cell   // eMobile
-} ;
-
-KABC::PhoneNumber::List KABCSync::getPhoneNumbers(const PilotAddress &a)
-{
-	FUNCTIONSETUP;
-
-	KABC::PhoneNumber::List list;
-	TQString test;
-
-	PhoneSlot shownPhone = a.getShownPhone();
-
-	DEBUGKPILOT << fname << ": preferred pilot index is: ["
-		<< shownPhone << "], preferred phone number is: ["
-		<< a.getField(shownPhone) << "]" << endl;
-
-	for (PhoneSlot i = PhoneSlot::begin(); i.isValid(); ++i)
-	{
-		// skip email entries
-		if ( a.getPhoneType(i) == PilotAddressInfo::eEmail )
-		{
-			continue;
-		}
-
-		test = a.getField(i);
-		// only look at this if the field is populated
-		if (test.isEmpty())
-		{
-			continue;
-		}
-
-		int phoneType = pilotToPhoneMap[a.getPhoneType(i)];
-
-		// only populate a PhoneNumber if we have a corresponding type
-		if (phoneType >=0)
-		{
-			// if this is the preferred phone number, set it as such
-			if (shownPhone == i)
-			{
-				phoneType |= KABC::PhoneNumber::Pref;
-				DEBUGKPILOT << fname << ": found preferred pilot index: ["
-					<< i << "], text: [" << test << "]" << endl;
-			}
-			KABC::PhoneNumber ph(test, phoneType);
-			list.append(ph);
-		}
-		else
-		{
-			DEBUGKPILOT << fname << ": whoopsie.  pilot phone number: ["
-				<< test << "], index: [" << i << "], type: ["
-				<< phoneType << "], has no corresponding PhoneNumber type." << endl;
-		}
-	}
-
-	DEBUGKPILOT << fname << ": returning: ["
-		<< list.count() << "] phone numbers." << endl;
-
-	return list;
-}
-
-void KABCSync::setPhoneNumbers(const PilotAddressInfo &info,
-	PilotAddress &a,
-	const KABC::PhoneNumber::List &list)
-{
-	FUNCTIONSETUP;
-	TQString test;
-
-	// clear all phone numbers (not e-mails) first
-	for ( PhoneSlot i = PhoneSlot::begin(); i.isValid() ; ++i )
-	{
-		PilotAddressInfo::EPhoneType ind = a.getPhoneType( i );
-		if (ind != PilotAddressInfo::eEmail)
-		{
-			a.setField(i, TQString());
-		}
-	}
-
-	// now iterate through the list and for each PhoneNumber in the list,
-	// iterate through our phone types using our map and set the first one
-	// we find as the type of address for the Pilot
-	for(KABC::PhoneNumber::List::ConstIterator listIter = list.begin();
-		   listIter != list.end(); ++listIter)
-	{
-		KABC::PhoneNumber phone = *listIter;
-
-		PilotAddressInfo::EPhoneType phoneType = PilotAddressInfo::eHome;
-
-		for ( int pilotPhoneType = PilotAddressInfo::eWork;
-			pilotPhoneType <= PilotAddressInfo::eMobile;
-			++pilotPhoneType)
-		{
-			int phoneKey = pilotToPhoneMap[pilotPhoneType];
-			if ( phone.type() & phoneKey)
-			{
-				DEBUGKPILOT << fname << ": found pilot type: ["
-					<< pilotPhoneType << "] ("
-					<< info.phoneLabel( (PilotAddressInfo::EPhoneType)pilotPhoneType)
-					<< ") for PhoneNumber: ["
-					<< phone.number() << "]" << endl;
-
-				phoneType = (PilotAddressInfo::EPhoneType) pilotPhoneType;
-				break;
-			}
-		}
-		PhoneSlot fieldSlot =
-			a.setPhoneField(phoneType, phone.number(), PilotAddress::NoFlags);
-
-		// if this is the preferred phone number, then set it as such
-		if (fieldSlot.isValid() && (phone.type() & KABC::PhoneNumber::Pref))
-		{
-			DEBUGKPILOT << fname << ": found preferred PhoneNumber. "
-				<< "setting showPhone to index: ["
-				<< fieldSlot << "], PhoneNumber: ["
-				<< phone.number() << "]" << endl;
-			a.setShownPhone( fieldSlot );
-		}
-
-		if (!fieldSlot.isValid())
-		{
-			DEBUGKPILOT << fname << ": Phone listing overflowed." << endl;
-		}
-	}
-
-	DEBUGKPILOT << fname << ": Pilot's showPhone now: ["
-		<< a.getShownPhone() << "]." << endl;
-
-	// after setting the numbers, make sure that something sensible is set as the
-	// shownPhone on the Pilot if nothing is yet...
-	TQString pref = a.getField(a.getShownPhone());
-	if (!a.getShownPhone().isValid() || pref.isEmpty())
-	{
-		DEBUGKPILOT << fname << ": Pilot's showPhone: ["
-			<< a.getShownPhone()
-			<< "] not properly set to a default."
-			<< endl;
-
-		for (PhoneSlot i = PhoneSlot::begin(); i.isValid(); ++i)
-		{
-			pref = a.getField(i);
-			if (!pref.isEmpty())
-			{
-				a.setShownPhone( i );
-				DEBUGKPILOT << fname << ": Pilot's showPhone now: ["
-					<< a.getShownPhone() 
-					<< "], and that's final." << endl;
-				break;
-			}
-		}
-	}
-}
-
-unsigned int KABCSync::bestMatchedCategory(const TQStringList &pccategories,
-	const PilotAddressInfo &info,
-	unsigned int hhcategory)
-{
-	FUNCTIONSETUP;
-	// No categories in list, must be unfiled
-	if (pccategories.size()<1)
-	{
-		return Pilot::Unfiled;
-	}
-
-	// See if the suggested hhcategory is in the list, and if
-	// so that is the best match.
-	if (Pilot::validCategory(hhcategory) &&
-		pccategories.contains(info.categoryName(hhcategory)))
-	{
-		return hhcategory;
-	}
-
-	// Look for the first category from the list which is available on
-	// the handheld as well.
-	for(TQStringList::ConstIterator it = pccategories.begin(); it != pccategories.end(); ++it)
-	{
-		// Do not map unknown to unfiled when looking for category
-		int c = info.findCategory( *it, false );
-		if ( c >= 0)
-		{
-			Q_ASSERT(Pilot::validCategory(c));
-			return c;
-		}
-	}
-
-	// didn't find anything. return null
-	return Pilot::Unfiled;
-}
-
-void KABCSync::setCategory(KABC::Addressee & abEntry, const TQString &cat)
-{
-	if ( (!cat.isEmpty()))
-	{
-		abEntry.insertCategory(cat);
-	}
-}
-
-
-TQString KABCSync::getFieldForHHCustom(
-	const unsigned int index,
-	const KABC::Addressee &abEntry,
-	const KABCSync::Settings &settings)
-{
-	FUNCTIONSETUPL(4);
-
-	TQString retval;
-
-	if (index>3)
-	{
-		WARNINGKPILOT << "Bad index number " << index << endl;
-		retval = TQString();
-	}
-	if (settings.customMapping().count() != 4)
-	{
-		WARNINGKPILOT << "Mapping does not have 4 elements." << index << endl;
-		retval = TQString();
-	}
-
-	switch (settings.custom(index))
-	{
-	case eCustomBirthdate:
-		if (settings.dateFormat().isEmpty())
-		{
-			retval = KGlobal::locale()->formatDate(abEntry.birthday().date());
-		}
-		else
-		{
-			TQString tmpfmt(KGlobal::locale()->dateFormat());
-			KGlobal::locale()->setDateFormat(settings.dateFormat());
-			TQString ret(KGlobal::locale()->formatDate(abEntry.birthday().date()));
-			KGlobal::locale()->setDateFormat(tmpfmt);
-			retval = ret;
-		}
-		break;
-	case eCustomURL:
-		retval = abEntry.url().url();
-		break;
-	case eCustomIM:
-		retval = abEntry.custom(CSL1("KADDRESSBOOK"), CSL1("X-IMAddress"));
-		break;
-	case eCustomField:
-	default:
-		retval = abEntry.custom(appString, CSL1("CUSTOM")+TQString::number(index));
-		break;
-	}
-
-	return retval;
-}
-
-void KABCSync::setFieldFromHHCustom(
-	const unsigned int index,
-	KABC::Addressee &abEntry,
-	const TQString &value,
-	const KABCSync::Settings &settings)
-{
-	FUNCTIONSETUPL(4);
-
-	if (index>3)
-	{
-		WARNINGKPILOT << "Bad index number " << index << endl;
-		return;
-	}
-	if (settings.customMapping().count() != 4)
-	{
-		WARNINGKPILOT << "Mapping does not have 4 elements." << index << endl;
-		return;
-	}
-
-	switch (settings.custom(index))
-	{
-	case eCustomBirthdate:
-	{
-		TQDate bdate;
-		bool ok=false;
-		if (settings.dateFormat().isEmpty())
-		{
-			// empty format means use locale setting
-			bdate=KGlobal::locale()->readDate(value, &ok);
-		}
-		else
-		{
-			// use given format
-			bdate=KGlobal::locale()->readDate(value, settings.dateFormat(), &ok);
-		}
-
-		if (!ok)
-		{
-			TQString format = KGlobal::locale()->dateFormatShort();
-			TQRegExp re(CSL1("%[yY][^%]*"));
-			format.remove(re); // Remove references to year and following punctuation
-			bdate = KGlobal::locale()->readDate(value, format, &ok);
-		}
-		DEBUGKPILOT << "Birthdate from " << index << "-th custom field: "
-			<< bdate.toString() << endl;
-		DEBUGKPILOT << "Is Valid: " << bdate.isValid() << endl;
-		if (bdate.isValid())
-		{
-			abEntry.setBirthday(bdate);
-		}
-		else
-		{
-			abEntry.insertCustom(CSL1("KADDRESSBOOK"), CSL1("X-Birthday"), value);
-		}
-		break;
-	}
-	case eCustomURL:
-		abEntry.setUrl(value);
-		break;
-	case eCustomIM:
-		abEntry.insertCustom(CSL1("KADDRESSBOOK"), CSL1("X-IMAddress"), value);
-		break;
-	case eCustomField:
-	default:
-		abEntry.insertCustom(appString, CSL1("CUSTOM")+TQString::number(index), value);
-		break;
-	}
-}
-
-
-/** First search for a preferred  address. If we don't have one, search
- *  for home or work as specified in the config dialog. If we don't have
- *  such one, either, search for the other type. If we still have no luck,
- *  return an address with preferred + home/work flag (from config dlg). */
-KABC::Address KABCSync::getAddress(const KABC::Addressee &abEntry, const KABCSync::Settings &s)
-{
-	// preferhome == (AbbrowserSettings::pilotStreet==0)
-
-	// Check for preferred address first
-	KABC::Address ad(abEntry.address(KABC::Address::Pref));
-	if (!ad.isEmpty()) return ad;
-
-	// Look for home or work, whichever is preferred
-	int type = s.preferHome() ? KABC::Address::Home : KABC::Address::Work;
-	ad=abEntry.address(type);
-	if (!ad.isEmpty()) return ad;
-
-	// Switch preference if still none found
-	type = !s.preferHome() ? KABC::Address::Home : KABC::Address::Work;
-	ad=abEntry.address(type);
-	if (!ad.isEmpty()) return ad;
-
-	// Last-ditch attempt; see if there is a preferred home or work address
-	type = s.preferHome() ? KABC::Address::Home : KABC::Address::Work;
-	return abEntry.address(type | KABC::Address::Pref);
-}
-
-
-TQString KABCSync::getFieldForHHOtherPhone(const KABC::Addressee & abEntry, const KABCSync::Settings &s)
-{
-	switch(s.fieldForOtherPhone())
-	{
-		case eOtherPhone:
-			return abEntry.phoneNumber(0).number();
-		case eAssistant:
-			return abEntry.custom(CSL1("KADDRESSBOOK"), CSL1("AssistantsName"));
-		case eBusinessFax:
-			return abEntry.phoneNumber(KABC::PhoneNumber::Fax | KABC::PhoneNumber::Work).number();
-		case eCarPhone:
-			return abEntry.phoneNumber(KABC::PhoneNumber::Car).number();
-		case eEmail2:
-			return abEntry.emails().first();
-		case eHomeFax:
-			return abEntry.phoneNumber(KABC::PhoneNumber::Fax | KABC::PhoneNumber::Home).number();
-		case eTelex:
-			return abEntry.phoneNumber(KABC::PhoneNumber::Bbs).number();
-		case eTTYTTDPhone:
-			return abEntry.phoneNumber(KABC::PhoneNumber::Pcs).number();
-		default:
-			return TQString::null;
-	}
-}
-
-void KABCSync::setFieldFromHHOtherPhone(KABC::Addressee & abEntry, const TQString &nr, const KABCSync::Settings &s)
-{
-	int phoneType = 0;
-	switch (s.fieldForOtherPhone())
-	{
-	// One very special case which doesn't even map to a real phone type in KABC
-	case eAssistant:
-		abEntry.insertCustom(CSL1("KADDRESSBOOK"), CSL1("AssistantsName"), nr);
-		return;
-	// Special case: map phone to email, needs different handling.
-	case eEmail2:
-		abEntry.insertEmail(nr);
-		return;
-	// Remaining cases all map to various phone types
-	case eOtherPhone:
-		phoneType = 0;
-		break;
-	case eBusinessFax:
-		phoneType = KABC::PhoneNumber::Fax | KABC::PhoneNumber::Work;
-		break;
-	case eHomeFax:
-		phoneType = KABC::PhoneNumber::Fax | KABC::PhoneNumber::Home;
-		break;
-	case eCarPhone:
-		phoneType = KABC::PhoneNumber::Car;
-		break;
-	case eTelex:
-		phoneType = KABC::PhoneNumber::Bbs;
-		break;
-	case eTTYTTDPhone:
-		phoneType = KABC::PhoneNumber::Pcs;
-		break;
-	default:
-		WARNINGKPILOT << "Unknown phone mapping " << s.fieldForOtherPhone() << endl;
-		phoneType = 0;
-	}
-	KABC::PhoneNumber phone = abEntry.phoneNumber(phoneType);
-	phone.setNumber(nr);
-	phone.setType(phoneType); // Double-check in case there was no phonenumber of given type
-	abEntry.insertPhoneNumber(phone);
-}
-
-void KABCSync::setAddress(PilotAddress &toPilotAddr,
-	const KABC::Address & abAddress)
-{
-	toPilotAddr.setField(entryAddress, abAddress.street());
-	toPilotAddr.setField(entryCity, abAddress.locality());
-	toPilotAddr.setField(entryState, abAddress.region());
-	toPilotAddr.setField(entryZip, abAddress.postalCode());
-	toPilotAddr.setField(entryCountry, abAddress.country());
-}
-
-
-bool KABCSync::isArchived(const KABC::Addressee &addr)
-{
-	return addr.custom(KABCSync::appString, KABCSync::flagString) == TQString::number(SYNCDEL);
-}
-
-void KABCSync::makeArchived(KABC::Addressee &addr)
-{
-	FUNCTIONSETUP;
-	addr.insertCustom(KABCSync::appString, KABCSync::flagString, TQString::number(SYNCDEL));
-	addr.removeCustom(KABCSync::appString, KABCSync::idString);
-}
-
-
-
-
-void KABCSync::copy(PilotAddress &toPilotAddr,
-	const KABC::Addressee &fromAbEntry,
-	const PilotAddressInfo &appInfo,
-	const KABCSync::Settings &syncSettings)
-{
-	FUNCTIONSETUP;
-
-	toPilotAddr.setDeleted(false);
-
-	// don't do a reset since this could wipe out non copied info
-	//toPilotAddr.reset();
-	toPilotAddr.setField(entryLastname, fromAbEntry.familyName());
-	toPilotAddr.setField(entryFirstname, fromAbEntry.givenName());
-	toPilotAddr.setField(entryCompany, fromAbEntry.organization());
-	toPilotAddr.setField(entryTitle, fromAbEntry.prefix());
-	toPilotAddr.setField(entryNote, fromAbEntry.note());
-
-	// do email first, to ensure they get stored
-	toPilotAddr.setEmails(fromAbEntry.emails());
-
-	// now in one fell swoop, set all phone numbers from the Addressee.  Note,
-	// we don't need to differentiate between Fax numbers here--all Fax numbers
-	// (Home Fax or Work Fax or just plain old Fax) will get synced to the Pilot
-	KABCSync::setPhoneNumbers(appInfo,toPilotAddr,fromAbEntry.phoneNumbers());
-
-	// Other field is an oddball and if the user has more than one field set
-	// as "Other" then only one will be carried over.
-	TQString oth = KABCSync::getFieldForHHOtherPhone(fromAbEntry,syncSettings);
-	DEBUGKPILOT << fname << ": putting: ["<<oth<<"] into Palm's other"<<endl;
-	toPilotAddr.setPhoneField(PilotAddressInfo::eOther,
-		oth, PilotAddress::Replace);
-
-	KABC::Address homeAddress = KABCSync::getAddress(fromAbEntry, syncSettings);
-	KABCSync::setAddress(toPilotAddr, homeAddress);
-
-	// Process the additional entries from the Palm(the palm database app block tells us the name of the fields)
-	unsigned int customIndex = 0;
-	unsigned int hhField = entryCustom1;
-
-	for ( ; customIndex<4; ++customIndex,++hhField )
-	{
-		toPilotAddr.setField(hhField,getFieldForHHCustom(customIndex,fromAbEntry,syncSettings));
-	}
-
-	int categoryForHH = KABCSync::bestMatchedCategory(fromAbEntry.categories(),
-		appInfo,toPilotAddr.category());
-	toPilotAddr.setCategory(categoryForHH);
-
-	if (isArchived(fromAbEntry))
-	{
-		toPilotAddr.setArchived( true );
-	}
-	else
-	{
-		toPilotAddr.setArchived( false );
-	}
-}
-
-void KABCSync::copy(KABC::Addressee &toAbEntry,
-	const PilotAddress &fromPiAddr,
-	const PilotAddressInfo &appInfo,
-	const KABCSync::Settings &syncSettings)
-{
-	FUNCTIONSETUP;
-
-	// copy straight forward values
-	toAbEntry.setFamilyName(fromPiAddr.getField(entryLastname));
-	toAbEntry.setGivenName(fromPiAddr.getField(entryFirstname));
-	toAbEntry.setOrganization(fromPiAddr.getField(entryCompany));
-	toAbEntry.setPrefix(fromPiAddr.getField(entryTitle));
-	toAbEntry.setNote(fromPiAddr.getField(entryNote));
-
-	// set the formatted name
-	// TODO this is silly and should be removed soon.
-	toAbEntry.setFormattedName(toAbEntry.realName());
-
-	// copy the phone stuff
-	// first off, handle the e-mail addresses as a group and separate from
-	// the other phone number fields
-	toAbEntry.setEmails(fromPiAddr.getEmails());
-
-	// going from Pilot to kabc, we need to clear out all phone records in kabc
-	// so that they can be set from the Pilot.  If we do not do this, then records
-	// will be left in kabc when they are removed from the Pilot and we'll look
-	// broken.
-	KABC::PhoneNumber::List old = toAbEntry.phoneNumbers();
-	for (KABC::PhoneNumber::List::Iterator it = old.begin(); it != old.end(); ++it) {
-		KABC::PhoneNumber phone = *it;
-		toAbEntry.removePhoneNumber(phone);
-	}
-
-	// now, get the phone numbers from the Pilot and set them one at a time in kabc
-	KABC::PhoneNumber::List phones = KABCSync::getPhoneNumbers(fromPiAddr);
-	for (KABC::PhoneNumber::List::Iterator it = phones.begin(); it != phones.end(); ++it) {
-		KABC::PhoneNumber phone = *it;
-		// check for fax number if it is one, set the type per the user's direction
-		if (phone.type() & KABC::PhoneNumber::Fax)
-		{
-			phone.setType(syncSettings.faxTypeOnPC());
-		}
-		toAbEntry.insertPhoneNumber(phone);
-	}
-
-	// Note:  this is weird, and it may cause data to not be synced if there is
-	// more than one "Other" field being used on the Pilot, since only one will
-	// be synced in either direction.
-	KABCSync::setFieldFromHHOtherPhone(toAbEntry,
-		fromPiAddr.getPhoneField(PilotAddressInfo::eOther),syncSettings);
-
-	// going from Pilot to kabc, we need to clear out all addresses in kabc
-	// so that they can be set from the Pilot.  If we do not do this, then records
-	// will be left in kabc when they are removed from the Pilot and we'll look
-	// broken.
-	KABC::Address::List oAddr = toAbEntry.addresses();
-	for (KABC::Address::List::Iterator it = oAddr.begin(); it != oAddr.end(); ++it) {
-		const KABC::Address addr = *it;
-		toAbEntry.removeAddress(addr);
-	}
-	KABC::Address homeAddress = KABCSync::getAddress(toAbEntry,syncSettings);
-	homeAddress.setStreet(fromPiAddr.getField(entryAddress));
-	homeAddress.setLocality(fromPiAddr.getField(entryCity));
-	homeAddress.setRegion(fromPiAddr.getField(entryState));
-	homeAddress.setPostalCode(fromPiAddr.getField(entryZip));
-	homeAddress.setCountry(fromPiAddr.getField(entryCountry));
-	toAbEntry.insertAddress(homeAddress);
-
-	unsigned int customIndex = 0;
-	unsigned int hhField = entryCustom1;
-
-	for ( ; customIndex<4; ++customIndex,++hhField )
-	{
-		KABCSync::setFieldFromHHCustom(customIndex,
-			toAbEntry,
-			fromPiAddr.getField(hhField),
-			syncSettings);
-	}
-
-	// copy the fromPiAddr pilot id to the custom field KPilot_Id;
-	// pilot id may be zero(since it could be new) but couldn't hurt
-	// to even assign it to zero; let's us know what state the
-	// toAbEntry is in
-	toAbEntry.insertCustom(KABCSync::appString, KABCSync::idString, TQString::number(fromPiAddr.id()));
-
-	KABCSync::setCategory(toAbEntry, appInfo.categoryName(fromPiAddr.category()));
-
-	showAddressee(toAbEntry);
-}
-
-void KABCSync::showAddressee(const KABC::Addressee & abAddress)
-{
-	FUNCTIONSETUP;
-#ifdef DEBUG
-	DEBUGKPILOT << "\tAbbrowser Contact Entry" << endl;
-	if (abAddress.isEmpty())
-	{
-		DEBUGKPILOT<< "\t\tEMPTY"<<endl;
-		return;
-	}
-	DEBUGKPILOT << "\t\tLast name = " << abAddress.familyName() << endl;
-	DEBUGKPILOT << "\t\tFirst name = " << abAddress.givenName() << endl;
-	DEBUGKPILOT << "\t\tCompany = " << abAddress.organization() << endl;
-	DEBUGKPILOT << "\t\tJob Title = " << abAddress.prefix() << endl;
-	DEBUGKPILOT << "\t\tNote = " << abAddress.note() << endl;
-	DEBUGKPILOT << "\t\tCategory = " << abAddress.categories().first() << endl;
-	DEBUGKPILOT << "\t\tEmail = " << abAddress.emails().join(",") << endl;
-
-	KABC::PhoneNumber::List phs = abAddress.phoneNumbers();
-	for (KABC::PhoneNumber::List::Iterator it = phs.begin(); it != phs.end(); ++it) {
-		KABC::PhoneNumber phone = *it;
-		DEBUGKPILOT << "\t\t" << phone.label() 
-			<< "= " << phone.number() << endl;
-	}
-
-	KABC::Address::List ads = abAddress.addresses();
-	for (KABC::Address::List::Iterator it = ads.begin(); it != ads.end(); ++it) {
-		const KABC::Address addr = *it;
-		DEBUGKPILOT << "\t\tAddress = " << addr.street() <<endl;
-		DEBUGKPILOT << "\t\tLocality = " << addr.locality() <<endl;
-		DEBUGKPILOT << "\t\tRegion = " << addr.region() <<endl;
-		DEBUGKPILOT << "\t\tPostal code = " << addr.postalCode() <<endl;
-		DEBUGKPILOT << "\t\tCountry = " << addr.country() <<endl << endl;
-	}
-#else
-	Q_UNUSED( abAddress );
-#endif
-}
-
-
-
-
-KABCSync::Settings::Settings() :
-	fDateFormat(),
-	fCustomMapping(4), // Reserve space for 4 elements, value 0 == CustomField
-	fOtherPhone(eOtherPhone),
-	fPreferHome(true),
-	fFaxTypeOnPC(KABC::PhoneNumber::Fax | KABC::PhoneNumber::Home)
-{
-}
-
diff --git a/kpilot/conduits/abbrowserconduit/kabcRecord.h b/kpilot/conduits/abbrowserconduit/kabcRecord.h
deleted file mode 100644
index f27f0b1a..00000000
--- a/kpilot/conduits/abbrowserconduit/kabcRecord.h
+++ /dev/null
@@ -1,263 +0,0 @@
-#ifndef _KPILOT_KABCRECORD_H
-#define _KPILOT_KABCRECORD_H
-/* KPilot
-**
-** Copyright (C) 2000,2001 by Dan Pilone
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-** Copyright (C) 2007 by Adriaan de Groot <groot@kde.org>
-**
-** The abbrowser conduit copies addresses from the Pilot's address book to
-** the KDE addressbook maintained via the kabc library. This file
-** deals with the actual copying of HH addresses to KABC addresses
-** and back again.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org.
-*/
-
-#include <tqvaluevector.h>
-
-#include <kabc/phonenumber.h>
-
-#include "pilotAddress.h"
-
-#define SYNCNONE 0
-#define SYNCMOD 1
-#define SYNCDEL 3
-
-namespace KABCSync
-{
-	// This duplicates values from the config settings,
-	// and must be kept in sync if new settings are added
-	// -- there are compile time checks for this in the
-	// abbrowser conduit code.
-	enum MappingForOtherPhone {
-		eOtherPhone=0,
-		eAssistant,
-		eBusinessFax,
-		eCarPhone,
-		eEmail2,
-		eHomeFax,
-		eTelex,
-		eTTYTTDPhone
-	} ;
-
-	enum MappingForCustomField {
-		eCustomField=0,
-		eCustomBirthdate,
-		eCustomURL,
-		eCustomIM
-	} ;
-
-	class Settings
-	{
-	public:
-		Settings();
-		TQString dateFormat() const
-		{
-			return fDateFormat;
-		}
-		void setDateFormat(const TQString& s)
-		{
-			fDateFormat = s;
-		}
-
-		const TQValueVector<int> &customMapping() const
-		{
-			return fCustomMapping;
-		}
-		void setCustomMapping(const TQValueVector<int> &v)
-		{
-			if (v.count()==4)
-			{
-				fCustomMapping = v;
-			}
-		}
-		int custom(int index) const
-		{
-			if ( (index<0) || (index>3) )
-			{
-				return 0;
-			}
-			else
-			{
-				return fCustomMapping[index];
-			}
-		}
-
-		int fieldForOtherPhone() const
-		{
-			return fOtherPhone;
-		}
-		void setFieldForOtherPhone(int v)
-		{
-			fOtherPhone = v;
-		}
-
-		bool preferHome() const
-		{
-			return fPreferHome;
-		}
-		void setPreferHome(bool v)
-		{
-			fPreferHome = v;
-		}
-
-		int faxTypeOnPC() const
-		{
-			return fFaxTypeOnPC;
-		}
-		void setFaxTypeOnPC(int v)
-		{
-			fFaxTypeOnPC = v;
-		}
-	private:
-		TQString fDateFormat;
-		TQValueVector<int> fCustomMapping;
-		int fOtherPhone;
-		bool fPreferHome;
-		int fFaxTypeOnPC;
-	} ;
-
-
-	/** Return a list of all the phone numbers (max. 8) set in this
-	*   handheld entry @p a . Email entries are ignored.
-	*/
-	KABC::PhoneNumber::List getPhoneNumbers(const PilotAddress &a);
-
-	/** Set the phone numbers from @p list in the handheld entry
-	*   @p a (with info block @p info providing the mapping of category
-	*   names and some other fiddly stuff) as far as possible.
-	*   @em No overflow handling is done at all. If the desktop has
-	*   more than 5 phone entries, the remainder are dropped.
-	*/
-	void setPhoneNumbers(const PilotAddressInfo &info,
-		PilotAddress &a,
-		const KABC::PhoneNumber::List &list);
-
-	/** Given a list of category names from the KDE side (e.g. attached
-	*   to a PC-based Addressee) @p categorynames , look for the
-	*   category @em best matching the category @p category
-	*   in the appinfo block @p info . Here, best is defined as follows:
-	*     - if the name of category @p category is in the list, use it
-	*     - otherwise use the first category from the list that is a valid
-	*       category on the handheld.
-	*     - use Pilot::Unfiled if none match.
-	*
-	*   @return Category index that best matches.
-	*   @return Pilot::Unfiled if no best match.
-	*/
-	unsigned int bestMatchedCategory(const TQStringList &categorynames,
-		const PilotAddressInfo &info,
-		unsigned int category);
-
-	/** As above, but return the name of the category. */
-	inline TQString bestMatchedCategoryName(const TQStringList &categorynames,
-		const PilotAddressInfo &info,
-		unsigned int category)
-	{
-		return info.categoryName(
-			bestMatchedCategory(categorynames, info, category));
-	}
-
-	/** Give the addressee @p abEntry the category @p cat (leaving
-	*   existing category assignments intact).
-	*/
-	void setCategory(KABC::Addressee &abEntry, const TQString &cat);
-
-	/* These are string identifiers used for custom properties in the addressees,
-	*  used to store KPilot-specific settings.
-	*/
-	const TQString appString=CSL1("KPILOT"); ///< Identifier for the application
-	const TQString flagString=CSL1("Flag"); ///< Flags: synced or not
-	const TQString idString=CSL1("RecordID"); ///< Record ID on HH for this addressee
-
-
-	/** Get the string value for HH custom field @p index (0..3) from the addressee
-	*   @p abEntry . Which @em actual field this is depends on the mapping
-	*   of custom HH fields to PC fields. This mapping is given by the @p customMapping
-	*   which may be created from the conduit settings or by hand. Since one of the
-	*   possible actual fields is "birthday," which needs formatting, use the date format
-	*   string @p dateFormat. If this is empty, use the locale setting.
-	*
-	*   @return String value for HH custom field @p index
-	*   @return Null TQString on error (is also a valid return value)
-	*/
-	TQString getFieldForHHCustom(
-		unsigned int index,
-		const KABC::Addressee &abEntry,
-		const Settings &settings);
-
-	/** Set a field of the PC @p abEntry address from the custom HH field.
-	*   Use value @p value . The value comes from custom field @p index
-	*   using the interpretation of custom fields @p customMapping . Because
-	*   one of the interpretations includes the birthday, use the date format
-	*   @p dateFormat ; if empty, use the local format when setting dates from the HH.
-	*/
-	void setFieldFromHHCustom(
-		const unsigned int index,
-		KABC::Addressee &abEntry,
-		const TQString &value,
-		const Settings &settings);
-
-	/** The HH has a phone type "other" which may be mapped to any one of
-	*   several PC side phone numbers. Return the right one depending in the mapping.
-	*
-	* @note @p mappingForOther should come from AbbrowserSettings::pilotOther()
-	*/
-	TQString getFieldForHHOtherPhone(const KABC::Addressee &abEntry, const Settings &s);
-
-	/** The HH has a phone type "other" which may be mapped to any one
-	*   of several PC side phone numbers. Store the number @p nr in the
-	*   PC side phone field indicated by @p mappingForOther .
-	*
-	* @note @p mappingForOther should come from AbbrowserSettings::pilotOther()
-	*/
-	void setFieldFromHHOtherPhone(KABC::Addressee &abEntry, const TQString &nr, const Settings &s);
-
-	/** Returns the address portion of an addressee. Since the HH can only store
-	*   one address, we return the preferred address (if the Addressee @p abEntry
-	*   has one) and then either home or business depending on @p preferHome
-	*   and if that doesn't exist, the other one and if @em that doesn't exist,
-	*   return the preferred home or work address if it exists.
-	*/
-	KABC::Address getAddress(const KABC::Addressee &abEntry, const Settings &);
-
-	/** Set the address fields of the HH record from the @p abAddress . */
-	void setAddress(PilotAddress &toPilotAddr, const KABC::Address &abAddress);
-
-	bool isArchived(const KABC::Addressee &);
-	void makeArchived(KABC::Addressee &);
-
-	void copy(PilotAddress &toPilotAddr,
-		const KABC::Addressee &fromAbEntry,
-		const PilotAddressInfo &appInfo,
-		const Settings &syncSettings);
-	void copy(KABC::Addressee &toAbEntry,
-		const PilotAddress &fromPiAddr,
-		const PilotAddressInfo &appInfo,
-		const Settings &syncSettings);
-
-	void showAddressee(const KABC::Addressee &);
-}
-
-#endif
-
diff --git a/kpilot/conduits/abbrowserconduit/kaddressbookConduit.ui b/kpilot/conduits/abbrowserconduit/kaddressbookConduit.ui
deleted file mode 100644
index 6447caa0..00000000
--- a/kpilot/conduits/abbrowserconduit/kaddressbookConduit.ui
+++ /dev/null
@@ -1,746 +0,0 @@
-<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
-<class>AbbrowserWidget</class>
-<author>Adriaan de Groot and David Bishop</author>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>Form2</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>645</width>
-            <height>287</height>
-        </rect>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QTabWidget" row="0" column="0">
-            <property name="name">
-                <cstring>tabWidget</cstring>
-            </property>
-            <property name="enabled">
-                <bool>true</bool>
-            </property>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>tab</cstring>
-                </property>
-                <attribute name="title">
-                    <string>General</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <spacer row="3" column="0">
-                        <property name="name">
-                            <cstring>Spacer1</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>20</width>
-                                <height>50</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QButtonGroup" row="0" column="0">
-                        <property name="name">
-                            <cstring>fSyncDestination</cstring>
-                        </property>
-                        <property name="title">
-                            <string>Sync Destination</string>
-                        </property>
-                        <grid>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
-                                <property name="name">
-                                    <cstring>fSyncStdAbook</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>&amp;Standard addressbook</string>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Select this option to synchronize with KDE's standard addressbook (i.e. the addressbook that you edit in KAddressBook, and which you use in KMail)&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="QRadioButton" row="1" column="0">
-                                <property name="name">
-                                    <cstring>fSyncFile</cstring>
-                                </property>
-                                <property name="enabled">
-                                    <bool>true</bool>
-                                </property>
-                                <property name="text">
-                                    <string>vCard &amp;file:</string>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Select this option to use a specific address book file, instead of the standard KDE address book. This file must be in the vCard format (.vcf). Type the location of this file in the edit box or select it clicking the file picker button.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="KURLRequester" row="1" column="1">
-                                <property name="name">
-                                    <cstring>fAbookFile</cstring>
-                                </property>
-                                <property name="enabled">
-                                    <bool>false</bool>
-                                </property>
-                                <property name="sizePolicy">
-                                    <sizepolicy>
-                                        <hsizetype>3</hsizetype>
-                                        <vsizetype>5</vsizetype>
-                                        <horstretch>0</horstretch>
-                                        <verstretch>0</verstretch>
-                                    </sizepolicy>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Enter the vCard file name here or select it by clicking the file picker button. vCard is a standard format for exchanging contact information. &lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                        </grid>
-                    </widget>
-                    <widget class="QCheckBox" row="2" column="0">
-                        <property name="name">
-                            <cstring>fArchive</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Store &amp;archived records in the KDE addressbook</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;If you delete an address on your handheld, you can determine if it should be archived on the PC. If you check that and this checkbox, the address will be added to your addressbook, but no longer synchronized with the handheld.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                </grid>
-            </widget>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>tab</cstring>
-                </property>
-                <attribute name="title">
-                    <string>Conflicts</string>
-                </attribute>
-                <vbox>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <widget class="QGroupBox">
-                        <property name="name">
-                            <cstring>groupBox4</cstring>
-                        </property>
-                        <property name="title">
-                            <string>Conflict Resolution</string>
-                        </property>
-                        <grid>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="QLabel" row="1" column="0">
-                                <property name="name">
-                                    <cstring>textLabel1_2_2</cstring>
-                                </property>
-                                <property name="sizePolicy">
-                                    <sizepolicy>
-                                        <hsizetype>4</hsizetype>
-                                        <vsizetype>5</vsizetype>
-                                        <horstretch>0</horstretch>
-                                        <verstretch>0</verstretch>
-                                    </sizepolicy>
-                                </property>
-                                <property name="text">
-                                    <string>Conflict &amp;resolution:</string>
-                                </property>
-                                <property name="buddy" stdset="0">
-                                    <cstring>fConflictResolution</cstring>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Select in this list how conflicting entries (entries which were edited both on your handheld and on the PC) are resolved. Possibly values are "Use KPilot's Global Setting" to use the settings defined in KPilot HotSync configuration, "Ask User" to let you decide case by case, "Do Nothing" to allow the entries to be different, "PC overrides", "Handheld overrides", "Use values from last sync" and "Use both entries" to create a new entry on both the PC and handheld.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="QComboBox" row="1" column="1">
-                                <item>
-                                    <property name="text">
-                                        <string>Use KPilot's Global Setting</string>
-                                    </property>
-                                </item>
-                                <item>
-                                    <property name="text">
-                                        <string>Ask User</string>
-                                    </property>
-                                </item>
-                                <item>
-                                    <property name="text">
-                                        <string>Do Nothing</string>
-                                    </property>
-                                </item>
-                                <item>
-                                    <property name="text">
-                                        <string>Handheld Overrides</string>
-                                    </property>
-                                </item>
-                                <item>
-                                    <property name="text">
-                                        <string>PC Overrides</string>
-                                    </property>
-                                </item>
-                                <item>
-                                    <property name="text">
-                                        <string>Values From Last Sync (if possible)</string>
-                                    </property>
-                                </item>
-                                <item>
-                                    <property name="text">
-                                        <string>Use Both Entries</string>
-                                    </property>
-                                </item>
-                                <property name="name">
-                                    <cstring>fConflictResolution</cstring>
-                                </property>
-                                <property name="currentItem">
-                                    <number>6</number>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Select in this list how conflicting entries (entries which were edited both on your handheld and on the PC) are resolved. Possibly values are "Use KPilot's Global Setting" to use the settings defined in KPilot HotSync configuration, "Ask User" to let you decide case by case, "Do Nothing" to allow the entries to be different, "PC overrides", "Handheld overrides", "Use values from last sync" and "Use both entries" to create a new entry on both the PC and handheld.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
-                                <property name="name">
-                                    <cstring>textLabel1_7</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>&lt;p&gt;Select the default action if an event was modified on both sides here. &lt;/p&gt;</string>
-                                </property>
-                                <property name="alignment">
-                                    <set>WordBreak|AlignJustify|AlignVCenter</set>
-                                </property>
-                            </widget>
-                        </grid>
-                    </widget>
-                    <spacer>
-                        <property name="name">
-                            <cstring>spacer6</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>20</width>
-                                <height>41</height>
-                            </size>
-                        </property>
-                    </spacer>
-                </vbox>
-            </widget>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>tab</cstring>
-                </property>
-                <attribute name="title">
-                    <string>Fields</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <property name="margin">
-                        <number>11</number>
-                    </property>
-                    <property name="spacing">
-                        <number>6</number>
-                    </property>
-                    <widget class="QLabel" row="0" column="0">
-                        <property name="name">
-                            <cstring>TextLabel2</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Handheld other phone:</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Select which KAddressBook field should be used to store the Pilot's &amp;quot;Other&amp;quot; phone here.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="QComboBox" row="0" column="1">
-                        <item>
-                            <property name="text">
-                                <string>Other Phone</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>Assistant</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>Business Fax</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>Car Phone</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>Email 2</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>Home Fax</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>Telex</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>TTY/TTD Phone</string>
-                            </property>
-                        </item>
-                        <property name="name">
-                            <cstring>fOtherPhone</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>3</hsizetype>
-                                <vsizetype>0</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Select which KAddressBook field should be used to store the Pilot's &amp;quot;Other&amp;quot; phone here.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="1" column="0">
-                        <property name="name">
-                            <cstring>TextLabel4</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Handheld street address:</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Select which KAddressBook field should be used to store the Pilot's Street Address here.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="QComboBox" row="1" column="1">
-                        <item>
-                            <property name="text">
-                                <string>Preferred, then Home Address</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>Preferred, then Business Address</string>
-                            </property>
-                        </item>
-                        <property name="name">
-                            <cstring>fAddress</cstring>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Select which KAddressBook field should be used to store the Pilot's Street Address here.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="2" column="0">
-                        <property name="name">
-                            <cstring>TextLabel5</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Handheld fax:</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Select which KAddressBook field should be used to store the Fax number from the Pilot here.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="QComboBox" row="2" column="1">
-                        <item>
-                            <property name="text">
-                                <string>Home Fax</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>Business Fax</string>
-                            </property>
-                        </item>
-                        <property name="name">
-                            <cstring>fFax</cstring>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Select which KAddressBook field should be used to store the Fax number from the Pilot here.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <spacer row="3" column="0">
-                        <property name="name">
-                            <cstring>Spacer2</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>0</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                </grid>
-            </widget>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>tab</cstring>
-                </property>
-                <attribute name="title">
-                    <string>Custom Fields</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <widget class="QLabel" row="0" column="0">
-                        <property name="name">
-                            <cstring>textLabel1</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>5</hsizetype>
-                                <vsizetype>5</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="text">
-                            <string>Handheld custom field 1:</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Select the field from this list that represents best the meaning given by your use of the first custom field on your handheld.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="1" column="0">
-                        <property name="name">
-                            <cstring>textLabel1_2</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Handheld custom field 2:</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                             <string>&lt;qt&gt;Select the field from this list that represents best the meaning given by your use of the second custom field on your handheld.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="2" column="0">
-                        <property name="name">
-                            <cstring>textLabel1_3</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Handheld custom field 3:</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                             <string>&lt;qt&gt;Select the field from this list that represents best the meaning given by your use of the third custom field on your handheld.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="3" column="0">
-                        <property name="name">
-                            <cstring>textLabel1_4</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Handheld custom field 4:</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                             <string>&lt;qt&gt;Select the field from this list that represents best the meaning given by your use of the fourth custom field on your handheld.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="QComboBox" row="0" column="1">
-                        <item>
-                            <property name="text">
-                                <string>Store as Custom Field</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>Birthdate</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>URL</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>IM Address (ICQ, MS, ...)</string>
-                            </property>
-                        </item>
-                        <property name="name">
-                            <cstring>fCustom0</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>3</hsizetype>
-                                <vsizetype>0</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                             <string>&lt;qt&gt;Select the field from this list that represents best the meaning given by your use of the first custom field on your handheld.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="QComboBox" row="1" column="1">
-                        <item>
-                            <property name="text">
-                                <string>Store as Custom Field</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>Birthdate</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>URL</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>IM Address (ICQ, MSN, ...)</string>
-                            </property>
-                        </item>
-                        <property name="name">
-                            <cstring>fCustom1</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>3</hsizetype>
-                                <vsizetype>0</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                             <string>&lt;qt&gt;Select the field from this list that represents best the meaning given by your use of the second custom field on your handheld.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="QComboBox" row="2" column="1">
-                        <item>
-                            <property name="text">
-                                <string>Store as Custom Field</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>Birthdate</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>URL</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>IM Address (ICQ, MSN, ...)</string>
-                            </property>
-                        </item>
-                        <property name="name">
-                            <cstring>fCustom2</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>3</hsizetype>
-                                <vsizetype>0</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                             <string>&lt;qt&gt;Select the field from this list that represents best the meaning given by your use of the third custom field on your handheld.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="QComboBox" row="3" column="1">
-                        <item>
-                            <property name="text">
-                                <string>Store as Custom Field</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>Birthdate</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>URL</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>IM Address (ICQ, MSN, ...)</string>
-                            </property>
-                        </item>
-                        <property name="name">
-                            <cstring>fCustom3</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>3</hsizetype>
-                                <vsizetype>0</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                             <string>&lt;qt&gt;Select the field from this list that represents best the meaning given by your use of the fourth custom field on your handheld.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="Line" row="4" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>line1</cstring>
-                        </property>
-                        <property name="frameShape">
-                            <enum>HLine</enum>
-                        </property>
-                        <property name="frameShadow">
-                            <enum>Sunken</enum>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="5" column="0" rowspan="2" colspan="1">
-                        <property name="name">
-                            <cstring>textLabel1_5</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Date &amp;format:</string>
-                        </property>
-                        <property name="buddy" stdset="0">
-                            <cstring>fCustomDate</cstring>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Select the birthdate format here, if you selected "birthdate" for any of the custom fields above. Possible placeholders are:&lt;br&gt; %d for the day, %m for the month, %y for the two-digit year, %Y for the four-digit year. For  example, %d.%m.%Y would generate a date like 27.3.1952, while %m/%d/%y would write the same date as 03/27/52. &lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="QComboBox" row="6" column="1">
-                        <item>
-                            <property name="text">
-                                <string>Locale Settings</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>%d.%m.%Y</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>%d.%m.%y</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>%d/%m/%Y</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>%d/%m/%y</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>%m/%d/%Y</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>%m/%d/%y</string>
-                            </property>
-                        </item>
-                        <property name="name">
-                            <cstring>fCustomDate</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>3</hsizetype>
-                                <vsizetype>0</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="editable">
-                            <bool>true</bool>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Select the birthdate format here, if you selected "birthdate" for any of the custom fields above. Possible placeholders are:&lt;br&gt; %d for the day, %m for the month, %y for the two-digit year, %Y for the four-digit year. For  example, %d.%m.%Y would generate a date like 27.3.1952, while %m/%d/%y would write the same date as 03/27/52. &lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <spacer row="8" column="1">
-                        <property name="name">
-                            <cstring>spacer5</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>31</width>
-                                <height>30</height>
-                            </size>
-                        </property>
-                    </spacer>
-                </grid>
-            </widget>
-        </widget>
-    </grid>
-</widget>
-<connections>
-    <connection>
-        <sender>fSyncFile</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>fAbookFile</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-</connections>
-<tabstops>
-    <tabstop>fArchive</tabstop>
-    <tabstop>tabWidget</tabstop>
-    <tabstop>fOtherPhone</tabstop>
-    <tabstop>fAddress</tabstop>
-    <tabstop>fFax</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-<includes>
-    <include location="global" impldecl="in implementation">kurlrequester.h</include>
-    <include location="global" impldecl="in implementation">klineedit.h</include>
-    <include location="global" impldecl="in implementation">kpushbutton.h</include>
-</includes>
-</UI>
diff --git a/kpilot/conduits/abbrowserconduit/resolutionDialog.cc b/kpilot/conduits/abbrowserconduit/resolutionDialog.cc
deleted file mode 100644
index aa8e2f14..00000000
--- a/kpilot/conduits/abbrowserconduit/resolutionDialog.cc
+++ /dev/null
@@ -1,323 +0,0 @@
-/* resolutionDialog.h			KPilot
-**
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-**
-** See the .cc file for an explanation of what this file is for.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <tqtimer.h>
-#include <tqlabel.h>
-#include <tqpushbutton.h>
-#include <tqlistview.h>
-#include <tqregexp.h>
-
-#include "resolutionTable.h"
-#include "resolutionDialog_base.h"
-
-#include "resolutionDialog.moc"
-
-/** This class describes the controllers of the conflict resolution ListView,
- *  as well as its child radio buttons. There are two different constructors
- *  for them.
- *  Each controller has three child radio buttons, and if any of them is
- *  activated (stateChange), it sets the text of its parent (which is the
- *  controller, which is an instance of ResolutionCheckListItem, too).
- **/
-class ResolutionCheckListItem : TQCheckListItem {
-public:
-	ResolutionCheckListItem(ResolutionItem*it, ResolutionTable*tb,
-		TQListView*parent);
-	ResolutionCheckListItem(TQString header, TQString text,
-		ResolutionCheckListItem*parent);
-	~ResolutionCheckListItem() {};
-	virtual void stateChange(bool newstate);
-	virtual void setValue(TQString text);
-	virtual void setCaption(TQString caption);
-
-protected:
-	void updateText();
-	/* fResItem is only set for the controller */
-	ResolutionItem*fResItem;
-	bool isController;
-	/* The description of the entry, e.g. Backup, PC, Palm for the radio buttons,
-	 * of the field name for the controllers
-	 */
-	TQString fCaption;
-	/* The currrent value of the entry (for controllers this changes with the
-	 * selected button */
-	TQString fText;
-};
-
-
-ResolutionCheckListItem::ResolutionCheckListItem(ResolutionItem*it,
-		ResolutionTable*tb, TQListView*parent) :
-	TQCheckListItem(parent, TQString::null, TQCheckListItem::Controller),
-	fResItem(it),
-	isController(true),
-	fCaption(it?(it->fName):(TQString::null)),
-	fText(it?(it->fResolved):(TQString::null))
-{
-	FUNCTIONSETUP;
-	if (it && tb)
-	{
-		// If all three texts are identical, there is no need for
-		// resolution so don't show the radio items below
-		bool itemsEqual=true;
-		TQString testtext(TQString::null);
-		const enum eExistItems its[3]={eExistsPC, eExistsPalm, eExistsBackup};
-		// get a valid text from a valid field, which will serve as the
-		// test text for the comparison
-		for (int i=0; i<3; i++)
-		{
-			if ((testtext.isNull()) && (it->fExistItems & its[i]) )
-				testtext=it->fEntries[i];
-		}
-		for (int i=0; i<3; i++)
-		{
-			if (it->fExistItems & its[i])
-				itemsEqual&=(it->fEntries[i]==testtext);
-		}
-		if (!itemsEqual)
-		{
-			ResolutionCheckListItem*item;
-			for (int i=2; i>=0; i--)
-			{
-				// Add only existing items
-				if (it->fExistItems & its[i])
-				{
-					item=new ResolutionCheckListItem(it->fEntries[i], tb->labels[i], this);
-					item->setOn(it->fEntries[i]==fText);
-				}
-			}
-		}
-		updateText();
-	}
-	setOpen(true);
-}
-
-ResolutionCheckListItem::ResolutionCheckListItem(TQString text, TQString header,
-		ResolutionCheckListItem*parent) :
-	TQCheckListItem(parent, TQString(), TQCheckListItem::RadioButton),
-	fResItem(0L),
-	isController(false),
-	fCaption(header),
-	fText(text)
-{
-	updateText();
-}
-
-void ResolutionCheckListItem::stateChange(bool newstate)
-{
-	if (newstate && !isController)
-	{
-		ResolutionCheckListItem*par=static_cast<ResolutionCheckListItem*>(parent());
-		{
-			par->setValue(fText);
-		}
-	}
-}
-
-void ResolutionCheckListItem::setValue(TQString text)
-{
-	FUNCTIONSETUP;
-	fText=text;
-	if (isController && fResItem)
-	{
-		fResItem->fResolved=text;
-	}
-	updateText();
-}
-
-void ResolutionCheckListItem::setCaption(TQString caption)
-{
-	fCaption=caption;
-	updateText();
-}
-
-void ResolutionCheckListItem::updateText()
-{
-	TQString newText(i18n("Entries in the resolution dialog. First the name of the field, then the entry from the Handheld or PC after the colon", "%1: %2").arg(fCaption).arg(fText));
-	newText.replace(TQRegExp(CSL1("\n")),
-		i18n("Denoting newlines in Address entries. No need to translate", " | "));
-	setText(0, newText);
-}
-
-
-
-/*****************************************************************
- *
- *****************************************************************/
-
-ResolutionDlg::ResolutionDlg( TQWidget* parent, KPilotLink*fH,
-	const TQString &caption, const TQString &helpText, ResolutionTable*tab) :
-	KDialogBase( parent, "ResolutionDlg", false, caption, Apply|Cancel, Apply),
-	tickleTimer(0L),
-	fHandle(fH),
-	fTable(tab)
-{
-	fWidget = new ResolutionDialogBase( this );
-	setMainWidget(fWidget);
-	fTable->fResolution=SyncAction::eDoNothing;
-	fWidget->fIntroText->setText(helpText);
-
-	fillListView();
-	adjustButtons(tab);
-
-	adjustSize();
-	resize(size());
-
-	if (fHandle) tickleTimer=new TQTimer(this, "TickleTimer");
-
-	if (tickleTimer)
-	{
-		connect( tickleTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(_tickle()));
-		// tickle the palm every 10 seconds to prevent a timeout until the
-		// sync is really finished.
-		tickleTimer->start( 10000 );
-	}
-
-	connect(fWidget->fKeepBoth, TQT_SIGNAL(clicked()), TQT_SLOT(slotKeepBoth()));
-	connect(fWidget->fBackupValues, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseBackup()));
-	connect(fWidget->fPalmValues, TQT_SIGNAL(clicked()), TQT_SLOT(slotUsePalm()));
-	connect(fWidget->fPCValues, TQT_SIGNAL(clicked()), TQT_SLOT(slotUsePC()));
-}
-
-void ResolutionDlg::adjustButtons(ResolutionTable*tab)
-{
-	FUNCTIONSETUP;
-	if (!tab) return;
-	if (!(tab->fExistItems & eExistsPC) )
-	{
-		fWidget->fPCValues->setText(i18n("Delete entry"));
-		fWidget->fKeepBoth->setDisabled(TRUE);
-		fWidget->fKeepBoth->hide();
-	}
-	if (!(tab->fExistItems & eExistsPalm) )
-	{
-		fWidget->fPalmValues->setText(i18n("Delete entry"));
-		fWidget->fKeepBoth->setDisabled(TRUE);
-		fWidget->fKeepBoth->hide();
-	}
-	if (!(tab->fExistItems & eExistsBackup) )
-	{
-		fWidget->fBackupValues->setDisabled(TRUE);
-	}
-}
-
-void ResolutionDlg::fillListView()
-{
-	FUNCTIONSETUP;
-	fWidget->fResolutionView->setSorting(-1, FALSE);
-	fWidget->fResolutionView->clear();
-	for ( ResolutionItem* it = fTable->last(); it; it = fTable->prev() )
-	{
-#ifdef DEBUG
-		DEBUGKPILOT<<"Building table, items="<<it->fExistItems<<", PC="<<
-			it->fEntries[0]<<", Palm="<<it->fEntries[1]<<", Backup="<<
-			it->fEntries[2]<<endl;
-#endif
-		bool hasValidValues=false;
-		if (it->fExistItems & eExistsPC)
-			hasValidValues = hasValidValues || !(it->fEntries[0].isEmpty());
-		if (it->fExistItems & eExistsPalm)
-			hasValidValues = hasValidValues || !(it->fEntries[1].isEmpty());
-		if (it->fExistItems & eExistsBackup)
-			hasValidValues = hasValidValues || !(it->fEntries[2].isEmpty());
-		if (hasValidValues)
-			new ResolutionCheckListItem(it, fTable, fWidget->fResolutionView);
-	}
-}
-
-void ResolutionDlg::slotKeepBoth()
-{
-	if ( (fTable->fExistItems & eExistsPC) && (fTable->fExistItems & eExistsPalm) )
-	{
-		fTable->fResolution=SyncAction::eDuplicate;
-	}
-	else
-	{
-		fTable->fResolution=SyncAction::eDoNothing;
-	}
-	done(fTable->fResolution);
-}
-
-void ResolutionDlg::slotUseBackup()
-{
-	if (fTable->fExistItems & eExistsBackup)
-	{
-		fTable->fResolution=SyncAction::ePreviousSyncOverrides;
-	}
-	else
-	{
-		fTable->fResolution=SyncAction::eDoNothing;
-	}
-	done(fTable->fResolution);
-}
-
-void ResolutionDlg::slotUsePalm()
-{
-	if (fTable->fExistItems & eExistsPalm)
-	{
-		fTable->fResolution=SyncAction::eHHOverrides;
-	}
-	else
-	{
-		fTable->fResolution=SyncAction::eDelete;
-	}
-	done(fTable->fResolution);
-}
-
-void ResolutionDlg::slotUsePC()
-{
-	if (fTable->fExistItems & eExistsPC)
-	{
-		fTable->fResolution=SyncAction::ePCOverrides;
-	}
-	else
-	{
-		fTable->fResolution=SyncAction::eDelete;
-	}
-	done(fTable->fResolution);
-}
-
-void ResolutionDlg::slotApply()
-{
-	fTable->fResolution=SyncAction::eAskUser;
-	done(fTable->fResolution);
-}
-
-void ResolutionDlg::_tickle()
-{
-	if (fHandle) fHandle->tickle();
-}
-
-/*
- *  Destroys the object and frees any allocated resources
- */
-ResolutionDlg::~ResolutionDlg()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
diff --git a/kpilot/conduits/abbrowserconduit/resolutionDialog.h b/kpilot/conduits/abbrowserconduit/resolutionDialog.h
deleted file mode 100644
index 2c7a8b0d..00000000
--- a/kpilot/conduits/abbrowserconduit/resolutionDialog.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef RESOLUTIONDIALOG_H
-#define RESOLUTIONDIALOG_H
-/* resolutionDialog.h			KPilot
-**
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-**
-** See the .cc file for an explanation of what this file is for.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <kdialogbase.h>
-class KPilotLink;
-class TQTimer;
-class TQListView;
-class ResolutionDialogBase;
-
-
-class ResolutionTable;
-
-class ResolutionDlg : public KDialogBase
-{
-    Q_OBJECT
-
-public:
-	ResolutionDlg( TQWidget* parent=0, 
-		KPilotLink*fH=0L, 
-		const TQString &caption=TQString(), 
-		const TQString &helpText=TQString(), 
-		ResolutionTable *tab=0L );
-	~ResolutionDlg();
-
-public slots:
-	void slotKeepBoth();
-	void slotUseBackup();
-	void slotUsePalm();
-	void slotUsePC();
-	void slotApply();
-	void _tickle();
-protected:
-	void fillListView();
-	void adjustButtons(ResolutionTable*tab);
-
-	TQTimer* tickleTimer;
-	KPilotLink* fHandle;
-	ResolutionTable*fTable;
-
-	ResolutionDialogBase*fWidget;
-};
-
-#endif // RESOLUTIONDIALOG_H
diff --git a/kpilot/conduits/abbrowserconduit/resolutionDialog_base.ui b/kpilot/conduits/abbrowserconduit/resolutionDialog_base.ui
deleted file mode 100644
index 38fa73e8..00000000
--- a/kpilot/conduits/abbrowserconduit/resolutionDialog_base.ui
+++ /dev/null
@@ -1,129 +0,0 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
-<class>ResolutionDialogBase</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>widget2</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>459</width>
-            <height>350</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>widget2</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <widget class="QLabel" row="0" column="0">
-            <property name="name">
-                <cstring>fIntroText</cstring>
-            </property>
-            <property name="text">
-                <string>The following record was edited both on the handheld and on the PC. Please choose which values shall be synced:</string>
-            </property>
-            <property name="alignment">
-                <set>WordBreak|AlignVCenter</set>
-            </property>
-        </widget>
-        <widget class="QListView" row="1" column="0">
-            <column>
-                <property name="text">
-                    <string>Field</string>
-                </property>
-                <property name="clickable">
-                    <bool>false</bool>
-                </property>
-                <property name="resizable">
-                    <bool>false</bool>
-                </property>
-            </column>
-            <property name="name">
-                <cstring>fResolutionView</cstring>
-            </property>
-            <property name="rootIsDecorated">
-                <bool>true</bool>
-            </property>
-            <property name="resizeMode">
-                <enum>AllColumns</enum>
-            </property>
-            <property name="whatsThis" stdset="0">
-                <string>&lt;qt&gt;Use this list to resolve, field by field, the conflicts created when a record was edited both on the handheld and on the PC. For each record, the different values from the last sync, the handheld and PC are displayed for each field, allowing you to choose the desired value.&lt;/qt&gt;</string>
-            </property>
-        </widget>
-        <widget class="QLabel" row="2" column="0">
-            <property name="name">
-                <cstring>textLabel1</cstring>
-            </property>
-            <property name="text">
-                <string>Line breaks in any of the entries are denoted by a " | " (without the quotes).</string>
-            </property>
-            <property name="alignment">
-                <set>WordBreak|AlignVCenter</set>
-            </property>
-        </widget>
-        <widget class="QFrame" row="3" column="0">
-            <property name="name">
-                <cstring>frame3</cstring>
-            </property>
-            <property name="frameShape">
-                <enum>GroupBoxPanel</enum>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="QPushButton" row="0" column="1">
-                    <property name="name">
-                        <cstring>fKeepBoth</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Keep Both</string>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Click this button to use both values, resulting in the duplication of the record.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="0" column="0">
-                    <property name="name">
-                        <cstring>fPCValues</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;PC Values</string>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Click this button to use the PC values for synchronizing all conflicting fields in this record.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="1" column="0">
-                    <property name="name">
-                        <cstring>fBackupValues</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Last Sync Values</string>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Click this button to use the last sync values (old values) for synchronizing all conflicting fields in this record.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="1" column="1">
-                    <property name="name">
-                        <cstring>fPalmValues</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Handheld Values</string>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Click this button to use the handheld values for synchronizing all conflicting fields in this record.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/kpilot/conduits/abbrowserconduit/resolutionTable.h b/kpilot/conduits/abbrowserconduit/resolutionTable.h
deleted file mode 100644
index 51c25190..00000000
--- a/kpilot/conduits/abbrowserconduit/resolutionTable.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef RESOLUTIONTABLE_H
-#define RESOLUTIONTABLE_H
-/* resolutionTable.h			KPilot
-**
-** Copyright (C) 2003 by Reinhold Kainhofer
-**
-** See the .cc file for an explanation of what this file is for.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include <tqvaluelist.h>
-#include "syncAction.h"
-
-typedef enum eExistItems {
-	eExistsPC=0x1, eExistsPalm=0x2, eExistsBackup=0x4,
-	eExistsAll=eExistsPC|eExistsPalm|eExistsBackup
-};
-
-class ResolutionItem
-{
-public:
-	enum eExistItems fExistItems;
-	TQString fEntries[3];
-	TQString fResolved;
-	TQString fName;
-public:
-	ResolutionItem() {}
-	ResolutionItem(TQString name, int ex, TQString pc, TQString palm, TQString backup):fExistItems((eExistItems)ex),fName(name)
-		{fEntries[0]=pc;fEntries[1]=palm; fEntries[2]=backup; /*fExistItems=(eExistItems)ex;*/ }
-	~ResolutionItem() {}
-};
-
-/**
-@author Reinhold Kainhofer
-*/
-class ResolutionTable : public TQPtrList<ResolutionItem>
-{
-public:
-	ResolutionTable():TQPtrList<ResolutionItem>() {fResolution=SyncAction::eAskUser;};
-
-	~ResolutionTable() {};
-
-	SyncAction::ConflictResolution fResolution;
-	TQString labels[3];
-	enum eExistItems fExistItems;
-};
-
-#endif
-
diff --git a/kpilot/conduits/configure.in.bot b/kpilot/conduits/configure.in.bot
deleted file mode 100644
index 688f775f..00000000
--- a/kpilot/conduits/configure.in.bot
+++ /dev/null
@@ -1,14 +0,0 @@
-dnl Configure.in.bot for KPilot conduits.
-dnl
-dnl Copyright (C) 2000,2001 Adriaan de Groot
-dnl Copyright (C) 2002 Reinhold Kainhofer
-dnl
-dnl This file is released under the terms of the Gnu General Public
-dnl Licence (GPL) Version 2.
-
-if test "$with_mal" = NOTFOUND -o "$with_mal" = no ; then
-    echo ""
-    echo "KPILOT: MAL headers or library not found. AvantGo conduit will not be compiled."
-    echo "KPILOT: Download libmal>=0.20 from http://jasonday.home.att.net/code/libmal/"
-    echo ""
-fi
diff --git a/kpilot/conduits/configure.in.in b/kpilot/conduits/configure.in.in
deleted file mode 100644
index c6a0d143..00000000
--- a/kpilot/conduits/configure.in.in
+++ /dev/null
@@ -1,241 +0,0 @@
-dnl Configure.in.in for KPilot conduits.
-dnl
-dnl Copyright (C) 2000,2001 Adriaan de Groot
-dnl Copyright (C) 2002 Reinhold Kainhofer
-dnl
-dnl This file is released under the terms of the Gnu General Public
-dnl Licence (GPL) Version 2.
-
-
-
-
-dnl ----------------------------------------------------------------------------
-dnl
-dnl                     checks for the MAL conduit
-dnl
-dnl ----------------------------------------------------------------------------
-
-dnl
-dnl
-dnl Check to see if MAL header and library are available
-dnl
-
-dnl
-dnl Questions and comments can be sent to kde-pim@kde.org
-dnl
-dnl This was copied and adapted from kabc's ldap configure.in.in
-
-
-AC_DEFUN([KPILOT_CHECK_MAL],
-[
-AC_REQUIRE([KDE_CHECK_LIB64])
-AC_REQUIRE([KPILOT_CHECK_PISOCK])
-
-AC_MSG_CHECKING(for libmal (for KPilots MAL conduit))
-AC_ARG_WITH(mal,
-[  --with-mal=PATH         set path for libmal files @<:@default=check@:>@],
-[ case "$withval" in
-  yes)
-    with_mal=CHECK
-    ;;
-  esac ],
-[ with_mal=CHECK ]
-)dnl
-
-if test "x$with_mal" = "xCHECK" ; then
-  with_mal=NOTFOUND
-  search_incs_tmp="$kde_includes /usr/include /usr/local/include"
-	dnl build the list of include dirs, both with and without libmal appended
-	search_incs="";
-	for idir in $search_incs_tmp; do
-		search_incs="$search_incs $idir $idir/libmal"
-	done
-  AC_FIND_FILE(libmal.h, $search_incs, mal_incdir)
-  if test -r $mal_incdir/libmal.h ; then
-    test "x$mal_incdir" != "x/usr/include" && MAL_INCLUDE="-I$mal_incdir"
-    with_mal=FOUND
-  fi
-  if test $with_mal = FOUND ; then
-    with_mal=NOTFOUND
-    for ext in la so sl a ; do
-      AC_FIND_FILE(libmal.$ext, $kde_libraries $libdir /usr/lib$kdelibsuff /usr/local/lib$kdelibsuff $libdir/libmal /usr/lib/libmal /usr/local/lib/libmal,
-        mal_libdir)
-      if test -r $mal_libdir/libmal.$ext ; then
-        if test "x$mal_libdir" != "x/usr/lib$kdelibsuff" ; then
-          MAL_LIB="-L$mal_libdir "
-          test "$USE_RPATH" = yes && MAL_RPATH="-R $mal_libdir"
-        fi
-        MAL_LIB="${MAL_LIB}-lmal"
-        with_mal=FOUND
-        break
-      fi
-    done
-  fi
-fi
-
-case "$with_mal" in
-no) AC_MSG_RESULT(no) ;;
-NOTFOUND) AC_MSG_RESULT(searched but not found) ;;
-*)
-  if test "x$with_mal" = "xFOUND" ; then
-    msg="incs=$mal_incdir libs=$mal_libdir"
-  else
-    msg="$with_mal"
-    MAL_ROOT="$with_mal"
-    if test "x$MAL_ROOT" != "x/usr" ; then
-      MAL_INCLUDE="-I${MAL_ROOT}/include"
-      MAL_LIB="-L${MAL_ROOT}/lib$kdelibsuff "
-      if test "$USE_RPATH" = "yes" ; then
-        MAL_RPATH="-R ${MAL_ROOT}/lib$kdelibsuff"
-      fi
-    fi
-    MAL_LIB="${MAL_LIBS}-lmal"
-  fi
-
-  kde_save_LIBS="$LIBS"
-  kde_save_CFLAGS="$CFLAGS"
-  kde_save_CPPFLAGS="$CPPFLAGS"
-  kde_save_LDFLAGS="$LDFLAGS"
-  LIBS="$LIBS $PISOCK_LIB $MAL_LIB"
-  CFLAGS="$CFLAGS $MAL_INCLUDE"
-  CPPFLAGS="$CPPFLAGS $all_includes $PISOCK_INCLUDE $MAL_INCLUDE"
-  LDFLAGS="$LDFLAGS $PISOCK_LDFLAGS $all_libraries"
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  AC_TRY_LINK(dnl
-  [
-  #include <libmal.h>
-  ],
-  [
-  PalmSyncInfo *psi;
-  ],
-  , with_mal=no
-  )
-  if test "$with_mal" = "no" ; then
-    MAL_LIB="$MAL_LIB -ldl"
-    LIBS="$LIBS $PISOCK_LIB $MAL_LIB"
-    with_mal=yes
-    AC_TRY_LINK(dnl
-    [
-    #include <libmal.h>
-    ],
-    [
-    PalmSyncInfo *psi;
-    ],
-    , with_mal=no
-    )
-  fi
-  if test "$with_mal" = "no" ; then
-    MAL_INCLUDE=
-    MAL_LIB=
-    MAL_RPATH=
-    AC_MSG_RESULT(no (but first try gave $msg))
-  else
-    AC_DEFINE(HAVE_LIBMAL, 1, [Define if you have MAL libraries])
-		dnl check which version we have (pre 0.40 or >=0.40):
-    AC_TRY_LINK(dnl
-    [#include <libmal.h>],
-    [
-    PalmSyncInfo *psi;
-		psi->httpProxy;
-    ],
-    , mal_version20=yes
-    )
-    if test "$mal_version20" = "yes" ; then
-			AC_DEFINE(LIBMAL20, 1, [Define if we have the old libmal version (<0.40)])
-		fi
-    HAVE_LIBMAL=1
-    AC_MSG_RESULT($msg)
-  fi
-  AC_LANG_RESTORE
-  CFLAGS=$kde_save_CFLAGS
-  CPPFLAGS=$kde_save_CPPFLAGS
-  LIBS=$kde_save_LIBS
-  LDFLAGS=$kde_save_LDFLAGS
-  ;;
-esac
-
-AC_SUBST(MAL_INCLUDE)
-AC_SUBST(MAL_LIB)
-AC_SUBST(MAL_RPATH)
-
-AM_CONDITIONAL(include_malconduit, test "$HAVE_LIBMAL" = 1)
-
-])
-
-dnl ----------------------------------------------------------------------------
-dnl
-dnl                     checks for the addressbook conduit
-dnl
-dnl ----------------------------------------------------------------------------
-
-AC_DEFUN([KPILOT_CHECK_KABC],[HAVE_KABC=0
-KDE_CHECK_HEADER(kresources/factory.h,HAVE_KABC=1,
-	AC_MSG_WARN([KPILOT: Older kaddressbook version detected. No address book
-	conduit will be compiled.]))
-AM_CONDITIONAL(include_abc, test "$HAVE_KABC" = 1)
-])
-
-dnl ----------------------------------------------------------------------------
-dnl
-dnl                     checks for the notepad conduit
-dnl
-dnl ----------------------------------------------------------------------------
-
-AC_DEFUN([KPILOT_CHECK_NOTEPAD],[HAVE_NOTEPAD=0
-kpilot_save_cflags="$CPPFLAGS"
-kpilot_save_ldflags="$LDFLAGS"
-
-test -z "$PISOCK_INCLUDE" || CPPFLAGS="$CPPFLAGS $PISOCK_INCLUDE"
-KDE_CHECK_HEADER(pi-notepad.h,HAVE_NOTEPAD=1,
-	AC_MSG_WARN([KPILOT: No notepad.h for pilot-link. Your pilot-link is too old.]))
-
-CPPFLAGS="$kpilot_save_cflags"
-LDFLAGS="$kpilot_save_ldflags"
-unset kpilot_save_cflags
-unset kpilot_save_ldflags
-
-AM_CONDITIONAL(include_notepad, test "$HAVE_NOTEPAD" = 1)
-])
-
-dnl ----------------------------------------------------------------------------
-dnl
-dnl                     checks for embedded language conduits
-dnl
-dnl ----------------------------------------------------------------------------
-
-AC_DEFUN([KPILOT_CHECK_PERL],[HAVE_PERL=0
-AC_MSG_CHECKING([for Perl embedding])
-if perl -MExtUtils::Embed -e ccopts > /dev/null 2> /dev/null ; then
-	PERL_CFLAGS=`perl -MExtUtils::Embed -e ccopts 2> /dev/null`
-	PERL_LDFLAGS=`perl -MExtUtils::Embed -e ldopts 2> /dev/null`
-	HAVE_PERL=1
-	AC_MSG_RESULT(yes)
-else
-	PERL_CFLAGS=""
-	PERL_LDFLAGS=""
-	AC_MSG_RESULT(no)
-fi
-AC_SUBST(PERL_CFLAGS)
-AC_SUBST(PERL_LDFLAGS)
-AM_CONDITIONAL(include_perl, test "$HAVE_PERL" = 1)
-])
-
-AC_DEFUN([KPILOT_CHECK_PYTHON],[HAVE_PYTHON=0
-AC_MSG_CHECKING([for Python embedding])
-AM_CONDITIONAL(include_python, test "$HAVE_PYTHON" = 1)
-AC_MSG_RESULT(N/A)
-])
-
-dnl ----------------------------------------------------------------------------
-dnl
-dnl                   actually call the checks
-dnl
-dnl ----------------------------------------------------------------------------
-
-KPILOT_CHECK_MAL
-KPILOT_CHECK_KABC
-KPILOT_CHECK_PERL
-KPILOT_CHECK_PYTHON
-KPILOT_CHECK_NOTEPAD
-
diff --git a/kpilot/conduits/docconduit/CMakeLists.txt b/kpilot/conduits/docconduit/CMakeLists.txt
deleted file mode 100644
index fa87eb0f..00000000
--- a/kpilot/conduits/docconduit/CMakeLists.txt
+++ /dev/null
@@ -1,87 +0,0 @@
-include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
-)
-
-set(doc_shared_SRCS
-	makedoc9.cc
-	pilotDOCHead.cc
-	pilotDOCEntry.cc
-	pilotDOCBookmark.cc
-	DOC-converter.cc
-)
-
-set(conduit_doc_SRCS
-	${doc_shared_SRCS}
-	kpalmdoc_dlg.cc
-	kpalmdoc.cpp
-	doc-factory.cc
-	doc-setup.cc
-	doc-conduit.cc
-	doc-conflictdialog.cc
-)
-
-set(conduit_doc_UIS
-	kpalmdoc_dlgbase.ui
-	doc-setupdialog.ui
-)
-
-set(conduit_doc_KCFGS
-	docconduitSettings.kcfgc
-	kpalmdocSettings.kcfgc
-)
-
-kde3_add_kcfg_files(conduit_doc_SRCS ${conduit_doc_KCFGS})
-kde3_add_ui_files(conduit_doc_SRCS ${conduit_doc_UIS})
-kde3_automoc(${conduit_doc_SRCS})
-add_library(conduit_doc SHARED ${conduit_doc_SRCS})
-
-kpilot_rpath(conduit_doc)
-
-set_target_properties(
-	conduit_doc PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	PREFIX ""
-)
-
-kde3_install_libtool_file(conduit_doc)
-
-install(
-	TARGETS conduit_doc
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-)
-
-set(kpalmdoc_SRCS
-	${doc_shared_SRCS}
-	kpalmdoc_dlg.cc
-	kpalmdoc.cpp
-)
-kde3_add_kcfg_files(kpalmdoc_SRCS kpalmdocSettings.kcfgc)
-kde3_add_ui_files(kpalmdoc_SRCS kpalmdoc_dlgbase.ui)
-kde3_automoc(${kpalmdoc_SRCS})
-add_executable(kpalmdoc ${kpalmdoc_SRCS})
-target_link_libraries(kpalmdoc ${QT_LIBRARIES} kpilot kdeui kio)
-kpilot_rpath(kpalmdoc)
-
-install(
-	TARGETS kpalmdoc conduit_doc
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-	RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-)
-
-install(
-	FILES doc_conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
-)
-
-install(
-	FILES docconduit.kcfg kpalmdoc.kcfg DESTINATION ${KDE3_KCFG_DIR}
-)
-
-install(
-	FILES kpalmdoc.desktop DESTINATION ${KDE3_XDG_APPS_DIR}
-)
-
-install(
-	FILES kpalmdoc.upd
-	DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/kconf_update
-)
-
-add_subdirectory(Icons)
diff --git a/kpilot/conduits/docconduit/DOC-converter.cc b/kpilot/conduits/docconduit/DOC-converter.cc
deleted file mode 100644
index 6502fe54..00000000
--- a/kpilot/conduits/docconduit/DOC-converter.cc
+++ /dev/null
@@ -1,631 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-**
-** The doc converter synchronizes text files on the PC with DOC databases on the Palm
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include "options.h"
-#include "DOC-converter.moc"
-
-#include <tqdir.h>
-#include <tqfileinfo.h>
-#include <tqregexp.h>
-#include <tqsortedlist.h>
-
-#include <pilotDatabase.h>
-#include <pilotLocalDatabase.h>
-#include <pilotSerialDatabase.h>
-
-#include "pilotDOCHead.h"
-#include "pilotDOCEntry.h"
-#include "pilotDOCBookmark.h"
-
-
-
-#define min(a,b) (a<b)?(a):(b)
-
-
-
-/****************************************************************************************************
- *  various bookmark classes. Most important is the bmkList  findMatches(TQString) function,
- *  which needs to return a list of all bookmarks found for the given bookmark expression.
- *  A bookmark usually consists of a bookmark text and an offset into the text document.
- ****************************************************************************************************/
-
-
-bool docBookmark::compare_pos=true;
-
-bool operator< ( const docBookmark &s1, const docBookmark &s2)
-{
-	if (docBookmark::compare_pos) { return s1.position<s2.position;}
-	else {return s2.bmkName<s2.bmkName;}
-}
-
-bool operator== ( const docBookmark &s1, const docBookmark &s2)
-{
-	return (s1.position==s2.position) && (s1.bmkName==s2.bmkName);
-}
-
-
-int docMatchBookmark::findMatches(TQString doctext, bmkList &fBookmarks) {
-	FUNCTIONSETUP;
-//	bmkList res;
-	int pos = 0, nr=0, found=0;
-#ifdef DEBUG
-	DEBUGKPILOT<<"Finding matches of "<<pattern<<endl;
-#endif
-
-	while (pos >= 0 && found<to) {
-		pos = doctext.find(pattern, pos);
-#ifdef DEBUG
-		DEBUGKPILOT<<"Result of search: pos="<<pos<<endl;
-#endif
-		if (pos >= 0)
-		{
-			++found;
-			if (found>=from && found<=to) {
-				fBookmarks.append(new docBookmark(pattern, pos));
-				++nr;
-
-			}
-			++pos;
-		}
-	}
-	return nr;
-}
-
-
-
-int docRegExpBookmark::findMatches(TQString doctext, bmkList &fBookmarks)
-{
-	FUNCTIONSETUP;
-//	bmkList res;
-	TQRegExp rx(pattern);
-	int pos = 0, nr=0, found=0;
-
-	while (pos>=0 && found<=to) {
-#ifdef DEBUG
-		DEBUGKPILOT<<"Searching for bookmark "<<pattern<<endl;
-#endif
-		pos=rx.search(doctext, pos);
-		if (pos > -1) {
-			++found;
-			if (found>=from && found<to) {
-				if (capSubexpression>=0) {
-					fBookmarks.append(new docBookmark(/*bmkName.left(16)*/rx.cap(capSubexpression), pos));
-				} else {
-					// TODO: use the subexpressions from the regexp for the bmk name ($1..$9) (given as separate regexp)
-					TQString bmkText(bmkName);
-					for (int i=0; i<=rx.numCaptures(); ++i) {
-						bmkText.replace(CSL1("$%1").arg(i), rx.cap(i));
-						bmkText.replace(CSL1("\\%1").arg(i), rx.cap(i));
-					}
-					fBookmarks.append(new docBookmark(bmkText.left(16), pos));
-				}
-				++nr;
-			}
-			++pos;
-		}
-	}
-	return nr;
-}
-
-
-
-
-
-
-
-
-/*********************************************************************
-                        C O N S T R U C T O R
- *********************************************************************/
-
-
-DOCConverter::DOCConverter(TQObject *parent, const char *name):TQObject(parent,name) {
-	FUNCTIONSETUP;
-	docdb=0L;
-	eSortBookmarks=eSortNone;
-	fBookmarks.setAutoDelete( TRUE );
-}
-
-
-
-DOCConverter::~DOCConverter() {
-	FUNCTIONSETUP;
-}
-
-
-
-
-
-/*********************************************************************
-                S Y N C   S T R U C T U R E
- *********************************************************************/
-
-
-
-void DOCConverter::setTXTpath(TQString path, TQString file) {
-	TQDir dr(path);
-	TQFileInfo pth(dr, file);
-	if (!file.isEmpty())
-		 txtfilename = pth.absFilePath();
-}
-
-
-
-void DOCConverter::setTXTpath(TQString filename) {
-	if (!filename.isEmpty()) txtfilename = filename;
-}
-
-
-
-void DOCConverter::setPDB(PilotDatabase * dbi) {
-	if (dbi) docdb = dbi;
-}
-
-
-
-TQString DOCConverter::readText() {
-	FUNCTIONSETUP;
-	if (txtfilename.isEmpty()) return TQString();
-	TQFile docfile(txtfilename);
-	if (!docfile.open(IO_ReadOnly))
-	{
-		emit logError(i18n("Unable to open text file %1 for reading.").arg(txtfilename));
-		return TQString();
-	}
-
-	TQTextStream docstream(&docfile);
-
-	TQString doc = docstream.read();
-	docfile.close();
-	return doc;
-}
-
-
-
-int DOCConverter::findBmkEndtags(TQString &text, bmkList&fBmks) {
-	FUNCTIONSETUP;
-	// Start from the end of the text
-	int pos = text.length() - 1, nr=0;
-	bool doSearch=true;
-	while (pos >= 0/* && doSearch*/) {
-		DEBUGKPILOT<<"Current character is \'"<<text[pos].latin1()<<"\'"<<endl;
-		// skip whitespace until we reach a >
-		while (text[pos].isSpace() && pos >= 0) {
-			DEBUGKPILOT<<"Skipping whitespaces at the end of the file"<<endl;
-			pos--;
-		}
-		// every other character than a > is assumed to belong to the text, so there are no more bookmarks.
-		if (pos < 0 || text[pos] != '>') {
-			DEBUGKPILOT<<"Current character \'"<<text[pos].latin1()<<"\' at position "<<pos<<" is not and ending >. Finish searching for bookmarks."<<endl;
-
-			pos=-1;
-			break;
-		} else {
-			int endpos = pos;
-			doSearch=true;
-			DEBUGKPILOT<<"Found the ending >, now looking for the opening <"<<endl;
-
-			// Search for the opening <. There must not be a newline in the bookmark text.
-			while (doSearch && pos > 0) {
-//				DEBUGKPILOT<<"pos="<<pos<<", char="<<text[pos].latin1()<<endl;
-				pos--;
-				if (text[pos] == '\n') {
-					DEBUGKPILOT<<"Found carriage return at position "<<pos<<" inside the bookmark text, assuming this is not a bookmark, and the text ends in a >"<<endl;
-					doSearch = false;
-					pos = -1;
-					break;
-				}
-				if (text[pos] == '<') {
-					fBmks.append(new docMatchBookmark(text.mid(pos + 1, endpos - pos - 1)));
-					++nr;
-					DEBUGKPILOT<<"Found opening < at position "<<pos<<", bookmarktext ="<<text.mid(pos+1, endpos-pos-1)<<endl;
-					text.remove(pos, text.length());
-					pos--;
-					doSearch = false;
-				}
-			}
-		}
-		DEBUGKPILOT<<"Finished processing the next bookmark, current position: "<<pos<<endl;
-	}
-	return nr;
-}
-
-int DOCConverter::findBmkInline(TQString &text, bmkList &fBmks) {
-	FUNCTIONSETUP;
-//	bmkList res;
-	int nr=0;
-	TQRegExp rx(CSL1("<\\*(.*)\\*>"));
-
-	rx.setMinimal(TRUE);
-	int pos = 0;
-	while (pos >= 0) {
-		pos = rx.search(text, pos);
-		if (pos >= 0) {
-			fBmks.append(new docBookmark(rx.cap(1), pos+1));
-			++nr;
-			text = text.remove(pos, rx.matchedLength());
-		}
-	}
-	return nr;
-}
-
-int DOCConverter::findBmkFile(TQString &, bmkList &fBmks) {
-	FUNCTIONSETUP;
-	int nr=0;
-
-	TQString bmkfilename = txtfilename;
-	if (bmkfilename.endsWith(CSL1(".txt"))){
-		bmkfilename.remove(bmkfilename.length()-4, 4);
-	}
-	TQString oldbmkfilename=bmkfilename;
-	bmkfilename+=CSL1(BMK_SUFFIX);
-	TQFile bmkfile(bmkfilename);
-	if (!bmkfile.open(IO_ReadOnly)) 	{
-		bmkfilename=oldbmkfilename+CSL1(PDBBMK_SUFFIX);
-		bmkfile.setName(bmkfilename);
-		if (!bmkfile.open(IO_ReadOnly)) {
-			DEBUGKPILOT<<"Unable to open bookmarks file "<<bmkfilename<<" for reading the bookmarks of "<<docdb ->dbPathName()<<endl;
-			return 0;
-		}
-	}
-
-	DEBUGKPILOT<<"Bookmark file: "<<bmkfilename<<endl;
-
-	TQTextStream bmkstream(&bmkfile);
-	TQString line;
-	while ( !(line=bmkstream.readLine()).isEmpty() ) {
-		if (!line.isEmpty() && !line.startsWith(CSL1("#")) ) {
-			TQStringList bmkinfo=TQStringList::split(CSL1(","), line);
-			int fieldnr=bmkinfo.count();
-			// We use the same syntax for the entries as MakeDocJ bookmark files:
-			//   <bookmark>,<string-to-search>,<bookmark-name-string>,<starting-bookmark>,<ending-bookmark>
-			// For an explanation see: http://home.kc.rr.com/krzysztow/PalmPilot/MakeDocJ/index.html
-			if (fieldnr>0){
-				DEBUGKPILOT<<"Working on bookmark \""<<line<<"\""<<endl;
-				docMatchBookmark*bmk=0L;
-				TQString bookmark=bmkinfo[0];
-				bool ok;
-				int pos=bookmark.toInt(&ok);
-				if (ok) {
-					if (fieldnr>1) {
-						TQString name(bmkinfo[1]);
-						DEBUGKPILOT<<"Bookmark \""<<name<<"\" set at position "<<pos<<endl;
-						fBmks.append(new docBookmark(name, pos));
-					}
-				} else if (bookmark==CSL1("-") || bookmark==CSL1("+")) {
-					if (fieldnr>1) {
-						TQString patt(bmkinfo[1]);
-						TQString name(patt);
-						if (fieldnr>2) {
-							int cap=bmkinfo[2].toInt(&ok);
-							if (ok) {
-								bmk=new docRegExpBookmark(patt, cap);
-							} else {
-								name=bmkinfo[2];
-								bmk=new docRegExpBookmark(patt, name);
-							}
-						} else{
-							bmk=new docRegExpBookmark(patt, name);
-						}
-						// The third entry in the line (optional) denotes the index of a capture subexpression (if an integer) or the bookmark text as regexp (if a string)
-						DEBUGKPILOT<<"RegExp Bookmark, pattern="<<patt<<", name="<<name<<endl;
-						if (bmk) {
-							if (bookmark==CSL1("-")) {
-								bmk->from=1;
-								bmk->to=1;
-							} else {
-								if (fieldnr>3) {
-									bool ok;
-									int tmp=bmkinfo[3].toInt(&ok);
-									if (ok) bmk->from=tmp;
-									if (fieldnr>4) {
-										tmp=bmkinfo[4].toInt(&ok);
-										if (ok) bmk->to=tmp;
-									}
-								}
-							}
-							fBmks.append(bmk);
-							bmk=0L;
-						} else {
-							DEBUGKPILOT<<"Could not allocate bookmark "<<name<<endl;
-						}
-					} else {
-						DEBUGKPILOT<<"RegExp bookmark found with no other information (no bookmark pattern nor name)"<<endl;
-					}
-				} else {
-					TQString pattern(bookmark);
-					if (fieldnr>1) pattern=bmkinfo[1];
-					if (fieldnr>2) bookmark=bmkinfo[2];
-					DEBUGKPILOT<<"RegExp Bookmark, pattern="<<pattern<<", name="<<bookmark<<endl;
-					bmk=new docRegExpBookmark(pattern, bookmark);
-					if (bmk) {
-						bmk->from=1;
-						bmk->to=1;
-						fBmks.append(bmk);
-					}
-				}
-			} // fieldnr>0
-		} // !line.isEmpty()
-	} // while
-	return nr;
-}
-
-bool DOCConverter::convertTXTtoPDB() {
-	FUNCTIONSETUP;
-
-	if (!docdb) {
-		emit logError(i18n("Unable to open Database for writing"));
-		return false;
-	}
-
-	TQString text = readText();
-
-	if (fBmkTypes & eBmkEndtags) {
-		findBmkEndtags(text, fBookmarks);
-	}	// end: EndTag Bookmarks
-
-
-	// Search for all tags <* Bookmark text *> in the text. We have to delete them immediately, otherwise the later bookmarks will be off.
-	if (fBmkTypes & eBmkInline) {
-		findBmkInline(text, fBookmarks);
-	}	 // end: Inline Bookmarks
-
-
-	// Read in regular expressions and positions from an external file (doc-filename with extension .bmk)
-	if (fBmkTypes & eBmkFile)
-	{
-		findBmkFile(text, fBookmarks);
-	}
-
-	// Process the bookmarks: find the occurrences of the regexps, and sort them if requested:
-	bmkSortedList pdbBookmarks;
-	pdbBookmarks.setAutoDelete(TRUE);
-	docBookmark*bmk;
-	for (bmk = fBookmarks.first(); bmk; bmk = fBookmarks.next())
-	{
-		bmk->findMatches(text, pdbBookmarks);
-	}
-
-	switch (eSortBookmarks)
-	{
-		case eSortName:
-			docBookmark::compare_pos=false;
-//			qHeapSort(pdbBookmarks);
-			pdbBookmarks.sort();
-			break;
-		case eSortPos:
-			docBookmark::compare_pos=true;
-			pdbBookmarks.sort();
-			break;
-		case eSortNone:
-		default:
-			break;
-	}
-
-#ifdef DEBUG
-	DEBUGKPILOT << "Bookmarks: "<<endl;
-	for (bmk = pdbBookmarks.first(); bmk; bmk = pdbBookmarks.next())
-	{
-		DEBUGKPILOT<<bmk->bmkName.left(20)<<" at position "<<bmk->position<<endl;
-	}
-#endif
-
-	if (!docdb->isOpen()) {
-		emit logError(i18n("Unable to open palm doc database %1").arg(docdb->dbPathName()) );
-		return false;
-	}
-
-	// Clean the whole database, otherwise the records would be just appended!
-	docdb->deleteRecord(0, true);
-
-	// Header record for the doc file format
-	PilotDOCHead docHead;
-	docHead.position=0;
-	docHead.recordSize=4096;
-	docHead.spare=0;
-	docHead.storyLen=text.length();
-	docHead.version=compress?DOC_COMPRESSED:DOC_UNCOMPRESSED;
-	docHead.numRecords=(int)( (text.length()-1)/docHead.recordSize)+1;
-	PilotRecord*rec=docHead.pack();
-	docdb->writeRecord(rec);
-	KPILOT_DELETE(rec);
-
-	DEBUGKPILOT << "Write header record: length="<<text.length()<<", compress="<<compress<<endl;
-
-	// First compress the text, then write out the bookmarks and - if existing - also the annotations
-	int len=text.length();
-	int start=0,reclen=0;
-	int recnum=0;
-	while (start<len)
-	{
-		reclen=min(len-start, PilotDOCEntry::TEXT_SIZE);
-		DEBUGKPILOT << "Record #"<<recnum<<", reclen="<<reclen<<", compress="<<compress<<endl;
-
-		PilotDOCEntry recText;
-//		recText.setText(text.mid(start, reclen), reclen);
-		recText.setText(text.mid(start, reclen));
-//		if (compress)
-		recText.setCompress(compress);
-		PilotRecord*textRec=recText.pack();
-		docdb->writeRecord(textRec);
-		++recnum;
-		start+=reclen;
-		KPILOT_DELETE(textRec);
-	}
-
-	recnum=0;
-	// Finally, write out the bookmarks
-	for (bmk = pdbBookmarks.first(); bmk; bmk = pdbBookmarks.next())
-//	for (bmkList::const_iterator it=pdbBookmarks.begin(); it!=pdbBookmarks.end(); ++it)
-	{
-		++recnum;
-		DEBUGKPILOT << "Bookmark #"<<recnum<<", Name="<<bmk->bmkName.left(20)<<", Position="<<bmk->position<<endl;
-
-		PilotDOCBookmark bmkEntry;
-		bmkEntry.pos=bmk->position;
-		strncpy(&bmkEntry.bookmarkName[0], bmk->bmkName.latin1(), 16);
-		PilotRecord*bmkRecord=bmkEntry.pack();
-		docdb->writeRecord(bmkRecord);
-		KPILOT_DELETE(bmkRecord);
-	}
-
-	pdbBookmarks.clear();
-	fBookmarks.clear();
-
-	return true;
-}
-
-
-
-bool DOCConverter::convertPDBtoTXT()
-{
-	FUNCTIONSETUP;
-	if (txtfilename.isEmpty()) {
-		emit logError(i18n("No filename set for the conversion"));
-		return false;
-	}
-
-	if (!docdb) {
-		emit logError(i18n("Unable to open Database for reading"));
-		return false;
-	}
-
-	// The first record of the db is the document header containing information about the doc db
-	PilotRecord*headerRec = docdb->readRecordByIndex(0);
-	if (!headerRec)
-	{
-		emit logError(i18n("Unable to read database header for database %1.").arg(docdb->dbPathName()));
-		KPILOT_DELETE(docdb);
-		return false;
-	}
-	PilotDOCHead header(headerRec);
-	KPILOT_DELETE(headerRec);
-
-	DEBUGKPILOT<<"Database "<<docdb->dbPathName()<<" has "<<header.numRecords<<" text records, "<<endl
-		<<" total number of records: "<<docdb->recordCount()<<endl
-		<<" position="<<header.position<<endl
-		<<" recordSize="<<header.recordSize<<endl
-		<<" spare="<<header.spare<<endl
-		<<" storyLen="<<header.storyLen<<endl
-//		<<" textRecordSize="<<header.textRecordSize<<endl
-		<<" version="<<header.version<<endl;
-
-	// next come the header.numRecords real document records (might be compressed, see the version flag in the header)
-	TQFile docfile(txtfilename);
-	if (!docfile.open(IO_WriteOnly))
-	{
-		emit logError(i18n("Unable to open output file %1.").arg(txtfilename));
-		KPILOT_DELETE(docdb);
-		return false;
-	}
-	TQString doctext;
-	for (int i=1; i<header.numRecords+1; ++i)
-	{
-		PilotRecord*rec=docdb->readRecordByIndex(i);
-		if (rec)
-		{
-			PilotDOCEntry recText(rec, header.version==DOC_COMPRESSED);
-			doctext.append(recText.getText());
-			DEBUGKPILOT<<"Record "<<i<<endl;
-			KPILOT_DELETE(rec);
-		} else {
-			emit logMessage(i18n("Could not read text record #%1 from Database %2").arg(i).arg(docdb->dbPathName()));
-		}
-	}
-
-	// After the document records possibly come a few bookmark records, so read them in and put them in a separate bookmark file.
-	// for the ztxt conduit there might be annotations after the bookmarks, so the upper bound needs to be adapted.
-	int upperBmkRec=docdb->recordCount();
-	bmkSortedList bmks;
-	bmks.setAutoDelete(TRUE);
-	for (int i=header.numRecords+1; i<upperBmkRec; ++i)
-	{
-		PilotRecord*rec=docdb->readRecordByIndex(i);
-		if (rec)
-		{
-			PilotDOCBookmark bookie(rec);
-			docBookmark*bmk=new docBookmark(TQString::fromLatin1(bookie.bookmarkName), bookie.pos);
-			bmks.append(bmk);
-			KPILOT_DELETE(rec);
-		} else {
-			emit logMessage(i18n("Could not read bookmark record #%1 from Database %2").arg(i).arg(docdb->dbPathName()));
-		}
-	}
-	// TODO: Sort the list of bookmarks according to their position
-	docBookmark::compare_pos=true;
-	bmks.sort();
-
-	if ((fBmkTypes & eBmkFile) && (bmks.count()>0))
-	{
-		TQString bmkfilename = docfile.name();
-		if (bmkfilename.endsWith(CSL1(".txt"))){
-			bmkfilename.remove(bmkfilename.length()-4, 4);
-		}
-		bmkfilename+=CSL1(PDBBMK_SUFFIX);
-		TQFile bmkfile(bmkfilename);
-		if (!bmkfile.open(IO_WriteOnly))
-		{
-			emit logError(i18n("Unable to open file %1 for the bookmarks of %2.")
-				.arg(bmkfilename).arg(docdb ->dbPathName()));
-		}
-		else
-		{
-			DEBUGKPILOT<<"Writing "<<upperBmkRec-header.numRecords<<
-				"("<<upperBmkRec<<") bookmarks to file "<<bmkfilename<<endl;
-			TQTextStream bmkstream(&bmkfile);
-			for (docBookmark*bmk=bmks.first(); bmk; bmk=bmks.next())
-			{
-				bmkstream<<bmk->position<<", "<<bmk->bmkName<<endl;
-			}
-			//bmkstream.close();
-			bmkfile.close();
-		}
-	}
-	if (fBmkTypes & eBmkInline)
-	{
-		for (docBookmark*bmk=bmks.last(); bmk; bmk=bmks.prev())
-		{
-			doctext.insert(bmk->position, TQString(CSL1("<*") +
-				bmk->bmkName +
-				CSL1("*>")));
-		}
-	}
-
-	// Finally, write the actual text out to the file.
-	TQTextStream docstream(&docfile);
-	docstream<<doctext;
-	//docstream.close();
-	docfile.close();
-	docdb->cleanup();
-	// reset all records to unchanged. I don't know if this is really such a wise idea?
-	docdb->resetSyncFlags();
-	return true;
-}
-
-
diff --git a/kpilot/conduits/docconduit/DOC-converter.h b/kpilot/conduits/docconduit/DOC-converter.h
deleted file mode 100644
index 802d60f2..00000000
--- a/kpilot/conduits/docconduit/DOC-converter.h
+++ /dev/null
@@ -1,183 +0,0 @@
-#ifndef _DOC_CONVERTER_H
-#define _DOC_CONVERTER_H
-/* DOC-converter.h                           KPilot
-**
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-
-#define DOC_UNCOMPRESSED 1
-#define DOC_COMPRESSED 2
-
-
-#define BMK_SUFFIX ".bmk"
-#define PDBBMK_SUFFIX ".bm"
-
-#include <tqptrlist.h>
-#include <tqobject.h>
-
-class PilotDatabase;
-
-
-/****************************************************************************************************
- *  various bookmark classes. Most important is the bmkList  findMatches(TQString, bmkList &) function,
- *  which needs to return a list of all bookmarks found for the given bookmark expression.
- *  A bookmark usually consists of a bookmark text and an offset into the text document.
- ****************************************************************************************************/
-
-class docBookmark;
-#define bmkList TQPtrList<docBookmark>
-#define bmkSortedList TQSortedList<docBookmark>
-
-class docBookmark {
-public:
-	static bool compare_pos;
-	docBookmark():bmkName(), position(0) { };
-	docBookmark(TQString name, long int pos):bmkName(name), position(pos) { };
-	docBookmark(const docBookmark &bmk):bmkName(bmk.bmkName),position(bmk.position){};
-	virtual ~ docBookmark() { };
-	virtual int findMatches(TQString, bmkList &fBookmarks) {
-		FUNCTIONSETUP;
-		fBookmarks.append(new docBookmark(*this));
-		return 1;
-	};
-
-	TQString bmkName;
-	long int position;
-};
-
-class docMatchBookmark:public docBookmark {
- public:
-	docMatchBookmark():docBookmark() { from=0; to=100;};
-	docMatchBookmark(TQString pattrn, int options=0):docBookmark(),
-		pattern(pattrn), opts(options) { from=0; to=100; };
-	docMatchBookmark(TQString pattrn, TQString bmkname,
-		int options=0):docBookmark(bmkname, 0), pattern(pattrn),
-		opts(options) { from=0; to=100; };
-	virtual ~ docMatchBookmark() { };
-
-	virtual int findMatches(TQString, bmkList &fBookmarks);
-	TQString pattern;
-	int opts;
-	int from, to;
-};
-
-class docRegExpBookmark:public docMatchBookmark {
- public:
-	docRegExpBookmark():docMatchBookmark() { capSubexpression=-1;};
-	docRegExpBookmark(TQString regexp, int cap=0,
-		int options=0):docMatchBookmark(regexp, options) {capSubexpression=cap; };
-	docRegExpBookmark(TQString pattrn, TQString bmkname,
-		int options=0):docMatchBookmark(pattrn, bmkname, options) { capSubexpression=-1; };
-	virtual ~ docRegExpBookmark() { };
-
-	virtual int findMatches(TQString, bmkList &fBookmarks);
-	int capSubexpression;
-};
-
-
-/*************************************************************************************************************
- *  The converter class that does the real work for us.
- *************************************************************************************************************/
-
-class DOCConverter:public TQObject {
-Q_OBJECT
-private:
-	PilotDatabase * docdb;
-	TQString txtfilename;
-	TQString bmkfilename;
-	bool compress;
-
-	bmkList fBookmarks;
-public:
-	enum eSortBookmarksEnum
-	{
-		eSortNone,
-		eSortPos,
-		eSortName
-	} eSortBookmarks;
-
-public:
-	 DOCConverter(TQObject *parent=0L, const char *name=0L);
-	 virtual ~ DOCConverter();
-
-	TQString readText();
-	void setTXTpath(TQString path, TQString file);
-	void setTXTpath(TQString filename);
-	void setPDB(PilotDatabase * dbi);
-	TQString txtFilename() const {return txtfilename;}
-	TQString bmkFilename() const {return bmkfilename;}
-	void setBmkFilename(TQString bmkf) { bmkfilename=bmkf;}
-
-	bool getCompress() const { return compress; };
-	void setCompress(bool newcomp) {compress=newcomp;};
-
-	bool convertTXTtoPDB();
-	bool convertPDBtoTXT();
-
-	int setBookmarks(bmkList bookmarks) {
-		fBookmarks = bookmarks;
-		return fBookmarks.count();
-	};
-	int clearBookmarks() {
-		fBookmarks.clear();
-		return fBookmarks.count();
-	};
-	int addBookmark(docBookmark*bookmark) {
-		fBookmarks.append(bookmark);
-		return fBookmarks.count();
-	};
-
-	int findBmkEndtags(TQString &, bmkList&);
-	int findBmkInline(TQString &, bmkList&);
-	int findBmkFile(TQString &, bmkList&);
-
-
-	void setSort(enum eSortBookmarksEnum sort) {eSortBookmarks=sort;}
-	enum eSortBookmarksEnum getSort() {return eSortBookmarks;}
-
-	enum eBmkTypesEnum {
-		eBmkNone = 0,
-		eBmkFile = 1,
-		eBmkInline = 2,
-		eBmkEndtags = 4,
-		eBmkDefaultBmkFile = 8
-	} fBmkTypes;
-	void setBookmarkTypes(int types) {
-		fBmkTypes = (eBmkTypesEnum) types;
-	};
-
-protected:
-	int findBookmarks();
-
-private:
-	void readConfig();
-signals:
-	void logMessage(const TQString &);
-	void logError(const TQString &);
-};
-
-#endif
diff --git a/kpilot/conduits/docconduit/Icons/CMakeLists.txt b/kpilot/conduits/docconduit/Icons/CMakeLists.txt
deleted file mode 100644
index 3d1034d4..00000000
--- a/kpilot/conduits/docconduit/Icons/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-
-kde3_install_icons_custom( hicolor )
-
diff --git a/kpilot/conduits/docconduit/Icons/Makefile.am b/kpilot/conduits/docconduit/Icons/Makefile.am
deleted file mode 100644
index f371f4ae..00000000
--- a/kpilot/conduits/docconduit/Icons/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-METASOURCES = AUTO
-
-kpalmdocicondir = $(kde_datadir)/kpilot/icons
-kpalmdocicon_ICON = kpalmdoc
-
-KDE_ICON = kpalmdoc
-
diff --git a/kpilot/conduits/docconduit/Icons/cr16-app-kpalmdoc.png b/kpilot/conduits/docconduit/Icons/cr16-app-kpalmdoc.png
deleted file mode 100644
index 0f5fb75d..00000000
--- a/kpilot/conduits/docconduit/Icons/cr16-app-kpalmdoc.png
+++ /dev/null
diff --git a/kpilot/conduits/docconduit/Icons/cr22-app-kpalmdoc.png b/kpilot/conduits/docconduit/Icons/cr22-app-kpalmdoc.png
deleted file mode 100644
index d93aa4ba..00000000
--- a/kpilot/conduits/docconduit/Icons/cr22-app-kpalmdoc.png
+++ /dev/null
diff --git a/kpilot/conduits/docconduit/Icons/cr32-app-kpalmdoc.png b/kpilot/conduits/docconduit/Icons/cr32-app-kpalmdoc.png
deleted file mode 100644
index 09a7020b..00000000
--- a/kpilot/conduits/docconduit/Icons/cr32-app-kpalmdoc.png
+++ /dev/null
diff --git a/kpilot/conduits/docconduit/Icons/cr48-app-kpalmdoc.png b/kpilot/conduits/docconduit/Icons/cr48-app-kpalmdoc.png
deleted file mode 100644
index 41cb3b9b..00000000
--- a/kpilot/conduits/docconduit/Icons/cr48-app-kpalmdoc.png
+++ /dev/null
diff --git a/kpilot/conduits/docconduit/Makefile.am b/kpilot/conduits/docconduit/Makefile.am
deleted file mode 100644
index 77df2b61..00000000
--- a/kpilot/conduits/docconduit/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-### Makefile for KPilot's doc  conduit
-###
-### The doc conduit is Copyright (C) 2002 by Reinhold Kainhofer
-### the files makedoc9.{h,cpp} are also Copyright (C) 2000 by Pat Beirne
-
-SUBDIRS = Icons
-
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
-METASOURCES = AUTO
-
-
-servicedir = $(kde_servicesdir)
-service_DATA = doc_conduit.desktop
-
-noinst_LTLIBRARIES = libpalmdoc_shared.la
-kde_module_LTLIBRARIES = conduit_doc.la
-bin_PROGRAMS = kpalmdoc
-
-libpalmdoc_shared_la_SOURCES = makedoc9.cc pilotDOCHead.cc pilotDOCEntry.cc pilotDOCBookmark.cc DOC-converter.cc
-
-conduit_doc_la_SOURCES = docconduitSettings.kcfgc doc-factory.cc doc-setup.cc doc-conduit.cc doc-setupdialog.ui doc-conflictdialog.cc
-conduit_doc_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-conduit_doc_la_LIBADD = ../../lib/libkpilot.la libpalmdoc_shared.la \
-	$(LIB_KDEUI) $(LIB_KFILE)
-
-##libpalmdoc_shared.la
-
-kpalmdoc_SOURCES = kpalmdocSettings.kcfgc kpalmdoc_dlgbase.ui kpalmdoc_dlg.cc kpalmdoc.cpp
-kpalmdoc_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH)
-kpalmdoc_LDADD = $(LIB_KFILE) $(PISOCK_LIB) ../../lib/libkpilot.la libpalmdoc_shared.la
-
-xdg_apps_DATA = kpalmdoc.desktop
-servicetypedir = $(kde_servicetypesdir)
-kde_kcfg_DATA = docconduit.kcfg kpalmdoc.kcfg
-
-update_DATA = kpalmdoc.upd
-updatedir = $(kde_datadir)/kconf_update
-
diff --git a/kpilot/conduits/docconduit/bmkSpecification.txt b/kpilot/conduits/docconduit/bmkSpecification.txt
deleted file mode 100644
index f8a68d96..00000000
--- a/kpilot/conduits/docconduit/bmkSpecification.txt
+++ /dev/null
@@ -1,199 +0,0 @@
-KPilot PalmDoc Conduit bookmark Specification
-=============================================
-
-(c) 2003 Reinhold Kainhofer, reinhold@kainhofer.com
-
-This document is licensed under the FDL (Free Documentation License) 
-as published by the FSF. Any version of the FDL can be applied 
-at your convenience.
-
-
-
-
-The PalmDoc conduit has three ways to indicate bookmarks for a text:
-  -) Inline tags of the form <* bookmarkname *>
-	-) Endtags of the form <bookmarkname> at the end of the document
-	-) Regular expressions in a separate textname.bmk file 
-	   (textname.bmk ist the filename of the text with the .txt replaced by .bmk)
-		 
-
-In the design of the .bmk file, I tried to stay close to the 
-syntac of MakeDocJ bookmark files, but it turned out that I 
-needed to extend the syntax a little. Also, MakeDocJ uses Java 
-RegExps, while the PalmDoc conduit uses the QRegExp, which have
-some slight differences (especially concerning the ^ and $ 
-patterns as well as backreferences). So if you used MakeDocJ, 
-the .bmk file syntax will be quite familiar, but you will still
-have to adapt your bookmark files for Qt regular expressions 
-instead of Java regular expressions
-
- 
-		 
-1) INLINE TAGS
-
-Whenever a tag of the form <* someText *> appears in the text, 
-this sequence is removed from the text, and a bookmark is set 
-there with the bookmark name "someText" (the part between the 
-<* and the *>).
-
-
-2) ENDTAGS
-
-If the text ends with tags of the form <someText>, the string 
-in braces is used as bookmark name, and wherever it appears in 
-the text, a bookmark is set. 
-After the > any number of whitespace is allowed, but no other 
-characters like letters, numbers, or punctuation. Also, inside 
-the braces no line break must occur. The conduit searches the 
-text from the end and if it finds a line break inside a <...> 
-sequence, the tag and everything before it is assumed to belong 
-to the text and doesn't form a bookmark tag. 
-Between endtags any number of whitespace (spaces, tabs, line 
-feeds etc.) is allowed.
-
-As an example, assume you have a text ending in:
-... the bad guy was punished, and they lived happily 
-ever after! 
-<Tag with
-line feed>
-       <bad guy> <princess>
-<married>
-
-The conduit starts at the end, ignores all whitespace between 
-the tags, so it finds the tags "married", "princess", and "bad guy". 
-The "Tag with line feed" has a line feed, so it is assumed to belong 
-to the text. 
-Assume now you have a text ending in:
-... the bad guy was punished, and they lived happily 
-ever after! 
-<bad guy> The End <princess>
-<married>
-
-Here, only "married" and "princess" are found as bookmarks. Because 
-of the letters before the "princess" tags, the search for the 
-bookmarks ends at the letter "d" of "The End" (the conduit starts 
-from the end and moves backward until it finds some text which 
-cannot be seen as a endtag.
-
-
-
-
-3) REGULAR EXPRESSIONS IN A SEPARATE FILE
-
-This is by far the most complex way to specify bookmarks, but 
-it is also the mose powerful. 
-If you have a text with filename "My fairy tale.txt", the 
-bookmarks will be specified in a file called "My fairy tale.bmk" 
-(just the text filename with the .txt replaced by .bmk). This 
-file contains the bookmark definitions, one in each line. Lines 
-starting with a # are seen as comments, and empty lines are also 
-ignored.
-
-
-In the .bmk file, each bookmark line has one of the following syntaces 
-(I will explain all fields later on). Fields in [..] are optional:
-
-bmkName
-bmkPosition, bmkName
-+, bmkPatternRegExp[, bmkNameAsString[, firstIncludedBmk[, lastIncludedBmk]]]
-+, bmkPatternRegExp[, bmkNameIndexOfSubexpression[, firstIncludedBmk[, lastIncludedBmk]]]
--, bmkPatternRegExp[, bmkNameAsString]
--, bmkPatternRegExp[, bmkNameIndexOfSubexpression]
-
-  If the first field is a string, it is used as the bookmark name 
-and pattern to search for. 
-  If the first field is a number, it means the position of the 
-bookmark, and the second field is the name of the bookmark.
-  If the first field is either + or -, the second field gives 
-a regular expression that is used to find the position of the 
-bookmark. If the first field is a -, the search is done only 
-once and only the first match will be added as bookmark. If 
-the first field is a +, the search is done until the regular 
-expression can no longer be found (the fourth and fifth fields 
-can be used to include only a certain range of hits). If there 
-is a third field, and it is a string, it gives the name of the 
-bookmark as a regular expression (i.e. \1 are replaced by the 
-first subexpression of the search, where subexpressions are 
-specified by round brackets in the regexp of the second field). 
-If there is a third field, and it is a number, it gives the index 
-of the subexpression of bmkPatternRegExp that is used as the 
-bookmark name.
-If there is no third field, the whole matched text will be used 
-as bookmark name.
-The optional fourth and fifth fields can be used to set bookmarks 
-only after the first few ocurrences of the regexp in the text, and 
-to stop the search after the expression has been found a certain 
-number of times.
-
-
-
-If the PDB->PC sync is set up to store the bookmarks in a bookmark file, 
-it will create a file "My fairy tale.bm" (no "k") with entries of the form
-position,bmkName
-The .bmk file will be used if it exists, but if no .bmk file exists, the .bm file
-will be used. This way you can override the bookmark settings, while 
-at the same time the PDB->TXT sync does not destroy your possibly 
-existing .bmk file.
-
-
-
-Examples:
-
-1) Imagine you have a line like:
-frog princess
-In this case, the text is searched for "frog princess", and a 
-bookmark is set whenever "frog princess" occurs in the text. 
-The name of each of these bookmarks will be "frog princess".
-
-2) A bookmark line:
-55, Bookmark at offset 55
-Here, a bookmark will be set at offset 55 (55th character of 
-the text), and it will have the name "Bookmark at offs" (truncated 
-to 16 characters)
-
-3) A bookmark line
--,Chapter \d+
-causes a bookmark to be set at the first ocurrence of "Chapter XXX", 
-where XXX denotes one or more digits. The bookmark name will be 
-"Chapter XXX" (XXX replaced by the actual digits).
-
-4) A bookmark line
-+,Chapter \d+
-causes bookmarks to be set wherever "Chapter XXX" (XXX being one 
-or more digits) appears in the text. The bookmark name will again 
-be "Chapter XXX", but the search does not stop after the first hit.
-
-5) A bookmark line
-+,\n\s*(Chapter \d+)\D+, 1
-causes a bookmark to be set whenever a new line starts with 
-"Chapter XXX" (whitespace is allowed before the "Chapter"), and 
-uses the first subexpression in (..) as the bookmark name. If you 
-have a passage 
-     Chapter 15: here it starts
-The regular expression will match, so a bookmark will be set there 
-and the subexpression "Chapter 15" (which matches the (Chapter \d+) ) 
-will be used as bookmark text.
-
-6) A bookmark line
-+,\n\s*Part (\d+),\1\. part
-sets a bookmark whenever a line starts with "Part XXX". The XXX 
-will be stored as the first matched subexpression. The third field 
-"\1\. part" is the regular expression for the bookmark name, where 
-\1 is replaced by the first matched subexpression of the search (XXX 
-in this case). So if a line starts with "   Part 17: ", the bookmark 
-name will be "17. part".
-
-7) A bookmark line
-+,Table (\d+): ,\1\. Tabelle,5,25
-will match whenever "Table XXX: " appears in the text, and the bookmark 
-name will be "XXX. Tabelle". However, the fourth field means that the 
-first four hits are ignored (the 5th hit is the first hit to be included 
-as a bookmark), and the fifth field means that all further hits after the 
-25th will be ignored, too.
-
-8) In law texts, I use a regular expression
-+,\n *(§\.? *\d+[a-z]?\.?) +, 1
-to search for all paragraphs starting like "§. 15. " or "  §23 ", and set
-a bookmark there using only the part from the § to the last digit or the 
-full stop after the last digit (the pattern between the (), in our two 
-cases the bookmark names will be "§. 15." and "§23" ).
diff --git a/kpilot/conduits/docconduit/doc-conduit.cc b/kpilot/conduits/docconduit/doc-conduit.cc
deleted file mode 100644
index fbaa22f5..00000000
--- a/kpilot/conduits/docconduit/doc-conduit.cc
+++ /dev/null
@@ -1,1018 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** The doc conduit synchronizes text files on the PC with DOC databases on the Palm
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org.
-*/
-
-
-// naming of the bookmark file:
-// PDB->TXT:	convert bookmarks to a .bm file
-// TXT->PDB:	If a .bmk file exists, use it, otherwise use the .bm file (from the PDB->TXT conversion)
-//			This way, the bookmark file is not overwritten, a manual bookmark file overrides, but the bookmarks from the handheld are still available
-
-
-#include "options.h"
-#include "doc-conduit.moc"
-
-#include <tqtimer.h>
-#include <tqdir.h>
-
-#include <kconfig.h>
-#include <kmdcodec.h>
-
-#include <pilotLocalDatabase.h>
-#include <pilotSerialDatabase.h>
-
-#include "doc-factory.h"
-#include "doc-conflictdialog.h"
-#include "DOC-converter.h"
-#include "pilotDOCHead.h"
-#include "docconduitSettings.h"
-
-
-// Something to allow us to check what revision
-// the modules are that make up a binary distribution.
-extern "C"
-{
-unsigned long version_conduit_doc = Pilot::PLUGIN_API;
-}
-
-TQString dirToString(eSyncDirectionEnum dir) {
-	switch(dir) {
-//		case eSyncAll: return "eSyncAll";
-		case eSyncPDAToPC: return CSL1("eSyncPDAToPC");
-		case eSyncPCToPDA: return CSL1("eSyncPCToPDA");
-		case eSyncNone: return CSL1("eSyncNone");
-		case eSyncConflict: return CSL1("eSyncConflict");
-		case eSyncDelete: return CSL1("eSyncDelete");
-		default: return CSL1("ERROR");
-	}
-}
-
-
-/*********************************************************************
-                        C O N S T R U C T O R
- *********************************************************************/
-
-
-DOCConduit::DOCConduit(KPilotLink * o,
-	const char *n, const TQStringList & a):ConduitAction(o, n, a)
-{
-	FUNCTIONSETUP;
-	fConduitName=i18n("DOC");
-}
-
-
-
-DOCConduit::~DOCConduit()
-{
-	FUNCTIONSETUP;
-}
-
-
-bool DOCConduit::isCorrectDBTypeCreator(DBInfo dbinfo) {
-	return dbinfo.type == dbtype() && dbinfo.creator == dbcreator();
-}
-const unsigned long DOCConduit::dbtype() {
-	return get_long(DOCConduitFactory::dbDOCtype);
-}
-const unsigned long DOCConduit::dbcreator() {
-	return get_long(DOCConduitFactory::dbDOCcreator);
-}
-
-
-
-/*********************************************************************
-                L O A D I N G   T H E   D A T A
- *********************************************************************/
-
-
-
-void DOCConduit::readConfig()
-{
-	FUNCTIONSETUP;
-	DOCConduitSettings::self()->readConfig();
-
-	eConflictResolution = (enum eSyncDirectionEnum) (DOCConduitSettings::conflictResolution() );
-	fTXTBookmarks = DOCConverter::eBmkNone;
-	if ( DOCConduitSettings::convertBookmarks() )
-	{
-		if ( DOCConduitSettings::bmkFileBookmarks() )
-			fTXTBookmarks |= DOCConverter::eBmkFile;
-		if ( DOCConduitSettings::inlineBookmarks() )
-			fTXTBookmarks |= DOCConverter::eBmkInline;
-		if ( DOCConduitSettings::endtagBookmarks() )
-			fTXTBookmarks |= DOCConverter::eBmkEndtags;
-	}
-
-	eSyncDirection = (enum eSyncDirectionEnum)(DOCConduitSettings::syncDirection() );
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Settings "
-		<< " tXTDirectory=" << DOCConduitSettings::tXTDirectory()
-		<< " pDBDirectory=" << DOCConduitSettings::pDBDirectory()
-		<< " keepPDBLocally=" << DOCConduitSettings::keepPDBsLocally()
-		<< " eConflictResolution=" << eConflictResolution
-		<< " tXTBookmarks=" << fTXTBookmarks
-		<< " pDBBookmarks=" << DOCConduitSettings::bookmarksToPC()
-		<< " compress=" << DOCConduitSettings::compress()
-		<< " eSyncDirection=" << eSyncDirection << endl;
-#endif
-}
-
-
-
-bool DOCConduit::pcTextChanged(TQString txtfn)
-{
-	FUNCTIONSETUP;
-	// How do I find out if a text file has changed shince we last synced it??
-	// Use KMD5 for now. If I realize it is too slow, then I have to go back to comparing modification times
-	// if there is no config setting yet, assume the file has been changed. the md5 sum will be written to the config file after the sync.
-	TQString oldDigest=DOCConduitSettings::self()->config()->readEntry(txtfn);
-	if (oldDigest.length()<=0)
-	{
-		return true;
-	}
-#ifdef DEBUG
-	DEBUGKPILOT<<"Old digest is "<<oldDigest<<endl;
-#endif
-
-	KMD5 docmd5;
-	TQFile txtfile(txtfn);
-	if (txtfile.open(IO_ReadOnly)){
-		docmd5.update(txtfile);
-		TQString thisDigest(docmd5.hexDigest() /* .data() */);
-#ifdef DEBUG
-		DEBUGKPILOT<<"New digest is "<<thisDigest<<endl;
-#endif
-		return (thisDigest.length()<=0) || (thisDigest!=oldDigest);
-	} else {
-		// File does not exist. This should actually never happen. Anyways, just return true to indicate it has changed.
-		// doSync should detect this and delete the doc from the handheld.
-		return true;
-	}
-	return false;
-}
-
-
-
-bool DOCConduit::hhTextChanged(PilotDatabase*docdb)
-{
-	FUNCTIONSETUP;
-	if (!docdb) return false;
-
-	PilotRecord *firstRec = docdb->readRecordByIndex(0);
-	PilotDOCHead docHeader(firstRec);
-	KPILOT_DELETE(firstRec);
-
-	int storyRecs = docHeader.numRecords;
-
-	// determine the index of the next modified record (does it lie
-	// beyond the actual text records?)
-	int modRecInd=-1;
-	PilotRecord*modRec=docdb->readNextModifiedRec(&modRecInd);
-#ifdef DEBUG
-	DEBUGKPILOT<<"Index of first changed record: "<<modRecInd<<endl;
-#endif
-
-	KPILOT_DELETE(modRec);
-	// if the header record was changed, find out which is the first changed
-	// real document record:
-	if (modRecInd==0) {
-		modRec=docdb->readNextModifiedRec(&modRecInd);
-#ifdef DEBUG
-		DEBUGKPILOT<<"Reread Index of first changed records: "<<modRecInd<<endl;
-#endif
-		KPILOT_DELETE(modRec);
-	}
-
-	// The record index starts with 0, so only a negative number means
-	// no modified record was found
-	if (modRecInd >= 0) {
-#ifdef DEBUG
-		DEBUGKPILOT<<"Handheld side has changed, condition="<<
-			((!DOCConduitSettings::ignoreBmkChanges()) || (modRecInd <= storyRecs))<<endl;
-#endif
-		if ((!DOCConduitSettings::ignoreBmkChanges()) || (modRecInd <= storyRecs))
-			return true;
-	} else {
-#ifdef DEBUG
-		DEBUGKPILOT<<"Handheld side has NOT changed!"<<endl;
-#endif
-		return false;
-	}
-	return false;
-}
-
-
-
-/*********************************************************************
- *     Helper functions
- ********************************************************************/
-
-TQString DOCConduit::constructPDBFileName(TQString name) {
-	FUNCTIONSETUP;
-	TQString fn;
-	TQDir dr(DOCConduitSettings::pDBDirectory());
-	TQFileInfo pth(dr, name);
-	if (!name.isEmpty()) fn=pth.absFilePath()+CSL1(".pdb");
-	return fn;
-}
-TQString DOCConduit::constructTXTFileName(TQString name) {
-	FUNCTIONSETUP;
-	TQString fn;
-	TQDir dr( DOCConduitSettings::tXTDirectory() );
-	TQFileInfo pth(dr, name);
-	if (!name.isEmpty()) fn=pth.absFilePath()+CSL1(".txt");
-	return fn;
-}
-
-
-
-
-
-/*********************************************************************
-                S Y N C   S T R U C T U R E
- *********************************************************************/
-
-
-
-
-
-/* virtual */ bool DOCConduit::exec()
-{
-	FUNCTIONSETUP;
-
-	readConfig();
-	dbnr=0;
-
-	emit logMessage(i18n("Searching for texts and databases to synchronize"));
-
-	TQTimer::singleShot(0, this, TQT_SLOT(syncNextDB()));
-	return true;
-}
-
-
-
-bool DOCConduit::doSync(docSyncInfo &sinfo)
-{
-	FUNCTIONSETUP;
-	bool res=false;
-
-	if (sinfo.direction==eSyncDelete) {
-		if (!sinfo.txtfilename.isEmpty()) {
-			if (!TQFile::remove(sinfo.txtfilename)) {
-				WARNINGKPILOT << "Unable to delete the text file " << sinfo.txtfilename << " on the PC" << endl;
-			}
-			TQString bmkfilename = sinfo.txtfilename;
-			if (bmkfilename.endsWith(CSL1(".txt"))){
-				bmkfilename.remove(bmkfilename.length()-4, 4);
-			}
-			bmkfilename+=CSL1(PDBBMK_SUFFIX);
-			if (!TQFile::remove(bmkfilename)) {
-#ifdef DEBUG
-				DEBUGKPILOT<<"Could not remove bookmarks file "<<bmkfilename<<" for database "<<sinfo.handheldDB<<endl;
-#endif
-			}
-		}
-		if (!sinfo.pdbfilename.isEmpty() && DOCConduitSettings::keepPDBsLocally() ) {
-			PilotLocalDatabase*database=new PilotLocalDatabase(DOCConduitSettings::pDBDirectory(),
-				TQString::fromLatin1(sinfo.dbinfo.name), false);
-			if (database) {
-				if ( database->deleteDatabase() !=0 ) {
-					WARNINGKPILOT << "Unable to delete database " << sinfo.dbinfo.name << " on the PC" << endl;
-				}
-				KPILOT_DELETE(database);
-			}
-		}
-		if (!DOCConduitSettings::localSync()) {
-			PilotDatabase *database=deviceLink()->database( sinfo.dbinfo.name );
-			if ( database->deleteDatabase() !=0 ) {
-					WARNINGKPILOT << "Unable to delete database " << sinfo.dbinfo.name << " from the handheld" << endl;
-			}
-			KPILOT_DELETE(database);
-		}
-		return true;
-	}
-	// preSyncAction should initialize the custom databases/files for the
-	// specific action chosen for this db and return a pointer to a docDBInfo
-	// instance which points either to a local database or a database on the handheld.
-	PilotDatabase *database = preSyncAction(sinfo);
-
-	if (database && ( !database->isOpen() ) ) {
-#ifdef DEBUG
-		DEBUGKPILOT<<"Database "<<sinfo.dbinfo.name<<" does not yet exist. Creating it:"<<endl;
-#endif
-		if (!database->createDatabase(dbcreator(), dbtype()) ) {
-#ifdef DEBUG
-			DEBUGKPILOT<<"Failed"<<endl;
-			emit logMessage(i18n("Database created."));
-#endif
-		}
-	}
-
-	if (database && database->isOpen()) {
-		DOCConverter docconverter;
-		connect(&docconverter, TQT_SIGNAL(logError(const TQString &)), TQT_SIGNAL(logError(const TQString &)));
-		connect(&docconverter, TQT_SIGNAL(logMessage(const TQString &)), TQT_SIGNAL(logMessage(const TQString &)));
-
-		docconverter.setTXTpath( DOCConduitSettings::tXTDirectory(), sinfo.txtfilename );
-		docconverter.setPDB(database);
-		docconverter.setCompress(DOCConduitSettings::compress());
-
-		switch (sinfo.direction) {
-			case eSyncPDAToPC:
-				docconverter.setBookmarkTypes(DOCConduitSettings::bookmarksToPC());
-				res = docconverter.convertPDBtoTXT();
-				break;
-			case eSyncPCToPDA:
-				docconverter.setBookmarkTypes(fTXTBookmarks);
-				res = docconverter.convertTXTtoPDB();
-				break;
-			default:
-				break;
-		}
-
-		// Now calculate the md5 checksum of the PC text and write it to the config file
-		if (res)
-		{
-			KMD5 docmd5;
-			TQFile txtfile(docconverter.txtFilename());
-			if (txtfile.open(IO_ReadOnly)) {
-				docmd5.update(txtfile);
-				TQString thisDigest(docmd5.hexDigest() /* .data() */);
-				DOCConduitSettings::self()->config()->writeEntry(docconverter.txtFilename(), thisDigest);
-				DOCConduitSettings::self()->config()->sync();
-#ifdef DEBUG
-				DEBUGKPILOT<<"MD5 Checksum of the text "<<sinfo.txtfilename<<" is "<<thisDigest<<endl;
-#endif
-			} else {
-#ifdef DEBUG
-				DEBUGKPILOT<<"couldn't open file "<<docconverter.txtFilename()<<" for reading!!!"<<endl;
-#endif
-			}
-		}
-
-		if (!postSyncAction(database, sinfo, res))
-			emit logError(i18n("Unable to install the locally created PalmDOC %1 to the handheld.")
-				.arg(TQString::fromLatin1(sinfo.dbinfo.name)));
-		if (!res)
-			emit logError(i18n("Conversion of PalmDOC \"%1\" failed.")
-				.arg(TQString::fromLatin1(sinfo.dbinfo.name)));
-//		disconnect(&docconverter, TQT_SIGNAL(logError(const TQString &)), TQT_SIGNAL(logError(const TQString &)));
-//		disconnect(&docconverter, TQT_SIGNAL(logMessage(const TQString &)), TQT_SIGNAL(logMessage(const TQString &)));
-//		KPILOT_DELETE(database);
-	}
-	else
-	{
-		emit logError(i18n("Unable to open or create the database %1.")
-			.arg(TQString::fromLatin1(sinfo.dbinfo.name)));
-	}
-	return res;
-}
-
-
-/** syncNextDB walks through all PalmDoc databases on the handheld and decides if they are supposed to be synced to the PC.
- * syncNextDB and syncNextTXT fist build the list of all PalmDoc texts, and then the method syncDatabases does the actual sync. */
-void DOCConduit::syncNextDB() {
-	FUNCTIONSETUP;
-	DBInfo dbinfo;
-
-	if (eSyncDirection==eSyncPCToPDA || fHandle->findDatabase(NULL, &dbinfo, dbnr, dbtype(), dbcreator() /*, cardno */ ) < 0)
-	{
-		// no more databases available, so check for PC->Palm sync
-		TQTimer::singleShot(0, this, TQT_SLOT(syncNextTXT()));
-		return;
-	}
-	dbnr=dbinfo.index+1;
-#ifdef DEBUG
-	DEBUGKPILOT<<"Next Palm database to sync: "<<dbinfo.name<<", Index="<<dbinfo.index<<endl;
-#endif
-
-	// if creator and/or type don't match, go to next db
-	if (!isCorrectDBTypeCreator(dbinfo) ||
-		fDBNames.contains(TQString::fromLatin1(dbinfo.name)))
-	{
-		TQTimer::singleShot(0, this, TQT_SLOT(syncNextDB()));
-		return;
-	}
-
-	TQString txtfilename=constructTXTFileName(TQString::fromLatin1(dbinfo.name));
-	TQString pdbfilename=constructPDBFileName(TQString::fromLatin1(dbinfo.name));
-
-	docSyncInfo syncInfo(TQString::fromLatin1(dbinfo.name),
-		txtfilename, pdbfilename, eSyncNone);
-	syncInfo.dbinfo=dbinfo;
-	needsSync(syncInfo);
-	fSyncInfoList.append(syncInfo);
-	fDBNames.append(TQString::fromLatin1(dbinfo.name));
-
-	TQTimer::singleShot(0, this, TQT_SLOT(syncNextDB()));
-	return;
-}
-
-
-
-void DOCConduit::syncNextTXT()
-{
-	FUNCTIONSETUP;
-
-	if (eSyncDirection==eSyncPDAToPC  )
-	{
-		// We don't sync from PC to PDB, so start the conflict resolution and then the actual sync process
-		docnames.clear();
-		TQTimer::singleShot(0, this, TQT_SLOT(checkPDBFiles()));
-		return;
-	}
-
-	// if docnames isn't initialized, get a list of all *.txt files in DOCConduitSettings::tXTDirectory()
-	if (docnames.isEmpty()/* || dociterator==docnames.end() */) {
-		docnames=TQDir( DOCConduitSettings::tXTDirectory(), CSL1("*.txt")).entryList() ;
-		dociterator=docnames.begin();
-	}
-	if (dociterator==docnames.end()) {
-		// no more databases available, so start the conflict resolution and then the actual sync proces
-		docnames.clear();
-		TQTimer::singleShot(0, this, TQT_SLOT(checkPDBFiles()));
-		return;
-	}
-
-	TQString fn=(*dociterator);
-
-	TQDir dr( DOCConduitSettings::tXTDirectory() );
-	TQFileInfo fl(dr, fn );
-	TQString txtfilename=fl.absFilePath();
-	TQString pdbfilename;
-	++dociterator;
-
-	DBInfo dbinfo;
-	// Include all "extensions" except the last. This allows full stops inside the database name (e.g. abbreviations)
-	// first fill everything with 0, so we won't have a buffer overflow.
-	memset(&dbinfo.name[0], 0, 33);
-	strncpy(&dbinfo.name[0], fl.baseName(TRUE).latin1(), 30);
-
-	bool alreadySynced=fDBNames.contains(fl.baseName(TRUE));
-	if (!alreadySynced) {
-		docSyncInfo syncInfo(TQString::fromLatin1(dbinfo.name),
-			txtfilename, pdbfilename, eSyncNone);
-		syncInfo.dbinfo=dbinfo;
-		needsSync(syncInfo);
-		fSyncInfoList.append(syncInfo);
-		fDBNames.append(TQString::fromLatin1(dbinfo.name));
-	} else {
-#ifdef DEBUG
-		DEBUGKPILOT<<txtfilename<<" has already been synced, skipping it."<<endl;
-#endif
-	}
-
-	TQTimer::singleShot(0, this, TQT_SLOT(syncNextTXT()));
-	return;
-}
-
-
-
-/** This slot will only be used if DOCConduitSettings::keepPDBsLocally() to check if new doc databases have been copied to the pdb directory.
- *  If so, install it to the handheld and sync it to the PC */
-void DOCConduit::checkPDBFiles() {
-	FUNCTIONSETUP;
-
-	if ( DOCConduitSettings::localSync() || !DOCConduitSettings::keepPDBsLocally() || eSyncDirection==eSyncPCToPDA )
-	{
-		// no more databases available, so check for PC->Palm sync
-		TQTimer::singleShot(0, this, TQT_SLOT(checkDeletedDocs()));
-		return;
-	}
-
-	// Walk through all files in the pdb directory and check if it has already been synced.
-	// if docnames isn't initialized, get a list of all *.pdb files in DOCConduitSettings::pDBDirectory()
-	if (docnames.isEmpty()/* || dociterator==docnames.end() */) {
-		docnames=TQDir(DOCConduitSettings::pDBDirectory(), CSL1("*.pdb")).entryList() ;
-		dociterator=docnames.begin();
-	}
-	if (dociterator==docnames.end()) {
-		// no more databases available, so start the conflict resolution and then the actual sync proces
-		docnames.clear();
-		TQTimer::singleShot(0, this, TQT_SLOT(checkDeletedDocs()));
-		return;
-	}
-
-	TQString fn=(*dociterator);
-
-	TQDir dr(DOCConduitSettings::pDBDirectory());
-	TQFileInfo fl(dr, fn );
-	TQString pdbfilename=fl.absFilePath();
-	++dociterator;
-
-	//  Get the doc title and check if it has already been synced (in the synced docs list of in fDBNames to be synced)
-	// If the doc title doesn't appear in either list, install it to the Handheld, and add it to the list of dbs to be synced.
-	TQString dbname=fl.baseName(TRUE).left(30);
-	if (!fDBNames.contains(dbname) && !fDBListSynced.contains(dbname)) {
-		if (fHandle->installFiles(pdbfilename, false)) {
-			DBInfo dbinfo;
-			// Include all "extensions" except the last. This allows full stops inside the database name (e.g. abbreviations)
-			// first fill everything with 0, so we won't have a buffer overflow.
-			memset(&dbinfo.name[0], 0, 33);
-			strncpy(&dbinfo.name[0], dbname.latin1(), 30);
-
-			docSyncInfo syncInfo(dbname, constructTXTFileName(dbname), pdbfilename, eSyncNone);
-			syncInfo.dbinfo=dbinfo;
-			needsSync(syncInfo);
-			fSyncInfoList.append(syncInfo);
-			fDBNames.append(dbname);
-		} else {
-#ifdef DEBUG
-			DEBUGKPILOT<<"Could not install database "<<dbname<<" ("<<pdbfilename<<") to the handheld"<<endl;
-#endif
-		}
-	}
-
-	TQTimer::singleShot(0, this, TQT_SLOT(checkPDBFiles()));
-}
-
-
-
-void DOCConduit::checkDeletedDocs()
-{
-	FUNCTIONSETUP;
-
-	for (TQStringList::Iterator it=fDBListSynced.begin(); it!=fDBListSynced.end(); ++it ) {
-		if (!fDBNames.contains(*it)) {
-			// We need to delete this doc:
-			TQString dbname(*it);
-			TQString txtfilename=constructTXTFileName(dbname);
-			TQString pdbfilename=constructPDBFileName(dbname);
-			docSyncInfo syncInfo(dbname, txtfilename, pdbfilename, eSyncDelete);
-
-			DBInfo dbinfo;
-			memset(&dbinfo.name[0], 0, 33);
-			strncpy(&dbinfo.name[0], dbname.latin1(), 30);
-			syncInfo.dbinfo=dbinfo;
-
-			fSyncInfoList.append(syncInfo);
-		}
-	}
-	TQTimer::singleShot(0, this, TQT_SLOT(resolve()));
-	return;
-}
-
-
-
-void DOCConduit::resolve() {
-	FUNCTIONSETUP;
-
-	for (fSyncInfoListIterator=fSyncInfoList.begin(); fSyncInfoListIterator!=fSyncInfoList.end(); ++fSyncInfoListIterator) {
-		// Walk through each database and apply the conflictResolution option.
-		// the remaining conflicts will be resolved in the resolution dialog
-		if ((*fSyncInfoListIterator).direction==eSyncConflict){
-#ifdef DEBUG
-			DEBUGKPILOT<<"We have a conflict for "<<(*fSyncInfoListIterator).handheldDB<<", default="<<eConflictResolution<<endl;
-#endif
-			switch (eConflictResolution)
-			{
-				case eSyncPDAToPC:
-#ifdef DEBUG
-					DEBUGKPILOT<<"PDA overrides for database "<<(*fSyncInfoListIterator).handheldDB<<endl;
-#endif
-					(*fSyncInfoListIterator).direction = eSyncPDAToPC;
-					break;
-				case eSyncPCToPDA:
-#ifdef DEBUG
-					DEBUGKPILOT<<"PC overrides for database "<<(*fSyncInfoListIterator).handheldDB<<endl;
-#endif
-					(*fSyncInfoListIterator).direction = eSyncPCToPDA;
-					break;
-				case eSyncNone:
-#ifdef DEBUG
-					DEBUGKPILOT<<"No sync for database "<<(*fSyncInfoListIterator).handheldDB<<endl;
-#endif
-					(*fSyncInfoListIterator).direction = eSyncNone;
-					break;
-				case eSyncDelete:
-				case eSyncConflict:
-				default:
-#ifdef DEBUG
-					DEBUGKPILOT<<"Conflict remains due to default resolution setting for database "<<(*fSyncInfoListIterator).handheldDB<<endl;
-#endif
-					break;
-			}
-		}
-	}
-
-	// Show the conflict resolution dialog and ask for the action for each database
-	ResolutionDialog*dlg=new ResolutionDialog( 0,  i18n("Conflict Resolution"), &fSyncInfoList , fHandle);
-	bool show=DOCConduitSettings::alwaysShowResolutionDialog() || (dlg && dlg->hasConflicts);
-	if (show) {
-		if (!dlg || !dlg->exec() ) {
-			KPILOT_DELETE(dlg)
-			emit logMessage(i18n("Sync aborted by user."));
-			TQTimer::singleShot(0, this, TQT_SLOT(cleanup()));
-			return;
-		}
-	}
-	KPILOT_DELETE(dlg)
-
-
-	// fDBNames will be filled with the names of the databases that are actually synced (not deleted), so I can write the list to the config file
-	fDBNames.clear();
-	fSyncInfoListIterator=fSyncInfoList.begin();
-	TQTimer::singleShot(0,this, TQT_SLOT(syncDatabases()));
-	return;
-}
-
-
-
-void DOCConduit::syncDatabases() {
-	FUNCTIONSETUP;
-	if (fSyncInfoListIterator==fSyncInfoList.end()) {
-		// We're done, so clean up
-		TQTimer::singleShot(0, this, TQT_SLOT(cleanup()));
-		return;
-	}
-
-	docSyncInfo sinfo=(*fSyncInfoListIterator);
-	++fSyncInfoListIterator;
-
-	switch (sinfo.direction) {
-		case eSyncConflict:
-#ifdef DEBUG
-			DEBUGKPILOT<<"Entry "<<sinfo.handheldDB<<"( txtfilename: "<<sinfo.txtfilename<<
-				", pdbfilename: "<<sinfo.pdbfilename<<") had sync direction eSyncConflict!!!"<<endl;
-#endif
-			break;
-		case eSyncDelete:
-		case eSyncPDAToPC:
-		case eSyncPCToPDA:
-			emit logMessage(i18n("Synchronizing text \"%1\"").arg(sinfo.handheldDB));
-			if (!doSync(sinfo)) {
-				// The sync could not be done, so inform the user (the error message should probably issued inside doSync)
-#ifdef DEBUG
-				DEBUGKPILOT<<"There was some error syncing the text \""<<sinfo.handheldDB<<"\" with the file "<<sinfo.txtfilename<<endl;
-#endif
-			}
-			break;
-		case eSyncNone:
-//		case eSyncAll:
-			break;
-	}
-	if (sinfo.direction != eSyncDelete) fDBNames.append(sinfo.handheldDB);
-
-	TQTimer::singleShot(0,this, TQT_SLOT(syncDatabases()));
-	return;
-}
-
-
-PilotDatabase*DOCConduit::openDOCDatabase(const TQString &dbname) {
-	if (DOCConduitSettings::localSync())
-	{
-		return new PilotLocalDatabase(DOCConduitSettings::pDBDirectory(), dbname, false);
-	}
-	else
-	{
-		return deviceLink()->database( dbname );
-	}
-}
-
-
-bool DOCConduit::needsSync(docSyncInfo &sinfo)
-{
-	FUNCTIONSETUP;
-	sinfo.direction = eSyncNone;
-
-	PilotDatabase*docdb=openDOCDatabase(TQString::fromLatin1(sinfo.dbinfo.name));
-	if (!fDBListSynced.contains(sinfo.handheldDB)) {
-		// the database wasn't included on last sync, so it has to be new.
-#ifdef DEBUG
-		DEBUGKPILOT<<"Database "<<sinfo.dbinfo.name<<" wasn't included in the previous sync!"<<endl;
-#endif
-
-		/* Resolution Table:
-			PC  HH  |  normal      PC->HH      HH->PC
-			-----------------------------------------
-			N   -   |     P          P           D
-			-   N   |     H          D           H
-			N   N   |     C          P           H
-		*/
-
-		if (TQFile::exists(sinfo.txtfilename)) sinfo.fPCStatus=eStatNew;
-		else sinfo.fPCStatus=eStatDoesntExist;
-		if (docdb && docdb->isOpen()) sinfo.fPalmStatus=eStatNew;
-		else sinfo.fPalmStatus=eStatDoesntExist;
-		KPILOT_DELETE(docdb);
-
-		switch (eSyncDirection) {
-			case eSyncPDAToPC:
-				if (sinfo.fPalmStatus==eStatDoesntExist)
-					sinfo.direction=eSyncDelete;
-				else sinfo.direction=eSyncPDAToPC;
-				break;
-			case eSyncPCToPDA:
-				if (sinfo.fPCStatus==eStatDoesntExist)
-					sinfo.direction=eSyncDelete;
-				else sinfo.direction=eSyncPCToPDA;
-				break;
-			case eSyncNone: // means actually both directions!
-				if (sinfo.fPCStatus==eStatNew) {
-					if (sinfo.fPalmStatus==eStatNew) sinfo.direction=eSyncConflict;
-					else sinfo.direction=eSyncPCToPDA;
-				} else {
-					if (sinfo.fPalmStatus==eStatNew) sinfo.direction=eSyncPDAToPC;
-					else {
-						sinfo.direction=eSyncNone;
-#ifdef DEBUG
-						DEBUGKPILOT<<"I'm supposed to find a sync direction, but the "<<
-						" text "<<sinfo.dbinfo.name<<" doesn't exist on either "<<
-						" the handheld or the PC"<<endl;
-#endif
-					}
-				}
-				break;
-			default:
-				break;
-		}
-		return true;
-	}
-
-	// Text was included in the last sync
-	if (!TQFile::exists(sinfo.txtfilename)) sinfo.fPCStatus=eStatDeleted;
-	else if(pcTextChanged(sinfo.txtfilename)) {
-		sinfo.fPCStatus=eStatChanged;
-#ifdef DEBUG
-		DEBUGKPILOT<<"PC side has changed!"<<endl;
-#endif
-		// TODO: Check for changed bookmarks on the PC side
-#ifdef DEBUG
-	} else {
-		DEBUGKPILOT<<"PC side has NOT changed!"<<endl;
-#endif
-	}
-
-	if (!docdb || !docdb->isOpen()) sinfo.fPalmStatus=eStatDeleted;
-	else if (hhTextChanged(docdb)) {
-#ifdef DEBUG
-		DEBUGKPILOT<<"Handheld side has changed!"<<endl;
-#endif
-		sinfo.fPalmStatus=eStatChanged;
-#ifdef DEBUG
-	} else {
-		DEBUGKPILOT<<"Handheld side has NOT changed!"<<endl;
-#endif
-	}
-	KPILOT_DELETE(docdb);
-
-
-	// Now that we know the status of both sides, determine what to do.
-		/* Resolution Table:
-			PC  HH  |  normal      PC->HH      HH->PC
-			-----------------------------------------
-			-   -   |     -          -           -
-			C   -   |     P          P           H
-			-   C   |     H          P           H
-			C   C   |     C          P           H
-			D   -   |     D          D           H
-			-   D   |     D          P           D
-			D   D   |     D          D           D
-			-----------------------------------------
-			C   D   |     C          P           D
-			D   C   |     C          D           H
-		*/
-
-
-	if (sinfo.fPCStatus == eStatNone && sinfo.fPalmStatus==eStatNone) {
-#ifdef DEBUG
-		DEBUGKPILOT<<"Nothing has changed, not need for a sync."<<endl;
-#endif
-		sinfo.direction=eSyncNone;
-		return false;
-	}
-
-	// In all other cases, if only one direction (PC->HH or HH->PC)
-	// should be done, check if the DB was deleted or if we are supposed
-	// to sync that direction
-
-	if (eSyncDirection==eSyncPCToPDA) {
-		if (sinfo.fPCStatus==eStatDeleted) sinfo.direction=eSyncDelete;
-		else sinfo.direction=eSyncPCToPDA;
-		return true;
-	}
-	if (eSyncDirection==eSyncPDAToPC) {
-		if (sinfo.fPalmStatus==eStatDeleted) sinfo.direction=eSyncDelete;
-		else sinfo.direction=eSyncPDAToPC;
-		return true;
-	}
-
-
-	// ---------------------------------------------------------------
-	// Finally, do the normal case, where both directions are possible
-	// ---------------------------------------------------------------
-
-
-	// if either is deleted, and the other is not changed, delete
-	if ( ((sinfo.fPCStatus==eStatDeleted) && (sinfo.fPalmStatus!=eStatChanged)) ||
-	     ((sinfo.fPalmStatus==eStatDeleted) && (sinfo.fPCStatus!=eStatChanged)) )
-	{
-#ifdef DEBUG
-		DEBUGKPILOT<<"DB was deleted on one side and not changed on "
-			"the other -> Delete it."<<endl;
-#endif
-		sinfo.direction=eSyncDelete;
-		return true;
-	}
-
-	// eStatDeleted (and both not changed) have already been treated, for all
-	// other values in combination with eStatNone, just copy the texts.
-	if (sinfo.fPCStatus==eStatNone) {
-#ifdef DEBUG
-		DEBUGKPILOT<<"PC side has changed!"<<endl;
-#endif
-		sinfo.direction=eSyncPDAToPC;
-		return true;
-	}
-
-	if (sinfo.fPalmStatus==eStatNone) {
-		sinfo.direction=eSyncPCToPDA;
-		return true;
-	}
-
-	// All other cases
-	//    (deleted,changed), (changed, deleted), (changed,changed)
-	// create a conflict:
-	sinfo.direction=eSyncConflict;
-	return true;
-}
-
-
-
-PilotDatabase *DOCConduit::preSyncAction(docSyncInfo &sinfo) const
-{
-	FUNCTIONSETUP;
-
-	{
-		// make sure the dir for the local texts really exists!
-		TQDir dir( DOCConduitSettings::tXTDirectory() );
-		if (!dir.exists())
-		{
-			dir.mkdir(dir.absPath());
-		}
-	}
-
-	DBInfo dbinfo=sinfo.dbinfo;
-	switch (sinfo.direction)
-	{
-		case eSyncPDAToPC:
-			if (DOCConduitSettings::keepPDBsLocally())
-			{
-				// make sure the dir for the local db really exists!
-				TQDir dir(DOCConduitSettings::pDBDirectory());
-
-				if (!dir.exists())
-				{
-					dir.mkdir(dir.absPath());
-				}
-#ifdef DEBUG
-				DEBUGKPILOT<<"Need to fetch database "<<dbinfo.name<<
-					" to the directory "<<dir.absPath()<<endl;
-#endif
-				dbinfo.flags &= ~dlpDBFlagOpen;
-
-				if (!fHandle->retrieveDatabase(sinfo.pdbfilename, &dbinfo) )
-				{
-					WARNINGKPILOT << "Unable to retrieve database " << dbinfo.name <<
-						" from the handheld into " << sinfo.pdbfilename << "." << endl;
-					return 0L;
-				}
-			}
-			break;
-		case eSyncPCToPDA:
-			if (DOCConduitSettings::keepPDBsLocally())
-			{
-				// make sure the dir for the local db really exists!
-				TQDir dir(DOCConduitSettings::pDBDirectory());
-				if (!dir.exists())
-				{
-					dir.mkdir(dir.absPath());
-				}
-			}
-			break;
-		default:
-			break;
-	}
-	if (DOCConduitSettings::keepPDBsLocally())
-	{
-		return new PilotLocalDatabase(DOCConduitSettings::pDBDirectory(),
-			TQString::fromLatin1(dbinfo.name), false);
-	}
-	else
-	{
-		return deviceLink()->database(TQString::fromLatin1(dbinfo.name));
-	}
-}
-
-
-// res gives us information whether the sync worked and the db might need to be
-// transferred to the handheld or not (and we just need to clean up the mess)
-bool DOCConduit::postSyncAction(PilotDatabase * database,
-                                docSyncInfo &sinfo, bool res)
-{
-	FUNCTIONSETUP;
-	bool rs = true;
-
-	switch (sinfo.direction)
-	{
-	case eSyncPDAToPC:
-		// also reset the sync flags on the handheld
-#ifdef DEBUG
-		DEBUGKPILOT<<"Resetting sync flags for database "
-			<<sinfo.dbinfo.name<<endl;
-#endif
-		if (DOCConduitSettings::keepPDBsLocally() && !DOCConduitSettings::localSync())
-		{
-			PilotDatabase*db=deviceLink()->database(
-				TQString::fromLatin1(sinfo.dbinfo.name));
-#ifdef DEBUG
-			DEBUGKPILOT<<"Middle 1 Resetting sync flags for database "
-				<<sinfo.dbinfo.name<<endl;
-#endif
-			if (db)
-			{
-				db->resetSyncFlags();
-				KPILOT_DELETE(db);
-			}
-		}
-#ifdef DEBUG
-		DEBUGKPILOT<<"End Resetting sync flags for database "
-			<<sinfo.dbinfo.name<<endl;
-#endif
-		break;
-	case eSyncPCToPDA:
-		if (DOCConduitSettings::keepPDBsLocally() && !DOCConduitSettings::localSync() && res)
-		{
-			// Copy the database to the palm
-			PilotLocalDatabase*localdb=dynamic_cast<PilotLocalDatabase*>(database);
-			if (localdb)
-			{
-#ifdef DEBUG
-				DEBUGKPILOT<<"Installing file "<<localdb->dbPathName()<<" ("
-					<<sinfo.handheldDB<<") to the handheld"<<endl;
-#endif
-				TQString dbpathname=localdb->dbPathName();
-				// This deletes localdb as well, which is just a cast from database
-				KPILOT_DELETE(database);
-				if (!fHandle->installFiles(dbpathname, false))
-				{
-					rs = false;
-#ifdef DEBUG
-					DEBUGKPILOT<<"Could not install the database "<<dbpathname<<" ("
-						<<sinfo.handheldDB<<")"<<endl;
-#endif
-				}
-			}
-		}
-	default:
-		break;
-	}
-
-#ifdef DEBUG
-	DEBUGKPILOT<<"Vor KPILOT_DELETE(database)"<<endl;
-#endif
-
-	KPILOT_DELETE(database);
-#ifdef DEBUG
-	DEBUGKPILOT<<"End postSyncAction"<<endl;
-#endif
-	return rs;
-}
-
-
-
-void DOCConduit::cleanup()
-{
-	FUNCTIONSETUP;
-	DOCConduitSettings::setConvertedDOCfiles( fDBNames );
-	DOCConduitSettings::self()->writeConfig();
-
-	emit syncDone(this);
-}
-
diff --git a/kpilot/conduits/docconduit/doc-conduit.h b/kpilot/conduits/docconduit/doc-conduit.h
deleted file mode 100644
index aefb4264..00000000
--- a/kpilot/conduits/docconduit/doc-conduit.h
+++ /dev/null
@@ -1,152 +0,0 @@
-#ifndef _doc_CONDUIT_H
-#define _doc_CONDUIT_H
-/* doc-conduit.h                           KPilot
-**
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include <plugin.h>
-
-class docSyncInfo;
-typedef TQValueList<docSyncInfo> syncInfoList;
-
-typedef enum eSyncDirectionEnum {
-		eSyncNone,
-//		eSyncAll,
-		eSyncPDAToPC,
-		eSyncPCToPDA,
-		eSyncDelete,
-		eSyncConflict
-	};
-typedef enum eTextStatus {
-	eStatNone=0,
-	eStatNew=1,
-	eStatChanged=2,
-	eStatBookmarksChanged=4,
-	eStatDeleted=8,
-	eStatDoesntExist=16
-	};
-
-
-TQString dirToString(eSyncDirectionEnum dir);
-
-class DOCConduit:public ConduitAction {
-Q_OBJECT
-public:
-	eSyncDirectionEnum eSyncDirection;
-
-public:
-	DOCConduit(KPilotLink * o,
-		const char *n = 0L, const TQStringList & a = TQStringList());
-	 virtual ~ DOCConduit();
-
-	bool encode(TQStringList fileName, PilotDatabase * db);
-	bool decode(PilotDatabase * db, TQString fileName);
-	virtual bool exec();
-protected:
-	virtual bool isCorrectDBTypeCreator(DBInfo dbinfo);
-	virtual const unsigned long dbtype();
-	virtual const unsigned long dbcreator();
-
-public slots:
-/** syncNextDB walks through all PalmDoc databases on the handheld and decides if they are supposed to be synced to the PC.
- * syncNextDB and syncNextDOC fist build the list of all PalmDoc texts, and then the method syncDatabases does the actual sync. */
-	void syncNextDB();
-	void syncNextTXT();
-	void checkPDBFiles();
-	void checkDeletedDocs();
-	void resolve();
-	void syncDatabases();
-	void cleanup();
-
- private:
-	 /**
-    * Read the global KPilot config file for settings
-    * particular to the docConduit conduit.
-    */
-	void readConfig();
-
-	/**
-	* Check if the database needs to be synced at all.
-	*/
-	bool needsSync(docSyncInfo &sinfo);
-	 /**
-    * If necessary, copy the database from the palm to a local dir.
-    * Also initialize the docDBInfo that will be passed to the docconverter
-    */
-	PilotDatabase *preSyncAction(docSyncInfo &sinfo) const;
-
-	bool doSync(docSyncInfo &sinfo);
-	 /**
-    * Clean up after the sync. The bool parameter res tells
-    * the function if the  conversion was successful or not
-    */
-	bool postSyncAction(PilotDatabase * dbinfo, docSyncInfo &sinfo, bool res = true);
-
-	bool pcTextChanged(TQString txtfn);
-	bool hhTextChanged(PilotDatabase*docdb);
-
-	/** Opens the database with name dbname. For a local sync, this will be a
-	 *  PilotLocalDatabase, otherwise it will be a database on the serial device
-	 *  (i.e. an object of class PilotSerialDatabase) */
-	PilotDatabase *openDOCDatabase(const TQString &dbname);
-
-	TQString constructPDBFileName(TQString name);
-	TQString constructTXTFileName(TQString name);
-
-	eSyncDirectionEnum  eConflictResolution;
-	int fTXTBookmarks, fPDBBookmarks;
-	TQStringList fDBListSynced;
-	TQStringList fDBNames;
-	syncInfoList fSyncInfoList;
-	syncInfoList::Iterator fSyncInfoListIterator;
-	long int dbnr;
-
-	TQStringList docnames;
-	TQStringList::Iterator dociterator;
-};
-
-class docSyncInfo
-{
-public:
-	docSyncInfo(TQString hhDB=TQString(), TQString txtfn=TQString(), TQString pdbfn=TQString(), eSyncDirectionEnum dir=eSyncNone)
-	{
-		handheldDB=hhDB;
-		txtfilename=txtfn;
-		pdbfilename=pdbfn;
-		direction=dir;
-		fPCStatus=eStatNone;
-		fPalmStatus=eStatNone;
-	};
-	~docSyncInfo(){};
-	TQString handheldDB, txtfilename, pdbfilename;
-	DBInfo dbinfo;
-	eSyncDirectionEnum direction;
-	eTextStatus fPCStatus, fPalmStatus;
-};
-
-
-#endif
diff --git a/kpilot/conduits/docconduit/doc-conflictdialog.cc b/kpilot/conduits/docconduit/doc-conflictdialog.cc
deleted file mode 100644
index 50ecbbd1..00000000
--- a/kpilot/conduits/docconduit/doc-conflictdialog.cc
+++ /dev/null
@@ -1,182 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-#include "doc-conflictdialog.moc"
-
-#include <tqlabel.h>
-#include <tqpushbutton.h>
-#include <tqlayout.h>
-#include <tqbuttongroup.h>
-#include <kmessagebox.h>
-#include <tqtimer.h>
-#include <tqtable.h>
-#include <tqcombobox.h>
-#include <tqscrollview.h>
-
-
-ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, syncInfoList*sinfo, KPilotLink*lnk )
-    : KDialogBase( parent, "resolutionDialog", true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), tickleTimer(0L), fHandle(lnk) {
-	FUNCTIONSETUP;
-	syncInfo=sinfo;
-	hasConflicts=false;
-
-	TQWidget *page = new TQWidget( this );
-	setMainWidget(page);
-	TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
-
-	// First, insert the texts on top:
-	textLabel1 = new TQLabel(i18n("Here is a list of all text files and DOC databases the conduit found. The conduit tried to determine the correct sync direction, but for databases in bold red letters a conflict occurred (i.e. the text was changed both on the desktop and on the handheld). For these databases please specify which version is the current one."), page);
-	textLabel1->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
-	topLayout->addWidget(textLabel1);
-
-	textLabel2 = new TQLabel(i18n("You can also change the sync direction for databases without a conflict." ),  page );
-	textLabel2->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
-	topLayout->addWidget(textLabel2);
-
-	resolutionGroupBox = new TQGroupBox(i18n("DOC Databases"), page );
-	TQVBoxLayout*playout = new TQVBoxLayout(resolutionGroupBox);
-	TQScrollView* sv = new TQScrollView(resolutionGroupBox);
-	playout->addWidget(sv);
-	sv->setResizePolicy(TQScrollView::AutoOneFit);
-	sv->setHScrollBarMode(TQScrollView::AlwaysOff);
-	sv->setMargin(5);
-	TQFrame* big_box = new TQFrame(sv->viewport());
-	sv->addChild(big_box);
-
-
-	resolutionGroupBoxLayout = new TQGridLayout( big_box, syncInfo->size(), 3 );
-	resolutionGroupBoxLayout->setAlignment( Qt::AlignTop );
-
-	// Invisible button group for the information buttons to use the same slot for all of them (see Dallheimer's book, page 309f)
-	TQButtonGroup *bgroup = new TQButtonGroup( this );
-	bgroup->hide();
-	TQObject::connect(bgroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotInfo(int)));
-
-	if (syncInfo) {
-		DEBUGKPILOT<<"Adding resolution options for the databases "<<endl;
-		syncInfoList::Iterator it;
-		int nr=0;
-		DEBUGKPILOT<<"We're having "<<(*syncInfo).size()<<" entries in the database list"<<endl;
-		for (it=syncInfo->begin(); it!=syncInfo->end(); ++it ) {
-			docSyncInfo si=(*it);
-			conflictEntry cE;
-			cE.index=nr;
-			cE.conflict=(si.direction==eSyncConflict);
-			DEBUGKPILOT<<"Adding "<<si.handheldDB<<" to the conflict resolution dialog"<<endl;
-
-			TQString text=si.handheldDB;
-			if  (cE.conflict) {
-				text=CSL1("<qt><b><font color=red>")+text+CSL1("</font></b></qt>");
-				DEBUGKPILOT<<"We have a conflict for database "<<si.handheldDB<<endl;
-				hasConflicts=true;
-			}
-			cE.dbname=new TQLabel(text, big_box);
-			resolutionGroupBoxLayout->addWidget( cE.dbname, cE.index, 0 );
-
-			cE.resolution=new TQComboBox( FALSE, big_box);
-			cE.resolution->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7,
-				(TQSizePolicy::SizeType)0, 0, 0,
-				cE.resolution->sizePolicy().hasHeightForWidth() ) );
-			cE.resolution->clear();
-			cE.resolution->insertItem( i18n( "No Sync" ) );
-			cE.resolution->insertItem( i18n( "Sync Handheld to PC" ) );
-			cE.resolution->insertItem( i18n( "Sync PC to Handheld" ) );
-			cE.resolution->insertItem( i18n( "Delete Both Databases" ) );
-			cE.resolution->setCurrentItem((int)si.direction);
-			resolutionGroupBoxLayout->addWidget( cE.resolution, cE.index, 1);
-
-			cE.info = new TQPushButton( i18n("More Info..."), big_box );
-			resolutionGroupBoxLayout->addWidget(cE.info, cE.index, 2);
-			bgroup->insert(cE.info);
-
-			conflictEntries.append(cE);
-			++nr;
-		}
-	} else {
-		WARNINGKPILOT << "The list of text files is not available to the resolution dialog." << endl;
-	}
-
-
-	topLayout->addWidget( resolutionGroupBox );
-	resize( TQSize(600, 480).expandedTo(minimumSizeHint()) );
-
-	if (fHandle) tickleTimer=new TQTimer(this, "TickleTimer");
-	if (tickleTimer) {
-		connect( tickleTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(_tickle()) );
-		tickleTimer->start( 10000 ); // tickle the palm every 10 seconds to prevent a timeout until the sync is really finished.
-	}
-
-}
-
-/*
- *  Destroys the object and frees any allocated resources
- */
-ResolutionDialog::~ResolutionDialog()
-{
-	// no need to delete child widgets, Qt does it all for us
-}
-
-/* virtual slot */ void ResolutionDialog::slotOk() {
-	FUNCTIONSETUP;
-	TQValueList<conflictEntry>::Iterator ceIt;
-	for (ceIt=conflictEntries.begin(); ceIt!=conflictEntries.end(); ++ceIt) {
-		(*syncInfo)[(*ceIt).index].direction=(eSyncDirectionEnum)((*ceIt).resolution->currentItem());
-	}
-	KDialogBase::slotOk();
-}
-
-TQString eTextStatusToString(eTextStatus stat) {
-	switch(stat) {
-		case eStatNone: return i18n("unchanged");
-		case eStatNew: return i18n("new");
-		case eStatChanged: return i18n("changed");
-		case eStatBookmarksChanged: return i18n("only bookmarks changed");
-		case eStatDeleted: return i18n("deleted");
-		case eStatDoesntExist: return i18n("does not exist");
-		default: return i18n("unknown");
-	}
-}
-
-void ResolutionDialog::slotInfo(int index) {
-	FUNCTIONSETUP;
-	conflictEntry cE=conflictEntries[index];
-	int ix=cE.index;
-	if (!syncInfo) return;
-	docSyncInfo si=(*syncInfo)[ix];
-	TQString text=i18n("Status of the database %1:\n\n").arg(si.handheldDB);
-	text+=i18n("Handheld: %1\n").arg(eTextStatusToString(si.fPalmStatus));
-	text+=i18n("Desktop: %1\n").arg(eTextStatusToString(si.fPCStatus));
-
-	KMessageBox::information(this, text, i18n("Database information"));
-}
-
-
-void ResolutionDialog::_tickle() {
-	FUNCTIONSETUP;
-	if (fHandle) fHandle->tickle();
-}
diff --git a/kpilot/conduits/docconduit/doc-conflictdialog.h b/kpilot/conduits/docconduit/doc-conflictdialog.h
deleted file mode 100644
index f0c8b216..00000000
--- a/kpilot/conduits/docconduit/doc-conflictdialog.h
+++ /dev/null
@@ -1,83 +0,0 @@
-#ifndef CONFLICTDIALOG_H
-#define CONFLICTDIALOG_H
-/* doc-conflictdialog.h                           KPilot
-**
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include <kdialogbase.h>
-#include "doc-conduit.h"
-
-
-class TQComboBox;
-class TQGridLayout;
-class TQGroupBox;
-
-class TQLabel;
-class TQPushButton;
-class TQTimer;
-class KPilotLink;
-
-
-typedef struct conflictEntry {
-	TQLabel*dbname;
-	TQComboBox* resolution;
-	TQPushButton*info;
-	int index;
-	bool conflict;
-};
-
-
-class ResolutionDialog : public KDialogBase
-{
-	Q_OBJECT
-
-public:
-	ResolutionDialog( TQWidget* parent=0, const TQString& caption=i18n("Resolution Dialog"), syncInfoList*sinfo=0L, KPilotLink*lnk=0L);
-	~ResolutionDialog();
-
-	bool hasConflicts;
-public slots:
-	void _tickle();
-protected:
-	TQTimer* tickleTimer;
-	KPilotLink* fHandle;
-
-protected:
-	TQGroupBox* resolutionGroupBox;
-	TQGridLayout*resolutionGroupBoxLayout;
-
-	syncInfoList*syncInfo;
-	TQValueList<conflictEntry> conflictEntries;
-	TQLabel *textLabel1,*textLabel2;
-
-protected slots:
-	virtual void slotOk();
-	void slotInfo(int index);
-
-};
-
-#endif // CONFLICTDIALOG_H
diff --git a/kpilot/conduits/docconduit/doc-factory.cc b/kpilot/conduits/docconduit/doc-factory.cc
deleted file mode 100644
index cfab20f4..00000000
--- a/kpilot/conduits/docconduit/doc-factory.cc
+++ /dev/null
@@ -1,116 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This file defines the factory for the doc-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-#include "doc-factory.moc"
-#include "doc-factory.h"
-
-#include <kinstance.h>
-#include <kaboutdata.h>
-#include <kpilotlink.h>
-
-#include "doc-conduit.h"
-#include "doc-setup.h"
-
-
-extern "C" {
-	void *init_conduit_doc() {
-		return new DOCConduitFactory;
-	}
-}
-
-
-
-// A number of static variables
-KAboutData * DOCConduitFactory::fAbout = 0L;
-
-const char *DOCConduitFactory::dbDOCtype = "TEXt";
-const char *DOCConduitFactory::dbDOCcreator = "REAd";
-
-
-
-DOCConduitFactory::DOCConduitFactory(TQObject * p, const char *n):
-KLibFactory(p, n)
-{
-	FUNCTIONSETUP;
-	fInstance = new KInstance("docconduit");
-	fAbout =new KAboutData("docconduit",
-		I18N_NOOP("Palm DOC Conduit for KPilot"), KPILOT_VERSION,
-		I18N_NOOP("Configures the DOC Conduit for KPilot"),
-		KAboutData::License_GPL, "(C) 2002, Reinhold Kainhofer");
-
-	fAbout->addAuthor("Reinhold Kainhofer",
-		I18N_NOOP("Maintainer"), "reinhold@kainhofer.com",
-		"http://reinhold.kainhofer.com");
-}
-
-DOCConduitFactory::~DOCConduitFactory()
-{
-	FUNCTIONSETUP;
-	KPILOT_DELETE(fInstance);
-	KPILOT_DELETE(fAbout);
-}
-
-
-/* virtual */ TQObject * DOCConduitFactory::createObject(TQObject * p,
-	const char *n, const char *c, const TQStringList & a)
-{
-	FUNCTIONSETUP;
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname <<": Creating object of class " <<c <<endl;
-#endif
-	if (qstrcmp(c, "ConduitConfigBase") == 0)
-	{
-		TQWidget *w = dynamic_cast<TQWidget *>(p);
-		if (w)
-		{
-			return new DOCWidgetConfig(w,n);
-		}
-		else
-		{
-			WARNINGKPILOT << "Couldn't cast parent to widget." << endl;
-			return 0L;
-		}
-	}
-	if (qstrcmp(c, "SyncAction") == 0)
-	{
-		KPilotLink * d = dynamic_cast < KPilotLink * >(p);
-		if (d)
-		{
-			return new DOCConduit(d, n, a);
-		}
-		else
-		{
-			WARNINGKPILOT << "Couldn't cast parent to KPilotLink" <<endl;
-			return 0L;
-		}
-	}
-	return 0L;
-}
-
diff --git a/kpilot/conduits/docconduit/doc-factory.h b/kpilot/conduits/docconduit/doc-factory.h
deleted file mode 100644
index 312b9def..00000000
--- a/kpilot/conduits/docconduit/doc-factory.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef _DOC_FACTORY_H
-#define _DOC_FACTORY_H
-
-/* doc-factory.h                       KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This file defines the factory for the doc-conduit plugin.
-*/  
-	
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/ 
-	
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/ 
-	
-#include <klibloader.h>
-	
-class KInstance;
-class KAboutData;
-
-
-class DOCConduitFactory:public KLibFactory 
-{
- 
-Q_OBJECT 
- 
-public:
-	DOCConduitFactory(TQObject * = 0L, const char * = 0L);
-	virtual ~ DOCConduitFactory();
-	
-	static KAboutData *about() { 
-		return fAbout;
-	};
-
-	static const char 
-		*fDBListSynced;
-	static const char *dbDOCtype;
-	static const char *dbDOCcreator;
- 
-
-protected:
-	virtual TQObject * createObject(TQObject * parent = 0, 
-		const char *name = 0, 
-		const char *classname = "TQObject", 
-		const TQStringList & args = TQStringList());
- 
-private:
-	KInstance * fInstance;
-	static KAboutData *fAbout;
-};
-
-
-extern "C" {
-	void *init_libdocconduit();
-}
-
-
-#endif
diff --git a/kpilot/conduits/docconduit/doc-setup.cc b/kpilot/conduits/docconduit/doc-setup.cc
deleted file mode 100644
index 6e6858a5..00000000
--- a/kpilot/conduits/docconduit/doc-setup.cc
+++ /dev/null
@@ -1,136 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This file defines the setup dialog for the doc-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <tqtabwidget.h>
-#include <tqcheckbox.h>
-#include <tqbuttongroup.h>
-#include <tqcombobox.h>
-
-#include <kconfig.h>
-#include <kurlrequester.h>
-#include <kcharsets.h>
-
-#include "doc-setupdialog.h"
-#include "doc-factory.h"
-#include "doc-setup.h"
-#include "docconduitSettings.h"
-
-
-DOCWidgetConfig::DOCWidgetConfig(TQWidget * w, const char *n):
-	ConduitConfigBase(w, n),
-	fConfigWidget(new DOCWidget(w))
-{
-	FUNCTIONSETUP;
-
-	fWidget=fConfigWidget;
-
-	TQStringList l = KGlobal::charsets()->descriptiveEncodingNames();
-	for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it)
-	{
-		fConfigWidget->fEncoding->insertItem(*it);
-	}
-
-	fConfigWidget->fTXTDir->setMode(KFile::Directory);
-	fConfigWidget->fPDBDir->setMode(KFile::Directory);
-	ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,DOCConduitFactory::about());
-
-	fConduitName=i18n("Palm DOC");
-
-#define CMOD(a,b) connect(fConfigWidget->a,TQT_SIGNAL(b),this,TQT_SLOT(modified()))
-	CMOD(fTXTDir,textChanged(const TQString &));
-	CMOD(fPDBDir,textChanged(const TQString &));
-	CMOD(fkeepPDBLocally,clicked());
-	CMOD(fConflictResolution,clicked(int));
-	CMOD(fConvertBookmarks,stateChanged(int));
-	CMOD(fBookmarksBmk,stateChanged(int));
-	CMOD(fBookmarksInline,stateChanged(int));
-	CMOD(fBookmarksEndtags,stateChanged(int));
-	CMOD(fCompress,stateChanged(int));
-	CMOD(fSyncDirection,clicked(int));
-	CMOD(fNoConversionOfBmksOnly,stateChanged(int));
-	CMOD(fAlwaysUseResolution,stateChanged(int));
-	CMOD(fPCBookmarks,clicked(int));
-	CMOD(fEncoding,textChanged(const TQString &));
-#undef CMOD
-
-	fConfigWidget->adjustSize();
-}
-
-/* virtual */ void DOCWidgetConfig::commit()
-{
-	FUNCTIONSETUP;
-
-	DOCConduitSettings::setTXTDirectory( fConfigWidget->fTXTDir->url() );
-	DOCConduitSettings::setPDBDirectory( fConfigWidget->fPDBDir->url() );
-
-	DOCConduitSettings::setKeepPDBsLocally( fConfigWidget->fkeepPDBLocally->isChecked());
-	DOCConduitSettings::setConflictResolution( fConfigWidget->fConflictResolution->id(
-		fConfigWidget->fConflictResolution->selected()) );
-	DOCConduitSettings::setConvertBookmarks(fConfigWidget->fConvertBookmarks->isChecked());
-	DOCConduitSettings::setBmkFileBookmarks(fConfigWidget->fBookmarksBmk->isChecked());
-	DOCConduitSettings::setInlineBookmarks(fConfigWidget->fBookmarksInline->isChecked());
-	DOCConduitSettings::setEndtagBookmarks(fConfigWidget->fBookmarksEndtags->isChecked());
-	DOCConduitSettings::setCompress(fConfigWidget->fCompress->isChecked());
-	DOCConduitSettings::setSyncDirection(fConfigWidget->fSyncDirection->id(
-		fConfigWidget->fSyncDirection->selected()));
-	DOCConduitSettings::setIgnoreBmkChanges(fConfigWidget->fNoConversionOfBmksOnly->isChecked());
-	DOCConduitSettings::setAlwaysShowResolutionDialog(fConfigWidget->fAlwaysUseResolution->isChecked());
-	DOCConduitSettings::setBookmarksToPC( fConfigWidget->fPCBookmarks->id(
-		fConfigWidget->fPCBookmarks->selected()) );
-	DOCConduitSettings::setEncoding( fConfigWidget->fEncoding->currentText() );
-
-	DOCConduitSettings::self()->writeConfig();
-	unmodified();
-}
-
-/* virtual */ void DOCWidgetConfig::load()
-{
-	FUNCTIONSETUP;
-	DOCConduitSettings::self()->readConfig();
-
-	fConfigWidget->fTXTDir->setURL( DOCConduitSettings::tXTDirectory() );
-	fConfigWidget->fPDBDir->setURL( DOCConduitSettings::pDBDirectory() );
-	fConfigWidget->fkeepPDBLocally->setChecked( DOCConduitSettings::keepPDBsLocally() );
-	fConfigWidget->fConflictResolution->setButton(DOCConduitSettings::conflictResolution() );
-	fConfigWidget->fConvertBookmarks->setChecked(DOCConduitSettings::convertBookmarks() );
-	fConfigWidget->fBookmarksBmk->setChecked(DOCConduitSettings::bmkFileBookmarks() );
-	fConfigWidget->fBookmarksInline->setChecked(DOCConduitSettings::inlineBookmarks() );
-	fConfigWidget->fBookmarksEndtags->setChecked(DOCConduitSettings::endtagBookmarks() );
-	fConfigWidget->fCompress->setChecked(DOCConduitSettings::compress() );
-	fConfigWidget->fSyncDirection->setButton(DOCConduitSettings::syncDirection() );
-
-	fConfigWidget->fNoConversionOfBmksOnly->setChecked( DOCConduitSettings::ignoreBmkChanges() );
-	fConfigWidget->fAlwaysUseResolution->setChecked( DOCConduitSettings::alwaysShowResolutionDialog() );
-
-	fConfigWidget->fPCBookmarks->setButton(DOCConduitSettings::bookmarksToPC() );
-	fConfigWidget->fEncoding->setCurrentText(DOCConduitSettings::encoding() );
-	unmodified();
-}
-
diff --git a/kpilot/conduits/docconduit/doc-setup.h b/kpilot/conduits/docconduit/doc-setup.h
deleted file mode 100644
index 32d1b54b..00000000
--- a/kpilot/conduits/docconduit/doc-setup.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef _DOC_DOC_SETUP_H
-#define _DOC_DOC_SETUP_H
-/* doc-setup.h                       KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This file defines the widget and behavior for the config dialog
-** of the doc conduit.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "plugin.h"
-
-class DOCWidget;
-
-class DOCWidgetConfig : public ConduitConfigBase
-{
-public:
-	DOCWidgetConfig(TQWidget *, const char *);
-	virtual void commit();
-	virtual void load();
-protected:
-	DOCWidget *fConfigWidget;
-} ;
-
-
-#endif
diff --git a/kpilot/conduits/docconduit/doc-setupdialog.ui b/kpilot/conduits/docconduit/doc-setupdialog.ui
deleted file mode 100644
index cbb45e34..00000000
--- a/kpilot/conduits/docconduit/doc-setupdialog.ui
+++ /dev/null
@@ -1,557 +0,0 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>DOCWidget</class>
-<author>Reinhold Kainhofer</author>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>Form2</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>564</width>
-            <height>266</height>
-        </rect>
-    </property>
-    <property name="sizePolicy">
-        <sizepolicy>
-            <hsizetype>3</hsizetype>
-            <vsizetype>3</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-        </sizepolicy>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QTabWidget" row="0" column="0">
-            <property name="name">
-                <cstring>tabWidget</cstring>
-            </property>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>tab</cstring>
-                </property>
-                <attribute name="title">
-                    <string>General</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <widget class="QLabel" row="0" column="0">
-                        <property name="name">
-                            <cstring>TextLabel1</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&amp;Text files:</string>
-                        </property>
-                        <property name="buddy" stdset="0">
-                            <cstring>fTXTDir</cstring>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Enter here, or select clicking the file picker button, the name and location of the folder used to find and synchronize text files. All files with extension .txt located in this folder will be synced to Palm DOC databases in your handheld.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="QCheckBox" row="1" column="0">
-                        <property name="name">
-                            <cstring>fkeepPDBLocally</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Local co&amp;py:</string>
-                        </property>
-                        <property name="checked">
-                            <bool>true</bool>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Check this box if you want to save a copy of the Palm DOC databases (.pdb files) on your PC.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="KURLRequester" row="0" column="1">
-                        <property name="name">
-                            <cstring>fTXTDir</cstring>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Enter here, or select clicking the file picker button, the name and location of the folder used to find and synchronize text files. All files with extension .txt located in this folder will be synced to Palm DOC databases in your handheld.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>fSyncDirection</cstring>
-                        </property>
-                        <property name="title">
-                            <string>Synchronization Mode</string>
-                        </property>
-                        <grid>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <property name="margin">
-                                <number>11</number>
-                            </property>
-                            <property name="spacing">
-                                <number>6</number>
-                            </property>
-                            <widget class="QRadioButton" row="2" column="0">
-                                <property name="name">
-                                    <cstring>RadioButton3</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Sync only P&amp;C to PDA</string>
-                                </property>
-                                <property name="buttonGroupId">
-                                    <number>2</number>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Select this option to synchronize texts changed in your PC to Palm DOC databases in your handheld. Palm DOC databases modified in the handheld will not be converted to text files, but texts changed in the PC will be converted to the Palm DOC databases.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="QRadioButton" row="1" column="0">
-                                <property name="name">
-                                    <cstring>RadioButton2</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Sync only P&amp;DA to PC</string>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Select this option to synchronize the changes made to Palm DOC databases in your handheld to the PC text files. Palm DOC databases modified in the handheld will be converted to text files, but texts changed in the PC will not be converted to the Palm DOC databases.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="QRadioButton" row="0" column="0">
-                                <property name="name">
-                                    <cstring>RadioButton1</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Sync &amp;all</string>
-                                </property>
-                                <property name="checked">
-                                    <bool>true</bool>
-                                </property>
-                                <property name="buttonGroupId">
-                                    <number>0</number>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Select this option to synchronize the file texts in your PC to Palm DOC databases in your handheld. Palm DOC databases modified in the handheld will be converted to text files, and texts changed in the PC will be converted to the Palm DOC databases, keeping both versions in sync.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                        </grid>
-                    </widget>
-                    <spacer row="3" column="1">
-                        <property name="name">
-                            <cstring>Spacer1</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="KURLRequester" row="1" column="1">
-                        <property name="name">
-                            <cstring>fPDBDir</cstring>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Enter here, or select clicking the file picker button, the name and location of the folder where copies of the handheld databases are kept (.pdb files). Local copies are only made if the box is checked as well.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                </grid>
-            </widget>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>tab</cstring>
-                </property>
-                <attribute name="title">
-                    <string>PC -&gt; Handheld</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3">
-                        <property name="name">
-                            <cstring>fCompress</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&amp;Compress</string>
-                        </property>
-                        <property name="checked">
-                            <bool>true</bool>
-                        </property>
-                        <property name="toolTip" stdset="0">
-                            <string>Check this box, if the text should be compressed on the handheld to save memory. Most doc reader on the handheld support compressed texts.</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;The Palm DOC format supports compressing the text to save memory. Check this box to enable text compression, so the resulting Palm DOC database will consume about 50% less memory than in uncompressed state. Almost all DOC readers on the Palm support compressed texts.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3">
-                        <property name="name">
-                            <cstring>fConvertBookmarks</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Convert &amp;bookmarks</string>
-                        </property>
-                        <property name="checked">
-                            <bool>true</bool>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Check this box to enable bookmark creation when converting text files to Palm DOC databases. Most doc readers support bookmarks. In order to create a bookmark, it is necessary to to provide the location in the text where the bookmark should be set and the bookmark title, in at least one of the formats listed below.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <spacer row="6" column="2">
-                        <property name="name">
-                            <cstring>spacer9</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QCheckBox" row="2" column="1">
-                        <property name="name">
-                            <cstring>fBookmarksInline</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&amp;Inline tags in text</string>
-                        </property>
-                        <property name="checked">
-                            <bool>true</bool>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>Check this box to create bookmarks from inline tags in the text. The inline tag consist of tags in the form &lt;* bookmarktext *&gt;. The bookmark location is set using the location of the inline tag in the text, and  the name is the text between the &lt;* and the *&gt;. The inline tag (&lt;*...*&gt;) will be removed from the text.</string>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="5" column="0">
-                        <property name="name">
-                            <cstring>textLabel1</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&amp;Encoding:</string>
-                        </property>
-                        <property name="buddy" stdset="0">
-                            <cstring>fEncoding</cstring>
-                        </property>
-                    </widget>
-                    <widget class="QCheckBox" row="3" column="1">
-                        <property name="name">
-                            <cstring>fBookmarksEndtags</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&amp;Tags at end of text</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>Check this box to convert tags of the form &lt;bookmarkname&gt; at the end of the text to bookmarks. The text inside the tag ("bookmarkname") will be searched in the text, and whenever found, a bookmark will be set there. The endtags &lt;...&gt; will then be removed from the end of the text.</string>
-                        </property>
-                    </widget>
-                    <widget class="QCheckBox" row="4" column="1">
-                        <property name="name">
-                            <cstring>fBookmarksBmk</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Regular &amp;expressions in .bmk file</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Check this box to use regular expressions in a file to search the text for bookmarks. The file should have the same name as the text file, but should end in .bmk instead of .txt (for instance, the regular expression file for textname.txt should be textname.bmk). See the documentation for a description of the format of the bmk file.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="QComboBox" row="5" column="1">
-                        <property name="name">
-                            <cstring>fEncoding</cstring>
-                        </property>
-                    </widget>
-                </grid>
-            </widget>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>tab</cstring>
-                </property>
-                <attribute name="title">
-                    <string>Handheld -&gt; PC</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <spacer row="2" column="0">
-                        <property name="name">
-                            <cstring>spacer16</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QCheckBox" row="1" column="0">
-                        <property name="name">
-                            <cstring>fNoConversionOfBmksOnly</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Do not convert, if text unchanged (only bookmarks)</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Check this box to avoid syncing the text on the handheld to the PC if you only changed the bookmarks on the handheld (but not the text).&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="QButtonGroup" row="0" column="0">
-                        <property name="name">
-                            <cstring>fPCBookmarks</cstring>
-                        </property>
-                        <property name="title">
-                            <string>Convert Bookmarks</string>
-                        </property>
-                        <grid>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="QRadioButton" row="0" column="0">
-                                <property name="name">
-                                    <cstring>radioButton8</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Do &amp;not convert bookmarks</string>
-                                </property>
-                                <property name="buttonGroupId">
-                                    <number>0</number>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Check this box to avoid converting Palm DOC bookmarks to inline tags or to a bookmark file.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="QRadioButton" row="1" column="0">
-                                <property name="name">
-                                    <cstring>radioButton11</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Convert into .bm &amp;file</string>
-                                </property>
-                                <property name="checked">
-                                    <bool>true</bool>
-                                </property>
-                                <property name="buttonGroupId">
-                                    <number>1</number>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Check this box to convert the Palm DOC database bookmarks to a separate file, in the bmk format (see more about this format in the documentation). The resulting bookmark file shares the same filename as the resulting .txt file, but ends in .bmk instead. This approach creates a clean text file and a bookmark file.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="QRadioButton" row="2" column="0">
-                                <property name="name">
-                                    <cstring>radioButton9</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Convert as &amp;inline tags</string>
-                                </property>
-                                <property name="buttonGroupId">
-                                    <number>2</number>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Check this box to convert the Palm DOC database bookmarks to inline tags, in the form &amp;lt;* BookmarkName *&amp;gt;. These tags are inserted in the text in the position marked by the bookmark, and the text inside the tag corresponds to the bookmark name. Inline tags are easy to create, delete, move and edit.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                        </grid>
-                    </widget>
-                </grid>
-            </widget>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>tab</cstring>
-                </property>
-                <attribute name="title">
-                    <string>Conflicts</string>
-                </attribute>
-                <vbox>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <widget class="QButtonGroup">
-                        <property name="name">
-                            <cstring>fConflictResolution</cstring>
-                        </property>
-                        <property name="title">
-                            <string>Conflict Resolution</string>
-                        </property>
-                        <property name="toolTip" stdset="0">
-                            <string>If the same text was changed on the PC and the handheld, which of the two versions should be used as the new version?</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;The Palm DOC conduit does not feature merging the modifications when a text is changed both in the handheld and in the computer. Therefore, the choice is between working with the files out of sync, or discarding the changes in one of them.&lt;/qt&gt;</string>
-                        </property>
-                        <grid>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="QRadioButton" row="0" column="0">
-                                <property name="name">
-                                    <cstring>radioButton12</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>&amp;No resolution</string>
-                                </property>
-                                <property name="buttonGroupId">
-                                    <number>0</number>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;The Palm DOC conduit does not feature merging the modifications when a text is changed both in the handheld and in the computer. Therefore, when conflicts appear, the choice is between working with the files out of sync, or discarding the changes in one of them. Select this option to prevent KPilot from overwriting your modifications.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="QRadioButton" row="1" column="0">
-                                <property name="name">
-                                    <cstring>RadioButton5</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>P&amp;DA overrides</string>
-                                </property>
-                                <property name="buttonGroupId">
-                                    <number>1</number>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;The Palm DOC conduit does not feature merging the modifications when a text is changed both in the handheld and in the computer. Therefore, when conflicts appear, the choice is between working with the files out of sync, or discarding the changes in one of them. Select this option to make the PDA version overwrite the PC version in case of conflict.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="QRadioButton" row="2" column="0">
-                                <property name="name">
-                                    <cstring>RadioButton4</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>P&amp;C overrides</string>
-                                </property>
-                                <property name="buttonGroupId">
-                                    <number>2</number>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;The Palm DOC conduit does not feature merging the modifications when a text is changed both in the handheld and in the computer. Therefore, when conflicts appear, the choice is between working with the files out of sync, or discarding the changes in one of them. Select this option to make the PC version overwrite the PDA version in case of conflict.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="QRadioButton" row="3" column="0">
-                                <property name="name">
-                                    <cstring>RadioButton7</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>&amp;Ask the user</string>
-                                </property>
-                                <property name="checked">
-                                    <bool>true</bool>
-                                </property>
-                                <property name="buttonGroupId">
-                                    <number>4</number>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;The Palm DOC conduit does not feature merging the modifications when a text is changed both in the handheld and in the computer. Therefore, when conflicts appear, the choice is between working with the files out of sync, or discarding the changes in one of them. Select this option to show the resolution dialog to let the user decide on a case by case basis.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                        </grid>
-                    </widget>
-                    <widget class="QCheckBox">
-                        <property name="name">
-                            <cstring>fAlwaysUseResolution</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&amp;Always show the resolution dialog</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Check this box to force the resolution dialog to appear even when there are no conflicts.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <spacer>
-                        <property name="name">
-                            <cstring>Spacer8</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                </vbox>
-            </widget>
-        </widget>
-    </grid>
-</widget>
-<customwidgets>
-</customwidgets>
-<connections>
-    <connection>
-        <sender>fConvertBookmarks</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>fBookmarksInline</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>fConvertBookmarks</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>fBookmarksEndtags</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>fConvertBookmarks</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>fBookmarksBmk</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>fkeepPDBLocally</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>fPDBDir</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-</connections>
-<tabstops>
-    <tabstop>fTXTDir</tabstop>
-    <tabstop>fkeepPDBLocally</tabstop>
-    <tabstop>fPDBDir</tabstop>
-    <tabstop>fCompress</tabstop>
-    <tabstop>fConvertBookmarks</tabstop>
-    <tabstop>fBookmarksInline</tabstop>
-    <tabstop>fBookmarksEndtags</tabstop>
-    <tabstop>fBookmarksBmk</tabstop>
-    <tabstop>radioButton11</tabstop>
-    <tabstop>fNoConversionOfBmksOnly</tabstop>
-    <tabstop>RadioButton7</tabstop>
-    <tabstop>fAlwaysUseResolution</tabstop>
-    <tabstop>tabWidget</tabstop>
-    <tabstop>RadioButton1</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-<includes>
-    <include location="global" impldecl="in implementation">kurlrequester.h</include>
-    <include location="global" impldecl="in implementation">klineedit.h</include>
-    <include location="global" impldecl="in implementation">kpushbutton.h</include>
-</includes>
-</UI>
diff --git a/kpilot/conduits/docconduit/doc_conduit.desktop b/kpilot/conduits/docconduit/doc_conduit.desktop
deleted file mode 100644
index 324347e3..00000000
--- a/kpilot/conduits/docconduit/doc_conduit.desktop
+++ /dev/null
@@ -1,58 +0,0 @@
-[Desktop Entry]
-Type=Service
-Comment=Adds text files to your handheld, suitable for DOC readers.
-Comment[af]=Voeg teks lêers by jou draagbare toestel in DOC leser formaat.
-Comment[bg]=Добав�не на тек�тови файлове към мобилно у�трой�тво.
-Comment[ca]=Afegeix fitxers de text a la vostra agenda, apropiat per a lectors de DOC.
-Comment[cs]=Přidává textové soubory do vašeho Pilotu, výhodné pro �tenáře dokumentů.
-Comment[da]=Tilføjer tekstfiler til din håndholdte, passende for DOC-læsere.
-Comment[de]=Gibt Textdateien in Taschencomputer ein, passend für DOC-Leser.
-Comment[el]=Π�οσθέτει α�χεία κειμένου στον υπολογιστή παλάμης σας, κατάλληλο για αναγνώστες DOC.
-Comment[es]=Añade archivos de texto a su agenda electrónica. Compatible con los lectores DOC.
-Comment[et]=Lisab DOC-riiderile sobilikud tekstifailid sinu pihuseadmele.
-Comment[eu]=Zure agenda elektronikora DOC irakurleentzako aproposak diren testu fitxategiak gehitzen ditu.
-Comment[fa]=پرونده‌های متن را به دستی شما اضا�ه می‌کند، که برای خوانندگان DOC م�ید است.
-Comment[fi]=Lisää tekstitiedostoja taskutietokoneeseen. Tämä on käyttökelpoinen DOC-lukijoille.
-Comment[fr]=Ajoute des fichiers texte à votre Palm, approprié pour les lecteurs de DOC.
-Comment[fy]=Heakket tekstfjilden ta oan jo handheld, geskikt faor DOC-lêzers.
-Comment[gl]=Engade ficheiros de texto ao seu aparello de man, axeitado para os lectores DOC.
-Comment[hu]=Szöveges fájlok hozzáadása a kézi számítógéphez, DOC-olvasók számára.
-Comment[is]=Bætir textaskrám, sem hægt er að lesa í DOC lesara, við lófatölvuna þína.
-Comment[it]=Aggiunge file di testo al tuo Pilot, adatti per lettori DOC.
-Comment[ja]=テキストファイルを DOC リーダー����形���ンドヘルド�追加���。
-Comment[kk]=DOC файлды оқи алатын қалта құрылғыға мәтінді көшіру.
-Comment[km]=បន្�ែម​ឯកសារ​អ�្�បទ​ទៅ​ឧបករណ�​យួរ​ដៃ​របស់​អ្នក (សមស្រប​សម្រាប់​កម្មវិធី​អាន DOC) ។
-Comment[lt]=Prideda teksto bylas prie Jūsų nešiojamos knygelės, tinka DOC skaityklėms.
-Comment[ms]=Menambah fail teks ke komputer telapak, sesuai dengan pembaca DOC.
-Comment[nb]=Legger til tekstfiler på PDA-en, som passer for DOC-lesere.
-Comment[nds]=Föögt Textdateien op den Handreekner to, de för DOC-Kiekers passt.
-Comment[ne]=DOC रिडरका लागि उपय�क�त ह�ने पाठ फाइल तपाई�को ह�यान�डहेल�डमा थप�दछ ।
-Comment[nl]=Voegt tekstvelden toe aan uw handheld, geschikt voor DOC-lezers.
-Comment[nn]=Legg til tekstfiler på den handhaldne, passar til DOC-lesarar.
-Comment[pl]=Dodaje pliki tekstowe do Twojego palmtopa, w postaci odpowiedniej dla przeglÄ…darek DOC.
-Comment[pt]=Adiciona ficheiros de texto ao seu PDA, indicado para os leitores de DOC.
-Comment[pt_BR]=Adiciona arquivos de texto ao seu handheld, adequado para leitors de DOC.
-Comment[ru]=Перено� тек�товых файлов на КПК.
-Comment[sk]=Pridá textové súbory do ru�ného zariadenia, vhodné pre �ítanie DOC.
-Comment[sl]=V vaš ro�ni ra�unalnik doda besedilne datoteke, primerne za bralnike DOC.
-Comment[sr]=Додаје тек�туалне фајлове вашем ручном рачунару, погодне за DOC читаче.
-Comment[sr@Latn]=Dodaje tekstualne fajlove vašem ru�nom ra�unaru, pogodne za DOC �ita�e.
-Comment[sv]=Lägger till textfiler i en handdator, lämpliga för DOC-läsare.
-Comment[ta]=DOC  படிப�பவர�கள�க�க� பொர�த�தமான உங�கள� பைலட�ட�க�க�ரிய உரை கோப�ப�களை சேர�க�க�ம�
-Comment[tr]=Metin dosyalarını el bilgisayarınıza ekler, DOC biçimi okuyucuları için uygundur.
-Comment[uk]=Додає тек�тові файли до вашого кишенькового при�трою так, що вони читатимуть�� у перегл�дачах DOC.
-Comment[zh_CN]=将文本文件添加到您的手�设备中，以便适� DOC 阅读程�。
-Comment[zh_TW]=新增文字到您的 handheld。
-Name=Palm DOC
-Name[ca]=DOC de Palm
-Name[cy]=DOC Palm
-Name[de]=Palm-DOC
-Name[fa]=رایانۀ جیبی DOC
-Name[hi]=पॉम डॉक
-Name[nds]=Palm-DOC
-Name[ne]=पाल�म DOC
-Name[pt]=DOC do Palm
-Name[ta]=பாம� ஆவணம�
-Implemented=file
-ServiceTypes=KPilotConduit
-X-KDE-Library=conduit_doc
diff --git a/kpilot/conduits/docconduit/docconduit.kcfg b/kpilot/conduits/docconduit/docconduit.kcfg
deleted file mode 100644
index 6301f459..00000000
--- a/kpilot/conduits/docconduit/docconduit.kcfg
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
-      http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <kcfgfile name="kpilot_docconduitrc"/> 
-  <group name="General">
-    <entry name="TXTDirectory" key="TXT Directory" type="Path"/>
-    <entry name="PDBDirectory" key="PDB Directory" type="Path"/>
-    <entry name="KeepPDBsLocally" key="Keep PDBs locally" type="Bool">
-        <default>false</default>
-    </entry>
-    <entry name="LocalSync" key="Sync only locally" type="Bool">
-      <default>false</default>
-    </entry>
-    <entry name="ConflictResolution" key="Conflict Resolution" type="UInt">
-        <default>0</default>
-    </entry>
-    <entry name="ConvertBookmarks" key="Convert Bookmarks" type="Bool">
-        <default>true</default>
-    </entry>
-    <entry name="BmkFileBookmarks" key="Bmk file bookmarks" type="Bool">
-        <default>true</default>
-    </entry>
-    <entry name="InlineBookmarks" key="Inline bookmarks" type="Bool">
-        <default>true</default>
-    </entry>
-    <entry name="EndtagBookmarks" key="Endtag bookmarks" type="Bool">
-        <default>true</default>
-    </entry>
-    <entry name="Compress"  type="Bool">
-        <default>true</default>
-    </entry>
-    <entry name="SyncDirection" key="Sync Direction" type="UInt">
-        <default>1</default>
-    </entry>
-    <entry name="IgnoreBmkChanges" key="Ignore only bookmark changes" type="Bool">
-        <default>false</default>
-    </entry>
-    <entry name="AlwaysShowResolutionDialog" key="Always show resolution dialog" type="Bool">
-        <default>false</default>
-    </entry>
-    <entry name="BookmarksToPC" key="Bookmarks to PC" type="UInt">
-        <default>0</default>
-    </entry>
-    <entry name="ConvertedDOCfiles" key="Converted PalmDOCs" type="StringList">
-        <default></default>
-    </entry>
-    <entry name="Encoding" type="String">
-	<default>ISO8859-15</default>
-    </entry>
-  </group>
-
-</kcfg>
diff --git a/kpilot/conduits/docconduit/docconduitSettings.kcfgc b/kpilot/conduits/docconduit/docconduitSettings.kcfgc
deleted file mode 100644
index 2a9a3a0f..00000000
--- a/kpilot/conduits/docconduit/docconduitSettings.kcfgc
+++ /dev/null
@@ -1,7 +0,0 @@
-File=docconduit.kcfg
-ClassName=DOCConduitSettings
-Singleton=true
-ItemAccessors=true
-Mutators=true
-GlobalEnums=true
-SetUserTexts=true
diff --git a/kpilot/conduits/docconduit/kpalmdoc.cpp b/kpilot/conduits/docconduit/kpalmdoc.cpp
deleted file mode 100644
index 55956cf4..00000000
--- a/kpilot/conduits/docconduit/kpalmdoc.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/* converter.cpp
-**
-** Copyright (C) 2003 by Reinhold Kainhofer
-**
-** This is the main program of the KDE PalmDOC converter.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
-
-#include "kpalmdoc_dlg.h"
-
-
-
-int main(int argc, char *argv[])
-{
-
-	KAboutData about("converter", I18N_NOOP("KPalmDOC"), "-0.0.1",
-		"KPalmDOC - KDE Converter for PalmDOC texts.\n\n",
-		KAboutData::License_GPL, "(c) 2003, Reinhold Kainhofer");
-	about.addAuthor("Reinhold Kainhofer", I18N_NOOP("Main Developer"),
-		"reinhold@kainhofer.com", "http://reinhold.kainhofer.com/Linux/");
-	about.addCredit("Adriaan de Groot", I18N_NOOP("Maintainer of KPilot"),
-		"groot@kde.org", "http://www.kpilot.org/");
-
-	KCmdLineArgs::init(argc, argv, &about);
-	KApplication::addCmdLineOptions();
-
-	KApplication app;
-	ConverterDlg *dlg=new ConverterDlg(0L, i18n("PalmDOC Converter"));
-	dlg->show();
-	return app.exec();
-}
-
diff --git a/kpilot/conduits/docconduit/kpalmdoc.desktop b/kpilot/conduits/docconduit/kpalmdoc.desktop
deleted file mode 100644
index 6acbf66f..00000000
--- a/kpilot/conduits/docconduit/kpalmdoc.desktop
+++ /dev/null
@@ -1,64 +0,0 @@
-# KDE Config File
-[Desktop Entry]
-Name=KPalmDOC
-Name[hi]=के-पॉम-डॉक
-Name[sv]=Kpalm DOC
-Name[ta]=கேகைdoc
-GenericName=PalmDOC Converter
-GenericName[af]=PalmDOC omskakelaar
-GenericName[bg]=Конвертиране на PalmDOC
-GenericName[bs]=PalmDOC konverter
-GenericName[ca]=Convertidor a PalmDOC
-GenericName[cs]=Konvertor PalmDoc
-GenericName[cy]=Trosiadydd PalmDOC
-GenericName[da]=PalmDOC konverterer
-GenericName[de]=PalmDOC-Konvertierung
-GenericName[el]=Μετατ�οπέας PalmDOC
-GenericName[eo]=PalmDOC-konvertilo
-GenericName[es]=Conversor de PalmDOC
-GenericName[et]=PalmDOC konverter
-GenericName[eu]=PalmDOC bihurtzailea
-GenericName[fa]=مبدل PalmDOC
-GenericName[fi]=PalmDOC-muunnin
-GenericName[fr]=Convertisseur PalmDOC
-GenericName[fy]=PalmDOC-oersetter
-GenericName[ga]=Tiontaire PalmDOC
-GenericName[gl]=Convertidor de PalmDOC
-GenericName[hi]=पॉम-डॉक परिवर�तक
-GenericName[hu]=PalmDOC-konverter
-GenericName[is]=PalmDOC umbreytir
-GenericName[it]=Convertitore PalmDOC
-GenericName[ja]= PalmDOC コン�ータ
-GenericName[kk]=PalmDOC аударғышы
-GenericName[km]=កម្មវិធី​បម្លែង PalmDOC
-GenericName[lt]=PalmDOC konverteris
-GenericName[ms]=Penukar PalmDOC 
-GenericName[nb]=PalmDOC-konvertering
-GenericName[nds]=PalmDOC-Ãœmwanneln
-GenericName[ne]=PalmDOC र�पान�तरणकर�ता
-GenericName[nl]=PalmDOC-conversie
-GenericName[nn]=PalmDOC-omformar
-GenericName[pl]=Konwerter formatu PalmDOC
-GenericName[pt]=Conversor de PalmDOC
-GenericName[pt_BR]=Conversor para PalmDOC
-GenericName[ro]=Convertor PalmDOC
-GenericName[ru]=Конвертер PalmDOC
-GenericName[sk]=PalmDOC prevod
-GenericName[sl]=Pretvornik v PalmDOC
-GenericName[sr]=PalmDOC конвертор
-GenericName[sr@Latn]=PalmDOC konvertor
-GenericName[sv]=Konvertering av Palm DOC
-GenericName[ta]=பாம�DOC மாற�றி
-GenericName[tg]=Конвертёри PalmDOC
-GenericName[tr]=PalmDOC Çevirici
-GenericName[uk]=Перетворювач PalmDOC
-GenericName[zh_CN]=PalmDOC 转�器
-GenericName[zh_TW]=PalmDOC 轉�器
-Exec=kpalmdoc
-Icon=kpalmdoc
-Type=Application
-DocPath=kpalmdoc/index.html
-Terminal=false
-X-KDE-StartupNotify=true
-X-DCOP-ServiceType=Unique
-Categories=Qt;KDE;Utility;X-KDE-Utilities-File;Office;PDA;
diff --git a/kpilot/conduits/docconduit/kpalmdoc.kcfg b/kpilot/conduits/docconduit/kpalmdoc.kcfg
deleted file mode 100644
index 4d3d2211..00000000
--- a/kpilot/conduits/docconduit/kpalmdoc.kcfg
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
-      http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <kcfgfile name="converterrc"/>
-	<group name="General">
-    <entry name="TXTFolder" key="TXT folder" type="Path"/>
-    <entry name="PDBFolder" key="PDB folder" type="Path"/>
-    <entry name="SyncFolders" key="Sync folders" type="Bool">
-        <default>false</default>
-    </entry>
-    <entry name="AskOverwrite" key="Ask before overwriting files" type="Bool">
-       <default>true</default>
-    </entry>
-    <entry name="VerboseMessages" key="Verbose messages" type="Bool">
-        <default>true</default>
-    </entry>
-    <entry name="Compress"  type="Bool">
-        <default>true</default>
-    </entry>
-    <entry name="ConvertBookmarks" key="Convert bookmarks" type="Bool">
-        <default>true</default>
-    </entry>
-    <entry name="BookmarksInline" key="Bookmarks inline" type="Bool">
-        <default>true</default>
-    </entry>
-    <entry name="BookmarksEndtags" key="Bookmarks endtags" type="Bool">
-        <default>true</default>
-    </entry>
-    <entry name="BookmarksBmk" key="Bookmarks bmk" type="Bool">
-        <default>true</default>
-    </entry>
-    <entry name="BookmarksToPC" key="Bookmarks to PC" type="UInt">
-        <default>0</default>
-    </entry>
-    <entry name="Encoding" type="String">
-        <default>ISO8859-15</default>
-    </entry>
-	</group>
-</kcfg>
diff --git a/kpilot/conduits/docconduit/kpalmdoc.upd b/kpilot/conduits/docconduit/kpalmdoc.upd
deleted file mode 100644
index 77d3d1ee..00000000
--- a/kpilot/conduits/docconduit/kpalmdoc.upd
+++ /dev/null
@@ -1,6 +0,0 @@
-Id=kdepim_3.3
-File=converterrc
-Group=<default>,General
-AllKeys
-
-
diff --git a/kpilot/conduits/docconduit/kpalmdocSettings.kcfgc b/kpilot/conduits/docconduit/kpalmdocSettings.kcfgc
deleted file mode 100644
index 6da45c5e..00000000
--- a/kpilot/conduits/docconduit/kpalmdocSettings.kcfgc
+++ /dev/null
@@ -1,7 +0,0 @@
-File=kpalmdoc.kcfg
-ClassName=KPalmDocSettings
-Singleton=true
-ItemAccessors=true
-Mutators=true
-GlobalEnums=true
-SetUserTexts=true
diff --git a/kpilot/conduits/docconduit/kpalmdoc_dlg.cc b/kpilot/conduits/docconduit/kpalmdoc_dlg.cc
deleted file mode 100644
index 29713ffa..00000000
--- a/kpilot/conduits/docconduit/kpalmdoc_dlg.cc
+++ /dev/null
@@ -1,529 +0,0 @@
-/* kpalmdoc_dlg.cpp
-**
-** Copyright (C) 2003 by Reinhold Kainhofer
-**
-** This is the main dialog of the KDE PalmDOC converter.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-#include "options.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <iostream>
-
-#include <tqtabwidget.h>
-#include <tqcheckbox.h>
-#include <tqradiobutton.h>
-#include <tqbuttongroup.h>
-#include <tqlabel.h>
-#include <tqcombobox.h>
-
-#include <klocale.h>
-#include <kconfig.h>
-#include <kaboutapplication.h>
-#include <kapplication.h>
-#include <kurlrequester.h>
-#include <kmessagebox.h>
-#include <kcharsets.h>
-
-#include <pilotLocalDatabase.h>
-
-#include "kpalmdoc_dlg.h"
-#include "kpalmdoc_dlgbase.h"
-#include "DOC-converter.h"
-#include "kpalmdocSettings.h"
-
-
-ConverterDlg::ConverterDlg( TQWidget *parent, const TQString& caption)
-   : KDialogBase( parent, "converterdialog", false, caption, KDialogBase::Close|KDialogBase::Help|KDialogBase::User1,
-	   KDialogBase::Close, true, i18n("&About"))
-{
-	TQWidget *page = makeHBoxMainWidget();
-	dlg=new ConverterDlgBase(page);
-	TQStringList l = KGlobal::charsets()->descriptiveEncodingNames();
-	for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it)
-	{
-		dlg->fEncoding->insertItem(*it);
-	}
-
-	readSettings();
-
-	connect(dlg->fDirectories, TQT_SIGNAL(toggled(bool)),
-		this, TQT_SLOT(slotDirectories(bool)));
-	connect(dlg->fTextToPDB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotToPDB()));
-	connect(dlg->fPDBToText, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotToText()));
-
-	resize(minimumSize());
-}
-
-ConverterDlg::~ConverterDlg()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-void ConverterDlg::writeSettings()
-{
-	// General page
-	KPalmDocSettings::setTXTFolder( dlg->fTXTDir->url() );
-	KPalmDocSettings::setPDBFolder( dlg->fPDBDir->url() );
-	KPalmDocSettings::setSyncFolders( dlg->fDirectories->isChecked() );
-	KPalmDocSettings::setAskOverwrite( dlg->fAskOverwrite->isChecked() );
-	KPalmDocSettings::setVerboseMessages( dlg->fVerbose->isChecked() );
-	KPalmDocSettings::setEncoding( dlg->fEncoding->currentText() );
-
-	// PC->Handheld page
-	KPalmDocSettings::setCompress( dlg->fCompress->isChecked() );
-	KPalmDocSettings::setConvertBookmarks( dlg->fConvertBookmarks->isChecked() );
-	KPalmDocSettings::setBookmarksInline( dlg->fBookmarksInline->isChecked() );
-	KPalmDocSettings::setBookmarksEndtags( dlg->fBookmarksEndtags->isChecked() );
-	KPalmDocSettings::setBookmarksBmk( dlg->fBookmarksBmk->isChecked() );
-
-	// Handheld->PC page
-	KPalmDocSettings::setBookmarksToPC( dlg->fPCBookmarks->id(dlg->fPCBookmarks->selected()) );
-
-	KPalmDocSettings::self()->writeConfig();
-}
-
-void ConverterDlg::readSettings()
-{
-	FUNCTIONSETUP;
-
-	KPalmDocSettings::self()->readConfig();
-
-	// General Page:
-	dlg->fTXTDir->setURL(KPalmDocSettings::tXTFolder());
-	dlg->fPDBDir->setURL(KPalmDocSettings::pDBFolder());
-	bool dir=KPalmDocSettings::syncFolders();
-	dlg->fDirectories->setChecked(dir);
-	slotDirectories(dir);
-	dlg->fAskOverwrite->setChecked( KPalmDocSettings::askOverwrite() );
-	dlg->fVerbose->setChecked( KPalmDocSettings::verboseMessages() );
-	TQString encoding = KPalmDocSettings::encoding();
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Encoding=" << encoding << endl;
-#endif
-	dlg->fEncoding->setCurrentText( KPalmDocSettings::encoding() );
-
-	// PC->Handheld page
-	dlg->fCompress->setChecked(KPalmDocSettings::compress() );
-	dlg->fConvertBookmarks->setChecked(KPalmDocSettings::convertBookmarks());
-	dlg->fBookmarksInline->setChecked(KPalmDocSettings::bookmarksInline());
-	dlg->fBookmarksEndtags->setChecked(KPalmDocSettings::bookmarksEndtags());
-	dlg->fBookmarksBmk->setChecked(KPalmDocSettings::bookmarksBmk());
-
-	// Handheld->PC page
-	dlg->fPCBookmarks->setButton(KPalmDocSettings::bookmarksToPC() );
-}
-
-void ConverterDlg::slotClose()
-{
-  writeSettings();
-  kapp->quit();
-  delete this;
-}
-
-void ConverterDlg::slotToText()
-{
-	FUNCTIONSETUP;
-	// First, get the settings from the controls and initialize
-	// the converter object
-	int bmks=dlg->fPCBookmarks->id(dlg->fPCBookmarks->selected());
-	DOCConverter conv;
-	switch(bmks) {
-		case 0: conv.setBookmarkTypes(DOCConverter::eBmkNone); break;
-		case 1: conv.setBookmarkTypes(DOCConverter::eBmkInline); break;
-		case 2: conv.setBookmarkTypes(DOCConverter::eBmkEndtags); break;
-		case 3: conv.setBookmarkTypes(DOCConverter::eBmkDefaultBmkFile); break;
-		default:
-			break;
-	}
-
-	askOverwrite=dlg->fAskOverwrite->isChecked();
-	verbose=dlg->fVerbose->isChecked();
-
-
-	bool dir=dlg->fDirectories->isChecked();
-	TQString txturl=dlg->fTXTDir->url();
-	TQString pdburl=dlg->fPDBDir->url();
-
-	TQFileInfo txtinfo(txturl);
-	TQFileInfo pdbinfo(pdburl);
-
-	if (dir)
-	{
-		if (pdbinfo.isFile())
-		{
-			int res=KMessageBox::questionYesNo(this,
-				i18n("<qt>You selected to sync folders, "
-				"but gave a filename instead (<em>%1</em>)."
-				"<br>Use folder <em>%2</em> instead?</qt>").arg(pdburl)
-				.arg(pdbinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel());
-			if (res==KMessageBox::Yes)
-			{
-				pdburl=pdbinfo.dirPath(true);
-				pdbinfo.setFile(pdburl);
-			}
-			else return;
-		}
-
-		if (!pdbinfo.isDir())
-		{
-			// no directory, so error message and return
-			KMessageBox::sorry(this,
-				i18n("<qt>The folder <em>%1</em> for "
-				"the handheld database files is not a valid "
-				"folder.</qt>").arg(pdburl));
-			return;
-		}
-
-		if (!pdbinfo.exists())
-		{
-			KMessageBox::sorry(this,
-				i18n("<qt>The folder <em>%1</em> for "
-				"the handheld database files is not a "
-				"valid directory.</qt>").arg(pdburl));
-			return;
-		}
-
-
-		// Now check the to directory:
-		if (txtinfo.isFile())
-		{
-			int res=KMessageBox::questionYesNo(this,
-				i18n("<qt>You selected to sync folders, "
-				"but gave a filename instead (<em>%1</em>)."
-				"<br>Use folder <em>%2</em> instead?</qt>").arg(txturl)
-				.arg(txtinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel());
-			if (res==KMessageBox::Yes) {
-				txturl=txtinfo.dirPath(true);
-				txtinfo.setFile(txturl);
-			}
-			else return;
-		}
-
-		// Now that we have a directory path, try to create it:
-		if (!txtinfo.isDir()) {
-			txtinfo.dir().mkdir(txturl, true);
-		}
-		if (!txtinfo.isDir()) {
-			KMessageBox::sorry(this,
-				i18n("<qt>The folder <em>%1</em> for "
-				"the text files could not be created.</qt>").arg(txturl));
-			return;
-		}
-
-
-		// Now that we have both directories, create the converter object
-		DEBUGKPILOT<<"Pdbinfo.dir="<<pdbinfo.dir().absPath()<<endl;
-		DEBUGKPILOT<<"txtinfo.dir="<<txtinfo.dir().absPath()<<endl;
-		TQStringList pdbfiles(pdbinfo.dir().entryList(CSL1("*.pdb")));
-		TQStringList converted_Files;
-
-		DEBUGKPILOT<<"Length of filename list: "<<pdbfiles.size()<<endl;
-		for ( TQStringList::Iterator it = pdbfiles.begin(); it != pdbfiles.end(); ++it )
-		{
-			TQString txtfile=TQFileInfo(*it).baseName(true)+CSL1(".txt");
-			DEBUGKPILOT<<"pdbfile="<<*it<<", pdbdir="<<pdburl<<", txtfile="<<txtfile<<", txtdir="<<txturl<<endl;
-			if (convertPDBtoTXT(pdburl, *it, txturl, txtfile, &conv))
-			{
-				converted_Files.append(*it);
-			}
-		}
-		if (converted_Files.size()>0) {
-			KMessageBox::informationList(this, i18n("The following texts were "
-					"successfully converted:"), converted_Files, i18n("Conversion Successful"));
-		}
-		else
-		{
-			KMessageBox::sorry(this, i18n("No text files were converted correctly"));
-		}
-
-
-	} else { // no dir
-
-
-		// Check the from file
-		if (!pdbinfo.isFile() || !pdbinfo.exists())
-		{
-			KMessageBox::sorry(this, i18n("<qt>The file <em>%1</em> does not "
-				"exist.</qt>").arg(pdburl));
-			return;
-		}
-
-		// Now check the to file
-/*		// I can't check if a given filename is a valid filename
-		if (!txtinfo.isFile())
-		{
-			KMessageBox::sorry(this, i18n("<qt>The filename <em>%1</em> for the "
-				"text is not a valid filename.</qt>").arg(txturl));
-			return;
-		}*/
-		if (convertPDBtoTXT(pdbinfo.dirPath(true), pdbinfo.fileName(),
-				txtinfo.dirPath(true), txtinfo.fileName(), &conv) )
-		{
-			KMessageBox::information(this, i18n("Conversion of file %1 successful.").arg(pdburl));
-		}
-
-	}
-
-}
-
-void ConverterDlg::slotToPDB()
-{
-	FUNCTIONSETUP;
-	// First, get the settings from the controls and initialize
-	// the converter object
-	bool compress=dlg->fCompress->isChecked();
-	int bmks=0;
-	if (dlg->fConvertBookmarks->isChecked())
-	{
-		if (dlg->fBookmarksInline->isChecked()) bmks|=DOCConverter::eBmkInline;
-		if (dlg->fBookmarksEndtags->isChecked()) bmks|=DOCConverter::eBmkEndtags;
-		if(dlg->fBookmarksBmk->isChecked()) bmks|=DOCConverter::eBmkDefaultBmkFile;
-	}
-	DOCConverter conv;
-	conv.setBookmarkTypes(bmks);
-	conv.setCompress(compress);
-	conv.setSort(DOCConverter::eSortName);
-
-
-	askOverwrite=dlg->fAskOverwrite->isChecked();
-	verbose=dlg->fVerbose->isChecked();
-
-
-	bool dir=dlg->fDirectories->isChecked();
-	TQString txturl=dlg->fTXTDir->url();
-	TQString pdburl=dlg->fPDBDir->url();
-
-	TQFileInfo txtinfo(txturl);
-	TQFileInfo pdbinfo(pdburl);
-
-	if (dir)
-	{
-		if (txtinfo.isFile())
-		{
-			int res=KMessageBox::questionYesNo(this,
-				i18n("<qt>You selected to sync folders, "
-				"but gave a filename instead (<em>%1</em>)."
-				"<br>Use folder <em>%2</em> instead?</qt>").arg(txturl)
-				.arg(txtinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel());
-			if (res==KMessageBox::Yes)
-			{
-				txturl=txtinfo.dirPath(true);
-				txtinfo.setFile(txturl);
-			}
-			else return;
-		}
-
-		if (!txtinfo.isDir() || !txtinfo.exists())
-		{
-			KMessageBox::sorry(this,
-				i18n("<qt>The folder <em>%1</em> for "
-				"the text files is not a valid folder.</qt>").arg(txturl));
-			return;
-		}
-
-
-		// Now check the to directory:
-		if (pdbinfo.isFile())
-		{
-			int res=KMessageBox::questionYesNo(this,
-				i18n("<qt>You selected to sync folders, "
-				"but gave a filename instead (<em>%1</em>)."
-				"<br>Use folder <em>%2</em> instead?</qt>")
-				.arg(pdburl)
-				.arg(pdbinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel());
-			if (res==KMessageBox::Yes) {
-				pdburl=pdbinfo.dirPath(true);
-				pdbinfo.setFile(pdburl);
-			}
-			else return;
-		}
-
-		// Now that we have a directory path, try to create it:
-		if (!pdbinfo.isDir()) {
-			pdbinfo.dir().mkdir(pdburl, true);
-		}
-		if (!pdbinfo.isDir()) {
-			KMessageBox::sorry(this, i18n("<qt>The folder <em>%1</em> for "
-				"the PalmDOC files could not be created.</qt>").arg(pdburl));
-			return;
-		}
-
-
-		// Now that we have both directories, create the converter object
-		DEBUGKPILOT<<"Pdbinfo.dir="<<pdbinfo.dir().absPath()<<endl;
-		DEBUGKPILOT<<"txtinfo.dir="<<txtinfo.dir().absPath()<<endl;
-		TQStringList txtfiles(txtinfo.dir().entryList(CSL1("*.txt")));
-		TQStringList converted_Files;
-
-		DEBUGKPILOT<<"Length of filename list: "<<txtfiles.size()<<endl;
-		for ( TQStringList::Iterator it = txtfiles.begin(); it != txtfiles.end(); ++it )
-		{
-			TQString pdbfile=TQFileInfo(*it).baseName(true)+CSL1(".pdb");
-			DEBUGKPILOT<<"pdbfile="<<pdbfile<<", pdbdir="<<pdburl<<", txtfile="<<*it<<", txtdir="<<txturl<<endl;
-			if (convertTXTtoPDB(txturl, *it, pdburl, pdbfile, &conv))
-			{
-				converted_Files.append(*it);
-			}
-		}
-		if (converted_Files.size()>0) {
-			KMessageBox::informationList(this, i18n("The following texts were "
-					"successfully converted:"), converted_Files, i18n("Conversion Successful"));
-		}
-		else
-		{
-			KMessageBox::sorry(this, i18n("No text files were converted correctly"));
-		}
-
-
-	} else { // no dir
-
-
-		// Check the from file
-		if (!txtinfo.isFile() || !txtinfo.exists())
-		{
-			KMessageBox::sorry(this, i18n("<qt>The file <em>%1</em> does not "
-				"exist.</qt>").arg(txturl));
-			return;
-		}
-
-		if (convertTXTtoPDB(txtinfo.dirPath(true), txtinfo.fileName(),
-				pdbinfo.dirPath(true), pdbinfo.fileName(), &conv) )
-		{
-			KMessageBox::information(this, i18n("Conversion of file %1 successful.").arg(txturl));
-		}
-
-	}
-
-}
-
-
-void ConverterDlg::slotUser1()
-{
-	KAboutApplication ab(KGlobal::instance()->aboutData(), this);
-	ab.show();
-	ab.exec();
-	return;
-}
-
-void ConverterDlg::slotDirectories(bool dir)
-{
-	FUNCTIONSETUP;
-	DEBUGKPILOT<<"Slot Directories: "<<dir<<endl;
-	if (dir)
-	{
-		dlg->fTextLabel->setText(i18n("&Text folder:"));
-		dlg->fPdbLabel->setText(i18n("&PalmDOC folder:"));
-		dlg->fTXTDir->setMode(KFile::LocalOnly | KFile::Directory);
-		dlg->fPDBDir->setMode(KFile::LocalOnly | KFile::Directory);
-	} else {
-		dlg->fTextLabel->setText(i18n("&Text file:"));
-		dlg->fPdbLabel->setText(i18n("&DOC file:"));
-		dlg->fTXTDir->setMode(KFile::LocalOnly | KFile::File);
-		dlg->fPDBDir->setMode(KFile::LocalOnly | KFile::File);
-	}
-}
-
-bool ConverterDlg::convertTXTtoPDB(TQString txtdir, TQString txtfile,
-		TQString pdbdir, TQString pdbfile, DOCConverter*conv)
-{
-	FUNCTIONSETUP;
-	bool res=false;
-	TQFileInfo dbfileinfo(pdbdir, pdbfile);
-	DEBUGKPILOT<<"Working  on file "<<pdbfile<<endl;
-	if (!dbfileinfo.exists() || !askOverwrite ||
-			(KMessageBox::Yes==KMessageBox::questionYesNo(this,
-			i18n("<qt>The database file <em>%1</em> already exists. Overwrite it?</qt>")
-			.arg(dbfileinfo.filePath()), TQString::null, i18n("Overwrite"), KStdGuiItem::cancel() ) ))
-	{
-		PilotLocalDatabase*pdbdb=new PilotLocalDatabase(pdbdir, TQFileInfo(pdbfile).baseName(), false);
-		if (pdbdb)
-		{
-			if (!pdbdb->isOpen())
-			{
-#ifdef DEBUG
-				DEBUGKPILOT<<pdbfile<<" does not yet exist. Creating it"<<endl;
-#endif
-				if (!pdbdb->createDatabase(get_long("REAd"), get_long("TEXt")) ) {
-				}
-			}
-
-			if (pdbdb->isOpen())
-			{
-				conv->setPDB(pdbdb);
-				conv->setTXTpath(txtdir, txtfile);
-				DEBUGKPILOT<<"Converting "<<txtfile<<" (dir "<<txtdir<<") to "<<dbfileinfo.filePath()<<endl;
-				if (conv->convertTXTtoPDB()) res=true;
-			}
-			delete pdbdb;
-		}
-		if ( !res && verbose )
-		{
-			KMessageBox::sorry(this, i18n("<qt>Error while converting the text %1.</qt>").arg(txtfile));
-		}
-	}
-	else
-	{
-		DEBUGKPILOT<<"Ignoring the file "<<txtfile<<endl;
-	}
-	return res;
-}
-
-bool ConverterDlg::convertPDBtoTXT(TQString pdbdir, TQString pdbfile,
-		TQString txtdir, TQString txtfile, DOCConverter*conv)
-{
-	FUNCTIONSETUP;
-	bool res=false;
-	TQFileInfo txtfileinfo(txtdir, txtfile);
-	DEBUGKPILOT<<"Working  on file "<<txtfile<<endl;
-	if (!txtfileinfo.exists() || !askOverwrite ||
-			(KMessageBox::Yes==KMessageBox::questionYesNo(this,
-			i18n("<qt>The text file <em>%1</em> already exists. Overwrite it?</qt>")
-			.arg(txtfileinfo.filePath()), TQString::null, i18n("Overwrite"), KStdGuiItem::cancel() ) ))
-	{
-		PilotLocalDatabase*pdbdb=new PilotLocalDatabase(pdbdir, TQFileInfo(pdbfile).baseName(), false);
-		if (pdbdb)
-		{
-			if (pdbdb->isOpen())
-			{
-				conv->setPDB(pdbdb);
-				conv->setTXTpath(txtdir, txtfile);
-				DEBUGKPILOT<<"Converting "<<txtfile<<" (dir "<<txtdir<<") from "<<pdbfile<<" (dir "<<pdbdir<<")"<<endl;
-				if (conv->convertPDBtoTXT()) res=true;
-			}
-			delete pdbdb;
-		}
-		if ( !res && verbose )
-		{
-			KMessageBox::sorry(this, i18n("<qt>Error while converting the text %1.</qt>").arg(pdbfile));
-		}
-	}
-	else
-	{
-		DEBUGKPILOT<<"Ignoring the file "<<pdbfile<<endl;
-	}
-	return res;
-
-}
-
-#include "kpalmdoc_dlg.moc"
diff --git a/kpilot/conduits/docconduit/kpalmdoc_dlg.h b/kpilot/conduits/docconduit/kpalmdoc_dlg.h
deleted file mode 100644
index 5e9202b0..00000000
--- a/kpilot/conduits/docconduit/kpalmdoc_dlg.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* kpalmdoc_dlg.cpp
-**
-** Copyright (C) 2003 by Reinhold Kainhofer
-**
-** This is the main dialog of the KDE PalmDOC converter.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-#ifndef CONVERTERDLG_H
-#define CONVERTERDLG_H
-
-#include <kdialogbase.h>
-class ConverterDlgBase;
-class DOCConverter;
-
-class ConverterDlg : public KDialogBase
-{
-    Q_OBJECT
-
-public:
-	ConverterDlg( TQWidget *parent=0, const TQString& caption=0);
-	~ConverterDlg();
-
-protected slots:
-	virtual void slotClose();
-	void slotToText();
-	void slotToPDB();
-	void slotDirectories(bool dir);
-	void slotUser1();
-protected:
-	void writeSettings();
-	void readSettings();
-
-	// These two functions convert one single file to or from a pdb database
-	bool convertTXTtoPDB(TQString txtdir, TQString txtfile,
-		TQString pdbdir, TQString pdbfile, DOCConverter*conv);
-	bool convertPDBtoTXT(TQString pdbdir, TQString pdbfile,
-		TQString txtdir, TQString txtfile, DOCConverter*conv);
-
-
-	// The actual dialog widget (designer created) holding all controls
-	ConverterDlgBase*dlg;
-	// Settings
-	bool askOverwrite;
-	bool verbose;
-};
-
-#endif // CONVERTERDLG_H
diff --git a/kpilot/conduits/docconduit/kpalmdoc_dlgbase.ui b/kpilot/conduits/docconduit/kpalmdoc_dlgbase.ui
deleted file mode 100644
index 8b3e8966..00000000
--- a/kpilot/conduits/docconduit/kpalmdoc_dlgbase.ui
+++ /dev/null
@@ -1,435 +0,0 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>ConverterDlgBase</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>ConverterDlgBase</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>492</width>
-            <height>339</height>
-        </rect>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <widget class="QTabWidget" row="0" column="0">
-            <property name="name">
-                <cstring>tabWidget</cstring>
-            </property>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>tab</cstring>
-                </property>
-                <attribute name="title">
-                    <string>General</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <widget class="QLabel" row="1" column="0">
-                        <property name="name">
-                            <cstring>fPdbLabel</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>4</hsizetype>
-                                <vsizetype>5</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="text">
-                            <string>&amp;PalmDOC file:</string>
-                        </property>
-                        <property name="buddy" stdset="0">
-                            <cstring>fPDBDir</cstring>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="0" column="0">
-                        <property name="name">
-                            <cstring>fTextLabel</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>4</hsizetype>
-                                <vsizetype>5</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="text">
-                            <string>&amp;Text file:</string>
-                        </property>
-                        <property name="buddy" stdset="0">
-                            <cstring>fTXTDir</cstring>
-                        </property>
-                    </widget>
-                    <widget class="QCheckBox" row="2" column="1" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>fDirectories</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Convert whole &amp;folders</string>
-                        </property>
-                    </widget>
-                    <widget class="KURLRequester" row="1" column="1" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>fPDBDir</cstring>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>Folder where copies of the handheld databases are kept. You can install them to any PalmOS handheld, and distribute these copies to other people (but beware of copyright infringement).</string>
-                        </property>
-                    </widget>
-                    <widget class="QCheckBox" row="3" column="1" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>fAskOverwrite</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&amp;Ask before overwriting files</string>
-                        </property>
-                    </widget>
-                    <widget class="QCheckBox" row="4" column="1" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>fVerbose</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&amp;Verbose messages</string>
-                        </property>
-                    </widget>
-                    <widget class="KPushButton" row="7" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>fTextToPDB</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Convert Text to PalmDOC</string>
-                        </property>
-                    </widget>
-                    <widget class="KPushButton" row="7" column="2">
-                        <property name="name">
-                            <cstring>fPDBToText</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Convert PalmDOC to Text</string>
-                        </property>
-                    </widget>
-                    <spacer row="6" column="1">
-                        <property name="name">
-                            <cstring>spacer5</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>20</width>
-                                <height>16</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="KURLRequester" row="0" column="1" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>fTXTDir</cstring>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>Enter the name of the folder where the text files reside on the PC. All files with extension .txt will be synced to the handheld.</string>
-                        </property>
-                    </widget>
-                    <widget class="QComboBox" row="5" column="1" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>fEncoding</cstring>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="5" column="0">
-                        <property name="name">
-                            <cstring>textLabel1</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&amp;Encoding:</string>
-                        </property>
-                        <property name="buddy" stdset="0">
-                            <cstring>fEncoding</cstring>
-                        </property>
-                    </widget>
-                </grid>
-            </widget>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>tab</cstring>
-                </property>
-                <attribute name="title">
-                    <string>PC -&gt; Handheld</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <spacer row="3" column="0">
-                        <property name="name">
-                            <cstring>spacer6</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Fixed</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>20</width>
-                                <height>16</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <spacer row="4" column="0">
-                        <property name="name">
-                            <cstring>spacer7</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Fixed</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>20</width>
-                                <height>16</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <spacer row="2" column="0">
-                        <property name="name">
-                            <cstring>spacer8</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Fixed</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>20</width>
-                                <height>16</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QCheckBox" row="2" column="1">
-                        <property name="name">
-                            <cstring>fBookmarksInline</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&amp;Inline tags in text</string>
-                        </property>
-                        <property name="checked">
-                            <bool>true</bool>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>When a &lt;* bookmarktext *&gt; appears somewhere in the text, a bookmark will be set at this position, and the text between the &lt;* and the *&gt; will be used as bookmark name. The &lt;*...*&gt; will be removed from the text.</string>
-                        </property>
-                    </widget>
-                    <widget class="QCheckBox" row="3" column="1">
-                        <property name="name">
-                            <cstring>fBookmarksEndtags</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&amp;Tags at end of text</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>Tags of the form &lt;bookmarkname&gt; at the end of the text will be used to search the text for the pattern between the &lt; and &gt;. Whenever "bookmarkname" appears in the text, a bookmark will be set there. The endtags &lt;...&gt; will then be removed from the end of the text.</string>
-                        </property>
-                    </widget>
-                    <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>fCompress</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&amp;Compress</string>
-                        </property>
-                        <property name="checked">
-                            <bool>true</bool>
-                        </property>
-                        <property name="toolTip" stdset="0">
-                            <string>Check this box, if the text should be compressed on the handheld to save memory. Most doc reader on the handheld support compressed texts.</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>The Palm doc format supports compressing the text to save memory. If you check this box, the text will consume about 50% less memory than in uncompressed state. Almost all DOC readers on the Palm support compressed texts.</string>
-                        </property>
-                    </widget>
-                    <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>fConvertBookmarks</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Convert &amp;bookmarks</string>
-                        </property>
-                        <property name="checked">
-                            <bool>true</bool>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>Do you want to convert bookmarks? Most doc readers support bookmarks. You have to provide some information about where the bookmarks should be set and their titles. Check at least one of the bookmark types below.</string>
-                        </property>
-                    </widget>
-                    <widget class="QCheckBox" row="4" column="1">
-                        <property name="name">
-                            <cstring>fBookmarksBmk</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Regular &amp;expressions in .bmk file</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>Use regular expressions in a file textname.bmk (textname.txt is the filename of the text) to search the text for bookmarks.See the documentation for a description of the format of the bmk file.</string>
-                        </property>
-                    </widget>
-                    <spacer row="5" column="1">
-                        <property name="name">
-                            <cstring>spacer9</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>21</width>
-                                <height>200</height>
-                            </size>
-                        </property>
-                    </spacer>
-                </grid>
-            </widget>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>tab</cstring>
-                </property>
-                <attribute name="title">
-                    <string>Handheld -&gt; PC</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <spacer row="2" column="0">
-                        <property name="name">
-                            <cstring>spacer10</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>21</width>
-                                <height>190</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QButtonGroup" row="0" column="0">
-                        <property name="name">
-                            <cstring>fPCBookmarks</cstring>
-                        </property>
-                        <property name="title">
-                            <string>Convert Bookmarks</string>
-                        </property>
-                        <grid>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="QRadioButton" row="1" column="0">
-                                <property name="name">
-                                    <cstring>radioButton9</cstring>
-                                </property>
-                                <property name="enabled">
-                                    <bool>false</bool>
-                                </property>
-                                <property name="text">
-                                    <string>Convert as &amp;inline tags</string>
-                                </property>
-                                <property name="buttonGroupId">
-                                    <number>1</number>
-                                </property>
-                            </widget>
-                            <widget class="QRadioButton" row="0" column="0">
-                                <property name="name">
-                                    <cstring>radioButton8</cstring>
-                                </property>
-                                <property name="enabled">
-                                    <bool>false</bool>
-                                </property>
-                                <property name="text">
-                                    <string>Do &amp;not convert bookmarks</string>
-                                </property>
-                                <property name="buttonGroupId">
-                                    <number>0</number>
-                                </property>
-                            </widget>
-                            <widget class="QRadioButton" row="2" column="0">
-                                <property name="name">
-                                    <cstring>radioButton10</cstring>
-                                </property>
-                                <property name="enabled">
-                                    <bool>false</bool>
-                                </property>
-                                <property name="text">
-                                    <string>Convert as &amp;end tags</string>
-                                </property>
-                            </widget>
-                            <widget class="QRadioButton" row="3" column="0">
-                                <property name="name">
-                                    <cstring>radioButton11</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Convert into .bmk &amp;file</string>
-                                </property>
-                                <property name="checked">
-                                    <bool>true</bool>
-                                </property>
-                            </widget>
-                        </grid>
-                    </widget>
-                </grid>
-            </widget>
-        </widget>
-    </grid>
-</widget>
-<customwidgets>
-</customwidgets>
-<connections>
-    <connection>
-        <sender>fConvertBookmarks</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>fBookmarksInline</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>fConvertBookmarks</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>fBookmarksEndtags</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>fConvertBookmarks</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>fBookmarksBmk</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-</connections>
-<layoutdefaults spacing="6" margin="11"/>
-<includes>
-    <include location="global" impldecl="in implementation">kurlrequester.h</include>
-    <include location="global" impldecl="in implementation">klineedit.h</include>
-    <include location="global" impldecl="in implementation">kpushbutton.h</include>
-</includes>
-</UI>
diff --git a/kpilot/conduits/docconduit/makedoc9.cc b/kpilot/conduits/docconduit/makedoc9.cc
deleted file mode 100644
index 1f1c56ff..00000000
--- a/kpilot/conduits/docconduit/makedoc9.cc
+++ /dev/null
@@ -1,405 +0,0 @@
-// based on: MakeDoc, version 2
-// I only took the tBuf class from there and adapted it.
-//
-// Compresses text files into a format that is ready to export to a Pilot
-// and work with Rick Bram's PilotDOC reader.
-// Copyright (C) Reinhold Kainhofer, 2002
-// Copyrigth (C) Pat Beirne, 2000
-//
-// Original file (makedoc9.cpp) copyright by:
-// Copyright (C) Pat Beirne, 2000.
-// Distributable under the GNU General Public License Version 2 or later.
-//
-// ver 0.6 enforce 31 char limit on database names
-// ver 0.7 change header and record0 to structs
-// ver 2.0 added category control on the command line
-//              changed extensions from .prc to .pdb
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <iostream>
-
-
-#include "makedoc9.h"
-
-
-
-//
-// Issue()
-//
-// action: handle the details of writing a single
-//              character to the compressed stream
-//
-unsigned
- tBuf::Issue(byte src, int &bSpace)
-{
-	unsigned int iDest = len;
-	byte *dest = buf;
-
-	// TODO: which of the if parts should really be included???
-#if 0
-	// modified version of issue
-	// just issue the char
-	if (src >= 0x80 || src <= 8)
-		dest[iDest++] = 1;
-	dest[iDest++] = src;
-
-#else
-	// if there is an outstanding space char, see if
-	// we can squeeze it in with an ASCII char
-	if (bSpace)
-	{
-		if (src >= 0x40 && src <= 0x7F)
-			dest[iDest++] = src ^ 0x80;
-		else
-		{
-			// couldn't squeeze it in, so issue the space char by itself
-			// most chars go out simple, except the range 1...8,0x80...0xFF
-			dest[iDest++] = ' ';
-			if (src < 0x80 && (src == 0 || src > 8))
-				dest[iDest++] = src;
-			else
-				dest[iDest++] = 1, dest[iDest++] = src;
-		}
-		// knock down the space flag
-		bSpace = 0;
-	}
-	else
-	{
-		// check for a space char
-		if (src == ' ')
-			bSpace = 1;
-		else
-		{
-			if (src < 0x80 && (src == 0 || src > 8))
-				dest[iDest++] = src;
-			else
-				dest[iDest++] = 1, dest[iDest++] = src;
-
-		}
-	}
-#endif
-	len = iDest;
-	return iDest;
-}
-
-//
-// Compress
-//
-// params:      none
-//
-// action:      takes the given buffer,
-//                                      and compresses
-//                                      the original data down into a second buffer
-//
-// comment:     This version make heavy use of walking pointers.
-//
-unsigned tBuf::Compress()
-{
-	if (!buf)
-		return 0;
-	if (isCompressed) {
-//		cout<<"Buffer is already compressed!"<<endl;
-		return len;
-//	} else {
-//		cout<<" Compressing buffer!!!"<<endl;
-	}
-
-	unsigned int i;
-
-	// run through the input buffer
-	byte *pBuffer;					  // points to the input buffer
-	byte *pHit;						  // points to a walking test hit; works upwards on successive matches
-	byte *pPrevHit;				  // previous value of pHit; also, start of next test
-	byte *pTestHead;				  // current test string
-	byte *pTestTail;				  // current walking pointer; one past the current test buffer
-	byte *pEnd;						  // 1 past the end of the input buffer
-
-	pHit = pPrevHit = pTestHead = pBuffer = buf;
-	pTestTail = pTestHead + 1;
-	pEnd = buf + len;				  // should point to a 0!
-
-	// make a dest buffer and reassign the local buffer
-	buf = new byte[6000];
-	len = 0;							  // used to walk through the output buffer
-
-	// loop, absorbing one more char from the input buffer on each pass
-	for (; pTestHead != pEnd; pTestTail++)
-	{
-		// if we already have 10 char match, don't bother scanning again for the 11th (wasted time)
-		if (pTestTail - pTestHead != (1 << COUNT_BITS) + 3)
-		{
-			// scan in the previous data for a match
-			// terminate the test string (and the matcher string, as well!) in a 0
-			byte tmp = *pTestTail;
-
-			*pTestTail = 0;
-			pHit = (byte *) strstr((const char *) pPrevHit,
-				(const char *) pTestHead);
-			*pTestTail = tmp;		  // restore the char
-		}
-
-		// on a mismatch or end of buffer, issued codes
-		if (pHit == pTestHead
-			|| pTestTail - pTestHead > (1 << COUNT_BITS) + 2
-			|| pTestTail == pEnd)
-		{
-			// issue the codes
-			// first, check for short runs
-			if (pTestTail - pTestHead < 4)
-			{
-				if (pTestHead[0] > 0x7F || pTestHead[0] <= 8)
-					buf[len++] = 1;
-				buf[len++] = pTestHead[0];
-				pTestHead++;
-			}
-			// for longer runs, issue a run-code
-			else
-			{
-				unsigned int dist = pTestHead - pPrevHit;
-				unsigned int compound =
-					(dist << COUNT_BITS) + pTestTail - pTestHead - 4;
-
-//if (dist>=(1<<DISP_BITS)) printf("\n!! error dist overflow");
-//if (pTestTail-pTestHead-4>7) printf("\n!! error len overflow");
-
-				buf[len++] = 0x80 + (compound >> 8);
-				buf[len++] = compound & 0xFF;
-//printf("\nissuing code for sequence len %d <%c%c%c>",pTestTail-pTestHead-1,pTestHead[0],pTestHead[1],pTestHead[2]);
-//printf("\n          <%x%x>",pOut[-2],pOut[-1]);
-				// and start again
-				pTestHead = pTestTail - 1;
-			}
-			// start the search again
-			pPrevHit = pBuffer;
-			// within range
-			if (pTestHead - pPrevHit > ((1 << DISP_BITS) - 1))
-				pPrevHit = pTestHead - ((1 << DISP_BITS) - 1);
-		}
-		// got a match
-		else
-		{
-			pPrevHit = pHit;
-		}
-		// when we get to the end of the buffer, don't inc past the end
-		// this forces the residue chars out one at a time
-		if (pTestTail == pEnd)
-			pTestTail--;
-	}
-
-
-	// final scan to merge consecutive high chars together
-	// and merge space chars
-	unsigned int k;
-
-	for (i = k = 0; i < len; i++, k++)
-	{
-		buf[k] = buf[i];
-		// skip the run-length codes
-		if (buf[k] >= 0x80 && buf[k] < 0xC0)
-			buf[++k] = buf[++i];
-		// if we hit a high char marker, look ahead for another
-		// and merge multiples together
-		else if (buf[k] == 1)
-		{
-			buf[k + 1] = buf[i + 1];
-			while (i + 2 < len && buf[i + 2] == 1 && buf[k] < 8)
-			{
-				buf[k]++;
-				buf[k + buf[k]] = buf[i + 3];
-				i += 2;
-			}
-			k += buf[k];
-			i++;
-		}
-		else if (buf[k] == ' ' && i < len - 1 && buf[i + 1] <= 0x7F
-			&& buf[i + 1] >= 0x40)
-			buf[k] = 0x80 | buf[++i];
-	}
-
-	// delete original buffer
-	delete[]pBuffer;
-	len = k;
-
-	isCompressed = true;
-	return k;
-}
-
-/*
-	Decompress
-
-	params:	none
-
-	action: make a new buffer
-					run through the source data
-					check the 4 cases:
-						0,9...7F represent self
-						1...8		escape n chars
-						80...bf reference earlier run
-						c0...ff	space+ASCII
-
-*/
-unsigned tBuf::Decompress()
-{
-	if (!buf)
-		return 0;
-	if (!isCompressed) {
-//		cout<<"Buffer already uncompressed. Doing nothing"<<endl;
-		return len;
-//	} else {
-//		cout<<"Decompressing buffer"<<endl;
-	}
-
-	// we "know" that all decompresses fit within 4096, right?
-	byte *pOut = new byte[6000];
-	byte *in_buf = buf;
-	byte *out_buf = pOut;
-
-	unsigned int i, j;
-
-	for (j = i = 0; j < len;)
-	{
-		unsigned int c;
-
-		// take a char from the input buffer
-		c = in_buf[j++];
-
-		// separate the char into zones: 0, 1...8, 9...0x7F, 0x80...0xBF, 0xC0...0xFF
-
-		// codes 1...8 mean copy that many bytes; for accented chars & binary
-		if (c > 0 && c < 9)
-			while (c--)
-				out_buf[i++] = in_buf[j++];
-
-		// codes 0, 9...0x7F represent themselves
-		else if (c < 0x80)
-			out_buf[i++] = c;
-
-		// codes 0xC0...0xFF represent "space + ascii char"
-		else if (c >= 0xC0)
-			out_buf[i++] = ' ', out_buf[i++] = c ^ 0x80;
-
-		// codes 0x80...0xBf represent sequences
-		else
-		{
-			int m, n;
-
-			c <<= 8;
-			c += in_buf[j++];
-			m = (c & 0x3FFF) >> COUNT_BITS;
-			n = c & ((1 << COUNT_BITS) - 1);
-			n += 3;
-			while (n--)
-			{
-				out_buf[i] = out_buf[i - m];
-				i++;
-			}
-		}
-	}
-	out_buf[i++]='\0';
-	out_buf[i++]='\0';
-	delete[]buf;
-	buf = pOut;
-	len = i;
-
-	isCompressed = false;
-	return i;
-}
-
-unsigned tBuf::DuplicateCR()
-{
-	if (!buf)
-		return 0;
-	byte *pBuf = new byte[2 * len];
-
-	unsigned int k, j;
-
-	for (j = k = 0; j < len; j++, k++)
-	{
-		pBuf[k] = buf[j];
-		if (pBuf[k] == 0x0A)
-			pBuf[k++] = 0x0D, pBuf[k] = 0x0A;
-	}
-	delete[]buf;
-	buf = pBuf;
-	len = k;
-	return k;
-}
-
-
-
-// this nasty little beast removes really low ASCII and 0's
-// and handles the CR problem
-//
-// if a cr appears before a lf, then remove the cr
-// if a cr appears in isolation, change to a lf
-unsigned tBuf::RemoveBinary()
-{
-	if (!buf)
-		return 0;
-	byte *in_buf = buf;
-	byte *out_buf = new byte[len];
-
-	unsigned int k, j;
-
-	for (j = k = 0; j < len; j++, k++)
-	{
-		// copy each byte
-		out_buf[k] = in_buf[j];
-
-		// throw away really low ASCII
-		if (( /*out_buf[k]>=0 && */ out_buf[k] < 9))
-			k--;
-
-		// for CR
-		if (out_buf[k] == 0x0D)
-		{
-			// if next is LF, then drop it
-			if (j < len - 1 && in_buf[j + 1] == 0x0A)
-				k--;
-			else						  // turn it into a LF
-				out_buf[k] = 0x0A;
-		}
-	}
-	delete[]buf;
-	buf = out_buf;
-	len = k;
-	return k;
-}
-
-void tBuf::setText(const byte * text, unsigned txtlen, bool txtcomp)
-{
-	if (buf)
-		delete[]buf;
-	buf = 0L;
-
-	if (txtlen <= 0)
-		txtlen = strlen((const char *) text);
-	len = txtlen;
-	buf = new byte[len];
-
-	memcpy(buf, text, len*sizeof(char));
-//	strncpy((char *) buf, (const char *) text, len);
-	isCompressed = txtcomp;
-//	cout<<"Setting text, compressed="<<txtcomp<<endl;
-}
diff --git a/kpilot/conduits/docconduit/makedoc9.h b/kpilot/conduits/docconduit/makedoc9.h
deleted file mode 100644
index 27e3695d..00000000
--- a/kpilot/conduits/docconduit/makedoc9.h
+++ /dev/null
@@ -1,111 +0,0 @@
-#ifndef MAKEDOC_H
-#define MAKEDOC_H
-// based on: MakeDoc, version 2
-// I only took the tBuf class from there and adapted it.
-//
-// Compresses text files into a format that is ready to export to a Pilot
-// and work with Rick Bram's PilotDOC reader.
-// Copyright (C) Reinhold Kainhofer, 2002
-// Copyrigth (C) Pat Beirne, 2000
-//
-// Original file (makedoc9.cpp) copyright by:
-// Copyright (C) Pat Beirne, 2000.
-// Distributable under the GNU General Public License Version 2 or later.
-//
-// ver 0.6 enforce 31 char limit on database names
-// ver 0.7 change header and record0 to structs
-// ver 2.0 added category control on the command line
-//              changed extensions from .prc to .pdb
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-#include <stdio.h>
-
-typedef unsigned char byte;
-typedef unsigned long DWORD;
-typedef unsigned short WORD;
-
-#define DISP_BITS 11
-#define COUNT_BITS 3
-
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////                                  //////////////////////
-/////////////////////      tBuf class                  //////////////////////
-/////////////////////                                  //////////////////////
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-
-
-class tBuf {
- private:
-//      byte hichar[10];
-//      int hicharnum;
-//      bool space;
-
-	byte * buf;
-	unsigned len;
-	bool isCompressed;
- public:
-	 tBuf() {
-		buf = 0L;
-		len=0;
-		isCompressed=false;
-	};
-
-	~tBuf()
-	{
-		if (buf)
-			delete[]buf;
-	}
-
-	void Clear() {
-		delete[]buf;
-		buf = 0L;
-	}
-	void setText(const byte * text, unsigned int txtlen =
-		0, bool txtcomp = false);
-	byte *text() const {
-		return buf;
-	}
-	unsigned Len() const {
-		return len;
-	}
-	void setCompressed(bool compressed = true) {
-		isCompressed = compressed;
-	}
-	bool compressed() const {
-		return isCompressed;
-	}
-	unsigned RemoveBinary();
-	unsigned DuplicateCR();
-
-	unsigned Decompress();
-	unsigned Compress();
-
- private:
-	unsigned Issue(byte src, int &bSpace);
-	void Dump() const {
-		printf("\nbuffer len=%d", len);
-}};
-
-
-#endif
diff --git a/kpilot/conduits/docconduit/pilotDOCBookmark.cc b/kpilot/conduits/docconduit/pilotDOCBookmark.cc
deleted file mode 100644
index 9b93f2af..00000000
--- a/kpilot/conduits/docconduit/pilotDOCBookmark.cc
+++ /dev/null
@@ -1,87 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This is a C++ class for the DOC bookmark record structure
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-#include "pilotDOCBookmark.h"
-
-
-
-PilotDOCBookmark::PilotDOCBookmark():PilotRecordBase(), pos(0)
-{
-	FUNCTIONSETUP;
-	memset(&bookmarkName[0], 0, 16);
-}
-
-
-
-/* initialize the entry from another one. If rec==NULL, this constructor does the same as PilotDOCBookmark()
-*/
-PilotDOCBookmark::PilotDOCBookmark(PilotRecord * rec):PilotRecordBase(rec)
-{
-	if (rec)
-	{
-		const pi_buffer_t *b = rec->buffer();
-		unsigned int offset = 0;
-		Pilot::dlp<char *>::read(b,offset,bookmarkName,16);
-		bookmarkName[16]='\0';
-		pos = Pilot::dlp<long>::read(b,offset);
-	}
-}
-
-
-
-PilotDOCBookmark::PilotDOCBookmark(const PilotDOCBookmark & e):PilotRecordBase(e)
-{
-	FUNCTIONSETUP;
-	*this = e;
-}
-
-
-
-PilotDOCBookmark & PilotDOCBookmark::operator =(const PilotDOCBookmark & e)
-{
-	if (this != &e)
-	{
-		strncpy(&bookmarkName[0], &e.bookmarkName[0], 16);
-		bookmarkName[16]='\0';
-		pos = e.pos;
-	}
-	return *this;
-}
-
-
-
-PilotRecord *PilotDOCBookmark::pack() const
-{
-	pi_buffer_t *b = pi_buffer_new( 16 + Pilot::dlp<long>::size );
-	pi_buffer_append(b, bookmarkName, 16);
-	b->data[16] = 0;
-	Pilot::dlp<long>::append(b,pos);
-	PilotRecord* rec =  new PilotRecord(b, this);
-	return rec;
-}
diff --git a/kpilot/conduits/docconduit/pilotDOCBookmark.h b/kpilot/conduits/docconduit/pilotDOCBookmark.h
deleted file mode 100644
index fe511fc1..00000000
--- a/kpilot/conduits/docconduit/pilotDOCBookmark.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* pilotDOCBookmark.h	-*- C++ -*-		KPilot
-**
-** Copyright (C) 2003 by Reinhold Kainhofer
-**
-** See the .cc file for an explanation of what this file is for.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-#ifndef _KPILOT_PILOTDOCBOOKMARK_H
-#define _KPILOT_PILOTDOCBOOKMARK_H
-
-#include <pilotRecord.h>
-class PilotRecord;
-
-
-class PilotDOCBookmark:public PilotRecordBase {
-public:
-	PilotDOCBookmark();
-	PilotDOCBookmark(PilotRecord * rec);
-	PilotDOCBookmark(const PilotDOCBookmark & e);
-	~PilotDOCBookmark() {};
-	PilotDOCBookmark & operator=(const PilotDOCBookmark & e);
-
-	PilotRecord *pack() const;
-
-public:
-	char bookmarkName[17];
-	long int pos;
-};
-
-
-#endif
diff --git a/kpilot/conduits/docconduit/pilotDOCEntry.cc b/kpilot/conduits/docconduit/pilotDOCEntry.cc
deleted file mode 100644
index 75a51cef..00000000
--- a/kpilot/conduits/docconduit/pilotDOCEntry.cc
+++ /dev/null
@@ -1,92 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This is a C++ class dealing with PalmDOC text records
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-#include "pilotDOCEntry.h"
-
-
-
-const int PilotDOCEntry::TEXT_SIZE = 4096;
-
-
-PilotDOCEntry::PilotDOCEntry():PilotRecordBase()
-{
-	FUNCTIONSETUP;
-	compress = false;
-}
-
-
-
-/* initialize the entry from another one. If rec==NULL, this constructor does the same as PilotDOCEntry()
-*/
-PilotDOCEntry::PilotDOCEntry(PilotRecord * rec, bool compressed):PilotRecordBase(rec)
-{
-	if (rec) fText.setText((unsigned char *) rec->data(), rec->size(), compressed);
-	compress = compressed;
-}
-
-
-
-PilotDOCEntry::PilotDOCEntry(const PilotDOCEntry & e):PilotRecordBase(e)
-{
-	FUNCTIONSETUP;
-	// See PilotDateEntry::operator = for details
-	fText.setText(e.fText.text(), e.fText.Len(), e.fText.compressed());
-	compress = e.compress;
-}
-
-
-
-PilotDOCEntry & PilotDOCEntry::operator =(const PilotDOCEntry & e)
-{
-	if (this != &e)
-	{
-		fText.setText(e.fText.text(), e.fText.Len(), e.fText.compressed());
-		compress = e.compress;
-	}
-	return *this;
-}
-
-
-
-
-PilotRecord *PilotDOCEntry::pack()
-{
-	int len = compress ? fText.Compress() : fText.Decompress();
-
-	if (len<0)
-	{
-		return 0L;
-	}
-
-	pi_buffer_t *b = pi_buffer_new( len + 4 ); // +4 for safety
-	memcpy( b->data, (const char *) fText.text(), len );
-	b->used = len;
-	PilotRecord* rec =  new PilotRecord(b, this);
-	return rec;
-}
diff --git a/kpilot/conduits/docconduit/pilotDOCEntry.h b/kpilot/conduits/docconduit/pilotDOCEntry.h
deleted file mode 100644
index 4ecaf19a..00000000
--- a/kpilot/conduits/docconduit/pilotDOCEntry.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* pilotDOCEntry.h	-*- C++ -*-		KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** See the .cc file for an explanation of what this file is for.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to the mailinlist kde-pim@kde.org
-*/
-#ifndef _KPILOT_PILOTDOCENTRY_H
-#define _KPILOT_PILOTDOCENTRY_H
-
-#include <pilotRecord.h>
-#include "makedoc9.h"
-
-
-class PilotRecord;
-
-
-class PilotDOCEntry:public PilotRecordBase {
-private:
-	bool compress;
-	tBuf fText;
-public:
-	static const int TEXT_SIZE;
-	PilotDOCEntry();
-	PilotDOCEntry(PilotRecord * rec, bool compressed = false);
-	PilotDOCEntry(const PilotDOCEntry & e);
-	~PilotDOCEntry() {};
-	PilotDOCEntry & operator=(const PilotDOCEntry & e);
-
-
-	TQString getText() {
-		fText.Decompress();
-		return TQString::fromLatin1((const char *) fText.text());
-	};
-	void setText(TQString newtext, bool compressed = false) {
-		fText.setText((const unsigned char *) newtext.latin1(),
-			newtext.length(), compressed);
-	};
-
-	bool getCompress() const {
-		return compress;
-	}
-	void setCompress(bool compressed) {
-		compress = compressed;
-	};
-
-	PilotRecord *pack(); // Not const because it can change the compression
-};
-
-
-
-#endif
-
diff --git a/kpilot/conduits/docconduit/pilotDOCHead.cc b/kpilot/conduits/docconduit/pilotDOCHead.cc
deleted file mode 100644
index 1f07e286..00000000
--- a/kpilot/conduits/docconduit/pilotDOCHead.cc
+++ /dev/null
@@ -1,101 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This is a C++ class dealing with PalmDOC text records
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-#include "options.h"
-#include "pilotDOCHead.h"
-
-#include "makedoc9.h"
-
-
-
-const int PilotDOCHead::textRecordSize = 4096;
-
-PilotDOCHead::PilotDOCHead():PilotRecordBase(),
-version(0),
-spare(0), storyLen(0), numRecords(0), recordSize(textRecordSize), position(0)
-{
-	FUNCTIONSETUP;
-}
-
-
-
-/* initialize the entry from another one. If rec==NULL, this constructor does the same as PilotDOCHead()
-*/
-PilotDOCHead::PilotDOCHead(PilotRecord * rec):PilotRecordBase(rec)
-{
-	const unsigned char *b = (const unsigned char *) rec->data();
-	unsigned int offset = 0;
-
-	version = Pilot::dlp<short>::read(b,offset);
-	spare = Pilot::dlp<short>::read(b,offset);
-	storyLen = Pilot::dlp<long>::read(b,offset);
-	numRecords = Pilot::dlp<short>::read(b,offset);
-	recordSize = Pilot::dlp<short>::read(b,offset);
-	position = Pilot::dlp<long>::read(b,offset);
-}
-
-
-PilotDOCHead::PilotDOCHead(const PilotDOCHead & e):PilotRecordBase(e)
-{
-	FUNCTIONSETUP;
-	*this = e;
-}
-
-
-
-PilotDOCHead & PilotDOCHead::operator =(const PilotDOCHead & e)
-{
-	if (this != &e)
-	{
-		version = e.version;
-		spare = e.spare;
-		storyLen = e.storyLen;
-		numRecords = e.numRecords;
-		recordSize = e.recordSize;
-		position = e.position;
-	}
-	return *this;
-}
-
-
-
-
-PilotRecord *PilotDOCHead::pack() const
-{
-	pi_buffer_t *b = pi_buffer_new(16);
-
-	Pilot::dlp<short>::append(b,version);
-	Pilot::dlp<short>::append(b,spare);
-	Pilot::dlp<long>::append(b,storyLen);
-	Pilot::dlp<short>::append(b,numRecords);
-	Pilot::dlp<short>::append(b,recordSize);
-	Pilot::dlp<long>::append(b,position);
-
-	PilotRecord *rec =  new PilotRecord(b, this);
-	return rec;
-}
-
diff --git a/kpilot/conduits/docconduit/pilotDOCHead.h b/kpilot/conduits/docconduit/pilotDOCHead.h
deleted file mode 100644
index aeb7fb52..00000000
--- a/kpilot/conduits/docconduit/pilotDOCHead.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* pilotDOCHead.h	-*- C++ -*-		KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** See the .cc file for an explanation of what this file is for.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to the mailinlist kde-pim@kde.org
-*/
-#ifndef _KPILOT_PILOTDOCHEAD_H
-#define _KPILOT_PILOTDOCHEAD_H
-
-#include <pilotRecord.h>
-
-class PilotRecord;
-
-
-class PilotDOCHead:public PilotRecordBase {
- private:
-	static const int textRecordSize;
-
- public:
-	int version;
-	int spare;
-	long int storyLen;
-	int numRecords;
-	int recordSize;
-	long int position;
-
-	PilotRecord *pack() const;
-
- public:
-	 PilotDOCHead();
-	 PilotDOCHead(PilotRecord * rec);
-	 PilotDOCHead(const PilotDOCHead & e);
-	~PilotDOCHead() { }
-
-	PilotDOCHead & operator=(const PilotDOCHead & e);
-};
-
-
-
-#endif
-
diff --git a/kpilot/conduits/docconduit/tests/testcompress.cpp b/kpilot/conduits/docconduit/tests/testcompress.cpp
deleted file mode 100644
index b8367b2b..00000000
--- a/kpilot/conduits/docconduit/tests/testcompress.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/* 
-** Copyright (C) 2003 by Reinhold Kainhofer
-**
-** This is just a very simple programm to check the compress/uncompress 
-** routines by taking one string, compress and then decompress it and
-** see if it is the original string.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-#include <stdio.h>
-#include <iostream.h>
-
-
-#include "../makedoc9.h"
-
-void main () 
-{
-	tBuf fText;
-	char*text="asdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdf";
-
-	fText.setText((const byte*)text);
-	cout<<"Decompressed text: "<<fText.text()<<"  ("<<fText.Len()<<")  --  Compressed: "<<fText.compressed()<<endl;
-	
-	fText.Compress();
-	cout<<"  Compressed text: "<<fText.text()<<"  ("<<fText.Len()<<")  --  Compressed: "<<fText.compressed()<<endl;
-	fText.Decompress();
-	cout<<"Decompressed text: "<<fText.text()<<"  ("<<fText.Len()<<")  --  Compressed: "<<fText.compressed()<<endl;
-
-	fText.Compress();
-	cout<<"  Compressed text: "<<fText.text()<<"  ("<<fText.Len()<<")  --  Compressed: "<<fText.compressed()<<endl;
-	fText.Decompress();
-	cout<<"Decompressed text: "<<fText.text()<<"  ("<<fText.Len()<<")  --  Compressed: "<<fText.compressed()<<endl;
-
-	fText.Compress();
-	cout<<"  Compressed text: "<<fText.text()<<"  ("<<fText.Len()<<")  --  Compressed: "<<fText.compressed()<<endl;
-	fText.Decompress();
-	cout<<"Decompressed text: "<<fText.text()<<"  ("<<fText.Len()<<")  --  Compressed: "<<fText.compressed()<<endl;
-
-
-}
diff --git a/kpilot/conduits/knotes/CMakeLists.txt b/kpilot/conduits/knotes/CMakeLists.txt
deleted file mode 100644
index 568adb42..00000000
--- a/kpilot/conduits/knotes/CMakeLists.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
-)
-
-set(conduit_knotes_SRCS
-	knotes-factory.cc
-	knotes-setup.cc
-	knotes-action.cc
-)
-
-set(conduit_knotes_UIS
-	setup_base.ui
-)
-
-set(conduit_knotes_KCFGS
-	knotesconduitSettings.kcfgc
-)
-
-#set(conduit_knotes_STUBS
-#	KNotesIface.h
-#)
-
-#kde3_add_dcop_skels(conduit_knotes_SRCS ${conduit_knotes_STUBS})
-#kde3_add_dcop_stubs(conduit_knotes_SRCS ${conduit_knotes_STUBS})
-
-kde3_add_kcfg_files(conduit_knotes_SRCS ${conduit_knotes_KCFGS})
-kde3_add_ui_files(conduit_knotes_SRCS ${conduit_knotes_UIS})
-kde3_automoc(${conduit_knotes_SRCS})
-
-add_library(conduit_knotes SHARED ${conduit_knotes_SRCS})
-target_link_libraries(conduit_knotes kcal)
-
-set_target_properties(conduit_knotes PROPERTIES
-	LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
-	PREFIX ""
-)
-
-kde3_install_libtool_file(conduit_knotes)
-
-install(
-	TARGETS conduit_knotes
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-)
-
-install(
-	FILES knotes-conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
-)
-
-install(
-	FILES knotesconduit.kcfg DESTINATION ${KDE3_KCFG_DIR}
-)
diff --git a/kpilot/conduits/knotes/Makefile.am b/kpilot/conduits/knotes/Makefile.am
deleted file mode 100644
index db4cff3e..00000000
--- a/kpilot/conduits/knotes/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir) -I$(top_srcdir)/kpilot/lib $(all_includes)
-
-METASOURCES = AUTO
-
-servicedir = $(kde_servicesdir)
-service_DATA = knotes-conduit.desktop
-
-kde_module_LTLIBRARIES = conduit_knotes.la
-
-
-conduit_knotes_la_SOURCES = \
-	knotesconduitSettings.kcfgc \
-	knotes-factory.cc \
-	knotes-setup.cc \
-	knotes-action.cc \
-	setup_base.ui
-	
-conduit_knotes_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-conduit_knotes_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI)
-
-kde_kcfg_DATA = knotesconduit.kcfg
diff --git a/kpilot/conduits/knotes/cr32-app-knotesconduit.png b/kpilot/conduits/knotes/cr32-app-knotesconduit.png
deleted file mode 100644
index 6bca7900..00000000
--- a/kpilot/conduits/knotes/cr32-app-knotesconduit.png
+++ /dev/null
diff --git a/kpilot/conduits/knotes/knotes-action.cc b/kpilot/conduits/knotes/knotes-action.cc
deleted file mode 100644
index ca329132..00000000
--- a/kpilot/conduits/knotes/knotes-action.cc
+++ /dev/null
@@ -1,872 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2001 by Dan Pilone
-** Copyright (C) 2002,2003,2004 by Adriaan de Groot
-**
-** This file defines the SyncAction for the knotes-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <tqmap.h>
-#include <tqtimer.h>
-
-#include <kapplication.h>
-
-#include <kurl.h>
-#include <libkcal/calendarlocal.h>
-#include <kstandarddirs.h>
-
-
-#include <kconfig.h>
-//#include <dcopclient.h>
-
-#include <time.h>  // required by pilot-link includes
-
-#include <pi-memo.h>
-
-#include "pilotMemo.h"
-#include "pilotSerialDatabase.h"
-
-//#include "KNotesIface_stub.h"
-
-#include "knotes-factory.h"
-
-#include "knotes-action.moc"
-#include "knotesconduitSettings.h"
-
-extern "C"
-{
-
-unsigned long version_conduit_knotes = Pilot::PLUGIN_API;
-
-}
-
-typedef TQString KNoteID_t;
-typedef const TQString &KNoteID_pt;
-
-class NoteAndMemo
-{
-public:
-	NoteAndMemo() : noteId(),memoId(-1) { } ;
-	NoteAndMemo(KNoteID_pt noteid,int memoid) : noteId(noteid),memoId(memoid) { } ;
-	bool operator ==(const NoteAndMemo &p) const
-	{
-		return (p.memo()==memoId) && (p.note()==noteId);
-	}
-
-	int memo() const { return memoId; } ;
-	KNoteID_t note() const { return noteId; } ;
-	inline bool valid() const { return (memoId>0) && (!noteId.isEmpty()) ; } ;
-	TQString toString() const { return CSL1("<%1,%2>").arg(noteId).arg(memoId); } ;
-
-	static NoteAndMemo findNote(const TQValueList<NoteAndMemo> &,KNoteID_pt note);
-	static NoteAndMemo findMemo(const TQValueList<NoteAndMemo> &,int memo);
-
-protected:
-	KNoteID_t noteId;
-	int memoId;
-} ;
-
-NoteAndMemo NoteAndMemo::findNote(const TQValueList<NoteAndMemo> &l ,KNoteID_pt note)
-{
-	FUNCTIONSETUP;
-
-	for (TQValueList<NoteAndMemo>::ConstIterator it = l.begin();
-		it != l.end();
-		++it)
-	{
-		if ((*it).note()==note) return *it;
-	}
-
-	return NoteAndMemo();
-}
-
-NoteAndMemo NoteAndMemo::findMemo(const TQValueList<NoteAndMemo> &l , int memo)
-{
-	FUNCTIONSETUP;
-
-	for (TQValueList<NoteAndMemo>::ConstIterator it =l.begin();
-		it != l.end();
-		++it)
-	{
-		if ((*it).memo()==memo) return *it;
-	}
-
-	return NoteAndMemo();
-}
-
-class KNotesAction::KNotesActionPrivate
-{
-public:
-	KNotesActionPrivate() :
-		fNotesResource(0L),
-		fTimer(0L),
-		fDeleteCounter(0),
-		fModifiedNotesCounter(0),
-		fModifiedMemosCounter(0),
-		fAddedNotesCounter(0),
-		fAddedMemosCounter(0),
-		fDeletedNotesCounter(0),
-		fDeletedMemosCounter(0),
-		fDeleteNoteForMemo(false)
-	{ } ;
-	~KNotesActionPrivate()
-	{
-		fNotesResource->save();
-	
-		KPILOT_DELETE(fNotesResource);
-		KPILOT_DELETE(fTimer);
-	}
-
-	// The record index we're dealing with. Used by
-	// CopyHHToPC sync only.
-	int fRecordIndex;
-
-	KCal::CalendarLocal *fNotesResource;
-	// This is the collection of  notes held by KNotes and
-	KCal::Journal::List fNotes;
-	
-	// This iterates through that list; it's in here because
-	// we use slots to process one item at a time and need
-	// to keep track of where we are between slot calls.
-	KCal::Journal::List::ConstIterator fIndex;
-	
-	// The DCOP client for this application, and the KNotes stub.
-	// DCOPClient *fDCOP;
-	//KNotesIface_stub *fKNotes;
-
-	// The timer for invoking process() to do some more work.
-	TQTimer *fTimer;
-
-	// The database we're working with (MemoDB)
-	// PilotSerialDatabase *fDatabase;
-	// Some counter that needs to be preserved between calls to
-	// process(). Typically used to note how much work is done.
-	int fDeleteCounter; // Count deleted memos as well.
-	unsigned int fModifiedNotesCounter; // Count modified KNotes.
-	unsigned int fModifiedMemosCounter;
-	unsigned int fAddedNotesCounter;
-	unsigned int fAddedMemosCounter;
-	unsigned int fDeletedNotesCounter;
-	unsigned int fDeletedMemosCounter;
-
-	// We need to translate between the ids that KNotes uses and
-	// Pilot id's, so we make a list of pairs.
-	//
-	TQValueList<NoteAndMemo> fIdList;
-
-	// Setting to delete a KNote when the corresponding memo
-	// has been deleted.
-	bool fDeleteNoteForMemo;
-};
-
-
-
-KNotesAction::KNotesAction(KPilotLink *o,
-	const char *n, const TQStringList &a) :
-	ConduitAction(o,n ? n : "knotes-conduit",a),
-	fP(new KNotesActionPrivate)
-{
-	FUNCTIONSETUP;
-
-/*
-	if (fP) fP->fDCOP = KApplication::kApplication()->dcopClient();
-
-	if (fP && !fP->fDCOP)
-	{
-		WARNINGKPILOT << "Can't get DCOP client." << endl;
-	}
-*/
-}
-
-/* virtual */ KNotesAction::~KNotesAction()
-{
-	FUNCTIONSETUP;
-
-	KPILOT_DELETE(fP);
-}
-
-/* virtual */ bool KNotesAction::exec()
-{
-	FUNCTIONSETUP;
-	DEBUGKPILOT << fname << ": Starting knotes conduit." << endl;
-
-	if (syncMode().isTest())
-	{
-		test();
-		delayDone();
-		return true;
-	}
-
-	TQString e;
-	if (!openKNotesResource()) return false;
-
-	// Database names seem to be latin1
-	if (!openDatabases(CSL1("MemoDB")))
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname << "Can not open databases." << endl;
-#endif
-		emit logError(i18n("Could not open MemoDB on the handheld."));
-		return false;
-	}
-
-	fP->fTimer = new TQTimer(this);
-	fActionStatus = Init;
-	
-	// this is not needed. As it is done in the initstate in process();
-	// resetIndexes();
-
-	connect(fP->fTimer,TQT_SIGNAL(timeout()),TQT_SLOT(process()));
-	fP->fTimer->start(0,false);
-
-	return true;
-}
-
-void KNotesAction::test()
-{
-	if (!openKNotesResource()) return;
-	listNotes();
-}
-
-bool KNotesAction::openKNotesResource()
-{
-	FUNCTIONSETUP;
-	
-	KConfig korgcfg( locate( "config", CSL1("korganizerrc") ) );
-	korgcfg.setGroup( "Time & Date" );
-	TQString tz(korgcfg.readEntry( "TimeZoneId" ) );
-	
-	fP->fNotesResource = new KCal::CalendarLocal(tz);
-	KURL mURL = KGlobal::dirs()->saveLocation( "data", "knotes/" ) + "notes.ics";
-	
-	if( fP->fNotesResource->load( mURL.path() ) )
-	{
-		fP->fNotes = fP->fNotesResource->journals();
-		return true;
-	}
-	else
-	{
-		emit logError( i18n("Could not load the resource at: %1").arg(mURL.path()) );
-		return false;
-	}
-}
-
-
-void KNotesAction::resetIndexes()
-{
-	FUNCTIONSETUP;
-
-	fP->fRecordIndex = 0;
-	fP->fIndex = fP->fNotes.begin();
-}
-
-void KNotesAction::listNotes()
-{
-	FUNCTIONSETUP;
-	
-	KCal::Journal::List notes = fP->fNotesResource->journals();
-	DEBUGKPILOT << fname << ": the resource contains " << notes.size()
-		<< " note(s)." << endl;
-		
-	KCal::Journal::List::ConstIterator it;
-	int i = 1;
-	for ( it = notes.begin(); it != notes.end(); ++it )
-	{
-		DEBUGKPILOT << fname << ": note " << i << " has id " << (*it)->uid() 
-			<< endl;
-		i++;
-	}
-
-	DEBUGKPILOT << fname << ": "
-		<< "Sync direction: " << syncMode().name() << endl;
-}
-
-/* slot */ void KNotesAction::process()
-{
-	FUNCTIONSETUP;
-
-	DEBUGKPILOT << fname << ": Now in state " << fActionStatus << endl;
-
-	switch(fActionStatus)
-	{
-	case Init:
-		resetIndexes();
-		getAppInfo();
-		getConfigInfo();
-		switch(syncMode().mode())
-		{
-		case SyncAction::SyncMode::eBackup:
-		case SyncAction::SyncMode::eRestore:
-			// Impossible!
-			fActionStatus = Done;
-			break;
-		case SyncAction::SyncMode::eCopyHHToPC :
-			listNotes(); // Debugging
-			fActionStatus = MemosToKNotes;
-			break;
-		case SyncAction::SyncMode::eHotSync:
-		case SyncAction::SyncMode::eFullSync:
-		case SyncAction::SyncMode::eCopyPCToHH:
-			fActionStatus = ModifiedNotesToPilot;
-			break;
-		}
-		break;
-	case ModifiedNotesToPilot:
-		if (modifyNoteOnPilot())
-		{
-			resetIndexes();
-			fActionStatus = DeleteNotesOnPilot;
-		}
-		break;
-	case DeleteNotesOnPilot:
-		if (deleteNoteOnPilot())
-		{
-			resetIndexes();
-			fActionStatus = NewNotesToPilot;
-		}
-		break;
-	case NewNotesToPilot :
-		if (addNewNoteToPilot())
-		{
-			resetIndexes();
-			fDatabase->resetDBIndex();
-			switch(syncMode().mode())
-			{
-			case SyncAction::SyncMode::eBackup:
-			case SyncAction::SyncMode::eRestore:
-			case SyncAction::SyncMode::eCopyHHToPC :
-				// Impossible!
-				fActionStatus = Done;
-				break;
-			case SyncAction::SyncMode::eHotSync:
-			case SyncAction::SyncMode::eFullSync:
-				fActionStatus = MemosToKNotes;
-				break;
-			case SyncAction::SyncMode::eCopyPCToHH:
-				fActionStatus = Cleanup;
-				break;
-			}
-		}
-		break;
-	case MemosToKNotes :
-		if (syncMemoToKNotes())
-		{
-			fActionStatus=Cleanup;
-		}
-		break;
-	case Cleanup :
-		cleanupMemos();
-		break;
-	default :
-		if (fP->fTimer) fP->fTimer->stop();
-		delayDone();
-	}
-}
-
-
-void KNotesAction::getConfigInfo()
-{
-	FUNCTIONSETUP;
-
-	KNotesConduitSettings::self()->readConfig();
-
-	fP->fDeleteNoteForMemo = KNotesConduitSettings::deleteNoteForMemo();
-
-	TQValueList<KNoteID_t> notes;
-	TQValueList<int> memos;
-
-	// Make this match the type of KNoteID_t !
-	notes=KNotesConduitSettings::noteIds();
-	memos=KNotesConduitSettings::memoIds();
-
-	if (notes.count() != memos.count())
-	{
-		WARNINGKPILOT
-			<< ": Notes and memo id lists don't match ("
-			<< notes.count()
-			<< ","
-			<< memos.count()
-			<< ")"
-			<< endl;
-		notes.clear();
-		memos.clear();
-		setFirstSync( true );
-	}
-
-	TQValueList<KNoteID_t>::ConstIterator iNotes = notes.begin();
-	TQValueList<int>::ConstIterator iMemos = memos.begin();
-
-	while((iNotes != notes.end()) && (iMemos != memos.end()))
-	{
-		fP->fIdList.append(NoteAndMemo(*iNotes,*iMemos));
-		++iNotes;
-		++iMemos;
-	}
-}
-
-void KNotesAction::getAppInfo()
-{
-	FUNCTIONSETUP;
-
-	resetIndexes();
-}
-
-
-bool KNotesAction::modifyNoteOnPilot()
-{
-	FUNCTIONSETUP;
-	return true;
-	/*
-	if (fP->fIndex == fP->fNotes.end())
-	{
-		return true;
-	}
-	*/
-
-	//TODO DCOP_REMOVAL
-	/*
-	if (fP->fKNotes->isModified(CSL1("kpilot"),fP->fIndex.key()))
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname
-			<< ": The note #"
-			<< fP->fIndex.key()
-			<< " with name "
-			<< fP->fIndex.data()
-			<< " is modified in KNotes."
-			<< endl;
-#endif
-
-		NoteAndMemo nm = NoteAndMemo::findNote(fP->fIdList,
-			fP->fIndex.key());
-
-		if (nm.valid())
-		{
-			TQString text,title,body;
-			title = fP->fIndex.data();
-			body = fP->fKNotes->text(fP->fIndex.key());
-			if (body.startsWith(title))
-			{
-				text = body;
-			}
-			else
-			{
-				text = title + CSL1("\n") + body;
-			}
-
-			PilotMemo *a = new PilotMemo(text);
-			PilotRecord *r = a->pack();
-			r->setID(nm.memo());
-
-			int newid = fDatabase->writeRecord(r);
-			fLocalDatabase->writeRecord(r);
-
-			if (newid != nm.memo())
-			{
-				WARNINGKPILOT
-					<< ": Memo id changed during write? "
-					<< "From "
-					<< nm.memo()
-					<< " to "
-					<< newid
-					<< endl;
-			}
-		}
-		else
-		{
-			WARNINGKPILOT << "Modified note unknown to Pilot" << endl;
-			// Add it anyway, with new PilotID.
-			int newid = addNoteToPilot();
-			fP->fIdList.remove(nm);
-			fP->fIdList.append(NoteAndMemo(fP->fIndex.key(),newid));
-		}
-
-		++(fP->fModifiedMemosCounter);
-	}
-	*/
-
-	//++(fP->fIndex);
-	//return false;
-}
-
-bool KNotesAction::deleteNoteOnPilot()
-{
-	FUNCTIONSETUP;
-
-	/*
-	TQValueList<NoteAndMemo>::Iterator i = fP->fIdList.begin();
-	while ( i != fP->fIdList.end() )
-	{
-		// TODO DCOP_REMOVE
-		if (fP->fNotes.contains((*i).note()))
-		{
-#ifdef DEBUG
-			DEBUGKPILOT << fname << ": Note " << (*i).note() << " still exists." << endl;
-#endif
-		}
-		else
-		{
-#ifdef DEBUG
-			DEBUGKPILOT << fname << ": Note " << (*i).note() << " is deleted." << endl;
-#endif
-			fDatabase->deleteRecord((*i).memo());
-			fLocalDatabase->deleteRecord((*i).memo());
-			i = fP->fIdList.remove(i);
-			fP->fDeletedMemosCounter++;
-			continue;
-		}
-		++i;
-	}
-	*/
-	return true;
-}
-
-bool KNotesAction::addNewNoteToPilot()
-{
-	FUNCTIONSETUP;
-
-	if (fP->fIndex == fP->fNotes.end())
-	{
-		return true;
-	}
-
-	KCal::Journal *j = (*fP->fIndex);
-
-	if( j->pilotId() == 0 )
-	{
-		DEBUGKPILOT << fname << ": Adding note with id " << j->uid() 
-			<< " to pilot." << endl;
-		
-		int newid = addNoteToPilot();
-		
-		++(fP->fAddedMemosCounter);
-	}
-	//TODO DCOP_REMOVAL
-	/*
-	if (fP->fKNotes->isNew(CSL1("kpilot"),fP->fIndex.key()))
-	{
-		int newid = addNoteToPilot();
-		fP->fIdList.append(NoteAndMemo(fP->fIndex.key(),newid));
-		++(fP->fAddedMemosCounter);
-	}
-	*/
-
-	++(fP->fIndex);
-	return false;
-}
-
-bool KNotesAction::syncMemoToKNotes()
-{
-	FUNCTIONSETUP;
-
-	PilotRecord *rec = 0L;
-
-	if ( syncMode() == SyncAction::SyncMode::eCopyHHToPC )
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": Read record " << fP->fRecordIndex << endl;
-#endif
-		rec = fDatabase->readRecordByIndex(fP->fRecordIndex);
-		fP->fRecordIndex++;
-	}
-	else
-	{
-		rec = fDatabase->readNextModifiedRec();
-	}
-
-	if (!rec)
-	{
-		return true;
-	}
-
-	PilotMemo *memo = new PilotMemo(rec);
-	NoteAndMemo m = NoteAndMemo::findMemo(fP->fIdList,memo->id());
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Looking at memo "
-		<< memo->id()
-		<< " which was found "
-		<< m.toString()
-		<< endl;
-#endif
-
-	if (memo->isDeleted())
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": It's been deleted." << endl;
-#endif
-		if (m.valid())
-		{
-			// We knew about the note already, but it
-			// has changed on the Pilot.
-			//
-			//
-			if (fP->fDeleteNoteForMemo)
-			{
-		//TODO DCOP_REMOVAL
-	//fP->fKNotes->killNote(m.note(),KNotesConduitSettings::suppressKNotesConfirm()
-	//) ;
-				fP->fDeletedNotesCounter++;
-			}
-		}
-		else
-		{
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": It's new and deleted." << endl;
-#endif
-		}
-
-		fLocalDatabase->deleteRecord(rec->id());
-	}
-	else
-	{
-		if (m.valid())
-		{
-	#ifdef DEBUG
-			DEBUGKPILOT << fname << ": It's just modified." << endl;
-			DEBUGKPILOT << fname << ": <"
-//				<< fP->fNotes[m.note()]
-				<< "> <"
-				<< memo->shortTitle()
-				<< ">"
-				<< endl;
-	#endif
-			// Check if KNotes still knows about this note
-			//TODO DCOP_REMOVAL
-			/*
-			if (!(fP->fKNotes->name(m.note()).isEmpty()))
-			{
-				updateNote(m,memo);
-			}
-			else
-			{
-				uint c = fP->fIdList.remove(m);
-				if (!c)
-				{
-					WARNINGKPILOT
-						<< "Tried to remove valid note and failed."
-						<< endl;
-				}
-				addMemoToKNotes(memo);
-			}
-			*/
-		}
-		else
-		{
-			addMemoToKNotes(memo);
-		}
-		fLocalDatabase->writeRecord(rec);
-	}
-
-	KPILOT_DELETE(memo);
-	KPILOT_DELETE(rec);
-
-	return false;
-}
-
-void KNotesAction::updateNote(const NoteAndMemo &m, const PilotMemo *memo)
-{
-	FUNCTIONSETUP;
-	//TODO DCOP_REMOVAL
-	if (true/*fP->fNotes[m.note()] != memo->shortTitle()*/)
-	{
-		// Name changed. KNotes might complain though.
-		//TODO DCOP_REMOVAL
-		//fP->fKNotes->setName(m.note(), memo->shortTitle());
-	}
-	//TODO DCOP_REMOVAL
-	//fP->fKNotes->setText(m.note(),memo->text());
-	fP->fModifiedNotesCounter++;
-}
-
-void KNotesAction::addMemoToKNotes(const PilotMemo *memo)
-{
-	FUNCTIONSETUP;
-	// This note is new to KNotes
-	//TODO DCOP_REMOVAL
-	//KNoteID_t i = fP->fKNotes->newNote(memo->shortTitle(), memo->text());
-	//fP->fIdList.append(NoteAndMemo(i,memo->id()));
-	//fP->fAddedNotesCounter++;
-
-#ifdef DEBUG
-	//TODO DCOP_REMOVAL
-	//DEBUGKPILOT << fname << ": It's new with knote id " << i << endl;
-#endif
-}
-int KNotesAction::addNoteToPilot()
-{
-	FUNCTIONSETUP;
-	
-	KCal::Journal *j = (*fP->fIndex);
-	
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": The note #"
-		<< j->uid()
-		<< " with name "
-		<< j->summary()
-		<< " is new to the Pilot."
-		<< endl;
-#endif
-
-	TQString text = j->summary() + CSL1("\n");
-	text.append( j->description() );
-	//TODO DCOP_REMOVAL
-	//text.append(fP->fKNotes->text(fP->fIndex.key()));
-
-	PilotMemo *a = new PilotMemo(text);
-	PilotRecord *r = a->pack();
-
-	int newid = fDatabase->writeRecord(r);
-	fLocalDatabase->writeRecord(r);
-	
-	j->setPilotId( newid );
-
-	delete r;
-	delete a;
-	delete j;
-
-	fP->fAddedMemosCounter++;
-
-	return newid;
-}
-
-
-void KNotesAction::cleanupMemos()
-{
-	FUNCTIONSETUP;
-
-	// Tell KNotes we're up-to-date
-	//TODO DCOP_REMOVAL
-	//fP->fKNotes->sync(CSL1("kpilot"));
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Writing "
-		<< fP->fIdList.count()
-		<< " pairs to the config file."
-		<< endl;
-	DEBUGKPILOT << fname
-		<< ": The config file is read-only: "
-		<< KNotesConduitSettings::self()->config()->isReadOnly()
-		<< endl;
-#endif
-
-	TQValueList<KNoteID_t> notes;
-	TQValueList<int> memos;
-
-	for (TQValueList<NoteAndMemo>::ConstIterator i =
-		fP->fIdList.begin();
-		i!=fP->fIdList.end();
-		++i)
-	{
-		notes.append((*i).note());
-		memos.append((*i).memo());
-	}
-
-	KNotesConduitSettings::setNoteIds(notes);
-	KNotesConduitSettings::setMemoIds(memos);
-	KNotesConduitSettings::self()->writeConfig();
-
-	fActionStatus=Done;
-	fDatabase->cleanup();
-	fDatabase->resetSyncFlags();
-	fLocalDatabase->cleanup();
-	fLocalDatabase->resetSyncFlags();
-
-	// Tell the user what happened. If no changes were
-	// made, spoke remains false and we'll tack a
-	// message on to the end saying so, so that
-	// the user always gets at least one message.
-	bool spoke = false;
-	if (fP->fAddedMemosCounter)
-	{
-		addSyncLogEntry(i18n("Added one new memo.",
-			"Added %n new memos.",
-			fP->fAddedMemosCounter));
-	}
-	if (fP->fModifiedMemosCounter)
-	{
-		addSyncLogEntry(i18n("Modified one memo.",
-			"Modified %n memos.",
-			fP->fModifiedMemosCounter));
-		spoke = true;
-	}
-	if (fP->fDeletedMemosCounter)
-	{
-		addSyncLogEntry(i18n("Deleted one memo.",
-			"Deleted %n memos.",fP->fDeletedMemosCounter));
-		spoke = true;
-	}
-	if (fP->fAddedNotesCounter)
-	{
-		addSyncLogEntry(i18n("Added one note to KNotes.",
-			"Added %n notes to KNotes.",fP->fAddedNotesCounter));
-		spoke = true;
-	}
-	if (fP->fModifiedNotesCounter)
-	{
-		addSyncLogEntry(i18n("Modified one note in KNotes.",
-			"Modified %n notes in KNotes.",fP->fModifiedNotesCounter));
-		spoke = true;
-	}
-	if (fP->fDeletedNotesCounter)
-	{
-		addSyncLogEntry(i18n("Deleted one note from KNotes.",
-			"Deleted %n notes from KNotes.",fP->fDeletedNotesCounter));
-		spoke = true;
-	}
-	if (!spoke)
-	{
-		addSyncLogEntry(i18n("No change to KNotes."));
-	}
-}
-
-
-/* virtual */ TQString KNotesAction::statusString() const
-{
-	switch(fActionStatus)
-	{
-	case Init : return CSL1("Init");
-	case NewNotesToPilot :
-		return CSL1("NewNotesToPilot key=%1");
-			// TODO DCOP_REMOVAL .arg(fP->fIndex.key());
-	case ModifiedNotesToPilot :
-		return CSL1("ModifiedNotesToPilot key=%1");
-			//TODO DCOP_REMOVAL .arg(fP->fIndex.key());
-	case MemosToKNotes :
-		return CSL1("MemosToKNotes rec=%1")
-			.arg(fP->fRecordIndex);
-	case Cleanup : return CSL1("Cleanup");
-	case Done :
-		return CSL1("Done");
-	default :
-		return CSL1("Unknown (%1)").arg(fActionStatus);
-	}
-}
-
-
-
diff --git a/kpilot/conduits/knotes/knotes-action.h b/kpilot/conduits/knotes/knotes-action.h
deleted file mode 100644
index eb490e0a..00000000
--- a/kpilot/conduits/knotes/knotes-action.h
+++ /dev/null
@@ -1,113 +0,0 @@
-#ifndef _KPILOT_KNOTES_ACTION_H
-#define _KPILOT_KNOTES_ACTION_H
-/* knotes-action.h                      KPilot
-**
-** Copyright (C) 2001,2003 by Dan Pilone
-**
-** This file defines the SyncAction that the KNotes conduit performs.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <plugin.h>
-
-
-class NoteAndMemo;
-class PilotMemo;
-
-class KNotesAction : public ConduitAction
-{
-Q_OBJECT
-public:
-	KNotesAction(
-		KPilotLink *o,
-		const char *n = 0L,
-		const TQStringList &a = TQStringList() );
-	virtual ~KNotesAction();
-
-	enum Status { Init,
-		ModifiedNotesToPilot,
-		DeleteNotesOnPilot,
-		NewNotesToPilot,
-		MemosToKNotes,
-		Cleanup,
-		Done } ;
-	virtual TQString statusString() const;
-
-protected:
-	virtual bool exec();
-
-protected:
-	/**
-	* For test mode -- just list the notes KNotes has.
-	*/
-	void listNotes();
-
-	/** Run a test on the conduit. */
-	void test();
-
-	/**
-	* Loads the KNotes resource and retrieve the list of notes it
-	* has. @return false if the the resource could not be opened and a new
-	* resource could not be created. Modifies fP to store the notes in.
-	*/
-	bool openKNotesResource();
-
-	/**
-	* For actual processing. These are called by process
-	* and it is critical that fP->fIndex is set properly.
-	*
-	* Each returns true when it is completely finished processing,
-	* if it returns a bool. Void functions need only be called once.
-	*/
-	void getAppInfo();
-	void getConfigInfo();
-	bool modifyNoteOnPilot();
-	bool deleteNoteOnPilot();
-	bool addNewNoteToPilot();
-	bool syncMemoToKNotes();
-	void cleanupMemos();
-
-	void updateNote(const NoteAndMemo &,const PilotMemo *);
-
-	/**
-	* Add the Memo to KNotes.
-	*/
-	void addMemoToKNotes(const PilotMemo *);
-	/**
-	* Add the Note currently being processed to the
-	* pilot as a new memo. Returns the id of the record.
-	*/
-	int addNoteToPilot();
-
-
-	void resetIndexes();
-
-protected slots:
-	void process();
-
-private:
-	class KNotesActionPrivate;
-	KNotesActionPrivate *fP;
-} ;
-
-#endif
diff --git a/kpilot/conduits/knotes/knotes-conduit.desktop b/kpilot/conduits/knotes/knotes-conduit.desktop
deleted file mode 100644
index 9155d4b0..00000000
--- a/kpilot/conduits/knotes/knotes-conduit.desktop
+++ /dev/null
@@ -1,92 +0,0 @@
-[Desktop Entry]
-Type=Service
-Comment=This conduit syncs the Memo Pad application with KNotes.
-Comment[af]=Hierdie pad synkroniseer die Memo Pad program met KNotes.
-Comment[bg]=Синхронизаци� на бележки на KDE � мобилни у�трой�тва
-Comment[bs]=Ovaj conduit sinhronizuje Memo Pad aplikaciju sa KNotes.
-Comment[ca]=Aquest conducte sincronitza l'aplicació Memo Pad amb Knotes.
-Comment[cs]=Toto propojení synchronizuje vašeho Pilota s poznámkami v KNotes.
-Comment[cy]=Mae'r cwndid yma yn cydamseru y cymhwysiad Memo Pad efo KNodiadau.
-Comment[da]=Denne kanal synkroniserer dit memopad-program med KNotes.
-Comment[de]=Abgleich des Memo Pad mit KNotes
-Comment[el]=Αυτός ο σ�νδεσμος συγχ�ονίζει την εφα�μογή Memo Pad με το KNotes.
-Comment[eo]=Tiu kanalo sinkronigas la MemoPad-aplikaĵon kun KNotoj.
-Comment[es]=Este conducto sincroniza la aplicación de Notas con KNotes.
-Comment[et]=See kanal sünkroniseerib Memo Pad rakenduse ja KNotesi.
-Comment[eu]=Kanal honek Memo Pad aplikazioa KNotes-ekin sinkronizatzen du.
-Comment[fa]=این لوله، کاربرد Memo Pad را با KNotes همگام می‌سازد.
-Comment[fi]=Tämä yhdyskäytävä synkronoi Memo Pad -ohelman KNotesin kanssa.
-Comment[fr]=Ce canal synchronise l'application « Memo Pad » avec KNotes.
-Comment[fy]=Dit conduit syngronisearret de Memo Pad mei KNotes.
-Comment[gl]=Este conducto sincroniza a aplicación Memo Pad con KNotes.
-Comment[hi]=यह कन�ड�यूइट मेमो पेड अन�प�रयोगों को के-नोट�स के साथ सिंक करता है
-Comment[hu]=Ezzel a csatolóval a Memo Pad program és a KNotes között lehet szinkronizálást végezni.
-Comment[is]=Þessi rás samstillir lófatölvuna þína við KNotes.
-Comment[it]=Questo condotto sincronizza l'applicazione Memo Pad con KNotes.
-Comment[ja]=��コンジット�メモ帳アプリケーションを KNotes ��期����。
-Comment[kk]=Memo Pad қолданбаны KNotes жазбаларымен қадамда�тыру арна�ы.
-Comment[km]=បំពង់​ន�ះ​អាច​ឲ្យ​កម្មវិធី Memo Pad ធ្វើ​សមកាលកម្ម​ជាមួយ​នឹង KNotes ។
-Comment[lt]=Å is kanalas sinchronizuoja Memo Pad programÄ… su KNotes.
-Comment[mk]=Овој канал ја �инхронизира апликацијата Memo Pad �о КБелешки.
-Comment[ms]=Saluran ini mensegerakkan aplikasi Memo Pad dengan KNotes.
-Comment[nb]=Denne kanalen synkroniserer notatblokk-programmet med KNotes.
-Comment[nds]=Synkroniseert dat Palm-Programm "Memo Pad" mit KNotes.
-Comment[ne]=यो कन�ड�य�टले मेमो प�याड अन�प�रयोग केडीई टिप�पणीमा सिन�क गर�दछ ।
-Comment[nl]=Dit conduit synchroniseert de Memo Pad met KNotes.
-Comment[nn]=Denne koplinga synkroniserer «Memo Pad»-applikasjonen med KNotes.
-Comment[pl]=Ten Å‚Ä…cznik synchronizuje program Memo Pad palmtopa z KNotes (notatkami).
-Comment[pt]=Esta conduta sincroniza os memorandos com o KNotes.
-Comment[pt_BR]=Este conduíte sincroniza a aplicação Memo Pad com o KNotes.
-Comment[ro]=Această conductă sincronizează aplicaţia Memo Pad cu KNotes.
-Comment[ru]=Канал �инхронизации заметок КПК и KDE.
-Comment[sk]=Táto spojka synchronizuje aplikáciu Memo Pad s KNotes
-Comment[sl]=Ta veznik usklajuje program Memo Pad s KNotice.
-Comment[sr]=Овај провод �инхронизује Memo Pad програме �а KNotes-ом.
-Comment[sr@Latn]=Ovaj provod sinhronizuje Memo Pad programe sa KNotes-om.
-Comment[sv]=Den här kanalen synkroniserar programmet Memo Pad med Knotes.
-Comment[ta]=இந�த காப�ப�க� க�ழாய� க�றிப�பாணை அட�டை பயன�பாட� கேக�றிப�ப�கள�டன� ஒத�திசைக�கிறத�
-Comment[tg]=Канали �инхронизат�и�и қайдоти Pilot ва KDE.
-Comment[tr]=Bu kanal KNotes ile el bilgisayarınızı senkronize etmenize olanak sağlar
-Comment[uk]=Цей акведук �инхронізує Memo Pad з тижневиком KNotes.
-Comment[zh_CN]=此管�将会将您的备忘程�与 KNotes �步。
-Comment[zh_TW]=此軟體將 KNote 與 Memo Pad 應用程��步。
-Name=KNotes / Memos
-Name[be]=K �ататкі
-Name[bg]=KNotes/Memos
-Name[cs]=KNotes / Poznámky
-Name[cy]=KNodiadau/Memos
-Name[da]=KNotes / Memoer
-Name[el]=KNotes / Υπομνήματα
-Name[eo]=KNotoj
-Name[et]=KNotes / memod
-Name[eu]=KNotes / Oharrak
-Name[fr]=KNotes / Mémos
-Name[fy]=KNotes / memo's
-Name[ga]=KNotes / Meamraim
-Name[hi]=के-नोट�स / मेमो
-Name[hu]=KNotes / memók
-Name[is]=KNotes / minnisblöð
-Name[it]=KNotes / Memo
-Name[kk]=KNotes / Жазбалар
-Name[km]=KNotes / អនុស្សរណៈ
-Name[lt]=KNotes / Memo
-Name[mk]=КБелешки / Меморандуми
-Name[ms]=KNotes / Memo
-Name[nds]=KNotes / Notizen
-Name[ne]=केडीई टिप�पणी / मेमो
-Name[nl]=KNotes / memo's
-Name[nn]=KNotes / Memoar
-Name[pl]=KNotes / Notatki
-Name[pt]=Notas / Memorandos
-Name[pt_BR]=KNotes / Memorandos
-Name[ru]=KNotes / Заметки
-Name[sk]=Poznámky / Memo
-Name[sl]=KNotice / Opomniki
-Name[sv]=Knotes/Memo Pad
-Name[ta]=கேக�றிப�ப�கள�/க�றிப�பாணைகள�
-Name[tg]=KNotes / Қайдот
-Name[tr]=KNotlar / Hatırlatmalar
-Name[zh_CN]=KNotes / 备忘
-Implemented=file
-ServiceTypes=KPilotConduit
-X-KDE-Library=conduit_knotes
diff --git a/kpilot/conduits/knotes/knotes-factory.cc b/kpilot/conduits/knotes/knotes-factory.cc
deleted file mode 100644
index 9601e81e..00000000
--- a/kpilot/conduits/knotes/knotes-factory.cc
+++ /dev/null
@@ -1,133 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2001,2003 by Dan Pilone
-**
-** This file defines the factory for the knotes-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <kapplication.h>
-#include <kinstance.h>
-#include <kaboutdata.h>
-
-#include <dcopclient.h>
-
-#include <time.h> // Needed by pilot-link include
-
-#include <pi-memo.h>
-
-#include "knotes-action.h"
-#include "knotes-setup.h"
-
-#include "knotes-factory.moc"
-
-
-extern "C"
-{
-
-void *init_conduit_knotes()
-{
-	return new KNotesConduitFactory;
-}
-
-}
-
-
-/* static */ KAboutData *KNotesConduitFactory::fAbout = 0L;
-
-KNotesConduitFactory::KNotesConduitFactory(TQObject *p, const char *n) :
-	KLibFactory(p,n)
-{
-	FUNCTIONSETUP;
-
-	fInstance = new KInstance("knotesconduit");
-	fAbout = new KAboutData("knotesconduit",
-		I18N_NOOP("KNotes Conduit for KPilot"),
-		KPILOT_VERSION,
-		I18N_NOOP("Configures the KNotes Conduit for KPilot"),
-		KAboutData::License_GPL,
-		"(C) 2001, Adriaan de Groot");
-	fAbout->addAuthor("Adriaan de Groot",
-		I18N_NOOP("Primary Author"),
-		"groot@kde.org",
-		"http://www.cs.kun.nl/~adridg/kpilot");
-	fAbout->addCredit("David Bishop",
-		I18N_NOOP("UI"));
-}
-
-KNotesConduitFactory::~KNotesConduitFactory()
-{
-	FUNCTIONSETUP;
-
-	KPILOT_DELETE(fInstance);
-	KPILOT_DELETE(fAbout);
-}
-
-/* virtual */ TQObject *KNotesConduitFactory::createObject( TQObject *p,
-	const char *n,
-	const char *c,
-	const TQStringList &a)
-{
-	FUNCTIONSETUP;
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Creating object of class "
-		<< c
-		<< endl;
-#endif
-
-	if (qstrcmp(c,"ConduitConfigBase")==0)
-	{
-		TQWidget *w = dynamic_cast<TQWidget *>(p);
-		if (w)
-		{
-			return new KNotesConfigBase(w,0L);
-		}
-		else
-		{
-			return 0L;
-		}
-	}
-	else
-	if (qstrcmp(c,"SyncAction")==0)
-	{
-		KPilotLink *d = dynamic_cast<KPilotLink *>(p);
-
-		if (d)
-		{
-			return new KNotesAction(d,n,a);
-		}
-		else
-		{
-			WARNINGKPILOT
-				<< "Couldn't cast parent to KPilotDeviceLink"
-				<< endl;
-			return 0L;
-		}
-	}
-
-	return 0L;
-}
diff --git a/kpilot/conduits/knotes/knotes-factory.h b/kpilot/conduits/knotes/knotes-factory.h
deleted file mode 100644
index 02b0f610..00000000
--- a/kpilot/conduits/knotes/knotes-factory.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef _KPILOT_NULL_FACTORY_H
-#define _KPILOT_NULL_FACTORY_H
-/* null-factory.h                       KPilot
-**
-** Copyright (C) 2001,2003 by Dan Pilone
-**
-** This file defines the factory for the null-conduit plugin.
-** It also defines the class for the behavior of the setup dialog.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <klibloader.h>
-
-class KInstance;
-class KAboutData;
-
-class KNotesConduitFactory : public KLibFactory
-{
-Q_OBJECT
-
-public:
-	KNotesConduitFactory(TQObject * = 0L,const char * = 0L);
-	virtual ~KNotesConduitFactory();
-
-	static KAboutData *about() { return fAbout; } ;
-
-	// The KNotes instance, unlike previous conduits (alphabetically)
-	// has const char * const members. The extra const prevents people
-	// from assigning to this variable, so you have to work hard to
-	// break its value. We store group and entry keys in here.
-
-protected:
-	virtual TQObject* createObject( TQObject* parent = 0,
-		const char* name = 0,
-		const char* classname = "TQObject",
-		const TQStringList &args = TQStringList() );
-private:
-	KInstance *fInstance;
-	static KAboutData *fAbout;
-} ;
-
-extern "C"
-{
-
-void *init_libknotesconduit();
-
-}
-
-
-#endif
diff --git a/kpilot/conduits/knotes/knotes-setup.cc b/kpilot/conduits/knotes/knotes-setup.cc
deleted file mode 100644
index 1127011a..00000000
--- a/kpilot/conduits/knotes/knotes-setup.cc
+++ /dev/null
@@ -1,83 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2001,2003 by Dan Pilone
-**
-** This file defines the setup dialog for the knotes-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <tqtabwidget.h>
-#include <tqcheckbox.h>
-#include <tqmap.h>
-#include <tqtimer.h>
-
-#include <kapplication.h>
-#include <kconfig.h>
-
-#include "setup_base.h"
-
-#include "knotes-factory.h"
-#include "knotes-setup.h"
-#include "knotesconduitSettings.h"
-
-
-KNotesConfigBase::KNotesConfigBase(TQWidget *w, const char *n) :
-	ConduitConfigBase(w,n),
-	fConfigWidget(0L)
-{
-	fConfigWidget = new KNotesWidget(w);
-	ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,KNotesConduitFactory::about());
-	fWidget = fConfigWidget;
-	TQObject::connect(fConfigWidget->fDeleteNoteForMemo,TQT_SIGNAL(clicked()),
-		this,TQT_SLOT(modified()));
-	TQObject::connect(fConfigWidget->fSuppressConfirm,TQT_SIGNAL(clicked()),
-		this,TQT_SLOT(modified()));
-	TQObject::connect(fConfigWidget->fDeleteNoteForMemo,TQT_SIGNAL(toggled(bool)),
-		fConfigWidget->fSuppressConfirm,TQT_SLOT(setEnabled(bool)));
-	fConduitName=i18n("KNotes");
-}
-
-void KNotesConfigBase::commit()
-{
-	KNotesConduitSettings::setDeleteNoteForMemo( fConfigWidget->fDeleteNoteForMemo->isChecked() );
-	KNotesConduitSettings::setSuppressKNotesConfirm(fConfigWidget->fSuppressConfirm->isChecked());
-	KNotesConduitSettings::self()->writeConfig();
-	unmodified();
-}
-
-void KNotesConfigBase::load()
-{
-	KNotesConduitSettings::self()->readConfig();
-	fConfigWidget->fDeleteNoteForMemo->setChecked(KNotesConduitSettings::deleteNoteForMemo() );
-	fConfigWidget->fSuppressConfirm->setChecked(KNotesConduitSettings::suppressKNotesConfirm() );
-	fConfigWidget->fSuppressConfirm->setEnabled(KNotesConduitSettings::deleteNoteForMemo());
-	unmodified();
-}
-
-/* static */ ConduitConfigBase *KNotesConfigBase::create(TQWidget *w, const char *n)
-{
-	return new KNotesConfigBase(w,n);
-}
-
diff --git a/kpilot/conduits/knotes/knotes-setup.h b/kpilot/conduits/knotes/knotes-setup.h
deleted file mode 100644
index 652f2223..00000000
--- a/kpilot/conduits/knotes/knotes-setup.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef _KPILOT_KNOTES_SETUP_H
-#define _KPILOT_KNOTES_SETUP_H
-/* knotes-setup.h                       KPilot
-**
-** Copyright (C) 2001,2003 by Dan Pilone
-**
-** This file defines the widget and behavior for the config dialog
-** of the KNotes conduit.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "plugin.h"
-
-class KNotesWidget;
-
-class KNotesConfigBase : public ConduitConfigBase
-{
-public:
-	KNotesConfigBase(TQWidget *parent, const char *name);
-
-	virtual void commit();
-	virtual void load();
-
-	static ConduitConfigBase *create(TQWidget *p, const char *n);
-private:
-	KNotesWidget *fConfigWidget;
-} ;
-
-#endif
diff --git a/kpilot/conduits/knotes/knotesconduit.kcfg b/kpilot/conduits/knotes/knotesconduit.kcfg
deleted file mode 100644
index 41d86d2b..00000000
--- a/kpilot/conduits/knotes/knotesconduit.kcfg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
-      http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <kcfgfile name="kpilot_notesconduitrc"/> 
-  <group name="General">
-    <entry name="DeleteNoteForMemo"  type="Bool">
-        <default>false</default>
-    </entry>
-    <entry name="SuppressKNotesConfirm" type="Bool">
-        <label>Suppress the confirmation KNotes normally shows when deleting a note.</label>
-        <default>false</default>
-    </entry>
-
-    <entry name="MemoIds"  type="IntList">
-        <label>list of the synced MemoDB records</label>
-        <default></default>
-    </entry>
-    <entry name="NoteIds"  type="StringList">
-        <label>list of the corresponding KNotes note IDs</label>
-        <default></default>
-    </entry>
-  </group>
-</kcfg>
diff --git a/kpilot/conduits/knotes/knotesconduitSettings.kcfgc b/kpilot/conduits/knotes/knotesconduitSettings.kcfgc
deleted file mode 100644
index 33152ac6..00000000
--- a/kpilot/conduits/knotes/knotesconduitSettings.kcfgc
+++ /dev/null
@@ -1,7 +0,0 @@
-File=knotesconduit.kcfg
-ClassName=KNotesConduitSettings
-Singleton=true
-ItemAccessors=true
-Mutators=true
-GlobalEnums=true
-SetUserTexts=true
diff --git a/kpilot/conduits/knotes/setup_base.ui b/kpilot/conduits/knotes/setup_base.ui
deleted file mode 100644
index e6aef804..00000000
--- a/kpilot/conduits/knotes/setup_base.ui
+++ /dev/null
@@ -1,88 +0,0 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
-<class>KNotesWidget</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>KNotesWidget</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>436</width>
-            <height>394</height>
-        </rect>
-    </property>
-        <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-    <widget class="QTabWidget">
-        <property name="name">
-            <cstring>tabWidget</cstring>
-        </property>
-        <widget class="QWidget">
-            <property name="name">
-                <cstring>tab</cstring>
-            </property>
-            <attribute name="title">
-                <string>General</string>
-            </attribute>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="QCheckBox" row="0" column="0">
-                    <property name="name">
-                        <cstring>fDeleteNoteForMemo</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Delete KNote when Pilot memo is deleted</string>
-                    </property>
-                    <property name="checked">
-                        <bool>true</bool>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Check this box if you wish to delete notes from KNotes automatically when the corresponding Pilot memo is deleted. Use this option with care, as the notes you want to keep in the handheld and in the desktop are not necessarily the same.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QCheckBox" row="1" column="0">
-                    <property name="name">
-                        <cstring>fSuppressConfirm</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Suppress delete-confirmation in KNotes</string>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Check this box if you wish to delete notes from KNotes, without confirmation, when the corresponding Pilot memo is deleted. Use this option only if you want to keep the same notes in the handheld and in the PC.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <spacer row="2" column="0">
-                    <property name="name">
-                        <cstring>spacer1</cstring>
-                    </property>
-                    <property name="orientation">
-                        <enum>Vertical</enum>
-                    </property>
-                    <property name="sizeType">
-                        <enum>Expanding</enum>
-                    </property>
-                    <property name="sizeHint">
-                        <size>
-                            <width>20</width>
-                            <height>101</height>
-                        </size>
-                    </property>
-                </spacer>
-            </grid>
-        </widget>
-    </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/kpilot/conduits/malconduit/CMakeLists.txt b/kpilot/conduits/malconduit/CMakeLists.txt
deleted file mode 100644
index 092f340f..00000000
--- a/kpilot/conduits/malconduit/CMakeLists.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
-	${MAL_INCLUDE_DIR}
-)
-
-set(conduit_mal_SRCS
-	mal-factory.cc 
-	mal-setup.cc 
-	mal-conduit.cc 
-)
-
-set(conduit_mal_UIS
-	mal-setup_dialog.ui
-)
-
-set(conduit_mal_KCFGS
-	malconduitSettings.kcfgc
-)
-
-kde3_add_kcfg_files(conduit_mal_SRCS ${conduit_mal_KCFGS})
-kde3_add_ui_files(conduit_mal_SRCS ${conduit_mal_UIS})
-kde3_automoc(${conduit_mal_SRCS})
-add_library(conduit_mal SHARED ${conduit_mal_SRCS})
-target_link_libraries(conduit_mal ${MAL_LIBRARY})
-
-set_target_properties(
-	conduit_mal PROPERTIES 
-	LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	PREFIX ""
-	INSTALL_RPATH "${MAL_LIBRARY}"
-	INSTALL_RPATH_USE_LINK_PATH true
-)
-
-kde3_install_libtool_file(conduit_mal)
-
-install(
-	TARGETS conduit_mal
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-)
-
-install(
-	FILES mal_conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
-)
-
-install(
-	FILES malconduit.kcfg DESTINATION ${KDE3_KCFG_DIR}
-)
-
diff --git a/kpilot/conduits/malconduit/Makefile.am b/kpilot/conduits/malconduit/Makefile.am
deleted file mode 100644
index d8a22243..00000000
--- a/kpilot/conduits/malconduit/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-### Makefile for the avantgo conduit
-###
-### The mal conduit is Copyright (C) 2002 by Reinhold Kainhofer
-
-
-INCLUDES= $(PISOCK_INCLUDE)  $(MAL_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
-METASOURCES = AUTO
-
-servicedir = $(kde_servicesdir)
-service_DATA = mal_conduit.desktop
-kde_kcfg_DATA = malconduit.kcfg
-
-kde_module_LTLIBRARIES = conduit_mal.la
-
-conduit_mal_la_SOURCES = malconduitSettings.kcfgc mal-setup_dialog.ui mal-factory.cc mal-setup.cc mal-conduit.cc 
-conduit_mal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-conduit_mal_la_LIBADD = ../../lib/libkpilot.la $(MAL_LIB) $(LIB_KDEUI)
-
diff --git a/kpilot/conduits/malconduit/README b/kpilot/conduits/malconduit/README
deleted file mode 100644
index deeeb12e..00000000
--- a/kpilot/conduits/malconduit/README
+++ /dev/null
@@ -1,12 +0,0 @@
-KPilot's malconduit
-+++++++++++++++++++
-
-Summary: This conduit syncs the handheld with 
-         MAL servers such as AvantGo. 
-Author: Reinhold Kainhofer, reinhold@kainhofer.com
-Date: August 15, 2002
-License: GPL, linking to libmal (MPL) is explicitly allowed
-Depends: The conduits needs libmal >=0.20 installed 
-         (otherwise it will not be compiled). libmal 
-         can be downloaded from
-         http://jasonday.home.att.net/code/libmal/							
diff --git a/kpilot/conduits/malconduit/mal-conduit.cc b/kpilot/conduits/malconduit/mal-conduit.cc
deleted file mode 100644
index 95c4d64b..00000000
--- a/kpilot/conduits/malconduit/mal-conduit.cc
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
-** MAL conduit for KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-**
-**
-** Specific permission is granted for this code to be linked to libmal
-** (this is necessary because the libmal license is not GPL-compatible).
-*/
- 
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
- 
-
-
-
-#include "options.h"
-
-#include <tqregexp.h>
-#include <kconfig.h>
-#include <kdebug.h>
-
-#include "mal-factory.h"
-#include "mal-conduit.moc"
-#include <libmal.h>
-#include "malconduitSettings.h"
-
-
-static MALConduit *conduitInstance=0L;
-
-int malconduit_logf(const char *, ...) __attribute__ ((format (printf, 1, 2)));
-
-int malconduit_logf(const char *format, ...)
-{
-	FUNCTIONSETUP;
-	va_list val;
-	int rval;
-	va_start(val, format);
-#define WRITE_MAX_BUF	4096
-	char msg[WRITE_MAX_BUF];
-	msg[0]='\0';
-	rval=vsnprintf(&msg[0], sizeof(msg), format, val);
-	va_end(val);
-	if (rval == -1) {
-		msg[WRITE_MAX_BUF-1] = '\0';
-		rval=WRITE_MAX_BUF-1;
-	}
-	if (conduitInstance)
-	{
-		conduitInstance->printLogMessage(msg);
-	}
-	else
-	{
-		// write out to stderr
-		WARNINGKPILOT<< msg << endl;
-	}
-	return rval;
-}
- 
-#ifndef LIBMAL20
-int32 cbTask (void * /*out*/,
-        int32 * /*returnErrorCode*/,
-        char *currentTask,
-        AGBool /*bufferable*/)
-{
-    if (currentTask) {
-        malconduit_logf ("%s\n", currentTask);
-    }
-
-    return AGCLIENT_CONTINUE;
-}
-
-static int32 cbItem (void */*out*/,
-        int32 * /*returnErrorCode*/,
-        int32   /*currentItemNumber*/,
-        int32   /*totalItemCount*/,
-        char *  /*currentItem*/)
-{
-//	The log widget only supports writing out whole lines. You just can't add a single character 
-//	to the last line. Thus I completely remove the pseudo-percentbar.
-/*    malconduit_logf (".");
-
-    if (currentItemNumber == totalItemCount) {
-        malconduit_logf ("\n");
-    }
-*/
-    return AGCLIENT_CONTINUE;
-}
-#endif
-
- 
-MALConduit::MALConduit(KPilotLink * o,
-	const char *n, 
-	const TQStringList & a) :
-	ConduitAction(o, n, a)
-{
-	FUNCTIONSETUP;
-#ifdef LIBMAL20
-	register_printStatusHook(malconduit_logf);
-	register_printErrorHook(malconduit_logf);
-#endif
-	conduitInstance=this;
-	fConduitName=i18n("MAL");
-}
-
-
-
-MALConduit::~MALConduit()
-{
-	FUNCTIONSETUP;
-}
-
-
-
-void MALConduit::readConfig()
-{
-	FUNCTIONSETUP;
-	MALConduitSettings::self()->readConfig();
-#ifdef DEBUG
-	DEBUGKPILOT<<"Last sync was "<<MALConduitSettings::lastMALSync().toString()<<endl;
-#endif
-}
-
-
-
-void MALConduit::saveConfig()
-{
-	FUNCTIONSETUP;
-	MALConduitSettings::setLastMALSync( TQDateTime::currentDateTime() );
-	MALConduitSettings::self()->writeConfig();
-}
-
-
-
-bool MALConduit::skip() 
-{
-	TQDateTime now=TQDateTime::currentDateTime();
-	TQDateTime lastSync=MALConduitSettings::lastMALSync();
-	
-	if (!lastSync.isValid() || !now.isValid()) return false;
-	
-	switch ( MALConduitSettings::syncFrequency() ) 
-	{
-		case MALConduitSettings::eEveryHour:
-			if ( (lastSync.secsTo(now)<=3600) && (lastSync.time().hour()==now.time().hour()) ) return true;
-			else return false;
-		case MALConduitSettings::eEveryDay:
-			if ( lastSync.date() == now.date() ) return true;
-			else return false;
-		case MALConduitSettings::eEveryWeek:
-			if ( (lastSync.daysTo(now)<=7)  && ( lastSync.date().dayOfWeek()<=now.date().dayOfWeek()) ) return true;
-			else return false;
-		case MALConduitSettings::eEveryMonth:
-			if ( (lastSync.daysTo(now)<=31) && (lastSync.date().month()==now.date().month()) ) return true;
-			else return false;
-		case MALConduitSettings::eEverySync:
-		default:
-			return false;
-	}
-	return false;
-}
-
-
-
-/* virtual */ bool MALConduit::exec()
-{
-	FUNCTIONSETUP;
-
-	readConfig();
-	
-	// TODO: set the log/error message hooks of libmal here!!!
-
-	if (skip()) 
-	{
-		emit logMessage(i18n("Skipping MAL sync, because last synchronization was not long enough ago."));
-		emit syncDone(this);
-		return true;
-	}
-	
-	// Now initiate the sync.
-	PalmSyncInfo* pInfo=syncInfoNew();
-	if (!pInfo) {
-		WARNINGKPILOT << "Could not allocate SyncInfo!" << endl;
-		emit logError(i18n("MAL synchronization failed (no SyncInfo)."));
-		return false;
-	}
-
-	TQString proxyServer( MALConduitSettings::proxyServer() );
-	int proxyPort( MALConduitSettings::proxyPort() );
-	TQString syncMessage;
-	bool canContinue = true;
-	// Set all proxy settings
-	switch (MALConduitSettings::proxyType()) 
-	{
-		case MALConduitSettings::eProxyHTTP:
-			if (proxyServer.isEmpty()) 
-			{
-				canContinue = false;
-				syncMessage = i18n("No proxy server is set.");
-				break;
-			}
-			syncMessage = i18n("Using proxy server: %1").arg(proxyServer);
-
-#ifdef DEBUG
-			DEBUGKPILOT<<" Using HTTP proxy server \""<<proxyServer<<
-				"\", Port "<<proxyPort<<", User "<<MALConduitSettings::proxyUser()<<
-				", Password "<<( (MALConduitSettings::proxyPassword().isEmpty())?TQString("not "):TQString())<<"set"
-				<<endl;
-#endif
-#ifdef LIBMAL20
-			setHttpProxy(const_cast<char *>(proxyServer.latin1()));
-			if (proxyPort>0 && proxyPort<65536) setHttpProxyPort( proxyPort );
-			else setHttpProxyPort(80);
-#else
-			pInfo->httpProxy = new char[ proxyServer.length() + 1 ];
-			strlcpy( pInfo->httpProxy, proxyServer.latin1(), proxyServer.length() + 1);
-			if (proxyPort>0 && proxyPort<65536) pInfo->httpProxyPort = proxyPort;
-			else pInfo->httpProxyPort = 80;
-#endif
-			
-			if (!MALConduitSettings::proxyUser().isEmpty()) 
-			{
-#ifdef LIBMAL20
-				setProxyUsername( const_cast<char *>(MALConduitSettings::proxyUser().latin1()) );
-				if (!MALConduitSettings::proxyPassword().isEmpty()) setProxyPassword( const_cast<char *>(MALConduitSettings::proxyPassword().latin1()) );
-#else
-				pInfo->proxyUsername = new char[ MALConduitSettings::proxyUser().length() + 1 ];
-				strlcpy( pInfo->proxyUsername, MALConduitSettings::proxyUser().latin1(), MALConduitSettings::proxyUser().length() + 1);
-				if (!MALConduitSettings::proxyPassword().isEmpty()) {
-//						pInfo->proxyPassword = MALConduitSettings::proxyPassword().latin1();
-					pInfo->proxyPassword = new char[ MALConduitSettings::proxyPassword().length() + 1 ];
-					strlcpy( pInfo->proxyPassword, MALConduitSettings::proxyPassword().latin1(), MALConduitSettings::proxyPassword().length() + 1);
-				}
-#endif
-			}
-			break;
-		case MALConduitSettings::eProxySOCKS:
-			if (proxyServer.isEmpty()) 
-			{
-				canContinue = false;
-				syncMessage = i18n("No SOCKS proxy is set.");
-				break;
-			}
-			syncMessage = i18n("Using SOCKS proxy: %1").arg(proxyServer);
-#ifdef DEBUG
-			DEBUGKPILOT<<" Using SOCKS proxy server \""<<proxyServer<<"\",  Port "<<proxyPort<<", User "<<MALConduitSettings::proxyUser()<<", Password "<<( (MALConduitSettings::proxyPassword().isEmpty())?TQString("not "):TQString() )<<"set"<<endl;
-#endif
-#ifdef LIBMAL20
-			setSocksProxy( const_cast<char *>(proxyServer.latin1()) );
-			if (proxyPort>0 && proxyPort<65536) setSocksProxyPort( proxyPort );
-			else setSocksProxyPort(1080);
-#else
-//			pInfo->socksProxy = proxyServer.latin1();
-			pInfo->socksProxy = new char[ proxyServer.length() + 1 ];
-			strlcpy( pInfo->socksProxy, proxyServer.latin1(), proxyServer.length() + 1);
-			if (proxyPort>0 && proxyPort<65536) pInfo->socksProxyPort = proxyPort;
-			else pInfo->socksProxyPort = 1080;
-#endif
-			break; 
-		default:
-			break;
-	}
-
-	logMessage(syncMessage);
-
-	if (!canContinue)
-	{
-		return false;
-	}
-
-#ifdef LIBMAL20
-	malsync( pilotSocket(), pInfo);
-#else
-	pInfo->sd = pilotSocket();
-	pInfo->taskFunc = cbTask;
-	pInfo->itemFunc = cbItem;
-	malsync( pInfo );
-	delete[] pInfo->httpProxy;
-	delete[] pInfo->proxyUsername;
-	delete[] pInfo->proxyPassword;
-	delete[] pInfo->socksProxy;
-	syncInfoFree(pInfo);
-#endif
-
-	saveConfig();
-	return delayDone();
-}
-
-void MALConduit::printLogMessage(TQString msg)
-{
-	FUNCTIONSETUP;
-	// Remove the pseudo-progressbar:
-	TQString newmsg(msg);
-	newmsg.replace( TQRegExp("^\\s*\\.*\\s*"), "");
-	newmsg.replace( TQRegExp("\\s*\\.*\\s*$"), "");
-	if (newmsg.length()>0)
-	{
-		emit logMessage(newmsg);
-	}
-}
-
diff --git a/kpilot/conduits/malconduit/mal-conduit.h b/kpilot/conduits/malconduit/mal-conduit.h
deleted file mode 100644
index 3f5c14a0..00000000
--- a/kpilot/conduits/malconduit/mal-conduit.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef _MAL_CONDUIT_H
-#define _MAL_CONDUIT_H
-/* mal-conduit.h                           KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-**
-**
-** Specific permission is granted for this code to be linked to libmal
-** (this is necessary because the libmal license is not GPL-compatible).
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-
-#include <plugin.h>
-
-class MALConduit : public ConduitAction
-{
-Q_OBJECT
-public:
-	MALConduit(
-		KPilotLink *o,
-		const char *n = 0L,
-		const TQStringList &a = TQStringList() );
-	virtual ~MALConduit();
-	void printLogMessage(TQString msg);
-	virtual bool exec();
-
-protected:
-	/**
-	 * Read in the config from the KPilot config files and fill the member variables accordingly
-	 */
-	void readConfig();
-	/**
-	 * Store the sync time in the KPilot configuration
-	 */
-	void saveConfig();
-	/**
-	 * Check if the last sync was not so long ago that according to MALConduitSettings::syncFrequency() we can skip the sync this time
-	 */
-	bool skip();
-} ;
-
-
-#endif
diff --git a/kpilot/conduits/malconduit/mal-factory.cc b/kpilot/conduits/malconduit/mal-factory.cc
deleted file mode 100644
index 3e363d26..00000000
--- a/kpilot/conduits/malconduit/mal-factory.cc
+++ /dev/null
@@ -1,143 +0,0 @@
-/* Time-factory.cc                      KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This file defines the factory for the MAL-conduit plugin.
-*/
- 
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-**
-**
-** Specific permission is granted for this code to be linked to libmal
-** (this is necessary because the libmal license is not GPL-compatible).
-*/
- 
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h" 
-
-#include <kapplication.h>
-#include <kinstance.h>
-#include <kaboutdata.h>
-
-#include <time.h> // Needed by pilot-link include
-#include "mal-conduit.h"
-#include "mal-setup.h"
-
-#include "mal-factory.moc"
-
-
-extern "C"
-{
-
-void *init_conduit_mal()
-{
-	return new MALConduitFactory;
-}
-
-unsigned long version_conduit_mal = Pilot::PLUGIN_API;
-
-}
-
-
-// A number of static variables
-//
-KAboutData *MALConduitFactory::fAbout = 0L;
-
-MALConduitFactory::MALConduitFactory(TQObject *p, const char *n) :
-	KLibFactory(p,n)
-{
-	FUNCTIONSETUP;
-
-	fInstance = new KInstance("MALconduit");
-	fAbout = new KAboutData("MALconduit",
-		I18N_NOOP("MAL Synchronization Conduit for KPilot"),
-		KPILOT_VERSION,
-		I18N_NOOP("Synchronizes the content from MAL Servers like AvantGo to the Handheld"),
-		KAboutData::License_GPL,
-		"(C) 2002, Reinhold Kainhofer");
-	fAbout->addAuthor("Reinhold Kainhofer",
-		I18N_NOOP("Primary Author"), "reinhold@kainhofer.com", "http://reinhold.kainhofer.com/");
-	fAbout->addCredit("Jason Day",
-		I18N_NOOP("Author of libmal and the JPilot AvantGo conduit"), "jasonday@worldnet.att.net");
-	fAbout->addCredit("Tom Whittaker",
-		I18N_NOOP("Author of syncmal"), "tom@tomw.org", "http://www.tomw.org/");
-	fAbout->addCredit("AvantGo, Inc.",
-		I18N_NOOP("Authors of the malsync library (c) 1997-1999"), "", "http://www.avantgo.com/");
-}
-
-MALConduitFactory::~MALConduitFactory()
-{
-	FUNCTIONSETUP;
-
-	KPILOT_DELETE(fInstance);
-	KPILOT_DELETE(fAbout);
-}
-
-/* virtual */ TQObject *MALConduitFactory::createObject( TQObject *p,
-	const char *n,
-	const char *c,
-	const TQStringList &a)
-{
-	FUNCTIONSETUP;
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Creating object of class "
-		<< c
-		<< endl;
-#endif
-
-	if (qstrcmp(c,"ConduitConfigBase")==0)
-	{
-		TQWidget *w = dynamic_cast<TQWidget *>(p);
-
-		if (w)
-		{
-			return new MALWidgetSetup(w,n);
-		}
-		else 
-		{
-			WARNINGKPILOT
-				<< "Couldn't cast parent to widget."
-				<< endl;
-			return 0L;
-		}
-	}
-
-	if (qstrcmp(c,"SyncAction")==0)
-	{ 
-		KPilotLink *d = dynamic_cast<KPilotLink *>(p);
-
-		if (d)
-		{
-			return new MALConduit(d,n,a);
-		}
-		else
-		{
-			WARNINGKPILOT
-				<< "Couldn't cast parent to KPilotLink"
-				<< endl;
-			return 0L;
-		}
-	}
-
-	return 0L;
-}
-
diff --git a/kpilot/conduits/malconduit/mal-factory.h b/kpilot/conduits/malconduit/mal-factory.h
deleted file mode 100644
index a1531638..00000000
--- a/kpilot/conduits/malconduit/mal-factory.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifndef _TIME_FACTORY_H
-#define _TIME_FACTORY_H
-/* MAL-factory.h                       KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This file defines the factory for the mal-conduit plugin.
-*/
- 
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-**
-**
-** Specific permission is granted for this code to be linked to libmal
-** (this is necessary because the libmal license is not GPL-compatible).
-*/
- 
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <klibloader.h>
-
-class KInstance;
-class KAboutData;
-
-class MALConduitFactory : public KLibFactory
-{
-Q_OBJECT
-
-public:
-	MALConduitFactory(TQObject * = 0L,const char * = 0L);
-	virtual ~MALConduitFactory();
-
-	static KAboutData *about() { return fAbout; } ;
-
-protected:
-	virtual TQObject* createObject( TQObject* parent = 0,
-		const char* name = 0,
-		const char* classname = "TQObject",
-		const TQStringList &args = TQStringList() );
-private:
-	KInstance *fInstance;
-	static KAboutData *fAbout;
-} ;
-
-extern "C"
-{
-
-void *init_libtimeconduit();
-
-}
-
-#endif
diff --git a/kpilot/conduits/malconduit/mal-setup.cc b/kpilot/conduits/malconduit/mal-setup.cc
deleted file mode 100644
index 1d1f89ff..00000000
--- a/kpilot/conduits/malconduit/mal-setup.cc
+++ /dev/null
@@ -1,185 +0,0 @@
-/* MAL-setup.cc                      KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This file defines the setup dialog for the MAL-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-**
-**
-** Specific permission is granted for this code to be linked to libmal
-** (this is necessary because the libmal license is not GPL-compatible).
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <tqtabwidget.h>
-#include <tqradiobutton.h>
-#include <tqbuttongroup.h>
-#include <tqlineedit.h>
-#include <tqcheckbox.h>
-
-#include <kcombobox.h>
-#include <knuminput.h>
-#include <kpassdlg.h>
-
-#include <kapplication.h>
-#include <kconfig.h>
-
-
-#include "mal-setup_dialog.h"
-
-#include "mal-factory.h"
-#include "mal-setup.moc"
-#include "malconduitSettings.h"
-
-
-MALWidgetSetup::MALWidgetSetup(TQWidget *w, const char *n) :
-	ConduitConfigBase(w,n),
-	fConfigWidget(new MALWidget(w))
-{
-	FUNCTIONSETUP;
-
-	fConduitName=i18n("MAL");
-	ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,MALConduitFactory::about());
-	fWidget = fConfigWidget;
-
-	fConfigWidget->tabWidget->adjustSize();
-	fConfigWidget->resize(fConfigWidget->tabWidget->size());
-#define CM(a,b) connect(fConfigWidget->a,b,this,TQT_SLOT(modified()));
-	CM( syncTime, TQT_SIGNAL(clicked(int)) );
-	CM( proxyType, TQT_SIGNAL(clicked(int)) );
-
-	CM( proxyServerName, TQT_SIGNAL(textChanged(const TQString &)) );
-	CM( proxyCustomPortCheck, TQT_SIGNAL(clicked()) );
-	CM( proxyCustomPort, TQT_SIGNAL(valueChanged(int)) );
-	CM( proxyUserName, TQT_SIGNAL(textChanged(const TQString &)) );
-	CM( proxyPassword, TQT_SIGNAL(textChanged(const TQString &)) );
-
-	CM( malServerName, TQT_SIGNAL(textChanged(const TQString &)) );
-	CM( malCustomPortCheck, TQT_SIGNAL(clicked()) );
-	CM( malCustomPort, TQT_SIGNAL(valueChanged(int)) );
-	CM( malUserName, TQT_SIGNAL(textChanged(const TQString &)) );
-	CM( malPassword, TQT_SIGNAL(textChanged(const TQString &)) );
-#undef CM
-}
-
-MALWidgetSetup::~MALWidgetSetup()
-{
-	FUNCTIONSETUP;
-}
-
-/* virtual */ void MALWidgetSetup::commit()
-{
-	FUNCTIONSETUP;
-
-	MALConduitSettings::setSyncFrequency(
-		fConfigWidget->syncTime->id(fConfigWidget->syncTime->selected()));
-
-	// Proxy settings
-	MALConduitSettings::setProxyType(
-		fConfigWidget->proxyType->id(fConfigWidget->proxyType->selected()));
-	MALConduitSettings::setProxyServer( fConfigWidget->proxyServerName->currentText() );
-
-	if (fConfigWidget->proxyCustomPortCheck->isChecked() )
-	{
-		MALConduitSettings::setProxyPort( fConfigWidget->proxyCustomPort->value());
-	}
-	else
-	{
-		MALConduitSettings::setProxyPort(0);
-	}
-	MALConduitSettings::setProxyUser( fConfigWidget->proxyUserName->text() );
-	MALConduitSettings::setProxyPassword( fConfigWidget->proxyPassword->password() );
-
-	// MAL Server settings (not yet possible!!!)
-	MALConduitSettings::setMALServer( fConfigWidget->malServerName->currentText() );
-
-	if (fConfigWidget->malCustomPortCheck->isChecked() )
-	{
-		MALConduitSettings::setMALPort( fConfigWidget->malCustomPort->value());
-	}
-	else
-	{
-		MALConduitSettings::setMALPort(0);
-	}
-	MALConduitSettings::setMALUser( fConfigWidget->malUserName->text() );
-	MALConduitSettings::setMALPassword( fConfigWidget->malPassword->text() );
-
-	MALConduitSettings::self()->writeConfig();
-	unmodified();
-}
-
-
-
-/* virtual */ void MALWidgetSetup::load()
-{
-	FUNCTIONSETUP;
-	MALConduitSettings::self()->readConfig();
-
-	fConfigWidget->syncTime->setButton( MALConduitSettings::syncFrequency() );
-
-	// Proxy settings
-	fConfigWidget->proxyType->setButton(MALConduitSettings::proxyType());
-	fConfigWidget->proxyServerName->setEditText(MALConduitSettings::proxyServer());
-
-	int proxyPortNr=MALConduitSettings::proxyPort();
-	if (proxyPortNr>0 && proxyPortNr<65536)
-	{
-		fConfigWidget->proxyCustomPortCheck->setChecked(true);
-		fConfigWidget->proxyCustomPort->setEnabled(true);
-		fConfigWidget->proxyCustomPort->setValue(proxyPortNr);
-	}
-	fConfigWidget->proxyUserName->setText(MALConduitSettings::proxyUser());
-	fConfigWidget->proxyPassword->setText(TQString::null);
-	fConfigWidget->proxyPassword->insert(MALConduitSettings::proxyPassword());
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Got proxy password <"
-		<< MALConduitSettings::proxyPassword()
-		<< "> set Text <"
-		<< fConfigWidget->proxyPassword->text()
-		<< "> and Pwd <"
-		<< fConfigWidget->proxyPassword->password()
-		<< ">" << endl;
-#endif
-
-	// MAL Server settings (not yet possible!!!)
-	fConfigWidget->malServerName->setEditText(MALConduitSettings::mALServer());
-
-	int malPortNr=MALConduitSettings::mALPort();
-	if (malPortNr>0 && malPortNr<65536)
-	{
-		fConfigWidget->malCustomPortCheck->setChecked(true);
-		fConfigWidget->malCustomPort->setEnabled(true);
-		fConfigWidget->malCustomPort->setValue(proxyPortNr);
-	}
-	fConfigWidget->malUserName->setText(MALConduitSettings::mALUser());
-	fConfigWidget->malPassword->setText(MALConduitSettings::mALPassword());
-	unmodified();
-}
-
-/* static */ ConduitConfigBase *MALWidgetSetup::create(TQWidget *w, const char *n)
-{
-	return new MALWidgetSetup(w,n);
-}
-
diff --git a/kpilot/conduits/malconduit/mal-setup.h b/kpilot/conduits/malconduit/mal-setup.h
deleted file mode 100644
index 6a633749..00000000
--- a/kpilot/conduits/malconduit/mal-setup.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef _MAL_SETUP_H
-#define _MAL_SETUP_H
-/* mal-setup.h                       KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This file defines the widget and behavior for the config dialog
-** of the mal conduit.
-*/
- 
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-**
-**
-** Specific permission is granted for this code to be linked to libmal
-** (this is necessary because the libmal license is not GPL-compatible).
-*/
- 
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "plugin.h"
-
-class MALWidget;
-
-class MALWidgetSetup : public ConduitConfigBase
-{
-Q_OBJECT
-public:
-	MALWidgetSetup(TQWidget *,const char *);
-	virtual ~MALWidgetSetup();
-	virtual void load();
-	virtual void commit();
-	static ConduitConfigBase *create(TQWidget *, const char *);
-private:
-	MALWidget *fConfigWidget;
-} ;
-
-
-#endif
diff --git a/kpilot/conduits/malconduit/mal-setup_dialog.ui b/kpilot/conduits/malconduit/mal-setup_dialog.ui
deleted file mode 100644
index 8814d190..00000000
--- a/kpilot/conduits/malconduit/mal-setup_dialog.ui
+++ /dev/null
@@ -1,634 +0,0 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
-<class>MALWidget</class>
-<author>Reinhold Kainhofer</author>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>MalWidget</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>534</width>
-            <height>505</height>
-        </rect>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QTabWidget" row="0" column="0">
-            <property name="name">
-                <cstring>tabWidget</cstring>
-            </property>
-            <property name="enabled">
-                <bool>true</bool>
-            </property>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>tab</cstring>
-                </property>
-                <attribute name="title">
-                    <string>General</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <widget class="QButtonGroup" row="0" column="0">
-                        <property name="name">
-                            <cstring>syncTime</cstring>
-                        </property>
-                        <property name="title">
-                            <string>Sync</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>Select how often AvantGo should be synchronised</string>
-                        </property>
-                        <grid>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <property name="margin">
-                                <number>11</number>
-                            </property>
-                            <property name="spacing">
-                                <number>6</number>
-                            </property>
-                            <widget class="QRadioButton" row="0" column="0">
-                                <property name="name">
-                                    <cstring>RadioButton1</cstring>
-                                </property>
-                                <property name="enabled">
-                                    <bool>true</bool>
-                                </property>
-                                <property name="text">
-                                    <string>&amp;Every sync</string>
-                                </property>
-                                <property name="checked">
-                                    <bool>true</bool>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Select this option to synchronize with the MAL server on every HotSync. To perform a successful synchronization, you need to have access to the MAL server during the HotSync.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="QRadioButton" row="1" column="0">
-                                <property name="name">
-                                    <cstring>RadioButton1_2</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Once per &amp;hour</string>
-                                </property>
-                                <property name="toolTip" stdset="0">
-                                    <string></string>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Select this option to synchronize with the MAL server on every HotSync that is at least one hour after the previous MAL sync. To perform a successful synchronization, you need to have access to the MAL server during the HotSync.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="QRadioButton" row="2" column="0">
-                                <property name="name">
-                                    <cstring>RadioButton1_3</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Once a &amp;day</string>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Select this option to synchronize with the MAL server on every HotSync that is at least one day after the previous MAL sync. To perform a successful synchronization, you need to have access to the MAL server during the HotSync.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="QRadioButton" row="3" column="0">
-                                <property name="name">
-                                    <cstring>RadioButton1_4</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Once a &amp;week</string>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Select this option to synchronize with the MAL server on every HotSync that is at least one week after the previous MAL sync. To perform a successful synchronization, you need to have access to the MAL server during the HotSync.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="QRadioButton" row="4" column="0">
-                                <property name="name">
-                                    <cstring>RadioButton1_5</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Once a &amp;month</string>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Select this option to synchronize with the MAL server on every HotSync that is at least one month after the previous MAL sync. To perform a successful synchronization, you need to have access to the MAL server during the HotSync.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                        </grid>
-                    </widget>
-                    <spacer row="1" column="0">
-                        <property name="name">
-                            <cstring>Spacer3</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                </grid>
-            </widget>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>tab</cstring>
-                </property>
-                <attribute name="title">
-                    <string>Proxy</string>
-                </attribute>
-                <vbox>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <widget class="QButtonGroup">
-                        <property name="name">
-                            <cstring>proxyType</cstring>
-                        </property>
-                        <property name="frameShape">
-                            <enum>GroupBoxPanel</enum>
-                        </property>
-                        <property name="title">
-                            <string>Proxy Type</string>
-                        </property>
-                        <hbox>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <property name="margin">
-                                <number>11</number>
-                            </property>
-                            <property name="spacing">
-                                <number>6</number>
-                            </property>
-                            <widget class="QRadioButton">
-                                <property name="name">
-                                    <cstring>RadioButton8</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>&amp;No proxy</string>
-                                </property>
-                                <property name="checked">
-                                    <bool>true</bool>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Select this option if you do not want KPilot to use a proxy server. Use this option if you connect to the internet directly.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="QRadioButton">
-                                <property name="name">
-                                    <cstring>RadioButton8_2</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>&amp;HTTP proxy</string>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Select this option if you want KPilot to use a HTTP proxy.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="QRadioButton">
-                                <property name="name">
-                                    <cstring>RadioButton8_2_2</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>&amp;SOCKS proxy</string>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Select this option if you want KPilot to use a SOCKS proxy.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                        </hbox>
-                    </widget>
-                    <widget class="QGroupBox">
-                        <property name="name">
-                            <cstring>proxyServerInformation</cstring>
-                        </property>
-                        <property name="enabled">
-                            <bool>false</bool>
-                        </property>
-                        <property name="title">
-                            <string>Server Information</string>
-                        </property>
-                        <grid>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <property name="margin">
-                                <number>11</number>
-                            </property>
-                            <property name="spacing">
-                                <number>6</number>
-                            </property>
-                            <spacer row="1" column="2">
-                                <property name="name">
-                                    <cstring>Spacer2</cstring>
-                                </property>
-                                <property name="orientation">
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property name="sizeType">
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property name="sizeHint">
-                                    <size>
-                                        <width>20</width>
-                                        <height>20</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                            <widget class="QCheckBox" row="1" column="0">
-                                <property name="name">
-                                    <cstring>proxyCustomPortCheck</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Custom &amp;port:</string>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>Check this box to use a non-standard proxy port.</string>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="0" column="0">
-                                <property name="name">
-                                    <cstring>TextLabel1</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Ser&amp;ver name:</string>
-                                </property>
-                                <property name="buddy" stdset="0">
-                                    <cstring>proxyServerName</cstring>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;If you selected HTTP or SOCKS proxy, type the address of the proxy server to use here, in the form &lt;i&gt;foo.bar.com&lt;/i&gt; (not &lt;i&gt;http://foo.bar.com&lt;/i&gt; or &lt;i&gt;http://foo.bar.com:8080&lt;/i&gt;).&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="KHistoryCombo" row="0" column="1" rowspan="1" colspan="2">
-                                <property name="name">
-                                    <cstring>proxyServerName</cstring>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;If you selected HTTP or SOCKS proxy, type the address of the proxy server to use here, in the form &lt;i&gt;foo.bar.com&lt;/i&gt; (not &lt;i&gt;http://foo.bar.com&lt;/i&gt; or &lt;i&gt;http://foo.bar.com:8080&lt;/i&gt;).&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="KIntNumInput" row="1" column="1">
-                                <property name="name">
-                                    <cstring>proxyCustomPort</cstring>
-                                </property>
-                                <property name="enabled">
-                                    <bool>false</bool>
-                                </property>
-                                <property name="value">
-                                    <number>80</number>
-                                </property>
-                                <property name="minValue">
-                                    <number>0</number>
-                                </property>
-                                <property name="maxValue">
-                                    <number>65535</number>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Enter the port you want KPilot to use when connecting to your proxy server here.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="KPasswordEdit" row="5" column="1" rowspan="1" colspan="2">
-                                <property name="name">
-                                    <cstring>proxyPassword</cstring>
-                                </property>
-                                <property name="echoMode">
-                                    <enum>Password</enum>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;If your proxy requires authentication, enter your password here.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="QLineEdit" row="4" column="1" rowspan="1" colspan="2">
-                                <property name="name">
-                                    <cstring>proxyUserName</cstring>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;If your proxy requires authentication, enter your username here.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="5" column="0">
-                                <property name="name">
-                                    <cstring>TextLabel2_2</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>&amp;Password:</string>
-                                </property>
-                                <property name="buddy" stdset="0">
-                                    <cstring>proxyPassword</cstring>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="4" column="0">
-                                <property name="name">
-                                    <cstring>TextLabel2</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>&amp;User name:</string>
-                                </property>
-                                <property name="buddy" stdset="0">
-                                    <cstring>proxyUserName</cstring>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;If your proxy requires authentication, enter your username here.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="Line" row="3" column="0" rowspan="1" colspan="3">
-                                <property name="name">
-                                    <cstring>Line1</cstring>
-                                </property>
-                                <property name="frameShape">
-                                    <enum>HLine</enum>
-                                </property>
-                                <property name="frameShadow">
-                                    <enum>Sunken</enum>
-                                </property>
-                                <property name="orientation">
-                                    <enum>Horizontal</enum>
-                                </property>
-                            </widget>
-                            <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="2">
-                                <property name="name">
-                                    <cstring>proxyExclude</cstring>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Enter a list of MAL servers that do not need the use of a proxy here, separated with commas, e.g: &lt;br&gt;&lt;i&gt;localhost,127.0.0.1,.lan&lt;/i&gt;&lt;qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="2" column="0">
-                                <property name="name">
-                                    <cstring>textLabel1</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>N&amp;o proxy for:</string>
-                                </property>
-                                <property name="buddy" stdset="0">
-                                    <cstring>proxyExclude</cstring>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Enter a list of MAL servers that do not need the use of a proxy here, separated with commas, e.g: &lt;br&gt;&lt;i&gt;localhost,127.0.0.1,.lan&lt;/i&gt;&lt;qt&gt;</string>
-                                </property>
-                            </widget>
-                        </grid>
-                    </widget>
-                    <spacer>
-                        <property name="name">
-                            <cstring>Spacer3_2</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>20</width>
-                                <height>70</height>
-                            </size>
-                        </property>
-                    </spacer>
-                </vbox>
-            </widget>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>tab</cstring>
-                </property>
-                <attribute name="title">
-                    <string>MAL Server</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <property name="margin">
-                        <number>11</number>
-                    </property>
-                    <property name="spacing">
-                        <number>6</number>
-                    </property>
-                    <widget class="QGroupBox" row="1" column="0">
-                        <property name="name">
-                            <cstring>GroupBox1_2</cstring>
-                        </property>
-                        <property name="enabled">
-                            <bool>false</bool>
-                        </property>
-                        <property name="title">
-                            <string>MAL Server Information</string>
-                        </property>
-                        <grid>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <property name="margin">
-                                <number>11</number>
-                            </property>
-                            <property name="spacing">
-                                <number>6</number>
-                            </property>
-                            <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
-                                <property name="name">
-                                    <cstring>TextLabel1_2</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>&amp;MAL server name:</string>
-                                </property>
-                                <property name="buddy" stdset="0">
-                                    <cstring>malServerName</cstring>
-                                </property>
-                            </widget>
-                            <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2">
-                                <property name="name">
-                                    <cstring>malCustomPortCheck</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Custom &amp;port:</string>
-                                </property>
-                            </widget>
-                            <widget class="KIntNumInput" row="1" column="2">
-                                <property name="name">
-                                    <cstring>malCustomPort</cstring>
-                                </property>
-                                <property name="enabled">
-                                    <bool>false</bool>
-                                </property>
-                                <property name="value">
-                                    <number>80</number>
-                                </property>
-                                <property name="minValue">
-                                    <number>0</number>
-                                </property>
-                                <property name="maxValue">
-                                    <number>65535</number>
-                                </property>
-                            </widget>
-                            <spacer row="1" column="3">
-                                <property name="name">
-                                    <cstring>Spacer2_2</cstring>
-                                </property>
-                                <property name="orientation">
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property name="sizeType">
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property name="sizeHint">
-                                    <size>
-                                        <width>20</width>
-                                        <height>20</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                            <widget class="KHistoryCombo" row="0" column="2" rowspan="1" colspan="2">
-                                <property name="name">
-                                    <cstring>malServerName</cstring>
-                                </property>
-                            </widget>
-                            <widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="3">
-                                <property name="name">
-                                    <cstring>malUserName</cstring>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="4" column="0">
-                                <property name="name">
-                                    <cstring>TextLabel2_2_2</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>&amp;Password:</string>
-                                </property>
-                                <property name="buddy" stdset="0">
-                                    <cstring>malPassword</cstring>
-                                </property>
-                            </widget>
-                            <widget class="QLabel" row="3" column="0">
-                                <property name="name">
-                                    <cstring>textLabel</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>&amp;User name:</string>
-                                </property>
-                                <property name="buddy" stdset="0">
-                                    <cstring>malUserName</cstring>
-                                </property>
-                            </widget>
-                            <widget class="Line" row="2" column="0" rowspan="1" colspan="4">
-                                <property name="name">
-                                    <cstring>Line1_2</cstring>
-                                </property>
-                                <property name="frameShape">
-                                    <enum>HLine</enum>
-                                </property>
-                                <property name="frameShadow">
-                                    <enum>Sunken</enum>
-                                </property>
-                                <property name="orientation">
-                                    <enum>Horizontal</enum>
-                                </property>
-                            </widget>
-                            <widget class="KPasswordEdit" row="4" column="1" rowspan="1" colspan="3">
-                                <property name="name">
-                                    <cstring>malPassword</cstring>
-                                </property>
-                            </widget>
-                        </grid>
-                    </widget>
-                    <spacer row="2" column="0">
-                        <property name="name">
-                            <cstring>Spacer5</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QLabel" row="0" column="0">
-                        <property name="name">
-                            <cstring>TextLabel1_3</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&lt;qt&gt;There is currently &lt;b&gt;no way to set server parameters on the desktop&lt;/b&gt;; you need to use the &lt;i&gt;MobileLink&lt;/i&gt; or &lt;i&gt;AGConnect&lt;/i&gt; application on the handheld device. &lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                </grid>
-            </widget>
-        </widget>
-    </grid>
-</widget>
-<connections>
-    <connection>
-        <sender>RadioButton8</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>proxyServerInformation</receiver>
-        <slot>setDisabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>RadioButton8_2</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>proxyServerInformation</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>RadioButton8_2_2</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>proxyServerInformation</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>proxyCustomPortCheck</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>proxyCustomPort</receiver>
-        <slot>setEditFocus(bool)</slot>
-    </connection>
-    <connection>
-        <sender>proxyCustomPortCheck</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>proxyCustomPort</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>malCustomPortCheck</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>malCustomPort</receiver>
-        <slot>setEditFocus()</slot>
-    </connection>
-    <connection>
-        <sender>malCustomPortCheck</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>malCustomPort</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-</connections>
-<tabstops>
-    <tabstop>tabWidget</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-<includes>
-    <include location="global" impldecl="in implementation">klineedit.h</include>
-    <include location="global" impldecl="in implementation">knuminput.h</include>
-</includes>
-</UI>
diff --git a/kpilot/conduits/malconduit/mal_conduit.desktop b/kpilot/conduits/malconduit/mal_conduit.desktop
deleted file mode 100644
index c502668d..00000000
--- a/kpilot/conduits/malconduit/mal_conduit.desktop
+++ /dev/null
@@ -1,94 +0,0 @@
-[Desktop Entry]
-Type=Service
-Name=MAL (AvantGo) Conduit
-Name[af]=MAL (AvantGo) pad
-Name[ca]=Conducte MAL (AvantGo)
-Name[cs]=Propojení s AvantGo
-Name[cy]=Cwndid MAL (AvantGo)
-Name[de]=MAL- (AvantGo) Abgleich (Conduit)
-Name[el]=Σ�νδεσμος MAL (AvantGo)
-Name[eo]=MAL (AvantGo) Kanalo
-Name[es]=Conducto MAL (AvantGo)
-Name[et]=MAL (AvantGo) kanal
-Name[eu]=MAL (AvantGo) kanala
-Name[fa]=لولۀ MAL (AvantGo)
-Name[fi]=MAL (AvantGo)- yhdyskäytävä
-Name[fr]=MAL (AvantGo) Canal
-Name[ga]=Seoladán MAL (AvantGo)
-Name[gl]=Conducto MAL (AvantGo)
-Name[he]=ממשק AvantGo) MAL)
-Name[hi]=�म��ल (AvantGo) कन�ड�यूइट
-Name[hu]=MAL- (AvantGo) csatoló
-Name[is]=MAL (AvantGo)-rás
-Name[it]=Conduit MAL (AvantGo)
-Name[ja]=MAL (AvantGo) コンジット
-Name[kk]=MAL (AvantGo) арна�ы
-Name[km]=បំពង់ MAL (AvantGo)
-Name[lt]=MAL (AvantGo) kanalas
-Name[ms]=Saluran MAL (AvantGo) 
-Name[nb]=MAL (AvantGo) kanal
-Name[nds]=MAL(AvantGo)-Synkroniseren
-Name[ne]=MAL (AvantGo) कन�ड�य�ट
-Name[nn]=MAL-kopling (AvantGo)
-Name[nso]=Conduit ya MAL (AvantGo)
-Name[pl]=�ącznik do MAL (AvantGo)
-Name[pt]=Conduta MAL (AvantGo)
-Name[pt_BR]=Conduto MAL (AvantGo)
-Name[ro]=Conductă MAL (AvantGo)
-Name[ru]=Канал MAL (AvantGo)
-Name[sk]=Spojka MAL (AvantGo)
-Name[sl]=Veznik MAL (AvantGo)
-Name[sr]=MAL (AvantGo) провод
-Name[sr@Latn]=MAL (AvantGo) provod
-Name[sv]=MAL (AvantGo)-kanal
-Name[ta]=MAL (AvantGo) காப�ப�க� க�ழாய�
-Name[tg]=Канали MAL (AvantGo)
-Name[tr]=MAL (AvantGo) Kanalı
-Name[uk]=�кведук MAL (AvantGo)
-Name[zh_CN]=MAL (AvantGo) 管�
-Comment=Syncronize AvantGo (or generally a MAL server's content) to the handheld. This allows you to view web-pages offline on the handheld, like your cinema or TV schedule, or any other web page.
-Comment[af]=Sinkroniseer AvantGo (MAL bediener inhoud) informasie na die draagbare toestel. Dit maak dit moontlik om aflyn na web blaaie, soos TV en fliek skedules, te kyk.
-Comment[bg]=Синхронизиране на AvantGo към мобилно у�трой�тво. Тази при�тавка ви позвол�ва да разглеждате уеб �траници без връзка � Мрежата.
-Comment[ca]=Sincronitza AvantGo (o el contingut d'un servidor MAL en general) a l'agenda electrònica. Això us permet veure pàgines web a l'agenda electrònica en mode desconnectat, com ara la programació de TV o cinema o qualsevol altra pàgina web.
-Comment[cs]=Synchronizace AvantGo (nebo obecně obsahu MAL serverů) s PDA. To umožňuje offline prohlížení stránek v PDA např. TV programů, programů kin a mnoha dalších stránek.
-Comment[da]=Synkronisér AvantGo (eller mere alment indholdet på en MAL-server) med den håndholdte. Det lader dig kigge på nedsider offline på den håndholdte, såsom biografer eller tv-programmer, eller en hvilken som helst anden netside.
-Comment[de]=Gleicht AvantGo (oder allgemein den Inhalt eines MAL-Servers) mit dem Taschencomputer ab. So können Sie z. B. Internetseiten ohne Internetverbindung auf dem Taschencomputer lesen, zum Beispiel einen Kinoplan oder die aktuelle Programmzeitschrift.
-Comment[el]=Συγχ�ονισμός ενός AvantGo (ή γενικότε�α τα πε�ιεχόμενα ενός εξυπη�ετητή MAL) με τον υπολογιστή παλάμης. Αυτό σας επιτ�έπει να βλέπετε ιστοσελίδες στον υπολογιστή παλάμης χω�ίς να είστε συνδεδεμένοι, όπως το π�όγ�αμμα των κινηματογ�άφων ή της τηλεό�ασης, ή οποιαδήποτε άλλη ιστοσελίδα.
-Comment[en_GB]=Syncronise AvantGo (or generally a MAL server's content) to the handheld. This allows you to view web-pages offline on the handheld, like your cinema or TV schedule, or any other web page.
-Comment[es]=Sincroniza AvantGo (o más genéricamente, el contenido de un servidor MAL) con la agenda electrónica. Le permite ver páginas web en la agenda electrónica sin estar conectado, como la programación de televisión o la cartelera de cine, o cualquier otra página web.
-Comment[et]=See kanal sünkroniseerib AvantGo (või üldisemalt MAL serveri sisu) pihuarvutiga. See võimaldab vaadata veebilehekülgi pihuseadmelt ilma võrguühendusega, näiteks uurida kino- või telekava või mis tahes muud huvipakkuvat veebilehekülge.
-Comment[eu]=Sinkronizatu AvantGo (edo orokorrean MAL zerbitzariaren edukina) agenda elektronikora. Honek web-orriak agendan konexio gabe ikusteko aukera ematen dizu, zure zine edo TB antolatzailean bezala, edo beste web orri bat bezala.
-Comment[fa]=همگام‌سازی AvantGo (یا عموماً محتوای کارساز MAL) با دستی. به شما اجازه می‌دهد که ص�حات وب برون‌خطی روی دستی، مانند برنامۀ سینما یا تلویزیون شما، یا هر ص�حه وب دیگری را مشاهده کنید.
-Comment[fi]=Synkronoi AvantGo (tai yleisesti MAL-palvelimen sisältö) taskutietokoneeseen. Tämä mahdollistaa web-sivujen lukemisen offline-tilassa (esim. elokuva- tai tv-ohjelmasivujen).
-Comment[fr]=Synchronise AvantGo (ou plus généralement tout serveur MAL) avec votre Palm. Ceci vous permet de consulter des pages Web hors ligne sur votre Palm, comme des programmes TV, Cinéma ou n'importe quelle page Web.
-Comment[fy]=Avantgo mei de handheld syngronosearje (of eins mei de ynhâld fan in g MAL-tsjinner). Dit makket it mooglik om in webside sûnder ferbining te besjen op jo handheld.  Dit is hanjnich foar in soad saken lykas de TV-gids.
-Comment[gl]=Sincronizar AvantGo (ou xeralmente o contido dun servidor MAL) co aparello portátil. Isto permite ver as páxinas web fóra de liña no aparello portátil, como a programación do cine ou da TV, ou calquera outra páxina web.
-Comment[hu]=AvantGo (vagy MAL-kiszolgáló) adatainak szinkronizálása a kézi számítógéppel. Lehetővé teszi weboldalak offline módban való megtekintését, például a mozi- vagy tévéműsort, vagy bármi mást.
-Comment[is]=Samstillir AvantGo (eða venjulega innihald MAL þjóns) við lófatölvuna. Þetta gerir þér kleyft að skoða vefsíður þegar þú ert ótengd(ur) vefnum, t.d. kvikmynda eða sjónvarpsdagskrá.
-Comment[it]=Sincronizza AvantGo (o il contenuto di un generico server MAL) con il palmare. In questo modo potrai visualizzare le pagine web offline sul palmare come per esempio la programmazione di un cinema o una TV o qualsiasi altra pagina web.
-Comment[ja]=AvantGo (���一般� MAL サー��コンテンツ) ��ンドヘルドを�期����。�れ�より��ンドヘルド�映画や TV 番組表���他�ウェブページをオフライン�閲覧��るよ���り��。
-Comment[kk]=AvantGo (неме�е жалпы MAL �ервердің мазмұнын) қалта құрылғымен қадамда�тыру арна�ы. Бұл �ол құрылғыда кино, ТВ ке�теңізді неме�е ба�қа веб парақтарды желіге қо�ылмай көруге мүмкіндік береді.
-Comment[km]=ធ្វើ​សមកាលកម្ម AvantGo (ជាទូទៅ​គឺ មា�ិកា​របស់​ម៉ាស៊ីន​បម្រើ MAL) ទៅ​នឹង​ឧបករណ�​យួរ​ដៃ ។ វា​អនុញ្ញា�​ឲ្យ​អ្នក​មើល​ទំព�រ​បណ្ដាញ (កាលវិភាគ​រោង​ភាពយន្� ឬ ទូរទស្សន�...) នៅ​ក្រៅ​បណ្ដាញ នៅ​លើ​ឧបករណ�​យួរ​ដៃ​របស់​អ្នក ។
-Comment[lt]=Sinchronizuoti AvantGo (ar MAL serverio turinį apskritai) su nešiojamu įrenginiu. Tai leis jums peržiūrėti žiniatinklio puslapius nešiojamame įrenginyje, tokius kaip kino teatro ar TV programas, bei bet kokį kitą puslapį, neprisijungus prie Interneto.
-Comment[ms]=Mensegerakkan AvantGo (atau kandungan pelayan MAL secara umum) ke komputer telapak. Ini membolehkan anda memaparkan laman web di luar talian pada komputer telapak, seperti pawagam atau jadual TV, atau laman web lain.
-Comment[nb]=Synkroniser AvantGo (eller generelt innholdet i en MAL-tjener) til PDA-en. På denne måten kan du se nettsider frakoblet på PDA-en. slik som TV-programlister, kinoprogrammer eller andre nettsider.
-Comment[nds]=Synkroniseert den Inholt vun AvantGo oder jichtenseen anner MAL-Server ("Mobile Application Link") mit den Handreekner. So kannst Du Nettsieden ahn Verbinnen op den Handreekner ankieken, t.B. dat Kino- oder Feernsehprogramm.
-Comment[ne]=AvantGo (वा साधारणतया �उटा MAL सर�भरको सामाग�री) ह�यान�डहेल�डमा समक�रमण गर�न�होस� । यसले तपाई�लाई वेब पृष�ठ, जस�तै: सिनेमा वा टी भी कार�यतालिका, वा अन�य क�नै वेब पृष�ठ ह�यान�डहेल�डको अफलाईनमा हेर�न अन�मति दिन�छ ।
-Comment[nl]=Avantgo met de handheld synchroniseren (of eigenlijk met de inhoud van een MAL-server). Dit maakt het mogelijk om een webpagina offline op uw handheld te bekijken. Dit is handig voor allerlei zaken als bijvoorbeeld de TV-gids.
-Comment[pl]=Synchronizuje AvantGo (lub ogólnie zawartość serwera MAL) z palmtopem. Pozwala to przeglądać bez połączenia z siecią strony WWW na palmtopie, np. repertuar kin lub program telewizyjny.
-Comment[pt]=Sincroniza o AvantGo (ou, genericamente, o conteúdo de um servidor de MAL) para o dispositivo móvel. Isto permite-lhe ver as páginas Web no dispositivo móvel sem estar ligado, como o seu horário de cinema ou TV ou ainda qualquer outra página Web.
-Comment[pt_BR]=Sincroniza AvantGo (ou geralmente o conteúodo de um servidor MAL) com o handheld. Isto permite que você visualize páginas web offline no handheld, por exemplo a grade do cinema ou TV, ou qualquer outra página.
-Comment[ru]=Синхронизаци� AvantGo (�одержимого �ерверов MAL) � КПК. Это позволит вам про�матривать веб-�траницы без подключени� к Интернет.
-Comment[sk]=Synchronizuje AvantGo (alebo všeobecne obsah MAL servera) s ru�ným zariadením. Toto umožní vidieť webovské stránky bez pripojenia na ru�nom zariadení, ako sú programy kina alebo TV, alebo hociakej webovskej stránky.
-Comment[sl]=Uskladi AvantGo (oziroma v splošnem vsebino strežnika MAL) na ro�nem ra�unalniku. S tem si lahko na njem ogledujete spletne strani brez povezave, kot so razpored kino predstav ali pa TV spored ali pa katerokoli drugo spletno stran.
-Comment[sr]=Синхронизује AvantGo (или уопштено �адржај MAL �ервера) �а ручним рачунаром. Ово вам омогућава да на ручном рачунару прегледате веб �тране ван везе, као био�коп�ки или ТВ програм, или било коју другу веб �трану.
-Comment[sr@Latn]=Sinhronizuje AvantGo (ili uopšteno sadržaj MAL servera) sa ru�nim ra�unarom. Ovo vam omogućava da na ru�nom ra�unaru pregledate veb strane van veze, kao bioskopski ili TV program, ili bilo koju drugu veb stranu.
-Comment[sv]=Synkronisera AvantGo (eller mer allmänt innehållet på en MAL-server) med handdatorn. Det låter dig titta på webbsidor i nerkopplat läge på handdatorn, som bio eller tv-program, eller vilken annan webbsida som helst.
-Comment[ta]=AvantGo� கையில� வைத�திர�ப�பதில� கூட�டிணைக�கவ�ம� (அல�லத� ஒர� MAL சேவகனின� உள�ளடக�கத�திற�க�). இதன�மூலம� கையில� இர�ப�பதிலேயே  வலைப�பக�கங�களை பார�க�கலாம�, அதாவத� சினிமா, தொலைக�காட�டி அட�டவ�ணை, அல�லத� �தாவத� ஒர� வலைப�பக�கம�.
-Comment[tr]=AvantGo içeriğini (ya da genel olarak MAL sunucuları içeriğini) el bilgisayarı ile birleştirir. Bu, web sayfalarını el bilgisayarınızda çevirim dışı olarak görüntülemenizi sağlar.
-Comment[uk]=Синхронізаці� AvantGo (або вмі�т �ерверів MAL) на кишеньковий при�трій . Це дозвол�є перегл�дати веб-�торінки на кишеньковому при�трої без з'єднанн� з Інтернетом.
-Comment[zh_CN]=将 AvantGo(或 MAL �务器的内容)�步到手�设备中。这�许您在手�设备中脱机查看 Web 页，比如影讯�电视节目时间表或任何其它网页。
-Comment[zh_TW]=�步 AvantGo (或通常為一 MAL 伺�器內容) 與 handheld。
-Implemented=file
-ServiceTypes=KPilotConduit
-X-KDE-Library=conduit_mal
diff --git a/kpilot/conduits/malconduit/malconduit.kcfg b/kpilot/conduits/malconduit/malconduit.kcfg
deleted file mode 100644
index 146f7869..00000000
--- a/kpilot/conduits/malconduit/malconduit.kcfg
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
-      http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <kcfgfile name="kpilot_malconduitrc"/> 
-  <group name="General">
-    <entry name="LastMALSync" key="Last MAL Sync" type="DateTime">
-				<default>QDateTime( QDate(1970,1,1), QTime(0,0,0) )</default>
-		</entry>
-		
-    <entry name="SyncFrequency" key="Sync Frequency" type="Enum">
-				<choices>
-					<choice name="eEverySync"/>
-					<choice name="eEveryHour"/>
-					<choice name="eEveryDay"/>
-					<choice name="eEveryWeek"/>
-					<choice name="eEveryMonth"/>
-				</choices>
-        <default>eEverySync</default>
-    </entry>
-		
-    <entry name="ProxyType" key="Proxy Type" type="Enum">
-				<choices>
-					<choice name="eProxyNone"/>
-					<choice name="eProxyHTTP"/>
-					<choice name="eProxySOCKS"/>
-				</choices>
-        <default>eProxyNone</default>
-    </entry>
-    <entry name="ProxyServer" key="Proxy Server" type="String">
-        <default></default>
-    </entry>
-    <entry name="ProxyPort" key="Proxy Port" type="UInt">
-        <default>0</default>
-    </entry>
-    <entry name="ProxyUser" key="Proxy User" type="String">
-        <default></default>
-    </entry>
-    <entry name="ProxyPassword" key="Proxy Password" type="Password">
-        <default></default>
-    </entry>
-    <entry name="MALServer" key="MAL Server" type="String">
-        <default>sync.avantgo.com</default>
-    </entry>
-    <entry name="MALPort" key="MAL Port" type="UInt">
-        <default>0</default>
-    </entry>
-    <entry name="MALUser" key="MAL User" type="String">
-        <default></default>
-    </entry>
-    <entry name="MALPassword" key="MAL Password" type="String">
-        <default></default>
-    </entry>
-  </group>
-</kcfg>
diff --git a/kpilot/conduits/malconduit/malconduitSettings.kcfgc b/kpilot/conduits/malconduit/malconduitSettings.kcfgc
deleted file mode 100644
index d4254c41..00000000
--- a/kpilot/conduits/malconduit/malconduitSettings.kcfgc
+++ /dev/null
@@ -1,7 +0,0 @@
-File=malconduit.kcfg
-ClassName=MALConduitSettings
-Singleton=true
-ItemAccessors=true
-Mutators=true
-GlobalEnums=true
-SetUserTexts=true
diff --git a/kpilot/conduits/memofileconduit/CMakeLists.txt b/kpilot/conduits/memofileconduit/CMakeLists.txt
deleted file mode 100644
index 56994570..00000000
--- a/kpilot/conduits/memofileconduit/CMakeLists.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
-)
-
-set(conduit_memofile_SRCS
-	memofile-factory.cc
-	memofile.cc
-	memofiles.cc
-	memofile-conduit.cc
-)
-
-set(conduit_memofile_UIS
-	setup_base.ui
-)
-
-set(conduit_memofile_KCFGS
-	memofileSettings.kcfgc
-)
-
-kde3_add_kcfg_files(conduit_memofile_SRCS ${conduit_memofile_KCFGS})
-kde3_add_ui_files(conduit_memofile_SRCS ${conduit_memofile_UIS})
-kde3_automoc(${conduit_memofile_SRCS})
-add_library(conduit_memofile SHARED ${conduit_memofile_SRCS})
-
-set_target_properties(
-	conduit_memofile PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
-	PREFIX ""
-)
-
-kde3_install_libtool_file(conduit_memofile)
-
-install(
-	TARGETS conduit_memofile
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-)
-
-install(
-	FILES memofile-conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
-)
-
-install(
-	FILES memofileconduit.kcfg DESTINATION ${KDE3_KCFG_DIR}
-)
diff --git a/kpilot/conduits/memofileconduit/Makefile.am b/kpilot/conduits/memofileconduit/Makefile.am
deleted file mode 100644
index e4a244b5..00000000
--- a/kpilot/conduits/memofileconduit/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
-
-METASOURCES = AUTO
-
-servicedir = $(kde_servicesdir)
-service_DATA = memofile-conduit.desktop
-
-kde_module_LTLIBRARIES = conduit_memofile.la
-
-
-conduit_memofile_la_SOURCES = memofileSettings.kcfgc setup_base.ui \
-	memofile-factory.cc memofile.cc memofiles.cc memofile-conduit.cc
-conduit_memofile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-conduit_memofile_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) $(LIB_KFILE)
-
-kde_kcfg_DATA = memofileconduit.kcfg
diff --git a/kpilot/conduits/memofileconduit/design/SQD - copyHHToPC.jpg b/kpilot/conduits/memofileconduit/design/SQD - copyHHToPC.jpg
deleted file mode 100644
index 82cc1188..00000000
--- a/kpilot/conduits/memofileconduit/design/SQD - copyHHToPC.jpg
+++ /dev/null
diff --git a/kpilot/conduits/memofileconduit/design/SQD - copyPCToHH.jpg b/kpilot/conduits/memofileconduit/design/SQD - copyPCToHH.jpg
deleted file mode 100644
index ef4254d4..00000000
--- a/kpilot/conduits/memofileconduit/design/SQD - copyPCToHH.jpg
+++ /dev/null
diff --git a/kpilot/conduits/memofileconduit/design/SQD - detailed load.jpg b/kpilot/conduits/memofileconduit/design/SQD - detailed load.jpg
deleted file mode 100644
index 4e0601f6..00000000
--- a/kpilot/conduits/memofileconduit/design/SQD - detailed load.jpg
+++ /dev/null
diff --git a/kpilot/conduits/memofileconduit/design/SQD - sync.jpg b/kpilot/conduits/memofileconduit/design/SQD - sync.jpg
deleted file mode 100644
index 91299ce0..00000000
--- a/kpilot/conduits/memofileconduit/design/SQD - sync.jpg
+++ /dev/null
diff --git a/kpilot/conduits/memofileconduit/memofile-conduit.cc b/kpilot/conduits/memofileconduit/memofile-conduit.cc
deleted file mode 100644
index 7c2402ea..00000000
--- a/kpilot/conduits/memofileconduit/memofile-conduit.cc
+++ /dev/null
@@ -1,567 +0,0 @@
-/* memofile-conduit.cc			KPilot
-**
-** Copyright (C) 2004-2007 by Jason 'vanRijn' Kasper
-**
-** This file does the actual conduit work.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include "options.h"
-
-// Only include what we really need:
-// First UNIX system stuff, then std C++,
-// then Qt, then KDE, then local includes.
-//
-//
-
-#include <time.h>  // required by pilot-link includes
-
-#include <pi-memo.h>
-
-#include "pilotMemo.h"
-
-#include <tqfile.h>
-#include <tqdir.h>
-#include <tqtextcodec.h>
-
-#include <kconfig.h>
-#include <kdebug.h>
-
-#include "pilotRecord.h"
-#include "pilotSerialDatabase.h"
-#include "memofile-factory.h"
-#include "memofile-conduit.h"
-#include "memofileSettings.h"
-
-
-/**
- * Our workhorse.  This is the main driver for the conduit.
- */
-MemofileConduit::MemofileConduit(KPilotLink *d,
-                                 const char *n,
-                                 const TQStringList &l) :
-		ConduitAction(d,n,l),
-		_DEFAULT_MEMODIR(TQDir::homeDirPath() + CSL1("/MyMemos")),
-		fMemoAppInfo(0L),
-		_memofiles(0L)
-{
-	FUNCTIONSETUP;
-	fConduitName=i18n("Memofile");
-	fMemoList.setAutoDelete(true);
-}
-
-MemofileConduit::~MemofileConduit()
-{
-	FUNCTIONSETUP;
-	KPILOT_DELETE(_memofiles);
-}
-
-/* virtual */ bool MemofileConduit::exec()
-{
-	FUNCTIONSETUP;
-
-	setFirstSync( false );
-	// try new format first...
-	// DEBUGKPILOT << fname << ": trying new format database first." << endl;
-	bool _open = false;
-	/*
-	_open = openDatabases(CSL1("MemosDB-PMem"));
-	if(!_open) {
-		DEBUGKPILOT << fname << ": unable to open new format database. trying old one." << endl;
-	*/
-		_open = openDatabases(CSL1("MemoDB"));
-	/*
-	} else {
-		DEBUGKPILOT << fname << ": able to open new format database." << endl;
-	}
-	*/
-
-	if(!_open) {
-		emit logError(i18n("Unable to open the memo databases on the handheld."));
-		DEBUGKPILOT << fname << ": unable to open new or old format database." << endl;
-		return false;
-	}
-
-	readConfig();
-
-	if (! initializeFromPilot()) {
-		emit logError(i18n("Cannot initialize from pilot."));
-		return false;
-	}
-
-	_memofiles = new Memofiles(fCategories, *fMemoAppInfo,
-		_memo_directory, *fCtrHH);
-	if (! _memofiles || ! _memofiles->isReady()) {
-		emit logError(i18n("Cannot initialize the memo files from disk."));
-		return false;
-	}
-
-	fCtrPC->setStartCount(_memofiles->count());
-
-	setFirstSync( _memofiles->isFirstSync() );
-	addSyncLogEntry(i18n(" Syncing with %1.").arg(_memo_directory));
-
-	if ( (syncMode() == SyncAction::SyncMode::eCopyHHToPC) || _memofiles->isFirstSync() ) {
-		addSyncLogEntry(i18n(" Copying Pilot to PC..."));
-		DEBUGKPILOT << fname << ": copying Pilot to PC." << endl;
-		copyHHToPC();
-	} else if ( syncMode() == SyncAction::SyncMode::eCopyPCToHH ) {
-		DEBUGKPILOT << fname << ": copying PC to Pilot." << endl;
-		addSyncLogEntry(i18n(" Copying PC to Pilot..."));
-		copyPCToHH();
-	} else {
-		DEBUGKPILOT << fname << ": doing regular sync." << endl;
-		addSyncLogEntry(i18n(" Doing regular sync..."));
-		sync();
-	}
-
-	cleanup();
-
-	return delayDone();
-}
-
-bool MemofileConduit::readConfig()
-{
-	FUNCTIONSETUP;
-
-	TQString dir(MemofileConduitSettings::directory());
-	if (dir.isEmpty()) {
-		dir = _DEFAULT_MEMODIR;
-
-		DEBUGKPILOT << fname
-			<< ": no directory given to us.  defaulting to: ["
-			<< _DEFAULT_MEMODIR
-			<< "]" << endl;
-	}
-
-	_memo_directory = dir;
-	_sync_private = MemofileConduitSettings::syncPrivate();
-
-
-	DEBUGKPILOT << fname
-		<< ": Settings... "
-		<< "  directory: [" << _memo_directory
-		<< "], first sync: [" << isFirstSync()
-		<< "], sync private: [" << _sync_private
-		<< "]" << endl;
-
-	return true;
-
-}
-
-bool MemofileConduit::setAppInfo()
-{
-	FUNCTIONSETUP;
-
-	// reset our category mapping from the filesystem
-	MemoCategoryMap map = _memofiles->readCategoryMetadata();
-
-	if (map.count() <=0) {
-		DEBUGKPILOT << fname
-			<< ": category metadata map is empty, nothing to do." << endl;
-		return true;
-	}
-
-	fCategories = map;
-
-	for (unsigned int i = 0; i < Pilot::CATEGORY_COUNT; i++)
-	{
-		if (fCategories.contains(i)) {
-			fMemoAppInfo->setCategoryName(i,fCategories[i]);
-		}
-	}
-
-	if (fDatabase)
-	{
-		fMemoAppInfo->writeTo(fDatabase);
-	}
-	if (fLocalDatabase)
-	{
-		fMemoAppInfo->writeTo(fLocalDatabase);
-	}
-
-	return true;
-}
-
-bool MemofileConduit::getAppInfo()
-{
-	FUNCTIONSETUP;
-
-	KPILOT_DELETE(fMemoAppInfo);
-	fMemoAppInfo = new PilotMemoInfo(fDatabase);
-	fMemoAppInfo->dump();
-	return true;
-}
-
-
-/**
- * Methods related to getting set up from the Pilot.
- */
-
-bool MemofileConduit::initializeFromPilot()
-{
-
-	if (!getAppInfo()) return false;
-
-	if (!loadPilotCategories()) return false;
-
-	return true;
-}
-
-bool MemofileConduit::loadPilotCategories()
-{
-	FUNCTIONSETUP;
-
-	fCategories.clear();
-
-	TQString _category_name;
-	int _category_id=0;
-	int _category_num=0;
-
-	for (unsigned int i = 0; i < Pilot::CATEGORY_COUNT; i++)
-	{
-		_category_name = fMemoAppInfo->categoryName(i);
-		if (!_category_name.isEmpty())
-		{
-			_category_name = Memofiles::sanitizeName( _category_name );
-			_category_id   = fMemoAppInfo->categoryInfo()->ID[i];
-			_category_num  = i;
-			fCategories[_category_num] = _category_name;
-
-			DEBUGKPILOT << fname
-				<< ": Category #"
-				<< _category_num
-				<< " has ID "
-				<< _category_id
-				<< " and name "
-				<<_category_name << endl;
-		}
-	}
-	return true;
-}
-
-/**
- *  Read all memos in from Pilot.
- */
-void MemofileConduit::getAllFromPilot()
-{
-	FUNCTIONSETUP;
-
-	DEBUGKPILOT << fname
-		<< ": Database has " << fDatabase->recordCount()
-		<< " records." << endl;
-
-	fMemoList.clear();
-
-	int currentRecord = 0;
-	PilotRecord *pilotRec;
-	PilotMemo *memo = 0;
-
-	while ((pilotRec = fDatabase->readRecordByIndex(currentRecord)) != NULL) {
-		if ((!pilotRec->isSecret()) || _sync_private) {
-			memo = new PilotMemo(pilotRec);
-			fMemoList.append(memo);
-
-			DEBUGKPILOT << fname
-				<< ": Added memo: ["
-				<< currentRecord
-				<< "], id: ["
-				<< memo->id()
-				<< "], category: ["
-				<< fCategories[memo->category()]
-				<< "], title: ["
-				<< memo->getTitle()
-				<< "]" << endl;
-		} else {
-			DEBUGKPILOT << fname
-				<< ": Skipped secret record: ["
-				<< currentRecord
-				<< "], title: ["
-				<< memo->getTitle()
-				<< "]" << endl;
-		}
-
-		KPILOT_DELETE(pilotRec);
-
-		currentRecord++;
-	}
-
-	DEBUGKPILOT << fname
-		<< ": read: [" << fMemoList.count()
-		<< "] records from palm." << endl;
-}
-
-/**
- *  Read all modified memos in from Pilot.
- */
-void MemofileConduit::getModifiedFromPilot()
-{
-	FUNCTIONSETUP;
-
-	fMemoList.clear();
-
-	int currentRecord = 0;
-	PilotRecord *pilotRec;
-	PilotMemo *memo = 0;
-
-	while ((pilotRec = fDatabase->readNextModifiedRec()) != NULL) {
-		memo = new PilotMemo(pilotRec);
-		// we are syncing to both our filesystem and to the local
-		// database, so take care of the local database here
-		if (memo->isDeleted()) {
-			fLocalDatabase->deleteRecord(memo->id());
-		} else {
-			fLocalDatabase->writeRecord(pilotRec);
-		}
-
-		if ((!pilotRec->isSecret()) || _sync_private) {
-			fMemoList.append(memo);
-
-			DEBUGKPILOT << fname
-				<< ": modified memo id: ["
-				<< memo->id()
-				<< "], title: ["
-				<< memo->getTitle()
-				<< "]" << endl;
-		} else {
-			DEBUGKPILOT << fname
-				<< ": skipped secret modified record id: ["
-				<< memo->id()
-				<< "], title: ["
-				<< memo->getTitle()
-				<< "]" << endl;
-		}
-
-		KPILOT_DELETE(pilotRec);
-
-		currentRecord++;
-	}
-
-	DEBUGKPILOT << fname
-		<< ": read: [" << fMemoList.count()
-		<< "] modified records from palm." << endl;
-}
-
-
-/* slot */ void MemofileConduit::process()
-{
-	FUNCTIONSETUP;
-
-	DEBUGKPILOT << fname << ": Now in state " << fActionStatus << endl;
-}
-
-
-void MemofileConduit::listPilotMemos()
-{
-	FUNCTIONSETUP;
-
-	PilotMemo *memo;
-	for ( memo = fMemoList.first(); memo; memo = fMemoList.next() ) {
-		TQString _category_name = fCategories[memo->category()];
-
-		DEBUGKPILOT << fConduitName
-			<< ": listing record id: [" << memo->id()
-			<< "] category id: [" << memo->category()
-			<< "] category name: [" << _category_name
-			<< "] title: [" << memo->getTitle()
-			<< "]" << endl;
-	}
-}
-
-bool MemofileConduit::copyHHToPC()
-{
-	FUNCTIONSETUP;
-
-	getAllFromPilot();
-
-	_memofiles->eraseLocalMemos();
-
-	_memofiles->setPilotMemos(fMemoList);
-
-	_memofiles->save();
-
-	return true;
-
-}
-
-bool MemofileConduit::copyPCToHH()
-{
-	FUNCTIONSETUP;
-
-	// set category info from the filesystem, if we can.
-	// Note: This will reset both fCategories and fMemoAppInfo, so
-	//       after this, we need to reinitialize our memofiles object...
-	setAppInfo();
-
-	// re-create our memofiles helper...
-	KPILOT_DELETE(_memofiles);
-	_memofiles = new Memofiles(fCategories, *fMemoAppInfo,
-		_memo_directory, *fCtrHH);
-
-	_memofiles->load(true);
-
-	TQPtrList<Memofile> memofiles = _memofiles->getAll();
-
-	Memofile * memofile;
-
-	for ( memofile = memofiles.first(); memofile; memofile = memofiles.next() ) {
-		writeToPilot(memofile);
-	}
-
-	_memofiles->save();
-
-	// now that we've copied from the PC to our handheld, remove anything extra from the
-	// handheld...
-	deleteUnsyncedHHRecords();
-
-	return true;
-
-}
-
-void MemofileConduit::deleteUnsyncedHHRecords()
-{
-	FUNCTIONSETUP;
-	if ( syncMode()==SyncMode::eCopyPCToHH )
-	{
-		Pilot::RecordIDList ids=fDatabase->idList();
-		Pilot::RecordIDList::iterator it;
-		for ( it = ids.begin(); it != ids.end(); ++it )
-		{
-			if (!_memofiles->find(*it))
-			{
-				DEBUGKPILOT << fname
-					<< "Deleting record with ID "<< *it <<" from handheld "
-					<< "(is not on PC, and syncing with PC->HH direction)"
-					<< endl;
-				fDatabase->deleteRecord(*it);
-				fLocalDatabase->deleteRecord(*it);
-			}
-		}
-	}
-}
-
-int MemofileConduit::writeToPilot(Memofile * memofile)
-{
-	FUNCTIONSETUP;
-
-	int oldid = memofile->id();
-
-	PilotRecord *r = memofile->pack();
-
-	if (!r) {
-		DEBUGKPILOT << fname
-			<< ": ERROR: [" << memofile->toString()
-			<< "] could not be written to the pilot."
-			<< endl;
-		return -1;
-	}
-
-	int newid = fDatabase->writeRecord(r);
-	fLocalDatabase->writeRecord(r);
-
-	KPILOT_DELETE(r);
-
-	memofile->setID(newid);
-
-	TQString status;
-	if (oldid <=0) {
-		fCtrHH->created();
-		status = "new to pilot";
-	} else {
-		fCtrHH->updated();
-		status = "updated";
-	}
-
-	DEBUGKPILOT << fname
-		<< ": memofile: [" << memofile->toString()
-		<< "] written to the pilot, [" << status << "]."
-		<< endl;
-
-	return newid;
-}
-
-void MemofileConduit::deleteFromPilot(PilotMemo * memo)
-{
-	FUNCTIONSETUP;
-
-	PilotRecord *r = memo->pack();
-	if (r) {
-		r->setDeleted(true);
-		fDatabase->writeRecord(r);
-		fLocalDatabase->writeRecord(r);
-	}
-	KPILOT_DELETE(r);
-
-	fCtrHH->deleted();
-
-	DEBUGKPILOT << fname
-		<< ": memo: [" << memo->getTitle()
-		<< "] deleted from the pilot."
-		<< endl;
-}
-
-bool MemofileConduit::sync()
-{
-	FUNCTIONSETUP;
-
-	_memofiles->load(false);
-
-	getModifiedFromPilot();
-
-	PilotMemo *memo;
-	for ( memo = fMemoList.first(); memo; memo = fMemoList.next() ) {
-		_memofiles->addModifiedMemo(memo);
-	}
-
-	TQPtrList<Memofile> memofiles = _memofiles->getModified();
-
-	Memofile *memofile;
-	for ( memofile = memofiles.first(); memofile; memofile = memofiles.next() ) {
-		if (memofile->isDeleted()) {
-			deleteFromPilot(memofile);
-		} else {
-			writeToPilot(memofile);
-		}
-	}
-
-	_memofiles->save();
-
-	return true;
-}
-
-void MemofileConduit::cleanup()
-{
-	FUNCTIONSETUP;
-
-	fDatabase->resetSyncFlags();
-	fDatabase->cleanup();
-	fLocalDatabase->resetSyncFlags();
-	fLocalDatabase->cleanup();
-
-	fCtrPC->setEndCount(_memofiles->count());
-}
-
-
-#include "memofile-conduit.moc"
-
diff --git a/kpilot/conduits/memofileconduit/memofile-conduit.desktop b/kpilot/conduits/memofileconduit/memofile-conduit.desktop
deleted file mode 100644
index cb288d23..00000000
--- a/kpilot/conduits/memofileconduit/memofile-conduit.desktop
+++ /dev/null
@@ -1,91 +0,0 @@
-[Desktop Entry]
-Type=Service
-Name=Memo File
-Name[af]=Memo Lêer
-Name[bg]=Бележка
-Name[ca]=Fitxer de notes
-Name[cs]=Soubor s poznámkou
-Name[da]=Memo-fil
-Name[de]=Memo Datei
-Name[el]=Α�χείο υπομνήματος
-Name[eo]=Memo-dosiero
-Name[es]=Archivo de nota
-Name[et]=Memofail
-Name[eu]=Ohar fitxategia
-Name[fa]=پروندۀ Memo
-Name[fi]=Muistiotiedosto
-Name[fr]=Fichier mémo
-Name[fy]=Memotriem
-Name[ga]=Comhad Meamraim
-Name[gl]=Ficheiro Memo
-Name[hu]=Memófájl
-Name[is]=Minnismiðaskrá
-Name[it]=File appunti
-Name[ja]=メモファイル
-Name[kk]=Жазба файлы
-Name[km]=ឯកសារ​អនុស្សរណៈ
-Name[lt]=Memo byla
-Name[ms]=Fail Memo 
-Name[nb]=Notatfil
-Name[nds]=Notiz-Datei
-Name[ne]=स�मृति फाइल
-Name[nl]=Memobestand
-Name[nn]=Memofil
-Name[pl]=Plik notatki
-Name[pt]=Ficheiro Memorando
-Name[pt_BR]=Arquivo Memo
-Name[ru]=Заметка
-Name[sk]=Memo súbor
-Name[sl]=Datoteka z opombami
-Name[sv]=Anteckningsfil
-Name[ta]=மெமோ கோப�ப�
-Name[tr]=Hatırlatma Dosyası
-Name[uk]=Файл примітки
-Name[zh_CN]=备忘文件
-Name[zh_TW]=Memo 檔
-Comment=This conduit syncs your handheld memos with a local directory.
-Comment[af]=Hierdie pad sinkroniseer jou draagbare toestel se memos met 'n plaaslike gids.
-Comment[bg]=Синхронизаци� на бележките на KDE � мобилни у�трой�тва.
-Comment[ca]=Aquest conducte sincronitza les notes de l'agenda electrònica amb un directori local.
-Comment[cs]=Toto propojení synchronizuje vaše poznámky v PDA s lokálním adresářem.
-Comment[da]=Denne kanal synkroniserer dine håndholdte memoer med en lokal mappe.
-Comment[de]=Abgleich der Memos von Taschencomputer und einem lokalen Ordner
-Comment[el]=Αυτός ο σ�νδεσμος συγχ�ονίζει τα υπομνήματα του υπολογιστή παλάμης σας με έναν τοπικό κατάλογο.
-Comment[eo]=Tiu kanalo sinkronigas viajn po�komputil-memoojn kun loka dosierujo.
-Comment[es]=Este conducto sincroniza las notas de su agenda electrónica con el directorio local.
-Comment[et]=See kanal sünkroniseerib pihuarvutis ja arvutis olevad memod.
-Comment[eu]=Kanal honek zure agendako oharrak direktorio lokal batekin sinkronizatzen ditu.
-Comment[fa]=این لوله، memo‌های دستی خود را با �هرست راهنمای محلی همگام‌سازی می‌کند.
-Comment[fi]=Tämä yhdyskäytävä synkronoi taskutietokoneen muistiot paikalliseen kansioon.
-Comment[fr]=Ce canal synchronise les mémos du Palm avec ceux de KDE.
-Comment[fy]=Dit conduit syngronisearret de memo's fan jo handheld mei in lokale triemtafel.
-Comment[gl]=Este conducto sincroniza os memos do seu aparello portátil cun cartafol local.
-Comment[hu]=Ezzel a csatolóval egy kézi számítógép memóit lehet szinkronizálni a helyi címjegyzékkel.
-Comment[is]=Þessi rás samstillir minnismiða lófatölvunnar þinnar við staðbundna möppu.
-Comment[it]=Questo condotto sincronizza gli appunti del tuo palmare con una cartella locale.
-Comment[ja]=��コンジット��ンドヘルド�メモをローカル�ディレクトリ��期����。
-Comment[kk]=Қалта құрылғыдағы жазбаларды қапшықтағы файлымен қадамда�тыру арна�ы.
-Comment[km]=បំពង់​ន�ះ​អាច​ឲ្យ​អនុស្សរណៈ​ឧបករណ�​យួរ​ដៃ​របស់​អ្នក ធ្វើ​សមកាលកម្ម​ជាមួយ​នឹង​��​មូលដ្ឋាន ។​
-Comment[lt]=Šis kanalas sinchronizuoja Jūsų užrašus su vietiniu aplanku.
-Comment[ms]=Saluran ini mensegerakkan memo komputer telapak anda dengan direktori setempat.
-Comment[nb]=Denne kanalen synkroniserer PDA-ens notater med en lokal mappe.
-Comment[nds]=Synkroniseert de Notizen op den Handreekner mit en lokaal Orner.
-Comment[ne]=यो कन�ड�य�टले स�थानीय डाइरेक�टरीमा तपाई�का ह�यान�डहेल�ड मेमो सिन�क गर�दछ ।
-Comment[nl]=Dit conduit synchroniseert de memo's van uw handheld met een lokale map.
-Comment[pl]=Ten Å‚Ä…cznik synchronizuje notatki z palmtopa z lokalnym katalogiem.
-Comment[pt]=Esta conduta sincroniza os memorandos do seu PDA com uma pasta local.
-Comment[pt_BR]=Este conduíte sincroniza as anotações no seu handheld com um diretório local.
-Comment[ru]=Канал �инхронизации заметок КПК и KDE.
-Comment[sk]=Táto spojka synchronizuje adresár vášho prenosného zariadenia s lokálnym prie�inkom.
-Comment[sl]=Ta veznik usklajuje opombe v ro�nem ra�unalniku s krajevnim imenikom.
-Comment[sr]=Овај провод �инхронизује белешке на вашем ручном рачунару �а локалним директоријумом.
-Comment[sr@Latn]=Ovaj provod sinhronizuje beleške na vašem ru�nom ra�unaru sa lokalnim direktorijumom.
-Comment[sv]=Den här kanalen synkroniserar handdatorns anteckningar med en lokal katalog.
-Comment[ta]=இந�த க�ழாய� கையில� உள�ள ம�கவரிப�ப�த�தகத�தை கேடிஇயின� ம�கவரிப�ப�த�தகத�தோட� ஒத�திசைக�கிறத�
-Comment[tr]=Bu bileşen el bilgisayarı hatırlatmalarını yerel bir dosyaya aktarır veya alır.
-Comment[uk]=Цей акведук �инхронізує примітки кишенькового при�трою з локальним каталогом.
-Comment[zh_CN]=此管�会将您手�设备中的备忘与本地目录�步。
-Comment[zh_TW]=此軟體�步您的 handheld memo �本地端目錄。
-Implemented=file
-ServiceTypes=KPilotConduit
-X-KDE-Library=conduit_memofile
diff --git a/kpilot/conduits/memofileconduit/memofile-conduit.h b/kpilot/conduits/memofileconduit/memofile-conduit.h
deleted file mode 100644
index c7950661..00000000
--- a/kpilot/conduits/memofileconduit/memofile-conduit.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#ifndef _MEMOFILE_MEMOFILE_CONDUIT_H
-#define _MEMOFILE_MEMOFILE_CONDUIT_H
-/* memofile-conduit.h			KPilot
-**
-** Copyright (C) 2004-2007 by Jason 'vanRijn' Kasper
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <pi-memo.h>
-
-#include "plugin.h"
-
-#include "memofiles.h"
-
-class PilotMemo;
-
-class MemofileConduit : public ConduitAction
-{
-Q_OBJECT
-public:
-	MemofileConduit(KPilotLink *,
-		const char *name=0L,
-		const TQStringList &args = TQStringList());
-	virtual ~MemofileConduit();
-
-protected:
-	virtual bool exec();
-
-
-protected slots:
-	void process();
-
-private:
-	// configuration settings...
-	QString	_DEFAULT_MEMODIR;
-	QString	_memo_directory;
-	bool	_sync_private;
-
-	PilotMemoInfo	*fMemoAppInfo;
-	TQPtrList<PilotMemo> fMemoList;
-
-	// our categories
-	MemoCategoryMap fCategories;
-
-	Memofiles * _memofiles;
-
-
-	bool	readConfig();
-	bool	getAppInfo();
-	bool	setAppInfo();
-
-	bool	initializeFromPilot();
-	bool	loadPilotCategories();
-
-	void 	listPilotMemos();
-
-	void	getAllFromPilot();
-	void	getModifiedFromPilot();
-
-	bool	copyHHToPC();
-	bool	copyPCToHH();
-	void	deleteUnsyncedHHRecords();
-	bool	sync();
-
-	int 	writeToPilot(Memofile * memofile);
-	void	deleteFromPilot(PilotMemo* memo);
-
-	void 	cleanup();
-
-};
-
-#endif
diff --git a/kpilot/conduits/memofileconduit/memofile-factory.cc b/kpilot/conduits/memofileconduit/memofile-factory.cc
deleted file mode 100644
index 795edc33..00000000
--- a/kpilot/conduits/memofileconduit/memofile-factory.cc
+++ /dev/null
@@ -1,128 +0,0 @@
-/* memofile-factory.cc                      KPilot
-**
-** Copyright (C) 2004-2007 by Jason 'vanRijn' Kasper
-**
-** This file defines the factory for the memofile-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <tqtabwidget.h>
-#include <tqlineedit.h>
-#include <tqcheckbox.h>
-
-#include <kconfig.h>
-#include <kinstance.h>
-#include <kaboutdata.h>
-#include <kurlrequester.h>
-
-#include "setup_base.h"
-#include "memofile-conduit.h"
-#include "memofileSettings.h"
-
-#include "pluginfactory.h"
-
-class MemofileConduitConfig : public ConduitConfigBase
-{
-public:
-	MemofileConduitConfig(TQWidget *parent=0L, const char *n=0L);
-	virtual void commit();
-	virtual void load();
-protected:
-	MemofileWidget *fConfigWidget;
-} ;
-
-MemofileConduitConfig::MemofileConduitConfig(TQWidget *p, const char *n) :
-	ConduitConfigBase(p,n),
-	fConfigWidget(new MemofileWidget(p))
-{
-	FUNCTIONSETUP;
-	fConduitName = i18n("Memofile");
-	KAboutData *about = new KAboutData("MemofileConduit",
-		I18N_NOOP("Memofile Conduit for KPilot"),
-		KPILOT_VERSION,
-		I18N_NOOP("Configures the Memofile Conduit for KPilot"),
-		KAboutData::License_GPL,
-		"(C) 2004, Jason 'vanRijn' Kasper");
-	about->addAuthor("Jason 'vanRijn' Kasper",
-		I18N_NOOP("Primary Author"),
-		"vR@movingparts.net",
-		"http://www.cs.kun.nl/~adridg/kpilot");
-
-	ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,about);
-	fWidget=fConfigWidget;
-	TQObject::connect(fConfigWidget->fDirectory,TQT_SIGNAL(textChanged(const TQString&)),
-		this,TQT_SLOT(modified()));
-	TQObject::connect(fConfigWidget->fSyncPrivate,TQT_SIGNAL(toggled(bool)),
-					 this,TQT_SLOT(modified()));
-	
-}
-
-/* virtual */ void MemofileConduitConfig::commit()
-{
-	FUNCTIONSETUP;
-
-	DEBUGKPILOT << fname
-		<< ": Directory="
-		<< fConfigWidget->fDirectory->url()
-		<< endl;
-
-	MemofileConduitSettings::setDirectory( fConfigWidget->fDirectory->url() );
-	MemofileConduitSettings::setSyncPrivate( fConfigWidget->fSyncPrivate->isChecked() );
-	MemofileConduitSettings::self()->writeConfig();
-	unmodified();
-}
-
-/* virtual */ void MemofileConduitConfig::load()
-{
-	FUNCTIONSETUP;
-	MemofileConduitSettings::self()->readConfig();
-
-	fConfigWidget->fDirectory->setURL( MemofileConduitSettings::directory() );
-	fConfigWidget->fSyncPrivate->setChecked( MemofileConduitSettings::syncPrivate() );
-
-	DEBUGKPILOT << fname
-		<< ": Read Directory: ["
-		<< fConfigWidget->fDirectory->url()
-		<< "], sync private records: ["
-		<< fConfigWidget->fSyncPrivate
-		<< "]" << endl;
-
-	unmodified();
-}
-
-
-
-extern "C"
-{
-
-void *init_conduit_memofile()
-{
-	return new ConduitFactory<MemofileConduitConfig,MemofileConduit>(0,"memofileconduit");
-}
-
-unsigned long version_conduit_memofile = Pilot::PLUGIN_API;
-
-}
-
diff --git a/kpilot/conduits/memofileconduit/memofile-factory.h b/kpilot/conduits/memofileconduit/memofile-factory.h
deleted file mode 100644
index b42fb657..00000000
--- a/kpilot/conduits/memofileconduit/memofile-factory.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef _KPILOT_MEMOFILE_FACTORY_H
-#define _KPILOT_MEMOFILE_FACTORY_H
-/* memofile-factory.h                       KPilot
-**
-** Copyright (C) 2004-2007 by Jason 'vanRijn' Kasper
-**
-** This file defines the factory for the Memofile-conduit plugin.
-** It also defines the class for the behavior of the setup dialog.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-extern "C"
-{
-
-void *init_libmemofileconduit();
-
-}
-
-#endif
diff --git a/kpilot/conduits/memofileconduit/memofile.cc b/kpilot/conduits/memofileconduit/memofile.cc
deleted file mode 100644
index 3a7ff6c3..00000000
--- a/kpilot/conduits/memofileconduit/memofile.cc
+++ /dev/null
@@ -1,239 +0,0 @@
-/* memofile.cc			KPilot
-**
-** Copyright (C) 2004-2007 by Jason 'vanRijn' Kasper
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "memofile.h"
-
-Memofile::Memofile(PilotMemo * memo, TQString categoryName, TQString fileName, TQString baseDirectory) :
-		PilotMemo(memo,memo->text()), _categoryName(categoryName), _filename(fileName),  _baseDirectory(baseDirectory)
-{
-	_lastModified = 0;
-	_size = 0;
-	_modified = _modifiedByPalm = false;
-}
-
-Memofile::Memofile(recordid_t id, int category, uint lastModifiedTime, uint size,
-                   TQString categoryName, TQString fileName, TQString baseDirectory) :
-		PilotMemo(),  _categoryName(categoryName),
-		_filename(fileName),_baseDirectory(baseDirectory)
-{
-	setID(id);
-	PilotRecordBase::setCategory(category);
-	_lastModified = lastModifiedTime;
-	_size = size;
-	_modified = _modifiedByPalm = false;
-}
-
-Memofile::Memofile(int category, TQString categoryName, TQString fileName, TQString baseDirectory) :
-		PilotMemo(),
-		_categoryName(categoryName), _filename(fileName), _baseDirectory(baseDirectory)
-{
-	setID(0);
-	_new = true;
-	PilotRecordBase::setCategory(category);
-	_modified = true;
-	_modifiedByPalm = false;
-	_lastModified = 0;
-	_size = 0;
-}
-
-bool Memofile::load()
-{
-	FUNCTIONSETUP;
-	if (filename().isEmpty()) {
-		DEBUGKPILOT << fname
-		<< ": I was asked to load, but have no filename to load.  "
-		<< endl;
-		return false;
-	}
-
-	TQFile f( filenameAbs() );
-	if ( !f.open( IO_ReadOnly ) ) {
-		DEBUGKPILOT << fname
-		<< ": Couldn't open file: [" << filenameAbs() << "] to read.  "
-		<< endl;
-		return false;
-	}
-
-	TQTextStream ts( &f );
-
-	TQString text,title,body;
-	title = filename();
-	body = ts.read();
-
-	// funky magic.  we want the text of the memofile to have the filename
-	// as the first line....
-	if (body.startsWith(title)) {
-		text = body;
-	} else {
-		DEBUGKPILOT << fname
-		<< ": text of your memofile: [" << filename()
- 		<< "] didn't include the filename as the first line.  fixing it..." << endl;
-		text = title + CSL1("\n") + body;
-	}
-	
-	// check length of text.  if it's over the allowable length, warn user.
-	// NOTE: We don't need to truncate this here, since PilotMemo::setText()
-	// does it for us.
-	int _len = text.length();
-	int _maxlen = PilotMemo::MAX_MEMO_LEN;
-	if (_len > _maxlen) {
-		DEBUGKPILOT << fname << ": memofile: [" << filename()
-		 			<< "] length: [" << _len << "] is over maximum: ["
-		 			<< _maxlen << "] and will be truncated to fit." << endl;
-	}
-
-	setText(text);
-	f.close();
-
-	return true;
-}
-
-void Memofile::setID(recordid_t i)
-{
-	if (i != id())
-		_modifiedByPalm = true;
-
-	PilotMemo::setID(i);
-}
-
-bool Memofile::save()
-{
-	bool result = true;
-
-	if ((isModified() && isLoaded()) || _modifiedByPalm) {
-		result = saveFile();
-	}
-
-	return result;
-}
-
-bool Memofile::deleteFile()
-{
-	FUNCTIONSETUP;
-	DEBUGKPILOT << fname
-	<< ": deleting file: [" << filenameAbs() << "]." << endl;
-	return TQFile::remove(filenameAbs());
-
-}
-
-bool Memofile::saveFile()
-{
-	FUNCTIONSETUP;
-
-	if (filename().isEmpty()) {
-		DEBUGKPILOT << fname
-		<< ": I was asked to save, but have no filename to save to.  "
-		<< endl;
-		return false;
-	}
-
-	DEBUGKPILOT << fname
-	<< ": saving memo to file: ["
-	<< filenameAbs() << "]" << endl;
-
-
-	TQFile f( filenameAbs() );
-	if ( !f.open( IO_WriteOnly ) ) {
-		DEBUGKPILOT << fname
-		<< ": Couldn't open file: [" << filenameAbs() << "] to write your memo to.  "
-		<< "This won't end well." << endl;
-		return false;
-	}
-
-	TQTextStream stream(&f);
-	stream  << text() << endl;
-	f.close();
-
-	_lastModified = getFileLastModified();
-	_size = getFileSize();
-
-	return true;
-
-}
-
-bool Memofile::isModified(void)
-{
-	// first, check to see if this file is deleted....
-	if (!fileExists()) {
-		return true;
-	}
-
-	bool modByTimestamp = false;
-	bool modBySize = false;
-
-	if (_lastModified > 0)
-		modByTimestamp = isModifiedByTimestamp();
-
-	if (_size > 0)
-		modBySize = isModifiedBySize();
-
-	bool ret = _modified || modByTimestamp || modBySize;
-
-	return ret;
-}
-
-bool Memofile::isModifiedByTimestamp()
-{
-	if (_lastModified <=0) {
-		return true;
-	}
-
-	uint lastModifiedTime = getFileLastModified();
-	if ( lastModifiedTime != _lastModified) {
-		return true;
-	}
-
-	return false;
-}
-
-bool Memofile::isModifiedBySize()
-{
-	if (_size <=0) {
-		return true;
-	}
-
-	uint size = getFileSize();
-	if ( size != _size) {
-		return true;
-	}
-
-	return false;
-}
-
-uint Memofile::getFileLastModified()
-{
-	TQFileInfo f = TQFileInfo(filenameAbs());
-	uint lastModifiedTime = f.lastModified().toTime_t();
-	return lastModifiedTime;
-}
-
-uint Memofile::getFileSize()
-{
-	TQFileInfo f = TQFileInfo(filenameAbs());
-	uint size = f.size();
-	return size;
-}
diff --git a/kpilot/conduits/memofileconduit/memofile.h b/kpilot/conduits/memofileconduit/memofile.h
deleted file mode 100644
index 4bd5fb77..00000000
--- a/kpilot/conduits/memofileconduit/memofile.h
+++ /dev/null
@@ -1,113 +0,0 @@
-#ifndef _MEMOFILE_MEMOFILE_H
-#define _MEMOFILE_MEMOFILE_H
-/* memofile.h			KPilot
-**
-** Copyright (C) 2004-2007 by Jason 'vanRijn' Kasper
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include "options.h"
-
-// Only include what we really need:
-// First UNIX system stuff, then std C++,
-// then Qt, then KDE, then local includes.
-//
-//
-
-#include <time.h>  // required by pilot-link includes
-
-#include <pi-memo.h>
-
-#include <tqfile.h>
-#include <tqdir.h>
-#include <tqtextstream.h>
-#include <tqtextcodec.h>
-
-#include "pilotMemo.h"
-
-#include "memofiles.h"
-
-/**
- * Class that represents our filesystem memo.
- */
-class Memofile : public PilotMemo
-{
-	public:
-		Memofile(PilotMemo * memo, TQString categoryName, TQString fileName, TQString baseDirectory);
-		Memofile(recordid_t id, int category, uint lastModifiedTime, uint size, TQString categoryName, TQString filename, TQString baseDirectory);
-		Memofile(int category, TQString categoryName, TQString fileName, TQString baseDirectory);
-
-		uint lastModified() const { return _lastModified; } ;
-		uint size() const { return _size; } ;
-
-		void setModifiedByPalm(bool mod) { _modifiedByPalm = mod; } ;
-		void setModified(bool modified) { _modified = modified; } ;
-
-		bool isModified(void);
-		bool isModifiedByPalm() { return _modifiedByPalm; } ;
-		bool isLoaded(void) { return (! text().isEmpty()); } ;
-		bool isNew(void) { return _new; } ;
-
-		bool load();
-
-		bool fileExists() { return TQFile::exists(filenameAbs()); } ;
-
-		void setID(recordid_t id);
-
-		bool save();
-		bool deleteFile();
-
-		TQString toString() {
-			return CSL1("id: [") + TQString::number(id())
-					+ CSL1("], category:[") + _categoryName
-					+ CSL1("], filename: [") + _filename + CSL1("]");
-		} ;
-		const TQString & getCategoryName() { return _categoryName; } ;
-		const TQString & getFilename() { return _filename; } ;
-		const TQString & filename() { return _filename; } ;
-
-	private:
-		bool saveFile();
-		bool isModifiedByTimestamp();
-		bool isModifiedBySize();
-
-		TQString filenameAbs() { return dirName() + filename(); } ;
-		TQString dirName() { return _baseDirectory + TQDir::separator() + _categoryName + TQDir::separator(); } ;
-		bool setCategory(const TQString &label);
-		uint getFileLastModified();
-		uint getFileSize();
-
-		bool _modifiedByPalm;
-		bool _modified;
-		bool _new;
-		uint _lastModified;
-		uint _size;
-
-		TQString _categoryName;
-		TQString _filename;
-		TQString _baseDirectory;
-} ;
-
-#endif
diff --git a/kpilot/conduits/memofileconduit/memofileSettings.kcfgc b/kpilot/conduits/memofileconduit/memofileSettings.kcfgc
deleted file mode 100644
index 3d1373b8..00000000
--- a/kpilot/conduits/memofileconduit/memofileSettings.kcfgc
+++ /dev/null
@@ -1,7 +0,0 @@
-File=memofileconduit.kcfg
-ClassName= MemofileConduitSettings
-Singleton=true
-ItemAccessors=true
-Mutators=true
-GlobalEnums=true
-SetUserTexts=true
diff --git a/kpilot/conduits/memofileconduit/memofileconduit.kcfg b/kpilot/conduits/memofileconduit/memofileconduit.kcfg
deleted file mode 100644
index 506e040e..00000000
--- a/kpilot/conduits/memofileconduit/memofileconduit.kcfg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd">
-<kcfg><kcfgfile name="kpilotrc"/> 
-  <group name="memofile-conduit">
-    <entry name="Directory" type="Path">
-        <label>What directory do you want to sync your PDA's memos with?</label>
-        <default>$HOME/MyMemos</default>
-    </entry>
-    <entry name="SyncPrivate" type="Bool">
-        <label>Do you want to sync your private records to the filesystem?</label>
-        <default>true</default>
-    </entry>
-	
-  </group>
-	
-</kcfg>
diff --git a/kpilot/conduits/memofileconduit/memofileconduit.xmi b/kpilot/conduits/memofileconduit/memofileconduit.xmi
deleted file mode 100644
index 33ff89f8..00000000
--- a/kpilot/conduits/memofileconduit/memofileconduit.xmi
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<XMI xmlns:UML="org.omg/standards/UML" verified="false" timestamp="" xmi.version="1.2" >
- <XMI.header>
-  <XMI.documentation>
-   <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter>
-   <XMI.exporterVersion>1.2.90</XMI.exporterVersion>
-   <XMI.exporterEncoding>UnicodeUTF8</XMI.exporterEncoding>
-  </XMI.documentation>
-  <XMI.model xmi.name="umbrelloJSFhpc" href="/tmp/kde-gideon/umbrelloJSFhpc.tmp" />
-  <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
- </XMI.header>
- <XMI.content>
-  <UML:Model>
-   <UML:Stereotype visibility="public" xmi.id="3" name="datatype" />
-   <UML:Stereotype visibility="public" xmi.id="18" name="enum" />
-   <UML:Stereotype visibility="public" xmi.id="35" name="typedef" />
-   <UML:DataType stereotype="3" visibility="public" xmi.id="2" name="int" />
-   <UML:DataType stereotype="3" visibility="public" xmi.id="4" name="char" />
-   <UML:DataType stereotype="3" visibility="public" xmi.id="5" name="bool" />
-   <UML:DataType stereotype="3" visibility="public" xmi.id="6" name="float" />
-   <UML:DataType stereotype="3" visibility="public" xmi.id="7" name="double" />
-   <UML:DataType stereotype="3" visibility="public" xmi.id="8" name="long" />
-   <UML:DataType stereotype="3" visibility="public" xmi.id="9" name="short" />
-   <UML:DataType stereotype="3" visibility="public" xmi.id="10" name="string" />
-   <UML:Class visibility="public" xmi.id="11" name="MemofileConduit" >
-    <UML:Operation visibility="public" xmi.id="12" type="" name="MemofileConduit" >
-     <UML:Parameter visibility="public" xmi.id="13" value="" type="KPilotDeviceLink*" />
-     <UML:Parameter visibility="public" xmi.id="14" value="" type="const char*" name="name" />
-     <UML:Parameter visibility="public" xmi.id="15" value="" type="const QStringList&amp;" name="args" />
-    </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="16" type="" name="~ MemofileConduit" />
-    <UML:Operation visibility="protected" xmi.id="26" type="bool" name="exec" />
-    <UML:Operation visibility="protected" xmi.id="27" type="void" name="listPilotMemos" />
-    <UML:Operation visibility="protected" xmi.id="28" type="void" name="process" />
-    <UML:Operation visibility="private" xmi.id="43" type="bool" name="readConfig" />
-    <UML:Operation visibility="private" xmi.id="44" type="void" name="getAppInfo" />
-    <UML:Operation visibility="private" xmi.id="45" type="QString" name="getCategoryName" >
-     <UML:Parameter visibility="public" xmi.id="46" value="" type="int" name="category" />
-    </UML:Operation>
-    <UML:Operation visibility="private" xmi.id="47" type="bool" name="initializeFromPilot" />
-    <UML:Operation visibility="private" xmi.id="48" type="bool" name="loadPilotMemos" />
-    <UML:Operation visibility="private" xmi.id="49" type="bool" name="loadPilotCategories" />
-    <UML:Operation visibility="private" xmi.id="50" type="bool" name="initializeFromFilesystem" />
-    <UML:Operation visibility="private" xmi.id="51" type="bool" name="initializeMemofileList" />
-    <UML:Operation visibility="private" xmi.id="52" type="bool" name="checkDirectory" >
-     <UML:Parameter visibility="public" xmi.id="53" value="" type="QString" name="dir" />
-    </UML:Operation>
-    <UML:Operation visibility="private" xmi.id="54" type="bool" name="ensureFilesystemReady" />
-    <UML:Operation visibility="private" xmi.id="55" type="bool" name="copyHHToPC" />
-    <UML:Operation visibility="private" xmi.id="56" type="bool" name="saveCategoriesToFilesystem" />
-    <UML:Operation visibility="private" xmi.id="57" type="bool" name="saveMemoInfoToFilesystem" />
-    <UML:Operation visibility="private" xmi.id="58" type="bool" name="saveMemosToFilesystem" />
-    <UML:Operation visibility="private" xmi.id="59" type="bool" name="saveAsText" >
-     <UML:Parameter visibility="public" xmi.id="60" value="" type="const QString&amp;" name="fileName" />
-     <UML:Parameter visibility="public" xmi.id="61" value="" type="Memofile*" name="theMemo" />
-    </UML:Operation>
-    <UML:Attribute visibility="private" xmi.id="29" value="" type="QString" name="_DEFAULT_MEMODIR" />
-    <UML:Attribute visibility="private" xmi.id="30" value="" type="QString" name="_memo_directory" />
-    <UML:Attribute visibility="private" xmi.id="31" value="" type="bool" name="_sync_private" />
-    <UML:Attribute visibility="private" xmi.id="32" value="" type="QPtrList&lt; PilotMemo >" name="fMemoList" />
-    <UML:Attribute visibility="private" xmi.id="33" value="" type="struct MemoAppInfo" name="fMemoAppInfo" />
-    <UML:Attribute visibility="private" xmi.id="37" value="" type="QPtrList&lt; Memofile >" name="fMemofileList" />
-    <UML:Attribute visibility="private" xmi.id="38" value="" type="int" name="fRecordIndex" />
-    <UML:Attribute visibility="private" xmi.id="39" value="" type="QTimer*" name="fTimer" />
-    <UML:Attribute visibility="private" xmi.id="40" value="" type="int" name="fCounter" />
-    <UML:Attribute visibility="private" xmi.id="41" value="" type="int" name="fDeleteCounter" />
-    <UML:Attribute visibility="private" xmi.id="42" value="" type="int" name="fModifyCounter" />
-    <UML:Enumeration stereotype="18" visibility="public" xmi.id="17" name="Status" >
-     <UML:EnumerationLiteral visibility="public" xmi.id="19" name="Init" />
-     <UML:EnumerationLiteral visibility="public" xmi.id="20" name="ModifiedFilesToPilot" />
-     <UML:EnumerationLiteral visibility="public" xmi.id="21" name="DeleteFilesOnPilot" />
-     <UML:EnumerationLiteral visibility="public" xmi.id="22" name="NewFilesToPilot" />
-     <UML:EnumerationLiteral visibility="public" xmi.id="23" name="MemosToFiles" />
-     <UML:EnumerationLiteral visibility="public" xmi.id="24" name="Cleanup" />
-     <UML:EnumerationLiteral visibility="public" xmi.id="25" name="Done" />
-    </UML:Enumeration>
-    <UML:Class stereotype="35" visibility="public" xmi.id="34" name="MemoCategoryMap" />
-   </UML:Class>
-   <UML:Class visibility="public" xmi.id="63" name="Memofiles" >
-    <UML:Operation visibility="public" xmi.id="80" type="Memofiles" name="Memofiles" >
-     <UML:Parameter visibility="public" xmi.id="81" value="" type="QMap" name="categories" />
-     <UML:Parameter visibility="public" xmi.id="82" value="" type="QString" name="baseDirectory" />
-    </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="87" type="void" name="load" >
-     <UML:Parameter visibility="public" xmi.id="88" value="" type="bool" name="loadAll" />
-    </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="89" type="QPtrList&lt;Memofile>" name="getAll" />
-    <UML:Operation visibility="public" xmi.id="90" type="void" name="save" />
-    <UML:Operation visibility="public" xmi.id="91" type="void" name="eraseLocalMemos" />
-    <UML:Operation visibility="public" xmi.id="95" type="void" name="setModified" >
-     <UML:Parameter visibility="public" xmi.id="96" value="" type="QPtrList&lt;PilotMemo>" name="memos" />
-    </UML:Operation>
-    <UML:Operation visibility="private" xmi.id="97" type="void" name="ensureDirectoryReady" />
-    <UML:Operation visibility="public" xmi.id="98" type="void" name="loadIds" />
-    <UML:Operation visibility="public" xmi.id="99" type="Memofile" name="find" >
-     <UML:Parameter visibility="public" xmi.id="100" value="" type="QString" name="category" />
-     <UML:Parameter visibility="public" xmi.id="101" value="" type="QString" name="filename" />
-    </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="102" type="void" name="addModified" >
-     <UML:Parameter visibility="public" xmi.id="103" value="" type="PilotMemo *" name="memo" />
-    </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="104" type="QPtrList&lt;Memofile>" name="getModified" />
-    <UML:Attribute visibility="private" xmi.id="83" value="" type="QMap" name="_categories" />
-    <UML:Attribute visibility="private" xmi.id="85" value="" type="QString" name="_baseDirectory" />
-    <UML:Attribute visibility="private" xmi.id="93" value="" type="QPtrList&lt;Memofile>" name="_memofiles" />
-   </UML:Class>
-   <UML:Class visibility="public" xmi.id="64" name="Memofile" >
-    <UML:Operation visibility="public" xmi.id="65" type="" name="Memofile" >
-     <UML:Parameter visibility="public" xmi.id="66" value="" type="PilotMemo*" name="memo" />
-     <UML:Parameter visibility="public" xmi.id="67" value="" type="QString" name="categoryName" />
-    </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="68" type="" name="Memofile" >
-     <UML:Parameter visibility="public" xmi.id="69" value="" type="recordid_t" name="id" />
-     <UML:Parameter visibility="public" xmi.id="70" value="" type="int" name="category" />
-     <UML:Parameter visibility="public" xmi.id="71" value="" type="QString" name="categoryName" />
-     <UML:Parameter visibility="public" xmi.id="72" value="" type="uint" name="lastModifiedTime" />
-     <UML:Parameter visibility="public" xmi.id="73" value="" type="QString" name="filename" />
-     <UML:Parameter visibility="public" xmi.id="74" value="" type="QString" name="text" />
-    </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="75" type="uint" name="lastModified" />
-    <UML:Operation visibility="public" xmi.id="76" type="QString" name="filename" />
-    <UML:Attribute visibility="private" xmi.id="77" value="" type="uint" name="_lastModified" />
-    <UML:Attribute visibility="private" xmi.id="78" value="" type="QString" name="_categoryName" />
-    <UML:Attribute visibility="private" xmi.id="79" value="" type="QString" name="_filename" />
-   </UML:Class>
-   <UML:DataType stereotype="3" visibility="public" xmi.id="84" name="QMap" />
-   <UML:DataType stereotype="3" visibility="public" xmi.id="86" name="QString" />
-   <UML:DataType stereotype="3" visibility="public" xmi.id="94" name="QPtrList&lt;Memofile>" />
-   <UML:Association visibility="public" xmi.id="36" >
-    <UML:Association.connection>
-     <UML:AssociationEndRole visibility="public" aggregation="composite" type="11" />
-     <UML:AssociationEndRole visibility="private" type="34" />
-    </UML:Association.connection>
-   </UML:Association>
-  </UML:Model>
- </XMI.content>
- <XMI.extensions xmi.extender="umbrello" >
-  <docsettings viewid="62" documentation="" uniqueid="107" />
-  <diagrams>
-   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" linewidth="0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="807" snapy="10" showatts="1" xmi.id="1" documentation="" type="402" showops="1" showpackage="0" name="class diagram" localid="30000" showstereotype="0" showscope="1" snapcsgrid="0" font="Sans,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="591" >
-    <widgets/>
-    <messages/>
-    <associations/>
-   </diagram>
-   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" linewidth="0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="999" snapy="10" showatts="1" xmi.id="62" documentation="" type="402" showops="1" showpackage="0" name="memofile classes" localid="30000" showstereotype="0" showscope="1" snapcsgrid="0" font="Sans,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="630" >
-    <widgets>
-     <classwidget usesdiagramfillcolour="1" width="543" showattsigs="601" usesdiagramusefillcolour="1" x="428" linecolour="none" y="62" showopsigs="601" linewidth="none" usesdiagramlinewidth="1" usesdiagramlinecolour="1" fillcolour="none" height="544" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="11" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Sans,10,-1,5,75,0,0,0,0,0" />
-     <classwidget usesdiagramfillcolour="1" width="432" showattsigs="601" usesdiagramusefillcolour="1" x="17" linecolour="none" y="33" showopsigs="601" linewidth="none" usesdiagramlinewidth="1" usesdiagramlinecolour="1" fillcolour="none" height="255" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="63" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Sans,10,-1,5,75,0,0,0,0,0" />
-     <classwidget usesdiagramfillcolour="1" width="767" showattsigs="601" usesdiagramusefillcolour="1" x="3" linecolour="none" y="467" showopsigs="601" linewidth="none" usesdiagramlinewidth="1" usesdiagramlinecolour="1" fillcolour="none" height="136" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="64" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Sans,10,-1,5,75,0,0,0,0,0" />
-    </widgets>
-    <messages/>
-    <associations/>
-   </diagram>
-  </diagrams>
-  <listview>
-   <listitem open="1" type="800" id="-1" label="Views" >
-    <listitem open="1" type="801" id="-1" label="Logical View" >
-     <listitem open="0" type="807" id="1" label="class diagram" />
-     <listitem open="0" type="807" id="62" label="memofile classes" />
-     <listitem open="0" type="813" id="64" >
-      <listitem open="0" type="814" id="78" />
-      <listitem open="0" type="814" id="79" />
-      <listitem open="0" type="814" id="77" />
-      <listitem open="0" type="815" id="65" />
-      <listitem open="0" type="815" id="68" />
-      <listitem open="0" type="815" id="76" />
-      <listitem open="0" type="815" id="75" />
-     </listitem>
-     <listitem open="0" type="813" id="11" >
-      <listitem open="1" type="813" id="34" />
-      <listitem open="0" type="814" id="29" />
-      <listitem open="0" type="814" id="30" />
-      <listitem open="0" type="814" id="31" />
-      <listitem open="0" type="814" id="40" />
-      <listitem open="0" type="814" id="41" />
-      <listitem open="0" type="814" id="33" />
-      <listitem open="0" type="814" id="32" />
-      <listitem open="0" type="814" id="37" />
-      <listitem open="0" type="814" id="42" />
-      <listitem open="0" type="814" id="38" />
-      <listitem open="0" type="814" id="39" />
-      <listitem open="0" type="815" id="12" />
-      <listitem open="0" type="815" id="52" />
-      <listitem open="0" type="815" id="55" />
-      <listitem open="0" type="815" id="54" />
-      <listitem open="0" type="815" id="26" />
-      <listitem open="0" type="815" id="44" />
-      <listitem open="0" type="815" id="45" />
-      <listitem open="0" type="815" id="50" />
-      <listitem open="0" type="815" id="47" />
-      <listitem open="0" type="815" id="51" />
-      <listitem open="0" type="815" id="27" />
-      <listitem open="0" type="815" id="49" />
-      <listitem open="0" type="815" id="48" />
-      <listitem open="0" type="815" id="28" />
-      <listitem open="0" type="815" id="43" />
-      <listitem open="0" type="815" id="59" />
-      <listitem open="0" type="815" id="56" />
-      <listitem open="0" type="815" id="57" />
-      <listitem open="0" type="815" id="58" />
-      <listitem open="0" type="815" id="16" />
-      <listitem open="1" type="831" id="17" />
-     </listitem>
-     <listitem open="1" type="813" id="63" >
-      <listitem open="0" type="814" id="85" />
-      <listitem open="0" type="814" id="83" />
-      <listitem open="0" type="814" id="93" />
-      <listitem open="0" type="815" id="80" />
-      <listitem open="0" type="815" id="102" />
-      <listitem open="0" type="815" id="97" />
-      <listitem open="0" type="815" id="91" />
-      <listitem open="0" type="815" id="99" />
-      <listitem open="0" type="815" id="89" />
-      <listitem open="0" type="815" id="104" />
-      <listitem open="0" type="815" id="87" />
-      <listitem open="0" type="815" id="98" />
-      <listitem open="0" type="815" id="90" />
-      <listitem open="0" type="815" id="95" />
-     </listitem>
-     <listitem open="0" type="830" id="-1" label="Datatypes" >
-      <listitem open="1" type="829" id="84" />
-      <listitem open="1" type="829" id="94" />
-      <listitem open="1" type="829" id="86" />
-      <listitem open="1" type="829" id="5" />
-      <listitem open="1" type="829" id="4" />
-      <listitem open="1" type="829" id="7" />
-      <listitem open="1" type="829" id="6" />
-      <listitem open="1" type="829" id="2" />
-      <listitem open="1" type="829" id="8" />
-      <listitem open="1" type="829" id="9" />
-      <listitem open="1" type="829" id="10" />
-     </listitem>
-    </listitem>
-    <listitem open="1" type="802" id="-1" label="Use Case View" />
-    <listitem open="1" type="821" id="-1" label="Component View" />
-    <listitem open="1" type="827" id="-1" label="Deployment View" />
-   </listitem>
-  </listview>
-  <codegeneration/>
- </XMI.extensions>
-</XMI>
diff --git a/kpilot/conduits/memofileconduit/memofiles.cc b/kpilot/conduits/memofileconduit/memofiles.cc
deleted file mode 100644
index db3d8cac..00000000
--- a/kpilot/conduits/memofileconduit/memofiles.cc
+++ /dev/null
@@ -1,700 +0,0 @@
-/* memofile-conduit.cc			KPilot
-**
-** Copyright (C) 2004-2007 by Jason 'vanRijn' Kasper
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include "memofiles.h"
-#include "memofile.h"
-
-TQString Memofiles::FIELD_SEP = CSL1("\t");
-
-Memofiles::Memofiles (MemoCategoryMap & categories, PilotMemoInfo &appInfo, 
-	TQString & baseDirectory, CUDCounter &fCtrPC) :
-	_categories(categories), _memoAppInfo(appInfo), 
-	_baseDirectory(baseDirectory), _cudCounter(fCtrPC)
-{
-	FUNCTIONSETUP;
-	_memofiles.clear();
-	_memoMetadataFile = _baseDirectory + TQDir::separator() + CSL1(".ids");
-	_categoryMetadataFile = _baseDirectory + TQDir::separator() + CSL1(".categories");
-	_memofiles.setAutoDelete(true);
-
-	_ready = ensureDirectoryReady();
-
-	_metadataLoaded = loadFromMetadata();
-}
-
-Memofiles::~Memofiles()
-{
-	FUNCTIONSETUP;
-}
-
-void Memofiles::load (bool loadAll)
-{
-	FUNCTIONSETUP;
-
-	DEBUGKPILOT << fname
-	<< ": now looking at all memofiles in your directory." << endl;
-
-	// now go through each of our known categories and look in each directory
-	// for that category for memo files
-	MemoCategoryMap::ConstIterator it;
-	int counter = -1;
-
-	for ( it = _categories.begin(); it != _categories.end(); ++it ) {
-		int category = it.key();
-		TQString categoryName = it.data();
-		TQString categoryDirname = _baseDirectory + TQDir::separator() + categoryName;
-
-		TQDir dir = TQDir(categoryDirname);
-		if (! dir.exists() ) {
-			DEBUGKPILOT << fname
-			<< ": category directory: [" << categoryDirname
-			<< "] doesn't exist. skipping." << endl;
-			continue;
-		}
-
-
-		TQStringList entries = dir.entryList(TQDir::Files);
-		TQString file;
-		for(TQStringList::Iterator it = entries.begin(); it != entries.end(); ++it) {
-			file = *it;
-			TQFileInfo info(dir, file);
-
-			if(info.isFile() && info.isReadable()) {
-// 				DEBUGKPILOT << fname
-// 				<< ": checking category: [" << categoryName
-// 				<< "], file: [" << file << "]." << endl;
-				Memofile * memofile = find(categoryName, file);
-				if (NULL == memofile) {
-					memofile = new Memofile(category, categoryName, file, _baseDirectory);
-					memofile->setModified(true);
-					_memofiles.append(memofile);
-					DEBUGKPILOT << fname
-					<< ": looks like we didn't know about this one until now. "
-					<< "created new memofile for category: ["
-					<< categoryName << "], file: [" << file << "]." << endl;
-
-				}
-
-				counter++;
-
-				// okay, we should have a memofile for this file now.  see if we need
-				// to load its text...
-				if (memofile->isModified() || loadAll) {
-					DEBUGKPILOT << fname
-					<< ": now loading text for: [" << info.filePath() << "]." << endl;
-					memofile->load();
-				}
-			} else {
-				DEBUGKPILOT << fname
-				<< ": couldn't read file: [" << info.filePath() << "]. skipping it." << endl;
-
-			}
-		} // end of iterating through files in this directory
-
-	} // end of iterating through our categories/directories
-
-	DEBUGKPILOT << fname
-	<< ": looked at: [" << counter << "] files from your directories." << endl;
-
-
-	// okay, now we've loaded everything from our directories.  make one last
-	// pass through our loaded memofiles and see if we need to mark any of them
-	// as deleted (i.e. we created a memofile object from our metadata, but
-	// the file is now gone, so it's deleted.
-	Memofile * memofile;
-
-	for ( memofile = _memofiles.first(); memofile; memofile = _memofiles.next() ) {
-		if (! memofile->fileExists()) {
-			memofile->setDeleted( true );
-		}
-	}
-}
-
-/**
-* Make sure that our directory is ready to synchronize with our
-* Palm's database.  This means we need to make sure that the directory
-* that our user has specified for storing his/her memos exists, as well
-* as a directory inside that directory for each of his/her memo categories.
-*/
-bool Memofiles::ensureDirectoryReady()
-{
-	FUNCTIONSETUP;
-
-	if (!checkDirectory(_baseDirectory))
-		return false;
-
-	int failures = 0;
-	// now make sure that a directory for each category exists.
-	TQString _category_name;
-	TQString dir;
-
-	MemoCategoryMap::Iterator it;
-	for ( it = _categories.begin(); it != _categories.end(); ++it ) {
-		_category_name = it.data();
-		dir = _baseDirectory + TQDir::separator() + _category_name;
-
-		DEBUGKPILOT << fname
-		<< ": checking directory: [" << dir		<< "]" << endl;
-
-		if (!checkDirectory(dir))
-			failures++;
-	}
-
-	return failures == 0;
-}
-
-bool Memofiles::checkDirectory(TQString & dir)
-{
-	FUNCTIONSETUP;
-	// make sure that the directory we're asked to write to exists
-	TQDir d(dir);
-	TQFileInfo fid( dir );
-
-	if ( ! fid.isDir() ) {
-
-		DEBUGKPILOT << fname
-		<< ": directory: [" << dir
-		<< "] doesn't exist. creating...."
-		<< endl;
-
-		if (!d.mkdir(dir)) {
-
-			DEBUGKPILOT << fname
-			<< ": could not create directory: [" << dir
-			<< "].  this won't end well." << endl;
-			return false;
-		} else {
-			DEBUGKPILOT << fname
-			<< ": directory created: ["
-			<< dir << "]." << endl;
-
-		}
-	} else {
-		DEBUGKPILOT << fname
-		<< ": directory already existed: ["
-		<< dir << "]." << endl;
-
-	}
-
-	return true;
-
-}
-
-void Memofiles::eraseLocalMemos ()
-{
-	FUNCTIONSETUP;
-
-	MemoCategoryMap::Iterator it;
-	for ( it = _categories.begin(); it != _categories.end(); ++it ) {
-		TQString dir = _baseDirectory + TQDir::separator() + it.data();
-
-		if (!folderRemove(TQDir(dir))) {
-			DEBUGKPILOT << fname
-			<< ": couldn't erase all local memos from: ["
-			<< dir << "]." << endl;
-		}
-	}
-	TQDir d(_baseDirectory);
-	d.remove(_memoMetadataFile);
-
-	ensureDirectoryReady();
-
-	_memofiles.clear();
-}
-
-void Memofiles::setPilotMemos (TQPtrList<PilotMemo> & memos)
-{
-	FUNCTIONSETUP;
-
-	PilotMemo * memo;
-
-	_memofiles.clear();
-
-	for ( memo = memos.first(); memo; memo = memos.next() ) {
-		addModifiedMemo(memo);
-	}
-
-	DEBUGKPILOT << fname
-	<< ": set: ["
-	<< _memofiles.count() << "] from Palm to local." << endl;
-
-}
-
-bool Memofiles::loadFromMetadata ()
-{
-	FUNCTIONSETUP;
-
-	_memofiles.clear();
-
-	TQFile f( _memoMetadataFile );
-	if ( !f.open( IO_ReadOnly ) ) {
-		DEBUGKPILOT << fname
-		<< ": ooh, bad.  couldn't open your memo-id file for reading."
-		<< endl;
-		return false;
-	}
-
-	TQTextStream t( &f );
-	Memofile * memofile;
-
-	while ( !t.atEnd() ) {
-		TQString data = t.readLine();
-		int errors = 0;
-		bool ok;
-
-		TQStringList fields = TQStringList::split( FIELD_SEP, data );
-		if ( fields.count() >= 4 ) {
-			int id = fields[0].toInt( &ok );
-			if ( !ok )
-				errors++;
-			int category = fields[1].toInt( &ok );
-			if ( !ok )
-				errors++;
-			uint lastModified = fields[2].toInt( &ok );
-			if ( !ok )
-				errors++;
-			uint size = fields[3].toInt( &ok );
-			if ( !ok )
-				errors++;
-			TQString filename = fields[4];
-			if ( filename.isEmpty() )
-				errors++;
-
-			if (errors <= 0) {
-				memofile = new Memofile(id, category, lastModified, size,
-				                        _categories[category], filename, _baseDirectory);
-				_memofiles.append(memofile);
-				// 				DEBUGKPILOT << fname
-				// 				<< ": created memofile from metadata. id: [" << id
-				// 				<< "], category: ["
-				// 				<< _categories[category] << "], filename: [" << filename << "]."
-				// 				<< endl;
-			}
-		} else {
-			errors++;
-		}
-
-		if (errors > 0) {
-			DEBUGKPILOT << fname
-			<< ": error: couldn't understand this line: [" << data << "]."
-			<< endl;
-		}
-	}
-
-	DEBUGKPILOT << fname
-	<< ": loaded: [" << _memofiles.count() << "] memofiles."
-	<< endl;
-
-	f.close();
-
-	return true;
-}
-
-Memofile * Memofiles::find (recordid_t id)
-{
-
-	Memofile * memofile;
-
-	for ( memofile = _memofiles.first(); memofile; memofile = _memofiles.next() ) {
-		if ( memofile->id() == id) {
-			return memofile;
-		}
-	}
-
-	return NULL;
-
-}
-
-Memofile * Memofiles::find (const TQString & category, const TQString & filename)
-{
-
-	Memofile * memofile;
-
-	for ( memofile = _memofiles.first(); memofile; memofile = _memofiles.next() ) {
-		if ( memofile->getCategoryName() == category &&
-		        memofile->getFilename() == filename ) {
-			return memofile;
-		}
-	}
-
-	return NULL;
-
-}
-
-void Memofiles::deleteMemo(PilotMemo * memo)
-{
-	FUNCTIONSETUP;
-	if (! memo->isDeleted())
-		return;
-
-	Memofile * memofile = find(memo->id());
-	if (memofile) {
-		memofile->deleteFile();
-		_memofiles.remove(memofile);
-		_cudCounter.deleted();
-	}
-}
-
-
-void Memofiles::addModifiedMemo (PilotMemo * memo)
-{
-	FUNCTIONSETUP;
-
-	if (memo->isDeleted()) {
-		deleteMemo(memo);
-		return;
-	}
-
-	TQString debug = CSL1(": adding a PilotMemo. id: [")
-	                + TQString::number(memo->id()) + CSL1("], title: [")
-	                + memo->getTitle() + CSL1("]. ");
-
-	Memofile * memofile = find(memo->id());
-
-	if (NULL == memofile) {
-		_cudCounter.created();
-		debug += CSL1(" new from pilot.");
-	} else {
-		// we have found a local memofile that was modified on the palm.  for the time
-		// being (until someone complains, etc.), we will always overwrite changes to
-		// the local filesystem with changes to the palm (palm overrides local).  at
-		// some point in the future, we should probably honor a user preference for
-		// this...
-		_cudCounter.updated();
-		_memofiles.remove(memofile);
-		debug += CSL1(" modified from pilot.");
-	}
-
-	DEBUGKPILOT << fname
-	<< debug << endl;
-
-	memofile = new Memofile(memo, _categories[memo->category()], filename(memo), _baseDirectory);
-	memofile->setModifiedByPalm(true);
-	_memofiles.append(memofile);
-
-}
-
-TQPtrList<Memofile> Memofiles::getModified ()
-{
-	FUNCTIONSETUP;
-
-	TQPtrList<Memofile> modList;
-	modList.clear();
-
-	Memofile * memofile;
-
-	for ( memofile = _memofiles.first(); memofile; memofile = _memofiles.next() ) {
-		if ( memofile->isModified() && ! memofile->isModifiedByPalm() ) {
-			modList.append(memofile);
-		}
-	}
-
-	DEBUGKPILOT << fname
-	<< ": found: [" << modList.count() << "] memofiles modified on filesystem." << endl;
-
-	return modList;
-}
-
-void Memofiles::save()
-{
-	FUNCTIONSETUP;
-
-	saveCategoryMetadata();
-	saveMemos();
-	// this needs to be done last, because saveMemos() might change
-	// attributes of the Memofiles
-	saveMemoMetadata();
-
-}
-
-bool Memofiles::saveMemoMetadata()
-{
-	FUNCTIONSETUP;
-
-	DEBUGKPILOT << fname
-	<< ": saving memo metadata to file: ["
-	<< _memoMetadataFile << "]" << endl;
-
-	TQFile f( _memoMetadataFile );
-	TQTextStream stream(&f);
-
-	if( !f.open(IO_WriteOnly) ) {
-		DEBUGKPILOT << fname
-		<< ": ooh, bad.  couldn't open your memo-id file for writing."
-		<< endl;
-		return false;
-	}
-
-	Memofile * memofile;
-
-	// each line looks like this, but FIELD_SEP is the separator instead of ","
-	// id,category,lastModifiedTime,filesize,filename
-	for ( memofile = _memofiles.first(); memofile; memofile = _memofiles.next() ) {
-		// don't save deleted memos to our id file
-		if (! memofile->isDeleted()) {
-			stream  << memofile->id() << FIELD_SEP
-			<< memofile->category() << FIELD_SEP
-			<< memofile->lastModified() << FIELD_SEP
-			<< memofile->size() << FIELD_SEP
-			<< memofile->filename()
-			<< endl;
-		}
-	}
-
-	f.close();
-
-	return true;
-
-}
-
-MemoCategoryMap Memofiles::readCategoryMetadata()
-{
-	FUNCTIONSETUP;
-
-	DEBUGKPILOT << fname
-	<< ": reading categories from file: ["
-	<< _categoryMetadataFile << "]" << endl;
-
-	MemoCategoryMap map;
-	map.clear();
-
-	TQFile f( _categoryMetadataFile );
-	TQTextStream stream(&f);
-
-	if( !f.open(IO_ReadOnly) ) {
-		DEBUGKPILOT << fname
-		<< ": ooh, bad.  couldn't open your categories file for reading."
-		<< endl;
-		return map;
-	}
-
-
-	while ( !stream.atEnd() ) {
-		TQString data = stream.readLine();
-		int errors = 0;
-		bool ok;
-
-		TQStringList fields = TQStringList::split( FIELD_SEP, data );
-		if ( fields.count() >= 2 ) {
-			int id = fields[0].toInt( &ok );
-			if ( !ok )
-				errors++;
-			TQString categoryName = fields[1];
-			if ( categoryName.isEmpty() )
-				errors++;
-
-			if (errors <= 0) {
-				map[id] = categoryName;
-			}
-		} else {
-			errors++;
-		}
-
-		if (errors > 0) {
-			DEBUGKPILOT << fname
-			<< ": error: couldn't understand this line: [" << data << "]."
-			<< endl;
-		}
-	}
-
-	DEBUGKPILOT << fname
-	<< ": loaded: [" << map.count() << "] categories."
-	<< endl;
-
-	f.close();
-
-	return map;
-}
-
-bool Memofiles::saveCategoryMetadata()
-{
-	FUNCTIONSETUP;
-
-
-	DEBUGKPILOT << fname
-	<< ": saving categories to file: ["
-	<< _categoryMetadataFile << "]" << endl;
-
-	TQFile f( _categoryMetadataFile );
-	TQTextStream stream(&f);
-
-	if( !f.open(IO_WriteOnly) ) {
-		DEBUGKPILOT << fname
-		<< ": ooh, bad.  couldn't open your categories file for writing."
-		<< endl;
-		return false;
-	}
-
-	MemoCategoryMap::Iterator it;
-	for ( it = _categories.begin(); it != _categories.end(); ++it ) {
-		stream  << it.key()
-		<< FIELD_SEP
-		<< it.data()
-		<< endl;
-	}
-
-	f.close();
-
-	return true;
-}
-
-bool Memofiles::saveMemos()
-{
-	FUNCTIONSETUP;
-
-	Memofile * memofile;
-	bool result = true;
-
-	for ( memofile = _memofiles.first(); memofile; memofile = _memofiles.next() ) {
-		if (memofile->isDeleted()) {
-			_memofiles.remove(memofile);
-		} else {
-			result = memofile->save();
-			// Fix prompted by Bug #103922
-			// if we weren't able to save the file, then remove it from the list.
-			// if we don't do this, the next sync will think that the user deliberately
-			// deleted the memofile and will then delete it from the Pilot.
-			// TODO -- at some point, we should probably tell the user that this
-			//        did not work, but that will require a String change.
-			//        Also, this is a partial fix since at this point
-			//        this memo will never make its way onto the PC, but at least
-			//        we won't delete it from the Pilot erroneously either.  *sigh*
-			if (!result) {
-				DEBUGKPILOT << fname
-					<< ": unable to save memofile: ["
-					<< memofile->filename() 
-					<< "], now removing it from the metadata list."
-					<< endl;
-				_memofiles.remove(memofile);
-			}
-		}
-	}
-	return true;
-}
-
-bool Memofiles::isFirstSync()
-{
-	FUNCTIONSETUP;
-	bool metadataExists = TQFile::exists(_memoMetadataFile) &&
-	                      TQFile::exists(_categoryMetadataFile);
-
-	bool valid = metadataExists && _metadataLoaded;
-
-	DEBUGKPILOT << fname
-	<< ": local metadata exists: [" << metadataExists
-	<< "], metadata loaded: [" << _metadataLoaded
-	<< "], returning: [" << ! valid << "]" << endl;
-	return ! valid;
-}
-
-
-
-bool Memofiles::folderRemove(const TQDir &_d)
-{
-	FUNCTIONSETUP;
-
-	TQDir d = _d;
-
-	TQStringList entries = d.entryList();
-	for(TQStringList::Iterator it = entries.begin(); it != entries.end(); ++it) {
-		if(*it == CSL1(".") || *it == CSL1(".."))
-			continue;
-		TQFileInfo info(d, *it);
-		if(info.isDir()) {
-			if(!folderRemove(TQDir(info.filePath())))
-				return FALSE;
-		} else {
-			DEBUGKPILOT << fname
-			<< ": deleting file: [" << info.filePath() << "]" << endl;
-			d.remove(info.filePath());
-		}
-	}
-	TQString name = d.dirName();
-	if(!d.cdUp())
-		return FALSE;
-	DEBUGKPILOT << fname
-	<< ": removing folder: [" << name << "]" << endl;
-	d.rmdir(name);
-
-	return TRUE;
-}
-
-TQString Memofiles::filename(PilotMemo * memo)
-{
-	FUNCTIONSETUP;
-
-	TQString filename = memo->getTitle();
-
-	if (filename.isEmpty()) {
-		TQString text = memo->text();
-		int i = text.find(CSL1("\n"));
-		if (i > 1) {
-			filename = text.left(i);
-		}
-		if (filename.isEmpty()) {
-			filename = CSL1("empty");
-		}
-	}
-
-	filename = sanitizeName(filename);
-
-	TQString category = _categories[memo->category()];
-
-	Memofile * memofile = find(category, filename);
-
-	// if we couldn't find a memofile with this filename, or if the
-	// memofile that is found is the same as the memo that we're looking
-	// at, then use the filename
-	if (NULL == memofile || memofile == memo) {
-		return filename;
-	}
-
-	int uniq = 2;
-	TQString newfilename;
-
-	// try to find a good filename, but only do this 20 times at the most.
-	// if our user has 20 memos with the same filename, he/she is asking
-	// for trouble.
-	while (NULL != memofile && uniq <=20) {
-		newfilename = TQString(filename + CSL1(".") + TQString::number(uniq++) );
-		memofile = find(category, newfilename);
-	}
-
-	return newfilename;
-}
-
-TQString Memofiles::sanitizeName(TQString name)
-{
-	TQString clean = name;
-	// safety net. we can't save a
-	// filesystem separator as part of a filename, now can we?
-	clean.replace('/', CSL1("-"));
-	return clean;
-}
-
diff --git a/kpilot/conduits/memofileconduit/memofiles.h b/kpilot/conduits/memofileconduit/memofiles.h
deleted file mode 100644
index 72b6ed4a..00000000
--- a/kpilot/conduits/memofileconduit/memofiles.h
+++ /dev/null
@@ -1,96 +0,0 @@
-#ifndef _MEMOFILE_MEMOFILES_H
-#define _MEMOFILE_MEMOFILES_H
-/* memofiles.h			KPilot
-**
-** Copyright (C) 2004-2007 by Jason 'vanRijn' Kasper
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "plugin.h"
-#include <tqmap.h>
-
-#include "memofile.h"
-
-typedef TQMap<int, TQString> MemoCategoryMap;
-
-class Memofile;
-
-class Memofiles {
-
-public:
-
-	Memofiles (MemoCategoryMap & categories, PilotMemoInfo &appInfo, 
-		TQString & baseDirectory, CUDCounter &fCtrHH);
-	~Memofiles();
-
-	void load(bool loadAll);
-	void save();
-	void eraseLocalMemos();
-	void setPilotMemos (TQPtrList<PilotMemo> & memos);
-	void addModifiedMemo (PilotMemo * memo);
-	void deleteMemo (PilotMemo * memo);
-
-	bool isFirstSync();
-	bool isReady() { return _ready; };
-
-	TQPtrList<Memofile> getModified();
-	TQPtrList<Memofile> getAll() { return _memofiles; } ;
-	Memofile * find (const TQString & category, const TQString & filename);
-	Memofile * find (recordid_t id);
-
-	MemoCategoryMap readCategoryMetadata();
-	void setCategories(MemoCategoryMap map) { _categories = map; } ;
-
-	static TQString FIELD_SEP;
-	static TQString sanitizeName(TQString name);
-
-	int count() { return _memofiles.count(); }
-
-private:
-
-	MemoCategoryMap _categories;
-	PilotMemoInfo &_memoAppInfo;
-	TQString & _baseDirectory;
-	CUDCounter &_cudCounter;
-	TQPtrList<Memofile> _memofiles;
-
-	bool  loadFromMetadata();
-	bool  ensureDirectoryReady();
-	bool  checkDirectory(TQString & dir);
-	bool  saveMemoMetadata();
-	bool  saveCategoryMetadata();
-	bool  saveMemos();
-	bool  folderRemove(const TQDir & dir);
-
-	TQString filename(PilotMemo * memo);
-
-
-	TQString _categoryMetadataFile;
-	TQString _memoMetadataFile;
-
-	bool _metadataLoaded;
-	bool _ready;
-
-};
-#endif //MEMOFILES_H
-
diff --git a/kpilot/conduits/memofileconduit/setup_base.ui b/kpilot/conduits/memofileconduit/setup_base.ui
deleted file mode 100644
index 215c1805..00000000
--- a/kpilot/conduits/memofileconduit/setup_base.ui
+++ /dev/null
@@ -1,143 +0,0 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>MemofileWidget</class>
-<comment>A tabWidget for configuring
-the Memofile-conduit settings.</comment>
-<author>Jason 'vanRijn' Kasper</author>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>Form1</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>342</width>
-            <height>412</height>
-        </rect>
-    </property>
-    <property name="sizePolicy">
-        <sizepolicy>
-            <hsizetype>5</hsizetype>
-            <vsizetype>5</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-        </sizepolicy>
-    </property>
-    <property name="baseSize">
-        <size>
-            <width>570</width>
-            <height>270</height>
-        </size>
-    </property>
-    <property name="caption">
-        <string>Memofile Conduit Options</string>
-    </property>
-    <property name="layoutMargin" stdset="0">
-    </property>
-    <property name="layoutSpacing" stdset="0">
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QTabWidget" row="0" column="0">
-            <property name="name">
-                <cstring>tabWidget</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>7</hsizetype>
-                    <vsizetype>7</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="layoutMargin" stdset="0">
-            </property>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>Widget2</cstring>
-                </property>
-                <attribute name="title">
-                    <string>General</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <spacer row="2" column="2">
-                        <property name="name">
-                            <cstring>Spacer4</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>20</width>
-                                <height>180</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QLabel" row="1" column="0">
-                        <property name="name">
-                            <cstring>textLabel2</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Sync private records:</string>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="0" column="0">
-                        <property name="name">
-                            <cstring>textLabel1</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Memos directory:</string>
-                        </property>
-                    </widget>
-                    <widget class="KURLRequester" row="0" column="1" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>fDirectory</cstring>
-                        </property>
-                        <property name="mode">
-                            <number>18</number>
-                        </property>
-                        <property name="toolTip" stdset="0">
-                            <string>Select the directory you want to store your PDA's memos in</string>
-                        </property>
-                    </widget>
-                    <widget class="QCheckBox" row="1" column="1">
-                        <property name="name">
-                            <cstring>fSyncPrivate</cstring>
-                        </property>
-                        <property name="text">
-                            <string></string>
-                        </property>
-                        <property name="checked">
-                            <bool>true</bool>
-                        </property>
-                    </widget>
-                </grid>
-            </widget>
-        </widget>
-    </grid>
-</widget>
-<tabstops>
-    <tabstop>tabWidget</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-<includes>
-    <include location="global" impldecl="in implementation">kurlrequester.h</include>
-    <include location="global" impldecl="in implementation">klineedit.h</include>
-    <include location="global" impldecl="in implementation">kpushbutton.h</include>
-</includes>
-</UI>
diff --git a/kpilot/conduits/notepadconduit/CMakeLists.txt b/kpilot/conduits/notepadconduit/CMakeLists.txt
deleted file mode 100644
index 90e202d6..00000000
--- a/kpilot/conduits/notepadconduit/CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
-)
-
-set(conduit_notepad_SRCS
-	notepad-factory.cc
-	notepad-conduit.cc
-)
-
-set(conduit_notepad_UIS
-	notepad-setup.ui
-)
-
-set(conduit_notepad_KCFGS
-	notepadconduit.kcfgc
-)
-
-kde3_add_kcfg_files(conduit_notepad_SRCS ${conduit_notepad_KCFGS})
-kde3_add_ui_files(conduit_notepad_SRCS ${conduit_notepad_UIS})
-kde3_automoc(${conduit_notepad_SRCS})
-add_library(conduit_notepad SHARED ${conduit_notepad_SRCS})
-
-set_target_properties(
-	conduit_notepad PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
-	PREFIX ""
-)
-
-kde3_install_libtool_file(conduit_notepad)
-
-install(
-	TARGETS conduit_notepad
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-)
-
-install(
-	FILES notepad-conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
-)
diff --git a/kpilot/conduits/notepadconduit/Makefile.am b/kpilot/conduits/notepadconduit/Makefile.am
deleted file mode 100644
index d50e4fd4..00000000
--- a/kpilot/conduits/notepadconduit/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
-
-METASOURCES = AUTO
-
-servicedir = $(kde_servicesdir)
-service_DATA = notepad-conduit.desktop
-
-kde_module_LTLIBRARIES = conduit_notepad.la
-
-conduit_notepad_la_SOURCES = notepadconduit.kcfgc notepad-setup.ui \
-	notepad-conduit.cc notepad-factory.cc
-conduit_notepad_la_LDFLAGS= -module $(KDE_PLUGIN) $(all_libraries)
-conduit_notepad_la_LIBADD= ../../lib/libkpilot.la $(LIB_KDEUI) $(LIB_KIO)
-
diff --git a/kpilot/conduits/notepadconduit/notepad-conduit.cc b/kpilot/conduits/notepadconduit/notepad-conduit.cc
deleted file mode 100644
index da6f085d..00000000
--- a/kpilot/conduits/notepadconduit/notepad-conduit.cc
+++ /dev/null
@@ -1,265 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2004 by Adriaan de Groot, Joern Ahrens
-**
-** The code for NotepadActionThread::unpackNotePad was taken from
-** Angus Ainslies read-notepad.c, which is part of pilot-link.
-** NotepadActionThread::saveImage is also based on read-notepad.c.
-**
-** This file is part of the Notepad conduit, a conduit for KPilot that
-** stores the notepad drawings to files.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-#include "pilotUser.h"
-#include "pilotSerialDatabase.h"
-
-#include "notepad-conduit.h"  // The Conduit action
-#include "notepadconduit.h"   // The settings class
-
-#include <pi-notepad.h>
-
-#include <tqthread.h>
-#include <tqapplication.h>
-#include <tqvaluelist.h>
-#include <tqimage.h>
-#include <tqdir.h>
-#include <tqcstring.h>
-
-extern "C"
-{
-unsigned long version_conduit_notepad = Pilot::PLUGIN_API;
-}
-
-NotepadConduit::NotepadConduit(KPilotLink *d, const char *n,
-	const TQStringList &args) : ConduitAction(d, n, args)
-{
-	FUNCTIONSETUP;
-	fConduitName=i18n("Notepad");
-	thread = 0L;
-
-}
-
-NotepadConduit::~NotepadConduit()
-{
-	FUNCTIONSETUP;
-}
-
-/* virtual */ bool NotepadConduit::exec()
-{
-	FUNCTIONSETUP;
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": In exec() @" << (unsigned long) this << endl;
-#endif
-
-	TQDir dir(NotepadConduitSettings::outputDirectory());
-	if(!dir.exists() && !dir.mkdir(dir.path())) {
-		emit logError(i18n("Unable to open %1").arg(dir.path()));
-		delayDone();
-		return false;
-	}
-	else {
-		thread = new NotepadActionThread(this, deviceLink());
-		thread->start();
-		// tickle is disabled due to crashs during sync
-		// -> PADP TX "unexpected package"
-//		startTickle();
-	}
-
-	return true;
-}
-
-bool NotepadConduit::event(TQEvent *e)
-{
-	FUNCTIONSETUP;
-
-	if(e->type() == TQEvent::User) {
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": Notepad thread done." << endl;
-#endif
-//		stopTickle();
-		delayDone();
-		if(thread->getFailed())
-			logError(i18n("1 notepad could not be saved", "%n notepads could not be saved", thread->getFailed()));
-		logMessage(i18n("1 notepad saved", "%n notepads saved", thread->getSaved()));
-		delete thread;
-		return true;
-	}
-	else
-		return ConduitAction::event(e);
-}
-
-//-----------------------------------------------------------------------------
-// NotepadActionThread
-//-----------------------------------------------------------------------------
-
-NotepadActionThread::NotepadActionThread(TQObject *parent, KPilotLink *link) :
-	fParent(parent), fLink(link), notSaved(0), saved(0)
-{
-	FUNCTIONSETUP;
-}
-
-void NotepadActionThread::run()
-{
-	FUNCTIONSETUP;
-
-	PilotDatabase *db = fLink->database( CSL1("npadDB") );
-
-	int n = db->recordCount();
-
-	if ( n > 0 )
-	{
-		TQValueList<recordid_t> vl = db->idList();
-		TQValueList<recordid_t>::iterator it;
-		struct NotePad a;
-		for ( it = vl.begin(); it != vl.end(); ++it )
-		{
-			PilotRecord *pr = db->readRecordById(*it);
-			if(pr)
-			{
-				unpack_NotePad(&a, (unsigned char*)pr->data(), pr->size());
-				saveImage(&a);
-				free_NotePad(&a);
-			}
-		}
-	}
-	KPILOT_DELETE(db);
-	TQApplication::postEvent(fParent, new TQEvent(TQEvent::User));
-}
-
-static void saveImageFromBITS(TQImage &image, struct NotePad *n, unsigned int width)
-{
-	FUNCTIONSETUP;
-	image.setColor(0, qRgb(0xaa, 0xc1 ,0x91));
-	image.setColor(1, qRgb(0x30, 0x36, 0x29));
-
-	int x = 0;
-	int y = 0;
-	int pos = 0;
-	for(unsigned int i=0; i<n->body.dataLen/2; ++i)
-	{
-		for(int j=0; j<n->data[i].repeat; ++j)
-		{
-			for(int k=0; k<8; ++k)
-			{
-				y = pos / width;
-				x = pos % width ;
-
-				image.setPixel( x, y,
-					(n->data[i].data & 1<<(7-k)) ? 1 : 0 );
-				++pos;
-			}
-		}
-	}
-}
-
-static void saveImageFromUNCOMPRESSED(TQImage &image, struct NotePad *n, unsigned int width)
-{
-	FUNCTIONSETUP;
-
-	image.setColor(0, qRgb(0xaa, 0xc1 ,0x91));
-	image.setColor(1, qRgb(0x30, 0x36, 0x29));
-
-	unsigned int pos = 0;
-	unsigned int x,y;
-
-	for (unsigned int i=0; i<n->body.dataLen / 2; ++i)
-	{
-		for (unsigned int k=0; k<8; ++k)
-		{
-			y = pos / width;
-			x = pos % width ;
-
-			image.setPixel( x, y,
-				(n->data[i].repeat & 1<<(7-k)) ? 1 : 0 );
-			++pos;
-		}
-
-		for (unsigned int k=0; k<8; ++k)
-		{
-			y = pos / width;
-			x = pos % width ;
-
-			image.setPixel( x, y,
-				(n->data[i].data & 1<<(7-k)) ? 1 : 0 );
-			++pos;
-		}
-	}
-}
-
-void NotepadActionThread::saveImage(struct NotePad *n)
-{
-	FUNCTIONSETUP;
-
-	// Width needs adjusting, based on whether it's low res (+8)
-	// or a hi-res notepad image.
-	int width = n->body.width + ( n->body.width > 160 ? 16 : 8 );
-	int height = n->body.height;
-
-
-	TQImage image(width, height, 8, 2);
-
-	switch (n->body.dataType)
-	{
-	case NOTEPAD_DATA_BITS :
-		saveImageFromBITS( image,n,width );
-		break;
-	case NOTEPAD_DATA_UNCOMPRESSED :
-		saveImageFromUNCOMPRESSED( image,n,width );
-		break;
-	case NOTEPAD_DATA_PNG :
-		image.loadFromData((uchar*)(n->data), n->body.dataLen);
-		break;
-	default :
-		// Unknown data type
-		WARNINGKPILOT << "Unknown data type: " << n->body.dataType << endl;
-		return;
-
-		// TODO: Post a warning to the UI
-	}
-
-	TQString filename(n->name);
-	if(filename.isEmpty())
-	{
-		filename.sprintf("%4d-%02d-%02d_%02d-%02d-%02d",
-			n->changeDate.year,
-			n->changeDate.month,
-			n->changeDate.day,
-			n->changeDate.hour,
-			n->changeDate.min,
-			n->changeDate.sec);
-	}
-	TQString imgname = TQString("%1/%2.png").arg(NotepadConduitSettings::outputDirectory()).arg(filename);
-
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Notepad " << imgname << endl;
-#endif
-	if(!image.save(imgname, "PNG", -1))
-		++notSaved;
-	else
-		++saved;
-}
-
diff --git a/kpilot/conduits/notepadconduit/notepad-conduit.desktop b/kpilot/conduits/notepadconduit/notepad-conduit.desktop
deleted file mode 100644
index 48476219..00000000
--- a/kpilot/conduits/notepadconduit/notepad-conduit.desktop
+++ /dev/null
@@ -1,64 +0,0 @@
-[Desktop Entry]
-Type=Service
-Name=NotePad
-Name[cs]=Poznámkový blok
-Name[da]=Notesblok
-Name[de]=Notizen
-Name[es]=Bloc de notas
-Name[fi]=Muistio
-Name[fr]=Notes
-Name[gl]=Caderno de Notas
-Name[hu]=Notepad
-Name[nb]=NotisBlokk
-Name[ne]=नोटप�याड
-Name[nn]=NotisBlokk
-Name[pl]=Notatnik
-Name[sv]=Anteckningar
-Name[ta]=நோட�பேட�
-Name[tg]=Эзоҳот
-Name[zh_CN]=记事本
-Comment=This conduit backs up NotePad drawings to a local folder.
-Comment[af]=Hierdie pad sinkroniseer NotePad tekeninge na 'n plaaslike gids.
-Comment[bg]=Създаване на архивни копи� на изображени�та �ъздадени � NotePad в локална директори�.
-Comment[ca]=Aquest conducte copia els dibuixos NotePad a una carpeta local.
-Comment[cs]=Toto propojení synchronizuje záznamy v PDA s lokálním adresářem.
-Comment[da]=Denne kanal sikkerhedskopierer NotePad's tegninger til en lokal mappe.
-Comment[de]=Diese Erweiterung (Conduit) sichert NotePad-Zeichnungen in einen lokalen Ordner.
-Comment[el]=Αυτός ο σ�νδεσμος δημιου�γεί αντίγ�αφα ασφαλείας σχεδίων του NotePad σε έναν τοπικό φάκελο.
-Comment[es]=Este conducto copia los dibujos del bloc de notas en una carpeta local.
-Comment[et]=See kanal teeb NotePadi joonistustest varukoopia kohalikku kataloogi.
-Comment[eu]=Kanal honek Ohar-blokaren marrazkiak karpeta lokal batera gordetzen ditu.
-Comment[fa]=این لوله، ترسیمهای NotePad را در پوشه‌ای محلی پشتیبانی می‌کند.
-Comment[fi]=Tämä yhdyskäytävä tekee varmuuskopion NotePad -piirroksista paikalliseen kansioon.
-Comment[fr]=Ce conduit sauvegarde les dessins (Notes) dans un dossier local
-Comment[fy]=Dit conduit makket in reservekopy fan de notysje fan de notysje-oantekenings nei in lokale map.
-Comment[gl]=Este conducto pon de volta os debuxos do NotePad a un cartafol local.
-Comment[hu]=Bővítőmodul NotePad-rajzok helyi könyvtárba való lementéséhez.
-Comment[is]=Þessi rás afritar NotePad teikningar í staðbundna möppu.
-Comment[it]=Questo conduit archivia i disegni NotePad in una cartella locale.
-Comment[ja]=��コンジット� NotePad �絵をローカル�フォルダ��ックアップ���。
-Comment[kk]=NotePad файлдарының �ақтық көшірмелерін жергілікті қапшықта жа�ау арна�ы.
-Comment[km]=បំពង់​ន�ះ​អាច​បម្រុង​ទុក​គំនូរ NotePad ទៅ​��​មូលដ្ឋាន ។
-Comment[lt]=Šis kanalas padaro NotePad piešinių atsargines kopijas į vietinį aplanką.
-Comment[ms]=Saluran ini menyandarkan lukisan NotePad ke folder setempat.
-Comment[nb]=Denne kanalen tar sikkerhetskopi av NotePad tegninger til en lokal mappe.
-Comment[nds]=Sekert NotePad-Teken binnen en lokaal Orner.
-Comment[ne]=यो कन�ड�य�टले स�थानीय फाइलमा नोटप�याड रेखाचित�र ब�याकअप गर�छ ।
-Comment[nl]=Dit conduit maakt een backup van de notitie-aantekeningen naar een lokale map.
-Comment[pl]=Ten łącznik robi kopię zapasową rysunków z Notatnika do lokalnego katalogu.
-Comment[pt]=Esta conduta salvaguarda desenhos NotePad para uma pasta local.
-Comment[pt_BR]=Este conduíte faz backup de desenhos do NotePad em uma pasta local.
-Comment[ru]=Канал �оздани� резервных копий примечаний в локальной папке.
-Comment[sk]=Táto spojka zálohuje poznámky NotePad do lokálneho prie�inku.
-Comment[sl]=Ta veznik arhivira risanja z NotePadom v krajevno mapo.
-Comment[sr]=Овај провод прави резервне копије NotePad цртежа у локалну фа�циклу.
-Comment[sr@Latn]=Ovaj provod pravi rezervne kopije NotePad crteža u lokalnu fasciklu.
-Comment[sv]=Den här kanalen säkerhetskopierar ritade anteckningar i en lokal katalog.
-Comment[ta]=இத� நோட�பேடின� வரைபடங�களை உள�ளடைவ�க�க� சேமிக�கிறத�
-Comment[tr]=Bu bileşen, NotePad çizimlerini yerel bir dosyaya aktarır veya alır.
-Comment[uk]=Цей акведук �творює резервну копію нотаток у локальній теці.
-Comment[zh_CN]=此管�将记事本的绘图�存到本地文件夹。
-Comment[zh_TW]=此軟體備份 NotePad 畫的圖到本地端資料夾。
-Implemented=file
-ServiceTypes=KPilotConduit
-X-KDE-Library=conduit_notepad
diff --git a/kpilot/conduits/notepadconduit/notepad-conduit.h b/kpilot/conduits/notepadconduit/notepad-conduit.h
deleted file mode 100644
index 907a306a..00000000
--- a/kpilot/conduits/notepadconduit/notepad-conduit.h
+++ /dev/null
@@ -1,94 +0,0 @@
-#ifndef _KPILOT_NOTEPAD_CONDUIT_H
-#define _KPILOT_NOTEPAD_CONDUIT_H
-/* notepad-conduit.h			KPilot
-**
-** Copyright (C) 2004 by Adriaan de Groot, Joern Ahrens, Angus Ainslie
-**
-** The code for NotepadActionThread::unpackNotePad was taken from
-** Angus Ainslies read-notepad.c, which is part of pilot-link.
-** NotepadActionThread::saveImage is also based on read-notepad.c.
-**
-** This file is part of the Notepad conduit, a conduit for KPilot that
-** store the notepad drawings to files.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "plugin.h"
-
-#include <tqthread.h>
-struct NotePad;
-class NotepadActionThread;
-
-class NotepadConduit : public ConduitAction
-{
-public:
-	NotepadConduit(KPilotLink *,
-		const char *name=0L,
-		const TQStringList &args = TQStringList());
-	virtual ~NotepadConduit();
-	virtual bool event(TQEvent *e);
-
-protected:
-	virtual bool exec();           // From ConduitAction
-
-private:
-	NotepadActionThread *thread;
-};
-
-
-/**
- * This class saves the notepads to disk
- */
-class NotepadActionThread : public QThread
-{
-public:
-	NotepadActionThread(TQObject *parent, KPilotLink *link);
-
-	virtual void run();
-	int	getFailed() { return notSaved; }
-	int getSaved() { return saved; }
-
-private:
-	TQObject *fParent;
-	KPilotLink *fLink;
-
-	/**
-	 * counts how many notepads couldn't be saved during the sync
-	 */
-	int notSaved;
-	/**
-	 * counts how many files a saved during the sync
-	 */
-	int saved;
-
-	int unpackNotePad(struct NotePad *a, unsigned char *buffer, int len);
-
-	/**
-	* Saves a single NotePad structure to disk, using the name in
-	* the Note @p n, or if no name is specified, using the
-	* timestamp in the note.
-	*/
-	void saveImage(struct NotePad *n);
-};
-
-#endif
diff --git a/kpilot/conduits/notepadconduit/notepad-factory.cc b/kpilot/conduits/notepadconduit/notepad-factory.cc
deleted file mode 100644
index 0e1094b6..00000000
--- a/kpilot/conduits/notepadconduit/notepad-factory.cc
+++ /dev/null
@@ -1,124 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2004 by Adriaan de Groot, Joern Ahrens
-**
-** This file defines the factory for the notepad-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <kconfig.h>
-#include <kinstance.h>
-#include <kaboutdata.h>
-#include <kurlrequester.h>
-#include <kmessagebox.h>
-#include <tqlineedit.h>
-
-#include "pluginfactory.h"
-
-#include "notepad-conduit.h"     // Conduit action
-#include "notepad-setup.h"
-#include "notepadconduit.h"     // Settings class
-
-//----------------------------------------------------------------------------
-// Conduit Configuration
-//----------------------------------------------------------------------------
-class NotepadConduitConfig : public ConduitConfigBase
-{
-public:
-	NotepadConduitConfig(TQWidget *parent=0L, const char *n=0L);
-	virtual void commit();
-	virtual void load();
-	static ConduitConfigBase *create(TQWidget *p, const char *n)
-	{
-		return new NotepadConduitConfig(p, n);
-	};
-
-protected:
-	NotepadWidget *fConfigWidget;
-} ;
-
-static KAboutData *createAbout()
-{
-	FUNCTIONSETUP;
-
-	KAboutData *fAbout = new KAboutData("NotepadConduit",
-		I18N_NOOP("Saves notepads to png files"),
-		KPILOT_VERSION,
-		I18N_NOOP("Configures the Notepad Conduit for KPilot"),
-		KAboutData::License_LGPL,
-		"(C) 2004, Joern Ahrens");
-	fAbout->addAuthor("Joern Ahrens",
-		I18N_NOOP("Primary Author"),
-		"kde@jokele.de",
-		"http://www.jokele.de/");
-	fAbout->addCredit("Adriaan de Groot");
-	fAbout->addCredit("Angus Ainslies",
-		I18N_NOOP("Notepad conduit is based on Angus' read-notepad, part of pilot-link" ));
-	return fAbout;
-}
-
-
-NotepadConduitConfig::NotepadConduitConfig(TQWidget *p, const char *n) :
-	ConduitConfigBase(p, n),
-	fConfigWidget(new NotepadWidget(p))
-{
-	FUNCTIONSETUP;
-
-	fConduitName = i18n("Notepad");
-	ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget, createAbout());
-	fWidget=fConfigWidget;
-	TQObject::connect(fConfigWidget->fOutputDirectory, TQT_SIGNAL(textChanged(const TQString&)),
-		this, TQT_SLOT(modified()));
-	fConfigWidget->fOutputDirectory->setMode(KFile::Directory |
-											KFile::LocalOnly);
-}
-
-/* virtual */ void NotepadConduitConfig::commit()
-{
-	FUNCTIONSETUP;
-
-	NotepadConduitSettings::setOutputDirectory(fConfigWidget->fOutputDirectory->url());
-	NotepadConduitSettings::self()->writeConfig();
-}
-
-/* virtual */ void NotepadConduitConfig::load()
-{
-	FUNCTIONSETUP;
-
-	NotepadConduitSettings::self()->readConfig();
-	fConfigWidget->fOutputDirectory->setURL(NotepadConduitSettings::outputDirectory());
-	fModified=false;
-}
-
-extern "C"
-{
-
-void *init_conduit_notepad()
-{
-	return new ConduitFactory<NotepadConduitConfig,NotepadConduit>(0,"abbrowserconduit");
-}
-
-}
-
diff --git a/kpilot/conduits/notepadconduit/notepad-factory.h b/kpilot/conduits/notepadconduit/notepad-factory.h
deleted file mode 100644
index f208cd1f..00000000
--- a/kpilot/conduits/notepadconduit/notepad-factory.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef _KPILOT_NOTEPAD_FACTORY_H
-#define _KPILOT_NOTEPAD_FACTORY_H
-/* notepad-factory.h                       KPilot
-**
-** Copyright (C) 2004 by Adriaan de Groot, Joern Ahrens
-**
-** This file defines the factory for the notepad-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-extern "C"
-{
-
-void *init_conduit_notepad();
-
-}
-
-#endif
diff --git a/kpilot/conduits/notepadconduit/notepad-setup.ui b/kpilot/conduits/notepadconduit/notepad-setup.ui
deleted file mode 100644
index ccc3feb2..00000000
--- a/kpilot/conduits/notepadconduit/notepad-setup.ui
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
-<class>NotepadWidget</class>
-<author>Jörn Ahrens</author>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>Form2</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>435</width>
-            <height>391</height>
-        </rect>
-    </property>
-    <property name="whatsThis" stdset="0">
-        <string>Path to the directory to which the pictures should be exported.</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <widget class="QTabWidget" row="0" column="0">
-            <property name="name">
-                <cstring>tabWidget</cstring>
-            </property>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>tab</cstring>
-                </property>
-                <attribute name="title">
-                    <string>General</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <spacer row="2" column="1">
-                        <property name="name">
-                            <cstring>spacer1</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>20</width>
-                                <height>250</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="KURLRequester" row="1" column="1">
-                        <property name="name">
-                            <cstring>fOutputDirectory</cstring>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="1" column="0">
-                        <property name="name">
-                            <cstring>textLabel1</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Output:</string>
-                        </property>
-                    </widget>
-                </grid>
-            </widget>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-<includes>
-    <include location="global" impldecl="in implementation">kurlrequester.h</include>
-    <include location="global" impldecl="in implementation">klineedit.h</include>
-    <include location="global" impldecl="in implementation">kpushbutton.h</include>
-</includes>
-</UI>
diff --git a/kpilot/conduits/notepadconduit/notepadconduit.kcfg b/kpilot/conduits/notepadconduit/notepadconduit.kcfg
deleted file mode 100644
index 1a2c9bf6..00000000
--- a/kpilot/conduits/notepadconduit/notepadconduit.kcfg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
-      http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <kcfgfile name="kpilotrc"/> 
-  <group name="Notepad-conduit">
-    <entry name="outputDirectory" type="Path">
-        <label>The export directory for the notepad drawings</label>
-        <default>$HOME</default>
-    </entry>
-  </group>
-	
-</kcfg>
diff --git a/kpilot/conduits/notepadconduit/notepadconduit.kcfgc b/kpilot/conduits/notepadconduit/notepadconduit.kcfgc
deleted file mode 100644
index e18fa7c0..00000000
--- a/kpilot/conduits/notepadconduit/notepadconduit.kcfgc
+++ /dev/null
@@ -1,7 +0,0 @@
-File=notepadconduit.kcfg
-ClassName=NotepadConduitSettings
-Singleton=true
-ItemAccessors=true
-Mutators=true
-GlobalEnums=true
-SetUserTexts=true
diff --git a/kpilot/conduits/null/CMakeLists.txt b/kpilot/conduits/null/CMakeLists.txt
deleted file mode 100644
index b2fdbb8a..00000000
--- a/kpilot/conduits/null/CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
-)
-
-set(conduit_null_SRCS
-	null-conduit.cc
-	null-factory.cc
-)
-
-set(conduit_null_UIS
-	setup_base.ui
-)
-
-set(conduit_null_KCFGS
-	nullSettings.kcfgc
-)
-
-kde3_add_kcfg_files(conduit_null_SRCS ${conduit_null_KCFGS})
-kde3_add_ui_files(conduit_null_SRCS ${conduit_null_UIS})
-kde3_automoc(${conduit_null_SRCS})
-add_library(conduit_null SHARED ${conduit_null_SRCS})
-
-set_target_properties(
-	conduit_null PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
-	PREFIX ""
-)
-
-kde3_install_libtool_file(conduit_null)
-
-install(
-	TARGETS conduit_null
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-)
-
-install(
-	FILES null-conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
-)
diff --git a/kpilot/conduits/null/Makefile.am b/kpilot/conduits/null/Makefile.am
deleted file mode 100644
index c1057b4d..00000000
--- a/kpilot/conduits/null/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
-
-METASOURCES = AUTO
-
-servicedir = $(kde_servicesdir)
-service_DATA = null-conduit.desktop
-
-kde_module_LTLIBRARIES = conduit_null.la
-
-
-conduit_null_la_SOURCES = nullSettings.kcfgc setup_base.ui null-conduit.cc null-factory.cc
-conduit_null_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-conduit_null_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI)
-
-kde_kcfg_DATA = nullconduit.kcfg
diff --git a/kpilot/conduits/null/null-conduit.cc b/kpilot/conduits/null/null-conduit.cc
deleted file mode 100644
index f04c7435..00000000
--- a/kpilot/conduits/null/null-conduit.cc
+++ /dev/null
@@ -1,98 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2000-2001 by Adriaan de Groot
-**
-** This file is part of the NULL conduit, a conduit for KPilot that
-** does nothing except add a log message to the Pilot's HotSync log.
-** It is also intended as a programming example.
-**
-** This file does the actual conduit work.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include "options.h"
-
-// Only include what we really need:
-// First UNIX system stuff, then std C++,
-// then Qt, then KDE, then local includes.
-//
-//
-#include <time.h>
-
-#include <kconfig.h>
-#include <kdebug.h>
-
-#include "pilotSerialDatabase.h"
-#include "null-factory.h"
-#include "null-conduit.h"
-#include "nullSettings.h"
-
-// A conduit that does nothing has a very
-// simple constructor and destructor.
-//
-//
-NullConduit::NullConduit(KPilotLink *d,
-	const char *n,
-	const TQStringList &l) :
-	ConduitAction(d,n,l),
-	fDatabase(0L),
-	fFailImmediately( l.contains( CSL1("--fail") ))
-{
-	FUNCTIONSETUP;
-	fConduitName=i18n("Null");
-}
-
-NullConduit::~NullConduit()
-{
-	FUNCTIONSETUP;
-	KPILOT_DELETE(fDatabase);
-}
-
-/* virtual */ bool NullConduit::exec()
-{
-	FUNCTIONSETUP;
-
-	DEBUGKPILOT << fname << ": Mode " << syncMode().name() << endl;
-
-	if ( fFailImmediately )
-	{
-		DEBUGKPILOT << fname << ": Config says to fail now." << endl;
-		emit logError(i18n("NULL conduit is programmed to fail."));
-		return false;
-	}
-
-	TQString m(NullConduitSettings::logMessage());
-	if (!m.isEmpty())
-	{
-		addSyncLogEntry(m);
-	}
-
-	DEBUGKPILOT << fname
-		<< ": Message from null-conduit: "
-		<< m
-		<< endl;
-
-	emit syncDone(this);
-	return true;
-}
diff --git a/kpilot/conduits/null/null-conduit.desktop b/kpilot/conduits/null/null-conduit.desktop
deleted file mode 100644
index 3aa6fdf5..00000000
--- a/kpilot/conduits/null/null-conduit.desktop
+++ /dev/null
@@ -1,63 +0,0 @@
-[Desktop Entry]
-Type=Service
-Name=NULL
-Name[ca]=NUL
-Name[fa]=پوچ
-Name[mk]=�улов
-Name[ro]=NUL
-Name[sk]=NIČ
-Name[ta]=வெற�ற� மதிப�ப�
-Name[tr]=BOÅž
-Comment=This conduit does nothing.
-Comment[af]=Hierdie pad doen niks
-Comment[bg]=Това нещо прави нищо
-Comment[bs]=Ovaj conduit ne radi ništa.
-Comment[ca]=Aquest conducte no fa res.
-Comment[cs]=Toto propojení nedělá nic.
-Comment[cy]=Nid yw'r cwndid yma yn gwneud unrhyw beth.
-Comment[da]=Denne kanal gør ingenting.
-Comment[de]=Diese Erweiterung (Conduit) ist ohne Funktion
-Comment[el]=Αυτός ο σ�νδεσμος δεν κάνει τίποτα.
-Comment[eo]=Tiu kanalo faras nenion.
-Comment[et]=See kanal ei tee mitte kui midagi.
-Comment[eu]=Kanal honek ez du ezer egiten.
-Comment[fa]=این لوله هیچ چیز ندارد.
-Comment[fi]=Tämä yhdyskäytävä ei tee mitään.
-Comment[fr]=Ce canal ne fait rien.
-Comment[fy]=Dit conduit docht neat.
-Comment[ga]=Ní dhéanann an seoladán seo faic.
-Comment[gl]=Este conducto non fai nada.
-Comment[hi]=यह कन�ड�यूइट क�छ नहीं करता है.
-Comment[hu]=Ez a csatoló üres, csak tesztelési célokat szolgál
-Comment[is]=Þessi rás gerir ekki neitt.
-Comment[it]=Questo conduit non fa nulla.
-Comment[ja]=��コンジット�未知��。
-Comment[kk]=Ештеңе і�темейтін арна.
-Comment[km]=បំពង់​ន�ះ​មិន​ធ្វើ​អ្វី​ទាំងអស់ ។
-Comment[lt]=Å is kanalas nieko neatlieka.
-Comment[mk]=Овој канал не прави ништо.
-Comment[ms]=Saluran ini tidak berbuat apa-apa.
-Comment[nb]=Denne kanalen gjør ingenting.
-Comment[nds]=Disse Kanaal deit gor nix.
-Comment[ne]=यो कन�ड�य�टले केही पनि गर�दैन ।
-Comment[nl]=Dit conduit doet niets.
-Comment[nn]=Denne koplinga gjer ingenting.
-Comment[pl]=Ten Å‚Ä…cznik nic nie robi.
-Comment[pt]=Esta conduta não faz nada.
-Comment[pt_BR]=Este conduíte não faz coisa alguma.
-Comment[ro]=Această conductă nu face nimic.
-Comment[ru]=Канал, который ничего не делает.
-Comment[sk]=Táto spojka ni� nerobí.
-Comment[sl]=Ta veznik ne po�ne ni�esar.
-Comment[sr]=Овај провод не ради ништа.
-Comment[sr@Latn]=Ovaj provod ne radi ništa.
-Comment[sv]=Den här kanalen gör ingenting.
-Comment[ta]=இந�த காப�ப�க� க�ழாய� ஒன�ற�ம� செய�யாத�
-Comment[tg]=Канале, ки дар ҳолати шурӯъ не�т.
-Comment[tr]=Bu kanal herhangi bir iÅŸlem yapmaz.
-Comment[uk]=Цей акведук нічого не робить.
-Comment[zh_CN]=此管���任何事。
-Comment[zh_TW]=��任何事。
-Implemented=file
-ServiceTypes=KPilotConduit
-X-KDE-Library=conduit_null
diff --git a/kpilot/conduits/null/null-conduit.h b/kpilot/conduits/null/null-conduit.h
deleted file mode 100644
index 4cdbbdec..00000000
--- a/kpilot/conduits/null/null-conduit.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef _NULL_NULL_CONDUIT_H
-#define _NULL_NULL_CONDUIT_H
-/* null-conduit.h			KPilot
-**
-** Copyright (C) 2000-2001 by Adriaan de Groot
-**
-** This file is part of the NULL conduit, a conduit for KPilot that
-** does nothing except add a log message to the Pilot's HotSync log.
-** It is also intended as a programming example.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "plugin.h"
-
-class PilotRecord;
-class PilotDatabase;
-
-/**
- * The conduit Null does nothing. Almost nothing, anyway.
- * It writes a single log message to the sync log and then
- * completes successfully. For debugging purposes it can
- * also simulate failure, but that is a very specialized
- * case available only programmatically.
- */
-class NullConduit : public ConduitAction
-{
-public:
-	/** Constructor. Special case is if @p contains
-	 *  @c --fail as an argument to the conduit, then
-	 *  the conduit will fail instead of trivially succeeding.
-	 */
-	NullConduit(KPilotLink *,
-		const char *name=0L,
-		const TQStringList &args = TQStringList());
-	virtual ~NullConduit();
-
-protected:
-	virtual bool exec();
-
-protected:
-	PilotDatabase *fDatabase;
-	bool fFailImmediately;
-};
-
-#endif
diff --git a/kpilot/conduits/null/null-factory.cc b/kpilot/conduits/null/null-factory.cc
deleted file mode 100644
index c2d381de..00000000
--- a/kpilot/conduits/null/null-factory.cc
+++ /dev/null
@@ -1,125 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2001 by Dan Pilone
-**
-** This file defines the factory for the null-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <tqtabwidget.h>
-#include <tqlineedit.h>
-#include <tqcheckbox.h>
-
-#include <kconfig.h>
-#include <kinstance.h>
-#include <kaboutdata.h>
-
-#include "pluginfactory.h"
-
-#include "setup_base.h"
-#include "null-conduit.h"
-#include "null-factory.h"
-#include "nullSettings.h"
-
-
-class NullConduitConfig : public ConduitConfigBase
-{
-public:
-	NullConduitConfig(TQWidget *parent=0L, const char *n=0L);
-	virtual void commit();
-	virtual void load();
-protected:
-	NullWidget *fConfigWidget;
-	KAboutData *fAbout;
-} ;
-
-NullConduitConfig::NullConduitConfig(TQWidget *p, const char *n) :
-	ConduitConfigBase(p,n),
-	fConfigWidget(new NullWidget(p))
-{
-	FUNCTIONSETUP;
-	fConduitName = i18n("Null");
-	fAbout = new KAboutData("nullConduit",
-		I18N_NOOP("Null Conduit for KPilot"),
-		KPILOT_VERSION,
-		I18N_NOOP("Configures the Null Conduit for KPilot"),
-		KAboutData::License_GPL,
-		"(C) 2001, Adriaan de Groot");
-	fAbout->addAuthor("Adriaan de Groot",
-		I18N_NOOP("Primary Author"),
-		"groot@kde.org",
-		"http://www.cs.kun.nl/~adridg/kpilot");
-
-	ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,fAbout);
-	fWidget=fConfigWidget;
-	TQObject::connect(fConfigWidget->fLogMessage,TQT_SIGNAL(textChanged(const TQString&)),
-		this,TQT_SLOT(modified()));
-}
-
-/* virtual */ void NullConduitConfig::commit()
-{
-	FUNCTIONSETUP;
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Message="
-		<< fConfigWidget->fLogMessage->text()
-		<< endl;
-#endif
-
-	NullConduitSettings::setLogMessage( fConfigWidget->fLogMessage->text() );
-	NullConduitSettings::self()->writeConfig();
-	unmodified();
-}
-
-/* virtual */ void NullConduitConfig::load()
-{
-	FUNCTIONSETUP;
-	NullConduitSettings::self()->readConfig();
-
-	fConfigWidget->fLogMessage->setText( NullConduitSettings::logMessage() );
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Read Message="
-		<< fConfigWidget->fLogMessage->text()
-		<< endl;
-#endif
-
-	unmodified();
-}
-
-
-
-extern "C"
-{
-
-unsigned long version_conduit_null = Pilot::PLUGIN_API;
-void *init_conduit_null()
-{
-	return new ConduitFactory<NullConduitConfig,NullConduit>(0,"nullconduit");
-}
-
-}
-
diff --git a/kpilot/conduits/null/null-factory.h b/kpilot/conduits/null/null-factory.h
deleted file mode 100644
index 2897ad4f..00000000
--- a/kpilot/conduits/null/null-factory.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef _KPILOT_NULL_FACTORY_H
-#define _KPILOT_NULL_FACTORY_H
-/* null-factory.h                       KPilot
-**
-** Copyright (C) 2001 by Dan Pilone
-**
-** This file defines the factory for the null-conduit plugin.
-** It also defines the class for the behavior of the setup dialog.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-extern "C"
-{
-
-void *init_conduit_null();
-
-}
-
-#endif
diff --git a/kpilot/conduits/null/nullSettings.kcfgc b/kpilot/conduits/null/nullSettings.kcfgc
deleted file mode 100644
index 17a65cad..00000000
--- a/kpilot/conduits/null/nullSettings.kcfgc
+++ /dev/null
@@ -1,7 +0,0 @@
-File=nullconduit.kcfg
-ClassName= NullConduitSettings
-Singleton=true
-ItemAccessors=true
-Mutators=true
-GlobalEnums=true
-SetUserTexts=true
diff --git a/kpilot/conduits/null/nullconduit.kcfg b/kpilot/conduits/null/nullconduit.kcfg
deleted file mode 100644
index 3e899f1a..00000000
--- a/kpilot/conduits/null/nullconduit.kcfg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
-      http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <kcfgfile name="kpilotrc"/> 
-  <group name="Null-conduit">
-    <entry name="LogMessage" type="String">
-      <label>The error message if the null conduit is supposed to fail</label>
-      <default>KPilot was here.</default>
-    </entry>
-  </group>
-</kcfg>
diff --git a/kpilot/conduits/null/setup_base.ui b/kpilot/conduits/null/setup_base.ui
deleted file mode 100644
index 7e0d02ee..00000000
--- a/kpilot/conduits/null/setup_base.ui
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>NullWidget</class>
-<comment>A tabWidget for configuring
-the Null-conduit settings.</comment>
-<author>Adriaan de Groot</author>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>Form1</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>342</width>
-            <height>163</height>
-        </rect>
-    </property>
-    <property name="sizePolicy">
-        <sizepolicy>
-            <hsizetype>5</hsizetype>
-            <vsizetype>5</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-        </sizepolicy>
-    </property>
-    <property name="baseSize">
-        <size>
-            <width>570</width>
-            <height>270</height>
-        </size>
-    </property>
-    <property name="caption">
-        <string>Null-Conduit Options</string>
-    </property>
-    <property name="layoutMargin" stdset="0">
-    </property>
-    <property name="layoutSpacing" stdset="0">
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QTabWidget" row="0" column="0">
-            <property name="name">
-                <cstring>tabWidget</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>7</hsizetype>
-                    <vsizetype>7</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="layoutMargin" stdset="0">
-            </property>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>Widget2</cstring>
-                </property>
-                <attribute name="title">
-                    <string>General</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <property name="margin">
-                        <number>11</number>
-                    </property>
-                    <property name="spacing">
-                        <number>6</number>
-                    </property>
-                    <widget class="QLineEdit" row="0" column="1">
-                        <property name="name">
-                            <cstring>fLogMessage</cstring>
-                        </property>
-                        <property name="text">
-                            <string>KPilot was here.</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Enter the message to add to the Sync Log on your Pilot here.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="0" column="0">
-                        <property name="name">
-                            <cstring>TextLabel1_2</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&amp;Log message:</string>
-                        </property>
-                        <property name="buddy" stdset="0">
-                            <cstring>fLogMessage</cstring>
-                        </property>
-                    </widget>
-                    <spacer row="3" column="1">
-                        <property name="name">
-                            <cstring>Spacer4</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                </grid>
-            </widget>
-        </widget>
-    </grid>
-</widget>
-<tabstops>
-    <tabstop>tabWidget</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/kpilot/conduits/popmail/CMakeLists.txt b/kpilot/conduits/popmail/CMakeLists.txt
deleted file mode 100644
index daec3c3a..00000000
--- a/kpilot/conduits/popmail/CMakeLists.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
-)
-
-set(conduit_popmail_SRCS
-	popmail-factory.cc
-	popmail-conduit.cc
-	setupDialog.cc
-)
-
-set(conduit_popmail_UIS
-	setup-dialog.ui
-)
-
-set(conduit_popmail_KCFGS
-	popmailSettings.kcfgc
-)
-
-kde3_add_kcfg_files(conduit_popmail_SRCS ${conduit_popmail_KCFGS})
-kde3_add_ui_files(conduit_popmail_SRCS ${conduit_popmail_UIS})
-kde3_automoc(${conduit_popmail_SRCS})
-add_library(conduit_popmail SHARED ${conduit_popmail_SRCS})
-
-set_target_properties(
-	conduit_popmail PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
-	PREFIX ""
-)
-
-kde3_install_libtool_file(conduit_popmail)
-
-install(
-	TARGETS conduit_popmail
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-)
-
-install(
-	FILES popmail-conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
-)
-
-install(
-	FILES popmail.kcfg DESTINATION ${KDE3_KCFG_DIR}
-)
diff --git a/kpilot/conduits/popmail/Makefile.am b/kpilot/conduits/popmail/Makefile.am
deleted file mode 100644
index 0e565805..00000000
--- a/kpilot/conduits/popmail/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-### Makefile for the popmail conduit
-###
-
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
-METASOURCES = AUTO
-
-servicedir  = $(kde_servicesdir)
-service_DATA = popmail-conduit.desktop
-kde_kcfg_DATA = popmail.kcfg
-
-####### This part is very kpilot specific
-# you can add here more. This one gets installed 
-kde_module_LTLIBRARIES = conduit_popmail.la
-
-# Which sources should be compiled for popmail_conduit
-conduit_popmail_la_SOURCES = popmailSettings.kcfgc setup-dialog.ui \
-	popmail-factory.cc setupDialog.cc \
-	popmail-conduit.cc
-conduit_popmail_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-conduit_popmail_la_LIBADD  =  ../../lib/libkpilot.la $(LIB_KIO)
-
-# this option you can leave out. Just, if you use "make dist", you need it
-noinst_HEADERS = popmail-conduit.h setupDialog.h
-
diff --git a/kpilot/conduits/popmail/popmail-conduit.cc b/kpilot/conduits/popmail/popmail-conduit.cc
deleted file mode 100644
index 8f51545c..00000000
--- a/kpilot/conduits/popmail/popmail-conduit.cc
+++ /dev/null
@@ -1,416 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 1998-2001 Dan Pilone
-** Copyright (C) 1999,2000 Michael Kropfberger
-**
-** This file is part of the popmail conduit, a conduit for KPilot that
-** synchronises the Pilot's email application with the outside world,
-** which currently means:
-**	-- sendmail or SMTP for outgoing mail
-**	-- POP or mbox for incoming mail
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-#include "popmail-conduit.h"
-
-extern "C"
-{
-
-unsigned long version_conduit_popmail = Pilot::PLUGIN_API;
-
-}
-
-#include <tqsocket.h>
-#include <tqregexp.h>
-
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/utsname.h>
-#include <ctype.h>
-
-#include <unistd.h>
-#include <errno.h>
-
-#include <time.h>  // Needed by pilot-link include
-#include <pi-version.h>
-#if PILOT_LINK_MAJOR < 10
-#include <pi-config.h>
-#endif
-#include <pi-mail.h>
-
-#include <tqdir.h>
-#include <tqtextstream.h>
-#include <tqtextcodec.h>
-
-#include <kapplication.h>
-#include <kmessagebox.h>
-#include <ksock.h>
-#include <kconfig.h>
-#include <ksimpleconfig.h>
-#include <dcopclient.h>
-#include <ktempfile.h>
-
-#include "pilotRecord.h"
-#include "pilotSerialDatabase.h"
-
-#include "popmailSettings.h"
-#include "setupDialog.h"
-
-static TQString DATE_FORMAT("ddd, d MMM yyyy hh:mm:ss");
-
-PopMailConduit::PopMailConduit(KPilotLink *d,
-	const char *n,
-	const TQStringList &l) :
-	ConduitAction(d,n,l)
-{
-	FUNCTIONSETUP;
-	fConduitName=i18n("KMail");
-}
-
-PopMailConduit::~PopMailConduit()
-{
-	FUNCTIONSETUP;
-}
-
-void PopMailConduit::doSync()
-{
-	FUNCTIONSETUP;
-
-	int sent_count=0;
-	int mode=MailConduitSettings::syncOutgoing();
-
-	DEBUGKPILOT << fname
-		<< ": Outgoing mail disposition "
-		<< mode << endl;
-
-	if(mode)
-	{
-		sent_count=sendPendingMail(mode);
-	}
-
-	if (sent_count>0)
-	{
-		if (sent_count>0)
-		{
-			addSyncLogEntry(i18n("Sent one message",
-				"Sent %n messages",sent_count));
-		}
-	}
-}
-
-
-// additional changes by Michael Kropfberger
-int PopMailConduit::sendPendingMail(int mode)
-{
-	FUNCTIONSETUP;
-	int count=0;
-
-	if (mode==PopMailWidgetConfig::SendKMail)
-	{
-		count=sendViaKMail();
-	}
-
-	if (count == 0)
-	{
-		WARNINGKPILOT << "Mail was not sent at all!" << endl;
-		emit logError(i18n("No mail was sent."));
-	}
-	else if (count < 0)
-	{
-		WARNINGKPILOT
-			<< "Mail sending returned error " << count
-			<< endl;
-		emit logError(i18n("No mail could be sent."));
-	}
-	else
-	{
-		DEBUGKPILOT << fname
-			<< ": Sent "
-			<< count
-			<< " messages"
-			<< endl;
-	}
-
-	return count;
-}
-
-
-TQString PopMailConduit::getKMailOutbox() const
-{
-	FUNCTIONSETUP;
-
-	// Default to "outbox" with newer KMails.
-	KSimpleConfig c(CSL1("kmailrc"),true);
-	c.setGroup("General");
-
-	TQString outbox = c.readEntry("outboxFolder");
-	if (outbox.isEmpty())
-	{
-		outbox = MailConduitSettings::outboxFolder();
-	}
-
-	if (outbox.isEmpty()) outbox=CSL1("outbox");
-
-	return outbox;
-}
-
-/*
- * This function uses KMail's DCOP interface to put all the
- * outgoing mail into the outbox.
- */
-int PopMailConduit::sendViaKMail()
-{
-	FUNCTIONSETUP;
-	int count=0;
-	TQString kmailOutboxName = getKMailOutbox();
-
-	DCOPClient *dcopptr = KApplication::kApplication()->dcopClient();
-	if (!dcopptr)
-	{
-		WARNINGKPILOT << "Cannot get DCOP client."
-			<< endl;
-		KMessageBox::error(0L,
-			i18n("Could not connect to DCOP server for "
-				"the KMail connection."),
-			i18n("Error Sending Mail"));
-		return -1;
-	}
-
-	if (!dcopptr->isAttached())
-	{
-		dcopptr->attach();
-	}
-
-	while (PilotRecord *pilotRec = fDatabase->readNextRecInCategory(1))
-	{
-		DEBUGKPILOT << fname
-			<< ": Reading "
-			<< count + 1
-			<< "th message"
-			<< endl;
-
-		if (pilotRec->isDeleted() || pilotRec->isArchived())
-		{
-			DEBUGKPILOT << fname
-				<< ": Skipping record."
-				<< endl;
-			continue;
-		}
-
-		struct Mail theMail;
-		KTempFile t;
-		t.setAutoDelete(true);
-
-		if (t.status())
-		{
-			WARNINGKPILOT << "Cannot open temp file." << endl;
-			KMessageBox::error(0L,
-				i18n("Cannot open temporary file to store "
-					"mail from Pilot in."),
-				i18n("Error Sending Mail"));
-			continue;
-		}
-
-		FILE *sendf = t.fstream();
-
-		if (!sendf)
-		{
-			WARNINGKPILOT
-				<< "Cannot open temporary file for writing!" << endl;
-			KMessageBox::error(0L,
-				i18n("Cannot open temporary file to store "
-					"mail from Pilot in."),
-				i18n("Error Sending Mail"));
-			continue;
-		}
-
-		unpack_Mail(&theMail,
-			(unsigned char*)pilotRec->data(),
-			pilotRec->size());
-		writeMessageToFile(sendf, theMail);
-
-
-		TQByteArray data,returnValue;
-		TQCString returnType;
-		TQDataStream arg(data,IO_WriteOnly);
-
-		arg << kmailOutboxName << t.name() << CSL1("N") ;
-
-		if (!dcopptr->call("kmail",
-			"KMailIface",
-			"dcopAddMessage(TQString,TQString,TQString)",
-			data,
-			returnType,
-			returnValue,
-			true))
-		{
-			WARNINGKPILOT << "DCOP call failed." << endl;
-
-			KMessageBox::error(0L,
-				i18n("DCOP connection with KMail failed."),
-				i18n("Error Sending Mail"));
-			continue;
-		}
-
-		DEBUGKPILOT << fname
-			<< ": DCOP call returned "
-			<< returnType
-			<< " of "
-			<< (const char *)returnValue
-			<< endl;
-
-		// Mark it as filed...
-		pilotRec->setCategory(3);
-		pilotRec->setModified( false );
-		fDatabase->writeRecord(pilotRec);
-		delete pilotRec;
-		// This is ok since we got the mail with unpack mail..
-		free_Mail(&theMail);
-
-		count++;
-	}
-
-	return count;
-}
-
-// From pilot-link-0.8.7 by Kenneth Albanowski
-// additional changes by Michael Kropfberger
-
-void PopMailConduit::writeMessageToFile(FILE* sendf, struct Mail& theMail)
-{
-	FUNCTIONSETUP;
-
-	TQTextStream mailPipe(sendf, IO_WriteOnly);
-
-	TQString fromAddress = MailConduitSettings::emailAddress();
-	mailPipe << "From: " << fromAddress << "\r\n";
-	mailPipe << "To: " << theMail.to << "\r\n";
-	if(theMail.cc)
-		mailPipe << "Cc: " << theMail.cc << "\r\n";
-	if(theMail.bcc)
-		mailPipe << "Bcc: " << theMail.bcc << "\r\n";
-	if(theMail.replyTo)
-		mailPipe << "Reply-To: " << theMail.replyTo << "\r\n";
-	if(theMail.subject)
-		mailPipe << "Subject: " << theMail.subject << "\r\n";
-	
-	// if our struct indicates that it's dated, then use the date it
-	// holds.  otherwise, provide current date.  either way, we need to
-	// have a date...
-	TQDateTime date = TQDateTime::currentDateTime();
-	if (theMail.dated)
-	{
-		date = readTm(theMail.date);
-	}
-
-	TQString dateString = date.toString(DATE_FORMAT);
-
-	mailPipe << "Date: " << dateString << "\r\n";
-
-	mailPipe << "X-mailer: " << "Popmail-Conduit " << KPILOT_VERSION << "\r\n";
-	mailPipe << "\r\n";
-
-
-	DEBUGKPILOT << fname << ": To: " << theMail.to << endl;
-
-
-	if(theMail.body)
-	{
-		DEBUGKPILOT << fname << ": Sent body." << endl;
-		mailPipe << theMail.body << "\r\n";
-	}
-
-	//insert the real signature file from disk
-	TQString signature = MailConduitSettings::signature();
-	if(!signature.isEmpty())
-	{
-		DEBUGKPILOT << fname << ": Reading signature" << endl;
-
-		TQFile f(signature);
-		if ( f.open(IO_ReadOnly) )
-		{    // file opened successfully
-			mailPipe << "-- \r\n";
-			TQTextStream t( &f );        // use a text stream
-			while ( !t.eof() )
-			{        // until end of file...
-				mailPipe << t.readLine() << "\r\n";
-			}
-			f.close();
-		}
-	}
-	mailPipe << "\r\n";
-
-	DEBUGKPILOT << fname << ": Done" << endl;
-}
-
-
-/* virtual */ void PopMailConduit::doTest()
-{
-	FUNCTIONSETUP;
-
-	TQString outbox = getKMailOutbox();
-
-	DEBUGKPILOT << fname
-		<< ": KMail's outbox is "
-		<< outbox
-		<< endl;
-
-	TQDateTime date = TQDateTime::currentDateTime();
-	TQString dateString = date.toString(DATE_FORMAT);
-
-	DEBUGKPILOT << fname << ": Date format example: [" << dateString
-		<< "]" << endl;
-}
-
-/* virtual */ bool PopMailConduit::exec()
-{
-	FUNCTIONSETUP;
-
-	if (syncMode().isTest())
-	{
-		doTest();
-	}
-	else if (syncMode() == SyncMode::eBackup)
-	{
-		emit logError(i18n("Cannot perform backup of mail database"));
-	}
-	else
-	{
-		fDatabase = deviceLink()->database( CSL1("MailDB") );
-
-		if (!fDatabase || !fDatabase->isOpen())
-		{
-			emit logError(i18n("Unable to open mail database on handheld"));
-			KPILOT_DELETE(fDatabase);
-			return false;
-		}
-
-		doSync();
-		fDatabase->resetSyncFlags();
-		KPILOT_DELETE(fDatabase);
-	}
-	delayDone();
-	return true;
-}
diff --git a/kpilot/conduits/popmail/popmail-conduit.desktop b/kpilot/conduits/popmail/popmail-conduit.desktop
deleted file mode 100644
index 7f1b9a38..00000000
--- a/kpilot/conduits/popmail/popmail-conduit.desktop
+++ /dev/null
@@ -1,106 +0,0 @@
-[Desktop Entry]
-Type=Service
-Comment=Send mail from your handheld through KMail.
-Comment[af]=Stuur pos vanaf jou draagbare toestel deur KMail.
-Comment[bg]=Изпращане на поща от мобилно у�трой�тво чрез KMail.
-Comment[ca]=Envia correu des de la vostra agenda electrònica a través de KMail.
-Comment[cs]=Odeslání zprávy z PDA přes KMail.
-Comment[da]=Send post fra din håndholdte gennem KMail.
-Comment[de]=Zum Versenden von E-Mails mit dem Taschencomputer via KMail.
-Comment[el]=Αποστολή αλληλογ�αφίας από τον υπολογιστή παλάμης σας μέσω του KMail.
-Comment[eo]=Sendu po�ton de via po�komputilo per KMail.
-Comment[es]=Envía el correo de la agenda electrónica a través de KMail.
-Comment[et]=Saadab pihuseadmest KMaili vahendusel e-kirja.
-Comment[eu]=Bidali posta zure agenda elektronikotik KMail-en bidez.
-Comment[fa]=ارسال نامه از طریق KMail، از دستی شما.
-Comment[fi]=Lähetä sähköpostia taskutietokoneelta KMailin kautta.
-Comment[fr]=Permet d'envoyer des messages du Palm vers KMail
-Comment[fy]=Dit conduit ferstjoerd e-post fan jo handheld mei help fan KMail.
-Comment[gl]=Enviar correo dende o seu aparello de man a través de KMail.
-Comment[hu]=Ezzel a csatolóval kézi számítógépről lehet levelet küldeni a KMailen keresztül.
-Comment[is]=Sendu tölvupóst frá lófatölvunni þinni gegnum KMail.
-Comment[it]=Invia la posta dal tuo palmare tramite KMail.
-Comment[ja]=KMail 経由��ンドヘルド�らメールを�信���。
-Comment[kk]=Қалта құрылғының пошта�ын KMail арқылы жіберу.
-Comment[km]=ផ្ញើ​សំបុ�្រ​ទៅ​ឧបករណ�​យួរដៃ​របស់​អ្នក​�ាម​រយៈ KMail ។
-Comment[lt]=Siųsti paštą iš nešiojamo įrenginio per KMail.
-Comment[ms]=Menghantar mel dari komputer telapak melalui KMail.
-Comment[nb]=Send e-post fra PDA-en gjennom KMail.
-Comment[nds]=Nettbreven vun Dien Handreekner över KMail afsennen
-Comment[ne]=तपाई�को ह�यान�डहेल�डबाट केडीई मेलह�दै पत�र पठाउन�होस� ।
-Comment[nl]=Dit conduit verzendt mail van uw handheld met behulp van KMail.
-Comment[pl]=Wysyła pocztę z palmtopa za pomocą KMail.
-Comment[pt]=Enviar e-mail do seu dispositivo móvel através do KMail.
-Comment[pt_BR]=Envia e-mail do seu handheld através do Kmail.
-Comment[ru]=Отправка почты � КПК через KMail.
-Comment[sk]=Pošle poštu z prenosného zariadenia cez KMail.
-Comment[sl]=Pošljite pošto z vašega ro�nega ra�unalnika preko KMaila.
-Comment[sr]=Пошаљите пошту �а вашег ручног рачунара кроз KMail.
-Comment[sr@Latn]=Pošaljite poštu sa vašeg ru�nog ra�unara kroz KMail.
-Comment[sv]=Skicka e-post från handdatorn via Kmail.
-Comment[ta]=இந�த காப�ப�க�க�ழாய� உங�கள� கையேட�டில� இர�ந�த� தேதி ப�த�தகத�தை கேஅமைபாளர�க�க� ஒத�திசைக�கிறத�
-Comment[tr]=El bilgisayarınızdan KMail aracılığı ile e-posta gönderir.
-Comment[uk]=Від�иланн� пошти з кишенькового при�трою через KMail.
-Comment[zh_CN]=通过 KMail 从您的手�设备��邮件。
-Comment[zh_TW]=�� KMail �出您 handheld 的信件。
-Name=Mail
-Name[af]=Pos
-Name[ar]=البريد
-Name[be]=Пошта
-Name[bg]=Поща
-Name[br]=Lizher
-Name[ca]=Correu
-Name[cs]=Pošta
-Name[cy]=Ebost
-Name[da]=Brev
-Name[de]=E-Mail
-Name[eo]=Retpo�to
-Name[es]=Correo
-Name[et]=E-post
-Name[eu]=Posta
-Name[fa]=نامه
-Name[fi]=Sähköposti
-Name[fr]=Messages
-Name[fy]=E-post
-Name[ga]=Ríomhphost
-Name[gl]=Correo-e
-Name[he]=דו�"ל
-Name[hi]=डाक
-Name[hr]=Pošta
-Name[hu]=E-mail
-Name[is]=Póstur
-Name[it]=Posta
-Name[ja]=メール
-Name[kk]=Пошта
-Name[km]=សំបុ�្រ
-Name[lt]=Paštas
-Name[mk]=Е-пошта
-Name[ms]=Mel
-Name[nb]=E-post
-Name[nds]=Nettpost
-Name[ne]=पत�र
-Name[nl]=E-mail
-Name[nn]=E-post
-Name[pa]=ਪੱਤਰ
-Name[pl]=Poczta
-Name[pt]=E-mail
-Name[pt_BR]=Correio
-Name[ro]=E-Mail
-Name[ru]=Почта
-Name[se]=E-boasta
-Name[sk]=Pošta
-Name[sl]=Pošta
-Name[sr]=Пошта
-Name[sr@Latn]=Pošta
-Name[sv]=Brev
-Name[ta]=அஞ�சல�
-Name[tg]=Мактуб
-Name[th]=จดหมาย
-Name[tr]=Posta
-Name[uk]=Пошта
-Name[uz]=Хат-хабар
-Name[zh_CN]=邮件
-Name[zh_TW]=郵件
-Implemented=file
-ServiceTypes=KPilotConduit
-X-KDE-Library=conduit_popmail
diff --git a/kpilot/conduits/popmail/popmail-conduit.h b/kpilot/conduits/popmail/popmail-conduit.h
deleted file mode 100644
index 52b5b917..00000000
--- a/kpilot/conduits/popmail/popmail-conduit.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef _KPILOT_POPMAIL_CONDUIT_H
-#define _KPILOT_POPMAIL_CONDUIT_H
-/* popmail-conduit.h			KPilot
-**
-** Copyright (C) 1998,1999,2000 Dan Pilone
-** Copyright (C) 1999,2000 Michael Kropfberger
-**
-** This file is part of the popmail conduit, a conduit for KPilot that
-** synchronises the Pilot's email application with the outside world,
-** which currently means:
-**	-- sendmail or SMTP for outgoing mail
-**	-- POP or mbox for incoming mail
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include "plugin.h"
-
-class KSocket;
-
-class PilotRecord;
-class PilotDatabase;
-
-class PopMailConduit : public ConduitAction
-{
-public:
-	PopMailConduit(KPilotLink *d,
-		const char *n=0L,
-		const TQStringList &l=TQStringList());
-	virtual ~PopMailConduit();
-
-protected:
-	virtual bool exec();
-
-	// static PilotRecord *readMessage(FILE *mailbox,
-	//	char *buffer,int bufferSize);
-
-protected:
-	void doSync();
-	void doTest();
-
-	// Pilot -> Sendmail
-	//
-	//
-	int sendPendingMail(int mode /* unused */);
-	// int sendViaSendmail();
-	int sendViaKMail();
-	// int sendViaSMTP();
-	void writeMessageToFile(FILE* sendf, struct Mail& theMail);
-	TQString getKMailOutbox() const;
-
-};
-
-#endif
diff --git a/kpilot/conduits/popmail/popmail-factory.cc b/kpilot/conduits/popmail/popmail-factory.cc
deleted file mode 100644
index dc2a0cd1..00000000
--- a/kpilot/conduits/popmail/popmail-factory.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2001 by Dan Pilone
-** Copyright (C) 2006 by Adriaan de Groot <groot@kde.org>
-**
-** This file defines the factory for the popmail-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-
-#include "setupDialog.h"
-#include "popmail-conduit.h"
-#include "pluginfactory.h"
-
-
-extern "C"
-{
-
-void *init_conduit_popmail()
-{
-	return new ConduitFactory<PopMailWidgetConfig,PopMailConduit>;
-}
-
-}
-
diff --git a/kpilot/conduits/popmail/popmail-factory.h b/kpilot/conduits/popmail/popmail-factory.h
deleted file mode 100644
index 2cab4d84..00000000
--- a/kpilot/conduits/popmail/popmail-factory.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef _KPILOT_POPMAIL_FACTORY_H
-#define _KPILOT_POPMAIL_FACTORY_H
-/* popmail-factory.h                       KPilot
-**
-** Copyright (C) 2001 by Dan Pilone
-**
-** This file defines the factory for the popmail-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-extern "C"
-{
-void *init_conduit_popmail();
-}
-
-#endif
diff --git a/kpilot/conduits/popmail/popmail.kcfg b/kpilot/conduits/popmail/popmail.kcfg
deleted file mode 100644
index 65056cb5..00000000
--- a/kpilot/conduits/popmail/popmail.kcfg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
-      http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-<kcfgfile name="kpilot_mailconduitrc"/> 
-<group name="General">
-  <entry name="SyncOutgoing" type="UInt">
-    <label>Selects the way in which mail is sent: none (0), kmail (1).</label>
-    <default>0</default>
-  </entry>
-  <entry name="EmailAddress" type="String">
-    <label>The email address entered in the To: field of outgoing messages.</label>
-    <default></default>
-  </entry>
-  <entry name="Signature" type="Path">
-    <label>The pathname of your .signature file.</label>
-    <default>$HOME/.signature</default>
-  </entry>
-  <entry name="OutboxFolder" type="String">
-    <label>The name of KMail's outbox - use with caution.</label>
-    <default></default>
-  </entry>
-</group>
-</kcfg>
diff --git a/kpilot/conduits/popmail/popmailSettings.kcfgc b/kpilot/conduits/popmail/popmailSettings.kcfgc
deleted file mode 100644
index 1ac6276f..00000000
--- a/kpilot/conduits/popmail/popmailSettings.kcfgc
+++ /dev/null
@@ -1,7 +0,0 @@
-File=popmail.kcfg
-ClassName=MailConduitSettings
-Singleton=true
-ItemAccessors=true
-Mutators=true
-GlobalEnums=true
-SetUserTexts=true
diff --git a/kpilot/conduits/popmail/setup-dialog.ui b/kpilot/conduits/popmail/setup-dialog.ui
deleted file mode 100644
index e10f0e4b..00000000
--- a/kpilot/conduits/popmail/setup-dialog.ui
+++ /dev/null
@@ -1,141 +0,0 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
-<class>PopMailWidget</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>PopMailWidget</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>363</width>
-            <height>281</height>
-        </rect>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QTabWidget" row="0" column="0">
-            <property name="name">
-                <cstring>fTabWidget</cstring>
-            </property>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>tab</cstring>
-                </property>
-                <attribute name="title">
-                    <string>Send Mail</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <spacer row="5" column="1">
-                        <property name="name">
-                            <cstring>spacer1</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>20</width>
-                                <height>16</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QLabel" row="0" column="0">
-                        <property name="name">
-                            <cstring>textLabel1_2</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Send method:</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Select the method KPilot will use to send the mail from your Handheld to the recipients here. Depending on the method you choose, the other fields in the dialog may be enabled or disabled. Currently, the only &lt;i&gt;working&lt;/i&gt; method is through KMail.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="1" column="0">
-                        <property name="name">
-                            <cstring>textLabel1</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Email address:</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Enter the email address you want to send messages as here.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="KLineEdit" row="1" column="1">
-                        <property name="name">
-                            <cstring>fEmailFrom</cstring>
-                        </property>
-                        <property name="text">
-                            <string>$USER</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Enter the email address you want to send messages as here.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="2" column="0">
-                        <property name="name">
-                            <cstring>textLabel2</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Signature file:</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;If you want to add a signature file, enter the location of your signature file (usually, &lt;i&gt;.signature&lt;/i&gt;, located in your home folder) here, or select it clicking the file picker button. The signature file contains the text that is added to the end of your outgoing mail messages.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="KURLRequester" row="2" column="1">
-                        <property name="name">
-                            <cstring>fSignature</cstring>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;If you want to add a signature file, enter the location of your signature file (usually, &lt;i&gt;.signature&lt;/i&gt;, located in your home folder) here, or select it clicking the file picker button. The signature file contains the text that is added to the end of your outgoing mail messages.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="QComboBox" row="0" column="1">
-                        <item>
-                            <property name="text">
-                                <string>Do Not Send Mail</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>Use KMail</string>
-                            </property>
-                        </item>
-                        <property name="name">
-                            <cstring>fSendMode</cstring>
-                        </property>
-                        <property name="enabled">
-                            <bool>true</bool>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Select the method KPilot will use to send the mail from your Handheld to the recipients here. Depending on the method you choose, the other fields in the dialog may be enabled or disabled. Currently, the only &lt;i&gt;working&lt;/i&gt; method is through KMail.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                </grid>
-            </widget>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-<includes>
-    <include location="global" impldecl="in implementation">klineedit.h</include>
-    <include location="global" impldecl="in implementation">kurlrequester.h</include>
-    <include location="global" impldecl="in implementation">kpushbutton.h</include>
-</includes>
-</UI>
diff --git a/kpilot/conduits/popmail/setupDialog.cc b/kpilot/conduits/popmail/setupDialog.cc
deleted file mode 100644
index b8d3db70..00000000
--- a/kpilot/conduits/popmail/setupDialog.cc
+++ /dev/null
@@ -1,158 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 1998-2001 Dan Pilone
-**
-** This file is part of the popmail conduit, a conduit for KPilot that
-** synchronises the Pilot's email application with the outside world,
-** which currently means:
-**	-- sendmail or SMTP for outgoing mail
-**	-- POP or mbox for incoming mail
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-
-#include <kconfig.h>
-#include <kstandarddirs.h>
-#include <klineedit.h>
-#include <kaboutdata.h>
-
-#include <tqcheckbox.h>
-#include <tqdir.h>
-#include <tqcombobox.h>
-
-#include "kfiledialog.h"
-
-#include <kurlrequester.h>
-
-
-#include "popmail-factory.h"
-#include "setup-dialog.h"
-#include "setupDialog.moc"
-#include "popmailSettings.h"
-
-
-
-PopMailWidgetConfig::PopMailWidgetConfig(TQWidget *p,const char *n) :
-	ConduitConfigBase(p,n),
-	fConfigWidget(new PopMailWidget(p,"PopMailWidget"))
-{
-	FUNCTIONSETUP;
-	fConduitName = i18n("KMail");
-	KAboutData *fAbout = new KAboutData("popmailConduit",
-		I18N_NOOP("Mail Conduit for KPilot"),
-		KPILOT_VERSION,
-		I18N_NOOP("Configures the Mail Conduit for KPilot"),
-		KAboutData::License_GPL,
-		"(C) 2001, Dan Pilone, Michael Kropfberger, Adriaan de Groot");
-	fAbout->addAuthor("Adriaan de Groot",
-		I18N_NOOP("Maintainer"),
-		"groot@kde.org",
-		"http://www.kpilot.org/");
-	fAbout->addAuthor("Dan Pilone",
-		I18N_NOOP("Original Author"));
-	fAbout->addCredit("Michael Kropfberger",
-		I18N_NOOP("POP3 code"));
-	fAbout->addCredit("Marko Gr&ouml;nroos",
-		I18N_NOOP("SMTP support and redesign"),
-		"magi@iki.fi",
-		"http://www.iki.fi/magi/");
-
-	ConduitConfigBase::addAboutPage(fConfigWidget->fTabWidget,fAbout);
-	fWidget=fConfigWidget;
-
-#define CM(a,b) connect(fConfigWidget->a,b,this,TQT_SLOT(modified()));
-	CM(fSendMode,TQT_SIGNAL(activated(int)));
-	CM(fEmailFrom,TQT_SIGNAL(textChanged(const TQString &)));
-	CM(fSignature,TQT_SIGNAL(textChanged(const TQString &)));
-#undef CM
-
-	connect(fConfigWidget->fSendMode,TQT_SIGNAL(activated(int)),
-		this,TQT_SLOT(toggleSendMode(int)));
-
-}
-
-void PopMailWidgetConfig::commit()
-{
-	FUNCTIONSETUP;
-
-	MailConduitSettings::self()->readConfig();
-#define WR(a,b,c) MailConduitSettings::set##a(fConfigWidget->b->c);
-	WR(SyncOutgoing,fSendMode,currentItem());
-	WR(EmailAddress,fEmailFrom,text());
-	WR(Signature,fSignature,url());
-#undef WR
-
-	MailConduitSettings::self()->writeConfig();
-	unmodified();
-}
-
-void PopMailWidgetConfig::load()
-{
-	FUNCTIONSETUP;
-	MailConduitSettings::self()->config()->sync();
-	MailConduitSettings::self()->readConfig();
-
-#define RD(a,b,c) fConfigWidget->a->b(MailConduitSettings::c())
-	RD(fSendMode,setCurrentItem,syncOutgoing);
-	RD(fEmailFrom,setText,emailAddress);
-	RD(fSignature,setURL,signature);
-#undef RD
-
-	toggleSendMode(fConfigWidget->fSendMode->currentItem());
-
-	MailConduitSettings::self()->writeConfig();
-	unmodified();
-}
-
-
-/* slot */ void PopMailWidgetConfig::toggleSendMode(int i)
-{
-	FUNCTIONSETUP;
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Got mode " << i << endl;
-#endif
-
-#define E(a,b) fConfigWidget->a->setEnabled(b)
-	switch(i)
-	{
-	case SendKMail :
-		E(fEmailFrom,true);
-		E(fSignature,true);
-		break;
-	case NoSend : /* FALLTHRU */
-	default :
-		E(fEmailFrom,false);
-		E(fSignature,false);
-		break;
-	}
-#undef E
-}
-
-
-
diff --git a/kpilot/conduits/popmail/setupDialog.h b/kpilot/conduits/popmail/setupDialog.h
deleted file mode 100644
index 76bf9afe..00000000
--- a/kpilot/conduits/popmail/setupDialog.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef _POPMAIL_SETUPDIALOG_H
-#define _POPMAIL_SETUPDIALOG_H
-/* setupDialog.h			KPilot
-**
-** Copyright (C) 1998-2001 Dan Pilone
-**
-** This file is part of the popmail conduit, a conduit for KPilot that
-** synchronises the Pilot's email application with the outside world,
-** which currently means:
-**	-- sendmail or SMTP for outgoing mail
-**	-- POP or mbox for incoming mail
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include "plugin.h"
-
-class PopMailWidget; // From setup-dialog.ui
-
-class PopMailWidgetConfig : public ConduitConfigBase
-{
-Q_OBJECT
-public:
-	PopMailWidgetConfig(TQWidget *, const char *);
-	virtual void load();
-	virtual void commit();
-
-	static ConduitConfigBase *create(TQWidget *w, const char *n)
-		{ return new PopMailWidgetConfig(w,n); } ;
-
-	// These enums must follow the order of items in the combo box
-	enum SendMode { NoSend=0, SendKMail=1 } ;
-
-protected:
-	PopMailWidget *fConfigWidget;
-
-public slots:
-	void toggleSendMode(int);
-} ;
-
-
-#endif
diff --git a/kpilot/conduits/recordconduit/Makefile.am b/kpilot/conduits/recordconduit/Makefile.am
deleted file mode 100644
index 33ceb854..00000000
--- a/kpilot/conduits/recordconduit/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
-
-METASOURCES = AUTO
-
-servicedir = $(kde_servicesdir)
-service_DATA = record-conduit.desktop
-
-kde_module_LTLIBRARIES = conduit_record.la
-
-
-conduit_record_la_SOURCES = settings.kcfgc setup_base.ui factory.cc
-conduit_record_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-conduit_record_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI)
-
-kde_kcfg_DATA = settings.kcfg
diff --git a/kpilot/conduits/recordconduit/factory.cc b/kpilot/conduits/recordconduit/factory.cc
deleted file mode 100644
index 83377336..00000000
--- a/kpilot/conduits/recordconduit/factory.cc
+++ /dev/null
@@ -1,144 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2005 by Adriaan de Groot
-**
-** This file defines the factory for the recordconduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <tqtabwidget.h>
-#include <tqlineedit.h>
-#include <tqcheckbox.h>
-
-#include <kconfig.h>
-#include <kinstance.h>
-#include <kaboutdata.h>
-
-#include "pluginfactory.h"
-#include "pilotDatabase.h"
-#include "recordConduit.h"
-
-#include "setup_base.h"
-#include "factory.h"
-#include "settings.h"
-
-
-class ConduitConfig : public ConduitConfigBase
-{
-public:
-	ConduitConfig(TQWidget *parent=0L, const char *n=0L);
-	virtual void commit();
-	virtual void load();
-protected:
-	RecordWidget *fConfigWidget;
-	KAboutData *fAbout;
-} ;
-
-ConduitConfig::ConduitConfig(TQWidget *p, const char *n) :
-	ConduitConfigBase(p,n),
-	fConfigWidget(new RecordWidget(p))
-{
-	FUNCTIONSETUP;
-	fConduitName = i18n("Record Conduit");
-	fAbout = new KAboutData("recordConduit",
-		I18N_NOOP("Record Conduit for KPilot"),
-		KPILOT_VERSION,
-		I18N_NOOP("Configures the Record Conduit for KPilot"),
-		KAboutData::License_GPL,
-		"(C) 2005, Adriaan de Groot");
-	fAbout->addAuthor("Adriaan de Groot",
-		I18N_NOOP("Primary Author"),
-		"groot@kde.org",
-		"http://people.fruitsalad.org/adridg/");
-
-	ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,fAbout);
-	fWidget=fConfigWidget;
-	TQObject::connect(fConfigWidget->fLogMessage,TQT_SIGNAL(textChanged(const TQString&)),
-		this,TQT_SLOT(modified()));
-	TQObject::connect(fConfigWidget->fDatabases,TQT_SIGNAL(textChanged(const TQString&)),
-		this,TQT_SLOT(modified()));
-	TQObject::connect(fConfigWidget->fFailImmediately,TQT_SIGNAL(toggled(bool)),
-		this,TQT_SLOT(modified()));
-}
-
-/* virtual */ void ConduitConfig::commit()
-{
-	FUNCTIONSETUP;
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Message="
-		<< fConfigWidget->fLogMessage->text()
-		<< endl;
-	DEBUGKPILOT << fname
-		<< ": Databases="
-		<< fConfigWidget->fDatabases->text()
-		<< endl;
-#endif
-
-	ConduitSettings::setLogMessage( fConfigWidget->fLogMessage->text() );
-	ConduitSettings::setDatabases( fConfigWidget->fDatabases->text() );
-	ConduitSettings::setFailImmediately( fConfigWidget->fFailImmediately->isChecked());
-	ConduitSettings::self()->writeConfig();
-	unmodified();
-}
-
-/* virtual */ void ConduitConfig::load()
-{
-	FUNCTIONSETUP;
-	ConduitSettings::self()->readConfig();
-
-	fConfigWidget->fLogMessage->setText( ConduitSettings::logMessage() );
-	fConfigWidget->fDatabases->setText( ConduitSettings::databases().join(",") );
-	fConfigWidget->fFailImmediately->setChecked( ConduitSettings::failImmediately() );
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Read Message="
-		<< fConfigWidget->fLogMessage->text()
-		<< endl;
-	DEBUGKPILOT << fname
-		<< ": Read Database="
-		<< fConfigWidget->fDatabases->text()
-		<< endl;
-#endif
-
-	unmodified();
-}
-
-typedef PilotDatabase PilotDatabaseContainer;
-
-typedef RecordConduit<PilotRecord, PilotDatabaseContainer, PilotRecord, PilotAppInfoBase, NullMapper<PilotRecord> > RecordAction;
-
-extern "C"
-{
-
-void *init_conduit_record()
-{
-	return new ConduitFactory<ConduitConfig,RecordAction>(0,"recordconduit");
-}
-
-}
-
diff --git a/kpilot/conduits/recordconduit/factory.h b/kpilot/conduits/recordconduit/factory.h
deleted file mode 100644
index 6d35d4db..00000000
--- a/kpilot/conduits/recordconduit/factory.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef KPILOT_RECORD_FACTORY_H
-#define KPILOT_RECORD_FACTORY_H
-/* factory.h                       KPilot
-**
-** Copyright (C) 2005 by Adriaan de Groot
-**
-** This is the factory for the recordconduit, which uses the
-** template class RecordConduit for demonstration purposes.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-extern "C"
-{
-
-void *init_conduit_record();
-
-}
-
-#endif
diff --git a/kpilot/conduits/recordconduit/record-conduit.desktop b/kpilot/conduits/recordconduit/record-conduit.desktop
deleted file mode 100644
index a96f24ec..00000000
--- a/kpilot/conduits/recordconduit/record-conduit.desktop
+++ /dev/null
@@ -1,91 +0,0 @@
-[Desktop Entry]
-Type=Service
-Name=Records (Experimental)
-Name[af]=Rekords (Eksperimenteel)
-Name[bg]=Запи�и (Ек�периментално)
-Name[ca]=Registres (Experimental)
-Name[cs]=Záznamy (experimentální)
-Name[da]=Indspilninger (eksperimentel)
-Name[de]=Einträge (Experimentell)
-Name[el]=Εγγ�αφές (Πει�αματικό)
-Name[es]=Registros (Experimental)
-Name[et]=Kirjed (eksperimentaalne)
-Name[fr]=Enregistrements (expérimental)
-Name[fy]=Opnames (eksperimenteel)
-Name[gl]=Grava (Experimental)
-Name[hu]=Rekordok (kísérleti)
-Name[it]=Record (sperimentale)
-Name[ja]=レコード (実験中)
-Name[kk]=Жазулар (Эк�перименталдық)
-Name[km]=កំណ�់​�្រា (ពិសោធន�)
-Name[lt]=Įrašai (eksperimentinis)
-Name[nb]=Records (Eksperimentell)
-Name[nds]=Logbook (warrt utprobeert)
-Name[ne]=रेकर�ड (प�रयोगात�मक)
-Name[nl]=Opnames (experimenteel)
-Name[pl]=Wpisy (eksperymentalne)
-Name[pt]=Registos (Experimental)
-Name[pt_BR]=Registros (Experimental)
-Name[ru]=Запи�и (�к�периментально)
-Name[sk]=Záznamy (Experimentálne)
-Name[sl]=Zapisi (poskusno)
-Name[sr]=Слогови (ек�периментално)
-Name[sr@Latn]=Slogovi (eksperimentalno)
-Name[sv]=Inspelningar (experimentell)
-Name[tr]=Kayıtlar (Deneysel)
-Name[uk]=Запи�и (ек�периментальний)
-Name[zh_CN]=记录(试验性)
-Name[zh_TW]=紀錄（實驗性）
-Comment=This conduit does nothing.
-Comment[af]=Hierdie pad doen niks
-Comment[bg]=Това нещо прави нищо
-Comment[bs]=Ovaj conduit ne radi ništa.
-Comment[ca]=Aquest conducte no fa res.
-Comment[cs]=Toto propojení nedělá nic.
-Comment[cy]=Nid yw'r cwndid yma yn gwneud unrhyw beth.
-Comment[da]=Denne kanal gør ingenting.
-Comment[de]=Diese Erweiterung (Conduit) ist ohne Funktion
-Comment[el]=Αυτός ο σ�νδεσμος δεν κάνει τίποτα.
-Comment[eo]=Tiu kanalo faras nenion.
-Comment[et]=See kanal ei tee mitte kui midagi.
-Comment[eu]=Kanal honek ez du ezer egiten.
-Comment[fa]=این لوله هیچ چیز ندارد.
-Comment[fi]=Tämä yhdyskäytävä ei tee mitään.
-Comment[fr]=Ce canal ne fait rien.
-Comment[fy]=Dit conduit docht neat.
-Comment[ga]=Ní dhéanann an seoladán seo faic.
-Comment[gl]=Este conducto non fai nada.
-Comment[hi]=यह कन�ड�यूइट क�छ नहीं करता है.
-Comment[hu]=Ez a csatoló üres, csak tesztelési célokat szolgál
-Comment[is]=Þessi rás gerir ekki neitt.
-Comment[it]=Questo conduit non fa nulla.
-Comment[ja]=��コンジット�未知��。
-Comment[kk]=Ештеңе і�темейтін арна.
-Comment[km]=បំពង់​ន�ះ​មិន​ធ្វើ​អ្វី​ទាំងអស់ ។
-Comment[lt]=Å is kanalas nieko neatlieka.
-Comment[mk]=Овој канал не прави ништо.
-Comment[ms]=Saluran ini tidak berbuat apa-apa.
-Comment[nb]=Denne kanalen gjør ingenting.
-Comment[nds]=Disse Kanaal deit gor nix.
-Comment[ne]=यो कन�ड�य�टले केही पनि गर�दैन ।
-Comment[nl]=Dit conduit doet niets.
-Comment[nn]=Denne koplinga gjer ingenting.
-Comment[pl]=Ten Å‚Ä…cznik nic nie robi.
-Comment[pt]=Esta conduta não faz nada.
-Comment[pt_BR]=Este conduíte não faz coisa alguma.
-Comment[ro]=Această conductă nu face nimic.
-Comment[ru]=Канал, который ничего не делает.
-Comment[sk]=Táto spojka ni� nerobí.
-Comment[sl]=Ta veznik ne po�ne ni�esar.
-Comment[sr]=Овај провод не ради ништа.
-Comment[sr@Latn]=Ovaj provod ne radi ništa.
-Comment[sv]=Den här kanalen gör ingenting.
-Comment[ta]=இந�த காப�ப�க� க�ழாய� ஒன�ற�ம� செய�யாத�
-Comment[tg]=Канале, ки дар ҳолати шурӯъ не�т.
-Comment[tr]=Bu kanal herhangi bir iÅŸlem yapmaz.
-Comment[uk]=Цей акведук нічого не робить.
-Comment[zh_CN]=此管���任何事。
-Comment[zh_TW]=��任何事。
-Implemented=file
-ServiceTypes=KPilotConduit
-X-KDE-Library=conduit_record
diff --git a/kpilot/conduits/recordconduit/settings.kcfg b/kpilot/conduits/recordconduit/settings.kcfg
deleted file mode 100644
index 7fc2180d..00000000
--- a/kpilot/conduits/recordconduit/settings.kcfg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
-      http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <kcfgfile name="kpilotrc"/>
-  <group name="RecordConduit">
-		<entry name="FailImmediately" key="FailNow" type="Bool">
-        <label>Whether the conduit should immediately bail out with an error</label>
-        <default>false</default>
-    </entry>
-    <entry name="LogMessage" type="String">
-        <label>The error message if the null conduit is supposed to fail</label>
-        <default>KPilot was here.</default>
-    </entry>
-		<entry name="Databases" type="StringList">
-				<label>Databases that are skipped on sync</label>
-				<default></default>
-		</entry>
-  </group>
-
-</kcfg>
diff --git a/kpilot/conduits/recordconduit/settings.kcfgc b/kpilot/conduits/recordconduit/settings.kcfgc
deleted file mode 100644
index 8a2b4f35..00000000
--- a/kpilot/conduits/recordconduit/settings.kcfgc
+++ /dev/null
@@ -1,7 +0,0 @@
-File=settings.kcfg
-ClassName= ConduitSettings
-Singleton=true
-ItemAccessors=true
-Mutators=true
-GlobalEnums=true
-SetUserTexts=true
diff --git a/kpilot/conduits/recordconduit/setup_base.ui b/kpilot/conduits/recordconduit/setup_base.ui
deleted file mode 100644
index 126d3ff2..00000000
--- a/kpilot/conduits/recordconduit/setup_base.ui
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
-<class>RecordWidget</class>
-<comment>A tabWidget for configuring
-the Record-conduit settings.</comment>
-<author>Adriaan de Groot</author>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>Form1</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>342</width>
-            <height>163</height>
-        </rect>
-    </property>
-    <property name="sizePolicy">
-        <sizepolicy>
-            <hsizetype>5</hsizetype>
-            <vsizetype>5</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-        </sizepolicy>
-    </property>
-    <property name="baseSize">
-        <size>
-            <width>570</width>
-            <height>270</height>
-        </size>
-    </property>
-    <property name="caption">
-        <string>Null-Conduit Options</string>
-    </property>
-    <property name="layoutMargin" stdset="0">
-    </property>
-    <property name="layoutSpacing" stdset="0">
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QTabWidget" row="0" column="0">
-            <property name="name">
-                <cstring>tabWidget</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>7</hsizetype>
-                    <vsizetype>7</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="layoutMargin" stdset="0">
-            </property>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>Widget2</cstring>
-                </property>
-                <attribute name="title">
-                    <string>General</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <property name="margin">
-                        <number>11</number>
-                    </property>
-                    <property name="spacing">
-                        <number>6</number>
-                    </property>
-                    <widget class="QLineEdit" row="0" column="1">
-                        <property name="name">
-                            <cstring>fLogMessage</cstring>
-                        </property>
-                        <property name="text">
-                            <string>KPilot was here.</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Enter the message to add to the Sync Log on your Pilot here.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="0" column="0">
-                        <property name="name">
-                            <cstring>TextLabel1_2</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&amp;Log message:</string>
-                        </property>
-                        <property name="buddy" stdset="0">
-                            <cstring>fLogMessage</cstring>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="1" column="0">
-                        <property name="name">
-                            <cstring>TextLabel2_2</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&amp;Databases:</string>
-                        </property>
-                        <property name="buddy" stdset="0">
-                            <cstring>fDatabases</cstring>
-                        </property>
-                    </widget>
-                    <widget class="QLineEdit" row="1" column="1">
-                        <property name="name">
-                            <cstring>fDatabases</cstring>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;The Null-conduit can be attached to several databases, effectively preventing them from Syncing. Enter the database names here.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <spacer row="3" column="1">
-                        <property name="name">
-                            <cstring>Spacer4</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QCheckBox" row="2" column="1">
-                        <property name="name">
-                            <cstring>fFailImmediately</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Simulate failure</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>Force the conduit to simulate a failure to perform the HotSync.</string>
-                        </property>
-                    </widget>
-                </grid>
-            </widget>
-        </widget>
-    </grid>
-</widget>
-<tabstops>
-    <tabstop>tabWidget</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/kpilot/conduits/sysinfoconduit/CMakeLists.txt b/kpilot/conduits/sysinfoconduit/CMakeLists.txt
deleted file mode 100644
index cae6d89f..00000000
--- a/kpilot/conduits/sysinfoconduit/CMakeLists.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
-)
-
-set(conduit_sysinfo_SRCS
-	sysinfo-setup.cc
-	sysinfo-factory.cc
-	sysinfo-conduit.cc
-)
-
-set(conduit_sysinfo_UIS
-	sysinfo-setup_dialog.ui
-)
-
-set(conduit_sysinfo_KCFGS
-	sysinfoSettings.kcfgc
-)
-
-kde3_add_kcfg_files(conduit_sysinfo_SRCS ${conduit_sysinfo_KCFGS})
-kde3_add_ui_files(conduit_sysinfo_SRCS ${conduit_sysinfo_UIS})
-kde3_automoc(${conduit_sysinfo_SRCS})
-add_library(conduit_sysinfo SHARED ${conduit_sysinfo_SRCS})
-
-set_target_properties(
-	conduit_sysinfo PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
-	PREFIX ""
-)
-
-kde3_install_libtool_file(conduit_sysinfo)
-
-install(
-	TARGETS conduit_sysinfo
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-)
-
-install(
-	FILES sysinfo_conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
-)
-
-install(
-	FILES sysinfoSettings.kcfgc sysinfoconduit.kcfg
-	DESTINATION ${KDE3_KCFG_DIR}
-)
-
-install(
-	FILES Template.html Template.txt 
-	DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/kpilot/sysinfoconduit
-)
-
diff --git a/kpilot/conduits/sysinfoconduit/Makefile.am b/kpilot/conduits/sysinfoconduit/Makefile.am
deleted file mode 100644
index eb7f7aa9..00000000
--- a/kpilot/conduits/sysinfoconduit/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-### Makefile for the sysinfo conduit
-###
-### The sysinfo conduit is Copyright (C) 2003 by Reinhold Kainhofer
-
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
-METASOURCES = AUTO
-
-servicedir = $(kde_servicesdir)
-service_DATA = sysinfo_conduit.desktop
-
-kde_module_LTLIBRARIES = conduit_sysinfo.la
-
-conduit_sysinfo_la_SOURCES = sysinfoSettings.kcfgc \
-	sysinfo-factory.cc \
-	sysinfo-setup.cc \
-	sysinfo-conduit.cc \
-	sysinfo-setup_dialog.ui
-conduit_sysinfo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-conduit_sysinfo_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) $(LIB_KIO)
-
-kpilot_sysinfo_data_DATA = Template.html Template.txt
-kpilot_sysinfo_datadir = $(kde_datadir)/kpilot/sysinfoconduit
-EXTRA_DIST = $(kpilot_sysinfo_data_DATA)
-kde_kcfg_DATA = sysinfoconduit.kcfg
diff --git a/kpilot/conduits/sysinfoconduit/Template.html b/kpilot/conduits/sysinfoconduit/Template.html
deleted file mode 100644
index e5a33e0f..00000000
--- a/kpilot/conduits/sysinfoconduit/Template.html
+++ /dev/null
@@ -1,184 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<head>
-  <title>KPilot System Information Page</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-15">
-  <meta name="GENERATOR" content="KPilot SysInfo conduit">
-  <style type="text/css">
-  h1 {
-    font-family: sans-serif;
-    font-size: xx-large;
-    font-style: italic;
-    font-variant: small-caps;
-    font-weight: bolder;
-    color: darkBlue;
-    border-bottom: thick solid darkBlue;
-    margin: 30;
-  }
-  h2 {
-    font-family: sans-serif;
-    font-size: large;
-    color: darkRed;
-    margin-top: 40;
-    border-top: thin solid darkRed;
-    display: list-item;
-    list-style-type: circle;
-    margin: 40;
-  }
-  th {
-    font-style: italic;
-    font-weight: bold;
-    background-color: #DFC370;
-    text-align: center;
-  }
-  </style>
-</head>
-<body bgcolor="#FFE080">
-  <h1>KPilot System Information</h1>
-  <center>
-<p><!--#ifhardware#<a href="#Hardware">Hardware info</a> - #endifhardware#-->
-<!--#ifuser#<a href="#User">User info</a> - #endifuser#-->
-<!--#ifmemory#<a href="#Memory">Memory info</a> - #endifmemory#-->
-<!--#ifstorage#<a href="#Storage">Storage info</a> - #endifstorage#-->
-<!--#ifdblist#<a href="#DBList">Database list</a> - #endifdblist#-->
-<!--#ifrecords#<a href="#Records">Addresses, to-dos, events, and memos</a> - #endifrecords#-->
-<!--#ifsync#<a href="#Sync">Sync info</a> - #endifsync#-->
-<!--#ifpcversion#<a href="#Version">PC Version info</a> - #endifpcversion#-->
-<!--#ifpalmversion#<a href="#PalmVersion">Palm Version info</a> - #endifpalmversion#-->
-<!--#ifdebug#<a href="#Debug">Debug info</a>#endifdebug#--></p>
-  </center>
-
-
-<!--#ifhardware#<h2><a name="Hardware">Hardware Information</a></h2>
-  <center>
-  <table border=1>
-    <tbody>
-      <tr><td><b>DeviceID:</b></td><td>#deviceid#</td></tr>
-      <tr><td><b>Device name:</b></td><td>#devicename#</td></tr>
-      <tr><td><b>Device model:</b></td><td>#devicemodel#</td></tr>
-      <tr><td><b>Manufacturer:</b></td><td>#manufacturer#</td></tr>
-      <tr><td><b>Connected via:</b></td><td>#devicetype#</td></tr>
-    </tbody>
-  </table>
-  </center>#endifhardware#-->
-
-
-<!--#ifuser#<h2><a name="User">User Information</a></h2>
-  <center>
-  <table border=1>
-    <tbody>
-      <tr><td><b>Handheld User Name:</b></td><td>#username#</td></tr>
-      <tr><td><b>Handheld Password:</b></td><td>#pw#</td></tr>
-      <tr><td><b>Handheld User ID:</b></td><td>#uid#</td></tr>
-      <tr><td><b>Viewer ID:</b></td><td>#viewerid#</td></tr>
-    </tbody>
-  </table>
-  </center>#endifuser#-->
-
-
-<!--#ifmemory#<h2><a name="Memory">Memory Information</a></h2>
-  <center>
-  <table border=1>
-    <tbody>
-      <tr><td><b>ROM:</b></td><td>#rom# kB total</td></tr>
-      <tr><td><b>Total RAM:</b></td><td>#totalmem# kB total</td></tr>
-      <tr><td><b>Free RAM:</b></td><td>#freemem# kB free</td></tr>
-    </tbody>
-  </table>
-  </center>#endifmemory#-->
-
-
-<!--#ifstorage#<h2><a name="Storage">Storage Information</a></h2>
-  <center>
-  <table border=1>
-    <tbody>
-      <tr><td><b>Cards:</b></td><td>#cards#</td></tr>
-    </tbody>
-  </table>
-  </center>#endifstorage#-->
-
-
-<!--#ifdblist#<h2><a name="DBList">List of Databases on Handheld</a></h2>
-  <center>
-  <table border=1>
-    <tr><th>DB name</th><th>type, creator</th><th>index</th><th>flags</th>
-      <th>created</th><th>modified</th><th>version</th></tr>
-    #dblist[<tr><td>%0</td><td>%1,%2</td><td>%3</td><td>%4/%5</td>
-      <td>%7</td><td>%8</td><td>%6</td></tr>
-    ]#
-  </table>
-  </center>#endifdblist#-->
-
-
-
-<!--#ifrecords#<h2><a name="Records">Number of addresses, to-dos, events, and memos</a></h2>
-  <center>
-  <table border=1>
-    <thead>
-      <tr><th scope=col>Record type</th><th scope=col># of recs</th></tr>
-    </thead>
-    <tbody>
-      <tr><td><b>Addresses:</b></td><td>#addresses# entries in Addressbook</td></tr>
-      <tr><td><b>Events:</b></td><td>#events# entries in Calendar</td></tr>
-      <tr><td><b>To-dos:</b></td><td>#todos# entries in To-do list</td></tr>
-      <tr><td><b>Memos:</b></td><td>#memos# memos</td></tr>
-    </tbody>
-  </table>
-  </center>#endifrecords#-->
-
-
-<!--#ifsync#<h2><a name="Sync">Synchronization Information</a></h2>
-  <center>
-  <table border=1>
-    <tbody>
-      <tr><td><b>Last sync attempt:</b></td><td>#lastsync#</td></tr>
-      <tr><td><b>Last successful sync:</b></td><td>#lastsuccsync#</td></tr>
-      <tr><td><b>Last sync with PC (ID):</b></td><td>#lastsyncpc#</td></tr>
-    </tbody>
-  </table>
-  </center>#endifsync#-->
-
-
-<!--#ifpcversion#<h2><a name="Version">Version Information (Desktop)</a></h2>
-  <center>
-  <table border=1>
-    <thead>
-      <tr><th scope=col>Application</th><th scope=col>Version</th></tr>
-    </thead>
-    <tbody>
-      <tr><td><b>Operating System:</b></td><td>#os#</td></tr>
-      <tr><td><b>Hostname:</b></td><td>#hostname#</td></tr>
-      <tr><td><b>Qt Version:</b></td><td>#qt#</td></tr>
-      <tr><td><b>KDE Libraries Version:</b></td><td>#kde#</td></tr>
-      <tr><td><b>KPilot Version:</b></td><td>#kpilot#</td></tr>
-      <tr><td><b>Pilot-Link Version:</b></td><td>#pilotlink#</td></tr>
-    </tbody>
-  </table>
-  </center>#endifpcversion#-->
-
-
-<!--#ifpalmversion#<h2><a name="PalmVersion">Version Information (Handheld)</a></h2>
-  <center>
-  <table border=1>
-    <thead>
-      <tr><th scope=col>Application</th><th scope=col>Version</th></tr>
-    </thead>
-    <tbody>
-      <tr><td><b>PalmOS:</b></td><td>#palmos#</td></tr>
-    </tbody>
-  </table>
-  </center>#endifpalmversion#-->
-
-
-<!--#ifdebug#<h2><a name="Debug">Debug Information</a></h2>
-  <center>
-  <table border=1>
-    <tr><td><pre>#debug#</pre></td></tr>
-  </table>
-  </center>#endifdebug#-->
-
-
-    <p>&nbsp;</p>
-  <hr>
-  <font size="-1">Page created #date# by the SysInfo conduit of <a href="http://www.kpilot.org/">KPilot</a>.</font>
-</body>
-</html>
diff --git a/kpilot/conduits/sysinfoconduit/Template.txt b/kpilot/conduits/sysinfoconduit/Template.txt
deleted file mode 100644
index 8796e44a..00000000
--- a/kpilot/conduits/sysinfoconduit/Template.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-KPilot System Information Page
-==============================
-
-<!--#ifhardware#
--) Hardware Information
-     DeviceID:      #deviceid#
-     Device name:   #devicename#
-     Device model:  #devicemodel#
-     Manufacturer:  #manufacturer#
-     Connected via: #devicetype#
-#endifhardware#-->
-
-<!--#ifuser#
--) User Information
-     Handheld User Name: #username#
-     Handheld Password:  #pw#
-     Handheld User ID:   #uid#
-     Viewer ID:          #viewerid#
-#endifuser#-->
-
-<!--#ifmemory#
--) Memory Information
-     ROM:       #rom# kB total
-     Total RAM: #totalmem# kB total
-     Free RAM:  #freemem# kB fre
-#endifmemory#-->
-
-<!--#ifstorage#
--) Storage Information
-     Cards: #cards#
-#endifstorage#-->
-
-<!--#ifdblist#
--) List of Databases on Handheld
-     Available Databases: #dblist[
-         %0 (%1, %2)]#
-#endifdblist#-->
-
-<!--#ifrecords#
--) Number of addresses, todos, events, and memos
-     Addresses: #addresses# entries in Addressbook
-     Events:    #events# entries in Calendar
-     Todos:     #todos# entries in ToDo list
-     Memos:     #memos# memos
-#endifrecords#-->
-
-<!--#ifsync#
--) Synchronization Information
-     Last sync attempt:      #lastsync#
-     Last successful sync:  #lastsuccsync#
-     Last sync with PC (ID): #lastsyncpc#
-#endifsync#-->
-
-<!--#ifpcversion#
--) Version Information (Desktop)
-     Operating System:   #os#
-     Hostname:           #hostname#
-     Qt Version:         #qt#
-     KDE Version:        #kde#
-     KPilot Version:     #kpilot#
-     Pilot-Link Version: #pilotlink#
-#endifpcversion#-->
-
-<!--#ifpalmversion#
--) Version Information (Handheld)
-     PalmOS: #palmos#
-#endifpalmversion#-->
-
-<!--#ifdebug#
--) Debug Information
-     #debug#
-#endifdebug#-->
-
-
-------------------------------------------------------------
-Page created #date# by the SysInfo conduit of KPilot.
diff --git a/kpilot/conduits/sysinfoconduit/sysinfo-conduit.cc b/kpilot/conduits/sysinfoconduit/sysinfo-conduit.cc
deleted file mode 100644
index 86fc1075..00000000
--- a/kpilot/conduits/sysinfoconduit/sysinfo-conduit.cc
+++ /dev/null
@@ -1,611 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2003 by Reinhold Kainhofer
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org.
-*/
-
-#include "options.h"
-
-#include <pi-version.h>
-
-#include <tqtimer.h>
-#include <tqdir.h>
-#include <tqfileinfo.h>
-#include <tqregexp.h>
-#include <kconfig.h>
-#include <kdebug.h>
-
-#include <pilotSysInfo.h>
-#include <pilotUser.h>
-#include <pilotCard.h>
-#include <kpilotlink.h>
-#include <kstandarddirs.h>
-#include <pilotSerialDatabase.h>
-
-#include <sys/utsname.h>
-
-#include "sysinfo-factory.h"
-#include "sysinfo-conduit.moc"
-#include "sysinfoSettings.h"
-
-const TQString SysInfoConduit::defaultpage = CSL1("KPilot System Information Page\n"
-"==============================\n"
-"(Kpilot was unable to find the correct template file, \n"
-"so this simple template was used.)\n\n"
-"<!--#ifhardware#\n"
-"-) Hardware Information\n"
-"     DeviceID:      #deviceid#\n"
-"     Device name:   #devicename#\n"
-"     Device model:  #devicemodel#\n"
-"     Manufacturer:  #manufacturer#\n"
-"     Connected via: #devicetype#\n"
-"#endifhardware#-->\n"
-"\n"
-"<!--#ifuser#\n"
-"-) User Information\n"
-"     Handheld User Name: #username#\n"
-"     Handheld Password:  #pw#\n"
-"     Handheld User ID:   #uid#\n"
-"     Viewer ID:          #viewerid#\n"
-"#endifuser#-->\n"
-"\n"
-"<!--#ifmemory#\n"
-"-) Memory Information\n"
-"     ROM:       #rom# kB total\n"
-"     Total RAM: #totalmem# kB total\n"
-"     Free RAM:  #freemem# kB free\n"
-"#endifmemory#-->\n"
-"\n"
-"<!--#ifstorage#\n"
-"-) Storage Information\n"
-"     Number of cards: #cards#\n"
-"     Memory on cards: #storagemem#\n"
-"#endifstorage#-->\n"
-"\n"
-"<!--#ifdblist#\n"
-"-) List of Databases on Handheld\n"
-"     Available Databases: #dblist(%1,)#\n"
-"#endifdblist#-->\n"
-"\n"
-"<!--#ifrecords#\n"
-"-) Number of addresses, to-dos, events, and memos\n"
-"     Addresses: #addresses# entries in Addressbook\n"
-"     Events:    #events# entries in Calendar\n"
-"     To-dos:    #todos# entries in To-do list\n"
-"     Memos:     #memos# memos\n"
-"#endifrecords#-->\n"
-"\n"
-"<!--#ifsync#\n"
-"-) Synchronization Information\n"
-"     Last sync attempt:      #lastsync#\n"
-"     Last successful sync:  #lastsuccsync#\n"
-"     Last sync with PC (ID): #lastsyncpc#\n"
-"#endifsync#-->\n"
-"\n"
-"<!--#ifpcversion#\n"
-"-) Version Information (Desktop)\n"
-"     Operating System:   #os#\n"
-"     Hostname:           #hostname#\n"
-"     Qt Version:         #qt#\n"
-"     KDE Version:        #kde#\n"
-"     KPilot Version:     #kpilot#\n"
-"     Pilot-Link Version: #pilotlink#\n"
-"#endifpcversion#-->\n"
-"\n"
-"<!--#ifpalmversion#\n"
-"-) Version Information (Handheld)\n"
-"     PalmOS: #palmos#\n"
-"#endifpalmversion#-->\n"
-"\n"
-"<!--#ifdebug#\n"
-"-) Debug Information\n"
-"     #debug#\n"
-"#endifdebug#-->\n"
-"\n"
-"------------------------------------------------------------\n"
-"Page created <!--#date#--> by the KPilot System Information conduit.\n"
-"");
-
-
-	/** possible fields in the templates are:
-	 *  - hardware
-	 *  - user
-	 *  - memory
-	 *  - storage
-	 *  - dblist
-	 *  - recnumber
-	 *  - syncinfo
-	 *  - pcversion
-	 *  - palmversion
-	 *  - debug
-	 */
-
-
-// Something to allow us to check what revision
-// the modules are that make up a binary distribution.
-
-extern "C"
-{
-
-unsigned long version_conduit_sysinfo = Pilot::PLUGIN_API;
-
-}
-
-
-
-SysInfoConduit::SysInfoConduit(KPilotLink * o,
-	const char *n,
-	const TQStringList & a) :
-	ConduitAction(o, n, a)
-{
-	FUNCTIONSETUP;
-	fConduitName=i18n("System Information");
-}
-
-
-
-SysInfoConduit::~SysInfoConduit()
-{
-	FUNCTIONSETUP;
-}
-
-
-
-void SysInfoConduit::readConfig()
-{
-	fOutputFile = SysinfoSettings::outputFile();
-	fOutputType = (eOutputTypeEnum) SysinfoSettings::outputFormat();
-	fTemplateFile = SysinfoSettings::templateFile();
-	fHardwareInfo = SysinfoSettings::hardwareInfo();
-	fUserInfo = SysinfoSettings::userInfo();
-	fMemoryInfo = SysinfoSettings::memoryInfo();
-	fStorageInfo = SysinfoSettings::storageInfo();
-	fDBList = SysinfoSettings::databaseList();
-	fRecordNumber = SysinfoSettings::recordNumbers();
-	fSyncInfo = SysinfoSettings::syncInfo();
-	fKDEVersion = SysinfoSettings::kDEVersion();
-	fPalmOSVersion = SysinfoSettings::palmOSVersion();
-	fDebugInfo = SysinfoSettings::debugInformation();
-}
-
-
-/* virtual */ bool SysInfoConduit::exec()
-{
-	FUNCTIONSETUP;
-
-	readConfig();
-
-	TQTimer::singleShot(0, this, TQT_SLOT(hardwareInfo()));
-	return true;
-}
-
-void SysInfoConduit::hardwareInfo()
-{
-	FUNCTIONSETUP;
-	if (fHardwareInfo) {
-		TQString unknown = i18n("unknown");
-
-		/* Retrieve values for
-		* - #deviceid#
-		* - #devicename#
-		* - #devicemodel#
-		* - #manufactorer#
-		* - #devicetype#
-		*/
-		KPilotSysInfo sysinfo = fHandle->getSysInfo();
-		fValues[CSL1("deviceid")] = TQString::fromLatin1(sysinfo.getProductID());
-
-		const KPilotCard *device = fHandle->getCardInfo();
-		if (device)
-		{
-			fValues[CSL1("devicename")] = TQString::fromLatin1(device->getCardName());
-			fValues[CSL1("devicemodel")] = unknown;  // TODO
-			fValues[CSL1("manufacturer")] = TQString::fromLatin1(device->getCardManufacturer());
-		}
-		else
-		{
-			fValues[CSL1("devicename")] = unknown;
-			fValues[CSL1("devicemodel")] = unknown;
-			fValues[CSL1("manufacturer")] = unknown;
-		}
-
-		fValues[CSL1("devicetype")] = unknown;
-
-		KPILOT_DELETE(device);
-		keepParts.append(CSL1("hardware"));
-	} else removeParts.append(CSL1("hardware"));
-	TQTimer::singleShot(0, this, TQT_SLOT(userInfo()));
-}
-
-void SysInfoConduit::userInfo()
-{
-	FUNCTIONSETUP;
-	if (fUserInfo)
-	{
-		/* Retrieve values for
-		 * - #username#
-		 * - #uid#
-		 */
-		KPilotUser user=fHandle->getPilotUser();
-		fValues[CSL1("username")] = user.name();
-		if (user.passwordLength()>0)
-		{
-			fValues[CSL1("pw")] = i18n("Password set");
-		}
-		else
-		{
-			fValues[CSL1("pw")] = i18n("No password set");
-		}
-		fValues[CSL1("uid")] = TQString::number(user.data()->userID);
-		fValues[CSL1("viewerid")] = TQString::number(user.data()->viewerID);
-		keepParts.append(CSL1("user"));
-	}
-	else
-	{
-		removeParts.append(CSL1("user"));
-	}
-	TQTimer::singleShot(0, this, TQT_SLOT(memoryInfo()));
-}
-
-void SysInfoConduit::memoryInfo()
-{
-	FUNCTIONSETUP;
-	if (fMemoryInfo) {
-		/* Retrieve values for
-		 * - #rom#
-		 * - #totalmem#
-		 * - #freemem#
-		 */
-		const KPilotCard *device = fHandle->getCardInfo();
-		if (device)
-		{
-			fValues[CSL1("rom")] =  TQString::number(device->getRomSize()/1024);
-			fValues[CSL1("totalmem")] =  TQString::number(device->getRamSize()/1024);
-			fValues[CSL1("freemem")] =  TQString::number(device->getRamFree()/1024);
-		}
-		keepParts.append(CSL1("memory"));
-	} else removeParts.append(CSL1("memory"));
-	TQTimer::singleShot(0, this, TQT_SLOT(storageInfo()));
-}
-
-void SysInfoConduit::storageInfo()
-{
-	FUNCTIONSETUP;
-	if (fStorageInfo) {
-		/* Retrieve values for
-		 * - $cards$
-		 */
-		const KPilotCard *device = fHandle->getCardInfo(1);
-		if (device) {
-			fValues[CSL1("cards")] = CSL1("%1 (%2, %3 kB of %3 kB free)")
-				.arg(TQString::fromLatin1(device->getCardName()))
-				.arg(TQString::fromLatin1(device->getCardManufacturer()))
-				.arg(device->getRamFree()/1024)
-				.arg(device->getRamSize()/1024);
-			KPILOT_DELETE(device);
-		} else {
-			fValues[CSL1("cards")] = i18n("No Cards available via pilot-link");
-		}
-		keepParts.append(CSL1("storage"));
-	} else removeParts.append(CSL1("storage"));
-	TQTimer::singleShot(0, this, TQT_SLOT(dbListInfo()));
-}
-
-void SysInfoConduit::dbListInfo()
-{
-	FUNCTIONSETUP;
-	if (fDBList) {
-		/* Retrieve values for
-		 * - #dblist(structure)#
-		 */
-		dblist=deviceLink()->getDBList();
-		keepParts.append(CSL1("dblist"));
-	} else removeParts.append(CSL1("dblist"));
-	TQTimer::singleShot(0, this, TQT_SLOT(recNumberInfo()));
-}
-
-void SysInfoConduit::recNumberInfo()
-{
-	FUNCTIONSETUP;
-	if (fRecordNumber) {
-		/* Retrieve values for
-		 * - #addresses#
-		 * - #events#
-		 * - #todos#
-		 * - #memos#
-		 */
-		PilotDatabase *fDatabase = 0L;
-		TQString ERROR = CSL1("ERROR");
-		fValues[CSL1("addresses")] = ERROR;
-		fValues[CSL1("events")] = ERROR;
-		fValues[CSL1("todos")] = ERROR;
-		fValues[CSL1("memos")] = ERROR;
-		fDatabase = deviceLink()->database(CSL1("AddressDB"));
-		if (fDatabase) {
-			fValues[CSL1("addresses")] = TQString::number(fDatabase->recordCount());
-			KPILOT_DELETE(fDatabase);
-		}
-		fDatabase = deviceLink()->database(CSL1("DatebookDB"));
-		if (fDatabase) {
-			fValues[CSL1("events")] = TQString::number(fDatabase->recordCount());
-			KPILOT_DELETE(fDatabase);
-		}
-		fDatabase = deviceLink()->database(CSL1("ToDoDB"));
-		if (fDatabase) {
-			fValues[CSL1("todos")] = TQString::number(fDatabase->recordCount());
-			KPILOT_DELETE(fDatabase);
-		}
-		fDatabase = deviceLink()->database(CSL1("MemoDB"));
-		if (fDatabase) {
-			fValues[CSL1("memos")] = TQString::number(fDatabase->recordCount());
-			KPILOT_DELETE(fDatabase);
-		}
-		keepParts.append(CSL1("records"));
-	} else removeParts.append(CSL1("records"));
-	TQTimer::singleShot(0, this, TQT_SLOT(syncInfo()));
-}
-
-void SysInfoConduit::syncInfo()
-{
-	FUNCTIONSETUP;
-	if (fSyncInfo) {
-		/* Retrieve values for
-		 * - #lastsync#
-		 * - #lastsuccsync#
-		 * - #lastsyncpc#
-		 */
-		KPilotUser user = deviceLink()->getPilotUser();
-		time_t lastsync = user.getLastSyncDate();
-		TQDateTime qlastsync;
-		qlastsync.setTime_t(lastsync);
-		fValues[CSL1("lastsync")] = qlastsync.toString(Qt::LocalDate);
-		lastsync = user.getLastSuccessfulSyncDate();
-		qlastsync.setTime_t(lastsync);
-		fValues[CSL1("lastsuccsync")] = qlastsync.toString(Qt::LocalDate);
-		fValues[CSL1("lastsyncpc")] = TQString::number(user.getLastSyncPC());
-		keepParts.append(CSL1("sync"));
-	} else removeParts.append(CSL1("sync"));
-	TQTimer::singleShot(0, this, TQT_SLOT(pcVersionInfo()));
-}
-
-void SysInfoConduit::pcVersionInfo()
-{
-	FUNCTIONSETUP;
-	if (fKDEVersion) {
-		/* Retrieve values for
-		 * - #os#
-		 * - #qt#
-		 * - #kde#
-		 * - #kpilot#
-		 * - #pilotlink#
-		 */
-		fValues[CSL1("kpilot")] = TQString::fromLatin1(KPILOT_VERSION);
-		fValues[CSL1("kde")] = i18n("unknown");
-		fValues[CSL1("qt")] = i18n("unknown");
-		fValues[CSL1("os")] = i18n("unknown");
-		fValues[CSL1("hostname")] = i18n("unknown");
-		struct utsname name;
-		if (uname (&name) >= 0) {
-			fValues[CSL1("os")] = CSL1("%1 %3, %5")
-				.arg(TQString::fromLatin1(name.sysname))
-				.arg(TQString::fromLatin1(name.release))
-				.arg(TQString::fromLatin1(name.machine));
-			fValues[CSL1("hostname")] = CSL1("%2").arg(TQString::fromLatin1(name.nodename));
-		}
-#ifdef KDE_VERSION_STRING
-		fValues[CSL1("kde")] = TQString::fromLatin1(KDE_VERSION_STRING);
-#endif
-#ifdef QT_VERSION_STR
-		fValues[CSL1("qt")] = TQString::fromLatin1(QT_VERSION_STR);
-#endif
-		fValues[CSL1("pilotlink")] = CSL1("%1.%2.%3%4")
-			.arg(PILOT_LINK_VERSION)
-			.arg(PILOT_LINK_MAJOR)
-			.arg(PILOT_LINK_MINOR)
-#ifdef PILOT_LINK_PATCH
-			.arg(TQString::fromLatin1(PILOT_LINK_PATCH));
-#else
-			.arg(TQString());
-#endif
-		keepParts.append(CSL1("pcversion"));
-	} else removeParts.append(CSL1("pcversion"));
-	TQTimer::singleShot(0, this, TQT_SLOT(palmVersionInfo()));
-}
-
-void SysInfoConduit::palmVersionInfo()
-{
-	FUNCTIONSETUP;
-	if (fPalmOSVersion) {
-		/* Retrieve values for
-		 * - #palmos#
-		 */
-/*		fValues["palmos"] = TQString("PalmOS %1.%2 (compat %3.%4)")
-			.arg(fHandle->getSysInfo()->getMajorVersion())
-			.arg(fHandle->getSysInfo()->getMinorVersion())
-			.arg(fHandle->getSysInfo()->getCompatMajorVersion())
-			.arg(fHandle->getSysInfo()->getCompatMinorVersion());*/
-		KPilotSysInfo i = deviceLink()->getSysInfo();
-		fValues[CSL1("palmos")] = CSL1("PalmOS %1.%2").arg(i.getMajorVersion()).arg(i.getMinorVersion());
-
-		keepParts.append(CSL1("palmversion"));
-	} else removeParts.append(CSL1("palmversion"));
-	TQTimer::singleShot(0, this, TQT_SLOT(debugInfo()));
-}
-
-void SysInfoConduit::debugInfo()
-{
-	FUNCTIONSETUP;
-	if (fDebugInfo) {
-		/* Retrieve values for
-		 * - #debug#
-		 */
-		fValues[CSL1("debug")] = i18n("No debug data");
-		keepParts.append(CSL1("debug"));
-	} else removeParts.append(CSL1("debug"));
-	TQTimer::singleShot(0, this, TQT_SLOT(writeFile()));
-}
-
-void SysInfoConduit::writeFile()
-{
-	FUNCTIONSETUP;
-
-	fValues[CSL1("date")] = TQDateTime::currentDateTime().toString(Qt::LocalDate);
-
-	TQString output;
-	// Open the template file
-	TQString templatefile;
-	switch(fOutputType)
-	{
-		case eOutputText:
-			templatefile=locate("data", CSL1("kpilot/sysinfoconduit/Template.txt"));
-			break;
-		case eOutputTemplate:
-			templatefile=fTemplateFile;
-			break;
-		case eOutputHTML:
-		default:
-			templatefile=locate("data", CSL1("kpilot/sysinfoconduit/Template.html"));
-			break;
-	}
-
-	// Read in the template, close the file
-	bool loaded=false;
-	if (!templatefile.isEmpty()){
-#ifdef DEBUG
-		DEBUGKPILOT<<"Loading template file "<<templatefile<<endl;
-#endif
-		TQFile infile(templatefile);
-		if (infile.open(IO_ReadOnly)) {
-			TQTextStream instream(&infile);
-			output = instream.read();
-			infile.close();
-			loaded=true;
-		}
-	}
-
-	if (!loaded)
-	{
-		WARNINGKPILOT << "Loading template file " << templatefile
-			<<" failed. Using default template instead." << endl;
-		output=defaultpage;
-	}
-
-	// Remove all parts not extracted
-	for ( TQStringList::Iterator it = removeParts.begin(); it != removeParts.end(); ++it ) {
-		TQRegExp re(CSL1("<!--#if%1#.*#endif%1#-->").arg(*it).arg(*it));
-		re.setMinimal(true);
-		output.remove(re);
-	}
-	for ( TQStringList::Iterator it = keepParts.begin(); it != keepParts.end(); ++it ) {
-		TQRegExp re(CSL1("<!--#if%1#(.*)#endif%1#-->").arg(*it).arg(*it));
-		re.setMinimal(true);
-		output.replace(re, CSL1("\\1"));
-	}
-
-	// Do a loop through all keys in fValues
-	TQMap<TQString,TQString>::Iterator it;
-	for ( it = fValues.begin(); it != fValues.end(); ++it ) {
-		output.replace(CSL1("#%1#").arg(it.key()), it.data());
-	}
-
-	// Insert the list of databases
-	TQRegExp re(CSL1("#dblist\\[(.*)\\]#"));
-	re.setMinimal(true);
-	while (re.search(output)>=0){
-		TQString dbstring;
-		TQString subpatt=re.cap(1);
-		for (KPilotLink::DBInfoList::ConstIterator i = dblist.begin(); i != dblist.end(); ++i ) {
-			DBInfo dbi = *i;
-			TQString newpatt(subpatt);
-			char tmpchr[5];
-			::memset(&tmpchr[0], 0, 5);
-			/* Patterns for the dblist argument:
-			 * %0 .. Database name
-			 * %1 .. type
-			 * %2 .. creator
-			 * %3 .. index
-			 * %4 .. flags
-			 * %5 .. miscFlags
-			 * %6 .. version
-			 * %7 .. createDate
-			 * %8 .. modifyDate
-			 * %9 .. backupDate
-			 */
-			newpatt.replace(CSL1("%0"), TQString::fromLatin1(dbi.name));
-			set_long(&tmpchr[0],dbi.type);
-			newpatt.replace(CSL1("%1"), TQString::fromLatin1(tmpchr));
-			set_long(&tmpchr[0],dbi.creator);
-			newpatt.replace(CSL1("%2"), TQString::fromLatin1(tmpchr));
-			newpatt.replace(CSL1("%3"), TQString::number(dbi.index));
-			newpatt.replace(CSL1("%4"), TQString::number(dbi.flags));
-			newpatt.replace(CSL1("%5"), TQString::number(dbi.miscFlags));
-			newpatt.replace(CSL1("%6"), TQString::number(dbi.version));
-			TQDateTime tm;
-			tm.setTime_t(dbi.createDate);
-			newpatt.replace(CSL1("%7"), tm.toString(Qt::LocalDate));
-			tm.setTime_t(dbi.modifyDate);
-			newpatt.replace(CSL1("%8"), tm.toString(Qt::LocalDate));
-			tm.setTime_t(dbi.backupDate);
-			newpatt.replace(CSL1("%9"), tm.toString(Qt::LocalDate));
-
-			dbstring.append(newpatt);
-		}
-		// Now, just replace the whole found pattern by the string we just constructed.
-		output.replace(re.cap(0), dbstring);
-	}
-
-	// Write out the result
-	TQFile outfile(fOutputFile);
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Writing file <" << fOutputFile << ">" << endl;
-#endif
-	if (fOutputFile.isEmpty() || (!outfile.open(IO_WriteOnly)) ) {
-		TQFileInfo fi(TQDir::home(), CSL1("KPilotSysInfo.")+TQFileInfo(templatefile).extension() );
-		fOutputFile=fi.absFilePath();
-		WARNINGKPILOT << "Unable to open output file, using " << fOutputFile << " instead." << endl;
-		emit logMessage(i18n("Unable to open output file, using %1 instead.").arg(fOutputFile));
-		outfile.setName(fOutputFile);
-		if (!outfile.open(IO_WriteOnly)) {
-			WARNINGKPILOT<< "Unable to open " << fOutputFile << endl;
-			emit logError(i18n("Unable to open %1").arg(fOutputFile));
-			TQTimer::singleShot(0, this, TQT_SLOT(cleanup()));
-			return;
-		}
-	}
-
-	// Finally, write the actual text out to the file.
-	TQTextStream outstream(&outfile);
-	outstream<<output;
-	outfile.close();
-
-	emit logMessage(i18n("Handheld system information written to the file %1").arg(fOutputFile));
-	TQTimer::singleShot(0, this, TQT_SLOT(cleanup()));
-}
-
-void SysInfoConduit::cleanup()
-{
-	FUNCTIONSETUP;
-	// Nothing to clean up so far (Do I have memory leaks somewhere?)
-	emit syncDone(this);
-}
diff --git a/kpilot/conduits/sysinfoconduit/sysinfo-conduit.h b/kpilot/conduits/sysinfoconduit/sysinfo-conduit.h
deleted file mode 100644
index 803bc737..00000000
--- a/kpilot/conduits/sysinfoconduit/sysinfo-conduit.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifndef _SysInfo_CONDUIT_H
-#define _SysInfo_CONDUIT_H
-/* sysinfo-conduit.h                           KPilot
-**
-** Copyright (C) 2003 by Reinhold Kainhofer
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include <plugin.h>
-
-class SysInfoConduit : public ConduitAction
-{
-	Q_OBJECT
-public:
-	SysInfoConduit(
-		KPilotLink *o,
-		const char *n = 0L,
-		const TQStringList &a = TQStringList() );
-	virtual ~SysInfoConduit();
-	virtual bool exec();
-
-public slots:
-	void hardwareInfo();
-	void userInfo();
-	void memoryInfo();
-	void storageInfo();
-	void dbListInfo();
-	void recNumberInfo();
-	void syncInfo();
-	void pcVersionInfo();
-	void palmVersionInfo();
-	void debugInfo();
-	void writeFile();
-	void cleanup();
-
-protected:
-	void readConfig();
-private:
-	TQMap<TQString,TQString> fValues;
-
-	bool fHardwareInfo, fUserInfo, fMemoryInfo, fStorageInfo,
-		fDBList, fRecordNumber, fSyncInfo,
-		fKDEVersion, fPalmOSVersion, fDebugInfo;
-	TQString fOutputFile, fTemplateFile;
-	enum eOutputTypeEnum {
-		eOutputHTML=0,
-		eOutputText,
-		eOutputTemplate
-	} fOutputType;
-
-	KPilotLink::DBInfoList dblist;
-	TQStringList removeParts;
-	TQStringList keepParts;
-	static const TQString defaultpage;
-} ;
-
-#endif
diff --git a/kpilot/conduits/sysinfoconduit/sysinfo-factory.cc b/kpilot/conduits/sysinfoconduit/sysinfo-factory.cc
deleted file mode 100644
index d03dc0b0..00000000
--- a/kpilot/conduits/sysinfoconduit/sysinfo-factory.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-/* SysInfo-factory.cc                      KPilot
-**
-** Copyright (C) 2003 by Reinhold Kainhofer
-**
-** This file defines the factory for the SysInfo-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-#include "pluginfactory.h"
-
-#include "sysinfo-conduit.h"
-#include "sysinfo-setup.h"
-
-extern "C"
-{
-
-void *init_conduit_sysinfo()
-{
-	return new ConduitFactory<SysInfoWidgetConfig,SysInfoConduit>;
-}
-
-}
diff --git a/kpilot/conduits/sysinfoconduit/sysinfo-factory.h b/kpilot/conduits/sysinfoconduit/sysinfo-factory.h
deleted file mode 100644
index 66ae5ae3..00000000
--- a/kpilot/conduits/sysinfoconduit/sysinfo-factory.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef _SYSINFO_FACTORY_H
-#define _SYSINFO_FACTORY_H
-/* SysInfo-factory.h                       KPilot
-**
-** Copyright (C) 2003 by Reinhold Kainhofer
-**
-** This file defines the factory for the SysInfo-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-extern "C"
-{
-	void *init_libsysinfoconduit();
-}
-
-#endif
diff --git a/kpilot/conduits/sysinfoconduit/sysinfo-setup.cc b/kpilot/conduits/sysinfoconduit/sysinfo-setup.cc
deleted file mode 100644
index 271db659..00000000
--- a/kpilot/conduits/sysinfoconduit/sysinfo-setup.cc
+++ /dev/null
@@ -1,198 +0,0 @@
-/* SysInfo-setup.cc                      KPilot
-**
-** Copyright (C) 2003 by Reinhold Kainhofer
-**
-** This file defines the setup dialog for the SysInfo-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <tqtabwidget.h>
-#include <tqradiobutton.h>
-#include <tqcheckbox.h>
-#include <tqbuttongroup.h>
-#include <tqlistview.h>
-
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kurlrequester.h>
-
-#include "sysinfo-setup_dialog.h"
-
-#include "sysinfo-factory.h"
-#include "sysinfo-setup.h"
-#include "sysinfoSettings.h"
-
-
-typedef struct { const char *name; bool (*accessor)(); void (*mutator)(bool); } sysinfoEntry_t;
-
-const sysinfoEntry_t sysinfoEntries[] =
-{
-	{ I18N_NOOP("HardwareInfo"), SysinfoSettings::hardwareInfo, SysinfoSettings::setHardwareInfo },
-	{ I18N_NOOP("UserInfo"), SysinfoSettings::userInfo, SysinfoSettings::setUserInfo },
-	{ I18N_NOOP("MemoryInfo"), SysinfoSettings::memoryInfo, SysinfoSettings::setMemoryInfo },
-	{ I18N_NOOP("StorageInfo"), SysinfoSettings::storageInfo, SysinfoSettings::setStorageInfo },
-	{ I18N_NOOP("DatabaseList"), SysinfoSettings::databaseList, SysinfoSettings::setDatabaseList },
-	{ I18N_NOOP("RecordNumbers"), SysinfoSettings::recordNumbers, SysinfoSettings::setRecordNumbers},
-	{ I18N_NOOP("SyncInfo"), SysinfoSettings::syncInfo, SysinfoSettings::setSyncInfo },
-	{ I18N_NOOP("KDEVersion"), SysinfoSettings::kDEVersion, SysinfoSettings::setKDEVersion },
-	{ I18N_NOOP("PalmOSVersion"), SysinfoSettings::palmOSVersion, SysinfoSettings::setPalmOSVersion },
-	{ I18N_NOOP("DebugInformation"), SysinfoSettings::debugInformation, SysinfoSettings::setDebugInformation },
-	{ 0L, 0L, 0L }
-} ;
-
-
-/*
-** The QCheckListItems used in the list of parts to print have
-** several text fields with special meanings.
-**    0: The text displayed in the list.
-**    1: The index of the item in the sysinfoEntries array.
-**    2: This string is empty if the part was originally not checked,
-**       and non-empty (probably "1") if the part was originally checked.
-**       This is used to detect changes in the configuration.
-** We introduce some defines for these numbers.
-*/
-
-#define PART_NAME	(0)
-#define PART_KEY	(1)
-#define PART_SETTING	(2)
-
-/*
-** This is a convenience define to update an item's "original setting".
-*/
-#define updateSetting(i) { TQCheckListItem *ubbu=(i); \
-	ubbu->setText(PART_SETTING,(ubbu->isOn() ? CSL1("1") : TQString::null)); }
-
-
-SysInfoWidgetConfig::SysInfoWidgetConfig(TQWidget *w, const char *n) :
-	ConduitConfigBase(w,n),
-	fConfigWidget(new SysInfoWidget(w))
-{
-	FUNCTIONSETUP;
-
-	KAboutData *fAbout = new KAboutData("SysInfoConduit",
-		I18N_NOOP("KPilot System Information conduit"),
-		KPILOT_VERSION,
-		I18N_NOOP("Retrieves System, Hardware, and User Info from the Handheld and stores them to a file."),
-		KAboutData::License_GPL,
-		"(C) 2003, Reinhold Kainhofer");
-	fAbout->addAuthor("Reinhold Kainhofer",
-		I18N_NOOP("Primary Author"), "reinhold@kainhofer.com", "http://reinhold.kainhofer.com/");
-
-	ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,fAbout);
-	fWidget=fConfigWidget;
-
-	TQObject::connect(fConfigWidget->fOutputFile,TQT_SIGNAL(textChanged(const TQString&)),
-		this,TQT_SLOT(modified()));
-	TQObject::connect(fConfigWidget->fTemplateFile,TQT_SIGNAL(textChanged(const TQString&)),
-		this,TQT_SLOT(modified()));
-	TQObject::connect(fConfigWidget->fOutputType,TQT_SIGNAL(clicked(int)),
-		this,TQT_SLOT(modified()));
-	fConduitName=i18n("System Information");
-}
-
-void SysInfoWidgetConfig::commit()
-{
-	FUNCTIONSETUP;
-
-	SysinfoSettings::setOutputFile(
-		fConfigWidget->fOutputFile->url() );
-	SysinfoSettings::setTemplateFile(
-		fConfigWidget->fTemplateFile->url() );
-	SysinfoSettings::setOutputFormat(
-		fConfigWidget->fOutputType->id(fConfigWidget->fOutputType->selected()));
-
-	TQListViewItem *i = fConfigWidget->fPartsList->firstChild();
-	TQCheckListItem *ci = dynamic_cast<TQCheckListItem *>(i);
-	while(ci)
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": Saving " << ci->text(PART_NAME)
-			<< (ci->isOn() ? " on" : " off") << endl;
-#endif
-		int index=ci->text(PART_KEY).toInt();
-		if (0<=index && index<=10)
-		{
-			const sysinfoEntry_t *p = sysinfoEntries+index;
-			p->mutator(ci->isOn());
-		}
-		updateSetting(ci);
-		i=i->nextSibling();
-		ci = dynamic_cast<TQCheckListItem *>(i);
-	}
-	SysinfoSettings::self()->writeConfig();
-	unmodified();
-}
-
-void SysInfoWidgetConfig::load()
-{
-	FUNCTIONSETUP;
-	SysinfoSettings::self()->readConfig();
-
-	const sysinfoEntry_t *p = sysinfoEntries;
-	TQCheckListItem *i = 0L;
-	while (p && p->name)
-	{
-		i = new TQCheckListItem(fConfigWidget->fPartsList,i18n(p->name),TQCheckListItem::CheckBox);
-		// by default let the sysinfo conduit write out all available information
-		i->setOn( p->accessor() );
-		i->setText(PART_KEY, TQString::number(p-sysinfoEntries)); // store index there
-		updateSetting(i);
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": Loaded " << p->name
-			<< (i->isOn() ? " on" : " off") << endl;
-#endif
-
-		p++;
-	}
-  fConfigWidget->fOutputFile->setURL( SysinfoSettings::outputFile() );
-	fConfigWidget->fTemplateFile->setURL( SysinfoSettings::templateFile() );
-	fConfigWidget->fOutputType->setButton( SysinfoSettings::outputFormat() );
-	unmodified();
-}
-
-/* virtual */ bool SysInfoWidgetConfig::isModified() const
-{
-	FUNCTIONSETUP;
-	if (fModified) return true;
-
-	TQListViewItem *i = fConfigWidget->fPartsList->firstChild();
-	TQCheckListItem *ci = dynamic_cast<TQCheckListItem *>(i);
-
-	while(ci)
-	{
-		bool current = ci->isOn();
-		bool original = !ci->text(PART_SETTING).isEmpty();
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": Checking " << ci->text(PART_KEY)
-			<<  " was " << (original ? " on" : " off")
-			<< " now " << (current ? " on" : " off") << endl;
-#endif
-
-		if (current!=original) return true;
-		i=i->nextSibling();
-		ci = dynamic_cast<TQCheckListItem *>(i);
-	}
-	return false;
-}
diff --git a/kpilot/conduits/sysinfoconduit/sysinfo-setup.h b/kpilot/conduits/sysinfoconduit/sysinfo-setup.h
deleted file mode 100644
index 400dea3c..00000000
--- a/kpilot/conduits/sysinfoconduit/sysinfo-setup.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef _SysInfo_SysInfo_SETUP_H
-#define _SysInfo_SysInfo_SETUP_H
-/* sysinfo-setup.h                       KPilot
-**
-** Copyright (C) 2003 by Reinhold Kainhofer
-**
-** This file defines the widget and behavior for the config dialog
-** of the KNotes conduit.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "plugin.h"
-
-class SysInfoWidget;
-
-class SysInfoWidgetConfig : public ConduitConfigBase
-{
-public:
-	SysInfoWidgetConfig(TQWidget *parent, const char *);
-	virtual void commit();
-	virtual void load();
-	virtual bool isModified() const;
-protected:
-	SysInfoWidget *fConfigWidget;
-} ;
-
-#endif
diff --git a/kpilot/conduits/sysinfoconduit/sysinfo-setup_dialog.ui b/kpilot/conduits/sysinfoconduit/sysinfo-setup_dialog.ui
deleted file mode 100644
index e4502bb1..00000000
--- a/kpilot/conduits/sysinfoconduit/sysinfo-setup_dialog.ui
+++ /dev/null
@@ -1,214 +0,0 @@
-<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
-<class>SysInfoWidget</class>
-<author>Reinhold Kainhofer</author>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>Form2</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>330</width>
-            <height>232</height>
-        </rect>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QTabWidget" row="0" column="0">
-            <property name="name">
-                <cstring>tabWidget</cstring>
-            </property>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>tab</cstring>
-                </property>
-                <attribute name="title">
-                    <string>General</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <spacer row="3" column="1">
-                        <property name="name">
-                            <cstring>spacer3</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>20</width>
-                                <height>51</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="KURLRequester" row="0" column="1">
-                        <property name="name">
-                            <cstring>fOutputFile</cstring>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Enter here, or select by clicking the file picker button, the location and file name of the output file used to store the handheld's system information.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="0" column="0">
-                        <property name="name">
-                            <cstring>textLabel4</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Output &amp;file:</string>
-                        </property>
-                        <property name="buddy" stdset="0">
-                            <cstring>fOutputFile</cstring>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Enter here, or select by clicking the file picker button, the location and file name of the output file used to store the handheld's system information.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>fOutputType</cstring>
-                        </property>
-                        <property name="title">
-                            <string>Type of Output</string>
-                        </property>
-                        <grid>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
-                                <property name="name">
-                                    <cstring>radioButton3</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>&amp;HTML</string>
-                                </property>
-                                <property name="checked">
-                                    <bool>true</bool>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Select this option to output the system information data as a HTML document.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2">
-                                <property name="name">
-                                    <cstring>radioButton4</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Te&amp;xt file</string>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Select this option to output the system information data as a text document.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="KURLRequester" row="2" column="1">
-                                <property name="name">
-                                    <cstring>fTemplateFile</cstring>
-                                </property>
-                                <property name="enabled">
-                                    <bool>false</bool>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Enter here, or select by clicking on the file picker button, the location of the template to be used if you select the Custom template option.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="QRadioButton" row="2" column="0">
-                                <property name="name">
-                                    <cstring>radioButton5</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>&amp;Custom template:</string>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Select this option to output the system information data as defined by a custom template. Enter the location of the template in the edit box, or select it clicking on the file picker button.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                        </grid>
-                    </widget>
-                </grid>
-            </widget>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>tab</cstring>
-                </property>
-                <attribute name="title">
-                    <string>Parts Included</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <spacer row="1" column="0">
-                        <property name="name">
-                            <cstring>spacer4</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>21</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QListView" row="0" column="0">
-                        <column>
-                            <property name="text">
-                                <string>Output Type</string>
-                            </property>
-                            <property name="clickable">
-                                <bool>true</bool>
-                            </property>
-                            <property name="resizable">
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <property name="name">
-                            <cstring>fPartsList</cstring>
-                        </property>
-                        <property name="resizeMode">
-                            <enum>LastColumn</enum>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Check on this list the types of information about your system and handheld you want to display in the output file.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                </grid>
-            </widget>
-        </widget>
-    </grid>
-</widget>
-<connections>
-    <connection>
-        <sender>radioButton5</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>fTemplateFile</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-</connections>
-<tabstops>
-    <tabstop>tabWidget</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-<includes>
-    <include location="global" impldecl="in implementation">kurlrequester.h</include>
-    <include location="global" impldecl="in implementation">klineedit.h</include>
-    <include location="global" impldecl="in implementation">kpushbutton.h</include>
-</includes>
-</UI>
diff --git a/kpilot/conduits/sysinfoconduit/sysinfoSettings.kcfgc b/kpilot/conduits/sysinfoconduit/sysinfoSettings.kcfgc
deleted file mode 100644
index 09337f30..00000000
--- a/kpilot/conduits/sysinfoconduit/sysinfoSettings.kcfgc
+++ /dev/null
@@ -1,7 +0,0 @@
-File=sysinfoconduit.kcfg
-ClassName=SysinfoSettings
-Singleton=true
-ItemAccessors=true
-Mutators=true
-GlobalEnums=true
-SetUserTexts=true
diff --git a/kpilot/conduits/sysinfoconduit/sysinfo_conduit.desktop b/kpilot/conduits/sysinfoconduit/sysinfo_conduit.desktop
deleted file mode 100644
index f31bd065..00000000
--- a/kpilot/conduits/sysinfoconduit/sysinfo_conduit.desktop
+++ /dev/null
@@ -1,108 +0,0 @@
-[Desktop Entry]
-Type=Service
-Comment=This conduit writes information about your handheld and the sync to a file.
-Comment[af]=Hierdie pad skryf informasie aangaande die draagbare toestel en sinkronisasie na 'n lêer.
-Comment[bg]=Запи� на информаци�та отно�но мобилното у�трой�тво във файл
-Comment[bs]=Ovaj conduit ispisuje informacije o ru�nom ra�unaru i sinhronizuje ih sa datotekom.
-Comment[ca]=Aquest conducte escriu informació a un fitxer a sobre de la vostra agenda electrònica i la sincronització.
-Comment[cs]=Toto propojení zapisuje informace o vašem handheldu a synchronizaci do souboru.
-Comment[cy]=Mae'r cwndid yma yn ysgrifennu gwybodaeth ynglyn â'ch llawiadur a'r cydamseriad i ffeil.
-Comment[da]=Denne kanal skriver information om din håndholdte og synkroniseringen til en fil.
-Comment[de]=Schreibt Daten zum Taschencomputer und den Abgleich in eine Datei
-Comment[el]=Αυτός ο σ�νδεσμος γ�άφει πλη�οφο�ίες σχετικά με τον υπολογιστή παλάμης σας και το συγχ�ονισμό π�ος ένα α�χείο.
-Comment[es]=Este conducto escribe la información subre su agenda electrónica y la sincronización a un archivo.
-Comment[et]=See kanal salvestab info pihuarvuti kohta failina.
-Comment[eu]=Kanal honek zure agenda elektronikoari buruzko informazioa eta sinkronizazio fitxategi batean gordetzen ditu.
-Comment[fa]=این لوله، اطلاعات دربارۀ دستی شما و ترکیب‌دهی به پرونده را می‌نویسد.
-Comment[fi]=Tämä yhdyskäytävä kirjoittaa tietoja taskutietokoneelta ja synkronoi ne tiedostoon.
-Comment[fr]=Ce canal écrit des informations sur votre périphérique et la synchronisation dans un fichier.
-Comment[fy]=Dit conduit bewarret ynformaasje oer jo handheld en syngronosaasje yn in triem.
-Comment[gl]=Este conducto escribe a información sobre o seu aparello portátil e a sincronización a un ficheiro.
-Comment[hi]=यह कन�ड�यूइट आपके हैंण�डहेल�ड के बारे में जानकारी लिखता है तथा �क फ़ाइल में सिंक करता है.
-Comment[hu]=Ezzel a csatolóval fájlba lehet kiíratni a kéziszámítógép és a szinkronizálás jellemzőit
-Comment[is]=Þessi rás skrifar upplýsingar um lófatölvuna þína og samstillinguna í skrá.
-Comment[it]=Questo conduit scrive in un file informazioni sul tuo palmare.
-Comment[ja]=��コンジット������ンドヘルド�情報を書�出��ファイル��期���。
-Comment[kk]=Қалта құрылғыңыз туралы мәліметті файла жазу арна�ы.
-Comment[km]=បំពង់​ន�ះ​សរស�រ​ព��៌មាន​អំពី​ឧបករណ�​យួរដៃ​របស់​អ្នក និង​ការ​ធ្វើ​សមកាលកម្ម ទៅ​ឯកសារ​មួយ ។
-Comment[lt]=Šis kanalas įrašo informaciją apie delninuką ir sinchronizavimą į bylą.
-Comment[ms]=Saluran ini menulis maklumat tentang komputer telapak dan segerakan ke fail.
-Comment[nb]=Denne kanalen skriver informasjon om PDA-en og synkroniseringen til en fil.
-Comment[nds]=De Kanaal schrifft Informatschonen över den Handreekner un de Synkroniseren na en Datei.
-Comment[ne]=यो कन�ड�य�टले ह�यान�डहेल�ड बारेमा सूचना लेख�दछ र फाइलमा सिन�क गर�दछ ।
-Comment[nl]=Dit conduit slaat informatie over uw handheld en de synchronisatie op in een bestand.
-Comment[nn]=Denne koplinga skriv informasjon om den handheldte eininga di og synkroniseringa til ei fil.
-Comment[pl]=Ten Å‚Ä…cznik zapisuje informacje o twoim palmtopie i przebiegu synchronizacji do pliku.
-Comment[pt]=Esta conduta escreve informações sobre o seu dispositivo e a sincronização para um ficheiro.
-Comment[pt_BR]=Este conduíte escreve informação sobre o seu handheld e a sincronização em um arquivo.
-Comment[ru]=Канал передачи �и�темной информации � КПК и запи�и в файл.
-Comment[sk]=Táto spojka zobrazuje informácie o vašom prenosnom zariadení a ukladá ich do súboru.
-Comment[sl]=Ta veznik zapiše podatke o vašem ro�nem ra�unalniku in usklajevanju v datoteko.
-Comment[sr]=Овај провод запи�ује информације о вашем ручном рачунару и �инхронизује �а фајлом.
-Comment[sr@Latn]=Ovaj provod zapisuje informacije o vašem ru�nom ra�unaru i sinhronizuje sa fajlom.
-Comment[sv]=Den här kanalen skriver information om handdatorn och synkroniseringen till en fil.
-Comment[ta]=இந�த காப�ப�க� க�ழாய� உங�கள� கையேட�டைப� பற�றிய தகவல�களைய�ம� ஒத�திசைவைய�ம� கோப�ப�க�க� எழ�த�கிறத�
-Comment[tg]=Канали таҳвили иттилооти �и�темавӣ аз Pilot ва қайдкунӣ ба файл
-Comment[tr]=Bu bileşen, el bilgisayarınızın bilgilerini bir dosyaya yazar.
-Comment[uk]=Цей акведук запи�ує інформацію про кишеньковий при�трій і �инхронізацію у файл.
-Comment[zh_CN]=此管�写入您手�设备的信�，并�步至一文件。
-Comment[zh_TW]=此軟體將您的 handheld 資訊寫入檔案。
-Name=System Information
-Name[af]=Stelsel informasie
-Name[ar]=معلومات عن النظام
-Name[be]=Сы�т�мна� інфармацы�
-Name[bg]=Си�темна информаци�
-Name[br]=Titouroù diwar-benn ar reizhiad
-Name[bs]=Sistemske informacije
-Name[ca]=Sistema d'informació
-Name[cs]=Informace o systému
-Name[cy]=Gwybodaeth Gysawd
-Name[da]=Systeminformation
-Name[de]=System-Information
-Name[el]=Πλη�οφο�ίες συστήματος
-Name[eo]=Sisteminformoj
-Name[es]=Información del sistema
-Name[et]=Süsteemi info
-Name[eu]=Sistemaren informazioa
-Name[fa]=اطلاعات سیستم
-Name[fi]=Järjestelmätiedot
-Name[fr]=Informations sur le système
-Name[fy]=Systeemynformaasje
-Name[ga]=Faisnéis Córais
-Name[gl]=Información do Sistema
-Name[hi]=तंत�र जानकारी
-Name[hu]=Rendszerinformáció
-Name[is]=Kerfisupplýsingar
-Name[it]=Informazioni di sistema
-Name[ja]=システム情報
-Name[kk]=Жүйелік мәлімет
-Name[km]=ព��៌មាន​អំពី​ប្រព�ន្ធ
-Name[lt]=Sistemos informacija
-Name[mk]=Информации за �и�темот
-Name[ms]=Maklumat Sistem
-Name[nb]=Systeminformasjon
-Name[nds]=Systeem-Informatschoon
-Name[ne]=प�रणाली सूचना
-Name[nl]=Systeeminformatie
-Name[nn]=Systeminformasjon
-Name[pl]=Informacja systemowa
-Name[pt]=Informação do Sistema
-Name[pt_BR]=Informação do Sistema
-Name[ro]=Informaţii de sistem
-Name[ru]=Информаци� о �и�теме
-Name[se]=Vuogádatdieđut
-Name[sk]=Informácie o systéme
-Name[sl]=Sistemske informacije
-Name[sr]=Информације о �и�тему
-Name[sr@Latn]=Informacije o sistemu
-Name[sv]=Systeminformation
-Name[ta]=அமைப�ப� தகவல�
-Name[tg]=Иттилоот дар бораи �и�тема
-Name[tr]=Sistem Bilgisi
-Name[uk]=Си�темна інформаці�
-Name[uz]=Тизим ҳақида маълумот
-Name[zh_CN]=系统信�
-Name[zh_TW]=系統資訊
-Implemented=file
-ServiceTypes=KPilotConduit
-X-KDE-Library=conduit_sysinfo
diff --git a/kpilot/conduits/sysinfoconduit/sysinfoconduit.kcfg b/kpilot/conduits/sysinfoconduit/sysinfoconduit.kcfg
deleted file mode 100644
index 20d8cc24..00000000
--- a/kpilot/conduits/sysinfoconduit/sysinfoconduit.kcfg
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
-      http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <kcfgfile name="kpilot_sysinfoconduitrc"/>
-  <group name="General">
-    <entry name="OutputFile" key="Output file" type="Path">
-        <default>$HOME/kpilot-syslog.html</default>
-    </entry>
-    <entry name="OutputFormat" key="Output format" type="Enum">
-				<choices>
-						<choice name="eSysInfoHTML"/>
-						<choice name="eSysInfoText"/>
-						<choice name="eSysInfoTemplate"/>
-				</choices>
-        <default>eSysInfoHTML</default>
-    </entry>
-    <entry name="TemplateFile" key="Template file" type="Path">
-        <default></default>
-    </entry>
-    <entry name="DebugInformation" key="Debug Information" type="Bool">
-        <label>Debug information (for KPilot developers)</label>
-        <default>true</default>
-    </entry>
-    <entry name="HardwareInfo" key="Hardware Info" type="Bool">
-        <label>Hardware information</label>
-        <default>true</default>
-    </entry>
-    <entry name="DatabaseList" key="Database List" type="Bool">
-        <label>List of databases on handheld (takes long!)</label>
-        <default>true</default>
-    </entry>
-    <entry name="MemoryInfo" key="Memory Info" type="Bool">
-        <label>Memory information</label>
-        <default>true</default>
-    </entry>
-    <entry name="RecordNumbers" key="Record Numbers" type="Bool">
-        <label>Number of addresses, todos, events and memos</label>
-        <default>true</default>
-    </entry>
-    <entry name="PalmOSVersion" key="PalmOS Version" type="Bool">
-        <label>PalmOS version</label>
-        <default>true</default>
-    </entry>
-    <entry name="StorageInfo" key="Storage Info" type="Bool">
-        <label>Storage info (SD card, memory stick, ...)</label>
-        <default>true</default>
-    </entry>
-    <entry name="SyncInfo" key="Sync Info" type="Bool">
-        <label>Synchronization information</label>
-        <default>true</default>
-    </entry>
-    <entry name="UserInfo" key="User Info" type="Bool">
-        <label>User information</label>
-        <default>true</default>
-    </entry>
-    <entry name="KDEVersion" key="KDE Version" type="Bool">
-        <label>Version of KPilot, pilot-link and KDE</label>
-        <default>true</default>
-    </entry>
-  </group>
-
-</kcfg>
diff --git a/kpilot/conduits/timeconduit/CMakeLists.txt b/kpilot/conduits/timeconduit/CMakeLists.txt
deleted file mode 100644
index e980e724..00000000
--- a/kpilot/conduits/timeconduit/CMakeLists.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
-)
-
-set(conduit_time_SRCS
-	time-conduit.cc
-	time-factory.cc
-	time-setup.cc
-)
-
-set(conduit_time_UIS
-	time-setup_dialog.ui
-)
-
-set(conduit_time_KCFGS
-	timeConduitSettings.kcfgc
-)
-
-kde3_add_kcfg_files(conduit_time_SRCS ${conduit_time_KCFGS})
-kde3_add_ui_files(conduit_time_SRCS ${conduit_time_UIS})
-kde3_automoc(${conduit_time_SRCS})
-add_library(conduit_time SHARED ${conduit_time_SRCS})
-
-kpilot_rpath(conduit_time)
-
-set_target_properties(
-	conduit_time PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	PREFIX ""
-)
-
-kde3_install_libtool_file(conduit_time)
-
-install(
-	TARGETS conduit_time
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-)
-
-install(
-	FILES time_conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
-)
-
-install(
-	FILES timeconduit.kcfg DESTINATION ${KDE3_KCFG_DIR}
-)
diff --git a/kpilot/conduits/timeconduit/Makefile.am b/kpilot/conduits/timeconduit/Makefile.am
deleted file mode 100644
index 6a58716a..00000000
--- a/kpilot/conduits/timeconduit/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-### Makefile for the time conduit
-###
-### The time conduit is Copyright (C) 2002 by Reinhold Kainhofer
-
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
-METASOURCES = AUTO
-
-servicedir = $(kde_servicesdir)
-service_DATA = time_conduit.desktop
-
-kde_module_LTLIBRARIES = conduit_time.la
-
-
-conduit_time_la_SOURCES = timeConduitSettings.kcfgc \
-	time-factory.cc \
-	time-setup.cc \
-	time-conduit.cc \
-	time-setup_dialog.ui
-conduit_time_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-conduit_time_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI)
- 
-kde_kcfg_DATA = timeconduit.kcfg
diff --git a/kpilot/conduits/timeconduit/time-conduit.cc b/kpilot/conduits/timeconduit/time-conduit.cc
deleted file mode 100644
index 76798dbe..00000000
--- a/kpilot/conduits/timeconduit/time-conduit.cc
+++ /dev/null
@@ -1,121 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org.
-*/
-
-#include "options.h"
-
-#include <time.h>
-
-#include <pilotSysInfo.h>
-
-#include <kconfig.h>
-#include <kdebug.h>
-
-#include "time-factory.h"
-#include "time-conduit.h"
-#include "timeConduitSettings.h"
-
-
-// Something to allow us to check what revision
-// the modules are that make up a binary distribution.
-extern "C"
-{
-unsigned long version_conduit_time = Pilot::PLUGIN_API ;
-}
-
-
-
-TimeConduit::TimeConduit(KPilotLink * o,
-	const char *n,
-	const TQStringList & a) :
-	ConduitAction(o, n, a)
-{
-	FUNCTIONSETUP;
-	fConduitName=i18n("Time");
-}
-
-
-
-TimeConduit::~TimeConduit()
-{
-	FUNCTIONSETUP;
-}
-
-
-
-void TimeConduit::readConfig()
-{
-	FUNCTIONSETUP;
-	TimeConduitSettings::self()->readConfig();
-}
-
-
-/* virtual */ bool TimeConduit::exec()
-{
-	FUNCTIONSETUP;
-
-	readConfig();
-
-	if (syncMode().isLocal())
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": Would have set time to "
-			<< TQDateTime::currentDateTime().toString() << endl;
-#endif
-		return delayDone();
-	}
-
-	emit logMessage(i18n("Setting the clock on the handheld"));
-	syncHHfromPC();
-	return delayDone();
-}
-
-
-void TimeConduit::syncHHfromPC()
-{
-	FUNCTIONSETUP;
-	time_t ltime;
-	time(&ltime);
-
-	long int major=fHandle->getSysInfo().getMajorVersion(), 
-		 minor=fHandle->getSysInfo().getMinorVersion();
-
-	if (major==3 && (minor==25 || minor==30))
-	{
-		emit logMessage(i18n("PalmOS 3.25 and 3.3 do not support setting the system time. Skipping the time conduit..."));
-		return;
-	}
-
-	int sd = pilotSocket();
-	if ( sd > 0 )
-	{
-		dlp_SetSysDateTime( sd, ltime );
-	}
-	else
-	{
-		WARNINGKPILOT << "Link is not a real device." << endl;
-	}
-}
diff --git a/kpilot/conduits/timeconduit/time-conduit.h b/kpilot/conduits/timeconduit/time-conduit.h
deleted file mode 100644
index 06b6b50e..00000000
--- a/kpilot/conduits/timeconduit/time-conduit.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef _Time_CONDUIT_H
-#define _Time_CONDUIT_H
-/* time-conduit.h                           KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include <plugin.h>
-
-class TimeConduit : public ConduitAction
-{
-public:
-	TimeConduit(
-		KPilotLink *o,
-		const char *n = 0L,
-		const TQStringList &a = TQStringList() );
-	virtual ~TimeConduit();
-	virtual bool exec();
-
-	void syncHHfromPC();
-
-protected:
-	void readConfig();
-} ;
-
-#endif
diff --git a/kpilot/conduits/timeconduit/time-factory.cc b/kpilot/conduits/timeconduit/time-factory.cc
deleted file mode 100644
index 28548fe5..00000000
--- a/kpilot/conduits/timeconduit/time-factory.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Time-factory.cc                      KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This file defines the factory for the Time-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-#include "pluginfactory.h"
-
-#include "time-conduit.h"
-#include "time-setup.h"
-
-
-extern "C"
-{
-
-void *init_conduit_time()
-{
-	return new ConduitFactory<TimeWidgetConfig,TimeConduit>(0,"Timeconduit");
-}
-
-}
-
-
diff --git a/kpilot/conduits/timeconduit/time-factory.h b/kpilot/conduits/timeconduit/time-factory.h
deleted file mode 100644
index 2b53c7c1..00000000
--- a/kpilot/conduits/timeconduit/time-factory.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef _TIME_FACTORY_H
-#define _TIME_FACTORY_H
-/* Time-factory.h                       KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This file defines the factory for the Time-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#define DIR_PCToPalm 0
-#define DIR_PalmToPC 1
-
-extern "C"
-{
-
-void *init_conduit_time();
-
-}
-
-#endif
diff --git a/kpilot/conduits/timeconduit/time-setup.cc b/kpilot/conduits/timeconduit/time-setup.cc
deleted file mode 100644
index 409cdc34..00000000
--- a/kpilot/conduits/timeconduit/time-setup.cc
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Time-setup.cc                      KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This file defines the setup dialog for the Time-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <tqtabwidget.h>
-#include <tqradiobutton.h>
-#include <tqbuttongroup.h>
-
-#include <kapplication.h>
-#include <kaboutdata.h>
-
-#include "time-setup_dialog.h"
-
-#include "time-setup.moc"
-#include "timeConduitSettings.h"
-
-
-
-static KAboutData *createAbout()
-{
-	KAboutData *fAbout = new KAboutData("Timeconduit",
-		I18N_NOOP("Time Synchronization Conduit for KPilot"),
-		KPILOT_VERSION,
-		I18N_NOOP("Synchronizes the Time on the Handheld and the PC"),
-		KAboutData::License_GPL,
-		"(C) 2002, Reinhold Kainhofer");
-	fAbout->addAuthor("Reinhold Kainhofer",
-		I18N_NOOP("Primary Author"), "reinhold@kainhofer.com", "http://reinhold.kainhofer.com/");
-	return fAbout;
-}
-
-
-
-TimeWidgetConfig::TimeWidgetConfig(TQWidget *w, const char *n) :
-	ConduitConfigBase(w,n),
-	fConfigWidget(new TimeWidget(w))
-{
-	FUNCTIONSETUP;
-	fAbout = createAbout();
-	ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,fAbout);
-	fWidget=fConfigWidget;
-	fConduitName=i18n("Time");
-}
-
-void TimeWidgetConfig::commit()
-{
-	FUNCTIONSETUP;
-	TimeConduitSettings::setDirection(
-		fConfigWidget->directionGroup->id(fConfigWidget->directionGroup->selected()) );
-	TimeConduitSettings::self()->writeConfig();
-}
-
-void TimeWidgetConfig::load()
-{
-	FUNCTIONSETUP;
-	TimeConduitSettings::self()->readConfig();
-
-	fConfigWidget->directionGroup->setButton( TimeConduitSettings::direction() );
-}
-
diff --git a/kpilot/conduits/timeconduit/time-setup.h b/kpilot/conduits/timeconduit/time-setup.h
deleted file mode 100644
index b0bb2f0a..00000000
--- a/kpilot/conduits/timeconduit/time-setup.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef _Time_Time_SETUP_H
-#define _Time_Time_SETUP_H
-/* knotes-setup.h                       KPilot
-**
-** Copyright (C) 2002 by Reinhold Kainhofer
-**
-** This file defines the widget and behavior for the config dialog
-** of the KNotes conduit.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "plugin.h"
-
-class TimeWidget;
-class KAboutData;
-
-class TimeWidgetConfig : public ConduitConfigBase
-{
-Q_OBJECT
-public:
-	TimeWidgetConfig(TQWidget *parent, const char *);
-	virtual void commit();
-	virtual void load();
-	static ConduitConfigBase *create(TQWidget *,const char *);
-protected:
-	TimeWidget *fConfigWidget;
-	KAboutData *fAbout;
-} ;
-
-#endif
diff --git a/kpilot/conduits/timeconduit/time-setup_dialog.ui b/kpilot/conduits/timeconduit/time-setup_dialog.ui
deleted file mode 100644
index b419b925..00000000
--- a/kpilot/conduits/timeconduit/time-setup_dialog.ui
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>TimeWidget</class>
-<author>Reinhold Kainhofer</author>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>Form2</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>399</width>
-            <height>293</height>
-        </rect>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QTabWidget" row="0" column="0">
-            <property name="name">
-                <cstring>tabWidget</cstring>
-            </property>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>tab</cstring>
-                </property>
-                <attribute name="title">
-                    <string>General</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <property name="margin">
-                        <number>11</number>
-                    </property>
-                    <property name="spacing">
-                        <number>6</number>
-                    </property>
-                    <spacer row="2" column="0">
-                        <property name="name">
-                            <cstring>Spacer3</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                    </spacer>
-                    <widget class="QButtonGroup" row="0" column="0">
-                        <property name="name">
-                            <cstring>directionGroup</cstring>
-                        </property>
-                        <property name="title">
-                            <string>Direction</string>
-                        </property>
-                        <grid>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <property name="margin">
-                                <number>11</number>
-                            </property>
-                            <property name="spacing">
-                                <number>6</number>
-                            </property>
-                            <widget class="QRadioButton" row="0" column="0">
-                                <property name="name">
-                                    <cstring>RadioButton1</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Set the &amp;handheld time from the time on the PC</string>
-                                </property>
-                                <property name="checked">
-                                    <bool>true</bool>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Select this option to synchronize the handheld time with the PC time, by using the PC time on both.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="QRadioButton" row="1" column="0">
-                                <property name="name">
-                                    <cstring>RadioButton1_2</cstring>
-                                </property>
-                                <property name="enabled">
-                                    <bool>false</bool>
-                                </property>
-                                <property name="text">
-                                    <string>Set the &amp;PC time from the time on the handheld</string>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Select this option to synchronize the handheld time with the PC time, by using the handheld time on both.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                        </grid>
-                    </widget>
-                    <widget class="QLabel" row="1" column="0">
-                        <property name="name">
-                            <cstring>TextLabel1</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&lt;qt&gt;PalmOS Version 3.25 and 3.3 do not support setting the system time, so this conduit will be skipped for handhelds that run either of these operating systems.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                </grid>
-            </widget>
-        </widget>
-    </grid>
-</widget>
-<tabstops>
-    <tabstop>tabWidget</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/kpilot/conduits/timeconduit/timeConduitSettings.kcfgc b/kpilot/conduits/timeconduit/timeConduitSettings.kcfgc
deleted file mode 100644
index 3487b6a6..00000000
--- a/kpilot/conduits/timeconduit/timeConduitSettings.kcfgc
+++ /dev/null
@@ -1,7 +0,0 @@
-File=timeconduit.kcfg
-ClassName=TimeConduitSettings
-Singleton=true
-ItemAccessors=true
-Mutators=true
-GlobalEnums=true
-SetUserTexts=true
diff --git a/kpilot/conduits/timeconduit/time_conduit.desktop b/kpilot/conduits/timeconduit/time_conduit.desktop
deleted file mode 100644
index 386868a6..00000000
--- a/kpilot/conduits/timeconduit/time_conduit.desktop
+++ /dev/null
@@ -1,105 +0,0 @@
-[Desktop Entry]
-Type=Service
-Comment=This conduit sets the time on your handheld from the PC clock.
-Comment[af]=Hierdie pad stel die tyd op jou draagbare toestel vanaf die PC horlosie.
-Comment[bg]=Синхронизаци� на датата и ча�а на мобилно у�трой�тво � ча�овника на компютъра
-Comment[bs]=Ovaj conduit postavlja vrijeme na vašem ru�nom ra�unaru prema PC satu.
-Comment[ca]=Aquest conducte estableix l'hora en la vostra agenda electrònica des del rellotge del PC.
-Comment[cs]=Toto propojení nastaví �as na vašem handheldu podle PC.
-Comment[cy]=Mae'r cwndid yma yn gosod yr amser ar eich llawiadur o gloc y CP.
-Comment[da]=Denne kanal sætter tiden på din håndholdte fra PC'ens ur.
-Comment[de]=Überträgt die Zeit vom PC auf das mobile Gerät
-Comment[el]=Αυτός ο σ�νδεσμος �υθμίζει την ώ�α στον υπολογιστή παλάμης σας από το �ολόι του υπολογιστή σας.
-Comment[es]=Este conducto fija la hora de su agenda electrónica según el reloj de su PC.
-Comment[et]=See kanal sünkroniseerib pihuarvuti aja PC kellaga.
-Comment[eu]=Kanal honek zure agenda elektronikoko ordua PC-aren ordura ezartzen du.
-Comment[fa]=این لوله، از طریق ساعت PC زمان دستی شما را تنظیم می‌کند.
-Comment[fi]=Tämä yhdyskäytävä asettaa taskutietokoneen kellonajan PC:n kellosta.
-Comment[fr]=Ce canal règle l'heure de votre périphérique depuis celle du PC.
-Comment[fy]=Dit conduit set de tiid fan jo handheld oan d ehân fan de pc-klok.
-Comment[gl]=Este conducto pon a hora do seu aparello portátil dende o reloxo do seu PC.
-Comment[hi]=यह कन�ड�यूइट आपके हैंण�डहेल�ड में पीसी घड़ी द�वारा समय नियत करता है.
-Comment[hu]=Ez a csatoló beállítja a kéziszámítógép óráját a számítógépé alapján
-Comment[is]=Þessi rás stillir klukku lófatölvunnar eftir klukku PC tölvunnar.
-Comment[it]=Questo conduit imposta l'ora sul tuo palmare prendendola dall'orologio del PC
-Comment[ja]=��コンジット��ンドヘルド�時間をPC�時計������。
-Comment[km]=បំពង់​ន�ះ​កំណ�់​ព�លវ�លា​នៅ​លើ​ឧបករណ�​យួរដៃ​របស់​អ្នក ពី​នាឡិកា​កុំព្យូទ�រ ។
-Comment[lt]=Å is kanalas nustato delninuko laikÄ… pagal PC laikÄ….
-Comment[mk]=Овој канал го по�тавува времето на рачниот уред �поред времето на компјутерот.
-Comment[ms]=Saluran ini mengeset waktu pada komputer telapak anda dari jam PC.
-Comment[nb]=Denne kanalen stiller klokka på PDA-en fra PC-klokka.
-Comment[nds]=Synkroniseert stellt Handreekner-Klock na de PC-Klock.
-Comment[ne]=यो कन�ड�य�टले पीसी घडीबाट ह�यान�डहेल�डमा समय सेट गर�दछ ।
-Comment[nl]=Dit conduit stelt de tijd van uw handheld in aan de hand van de pc-klok.
-Comment[nn]=Denne koplinga set tida på den handheldte eininga di frå PC-klokka.
-Comment[pl]=Ten Å‚Ä…cznik ustawia zegar na palmtopie zgodnie z zegarem komputera.
-Comment[pt]=Esta conduta acerta a hora do seu dispositivo a partir do relógio do PC.
-Comment[pt_BR]=Este conduíte define o horário no seu hendheld a partir do relógio do PC.
-Comment[ru]=Канал �инхронизации времени
-Comment[sk]=Táto spojka nastavuje �as na vašom prenosnom zariadení podľa PC.
-Comment[sl]=Ta veznik nastavi �as na ro�nem ra�unalniku glede na sistemsko uro osebnega ra�unalnika.
-Comment[sr]=Овај провод по�тавља време на вашем ручном рачунару према PC ча�овнику.
-Comment[sr@Latn]=Ovaj provod postavlja vreme na vašem ru�nom ra�unaru prema PC �asovniku.
-Comment[sv]=Den här kanalen ställer in tiden på handdatorn från datorns klocka.
-Comment[ta]=இந�த காப�ப�க�க�ழாய� பிசி கடிகாரத�தில� இர�ந�த� உங�கள� கையேட�டில� நேரத�தை அமைக�க�ம�
-Comment[tg]=Канали �инзронизат�и�и муддат
-Comment[tr]=Bu bileşen, el bilgisayarınızın saatini PC saatine bakarak ayarlar.
-Comment[uk]=Цей акведук �инхронізує ча� у кишеньковому при�трої з ча�ом комп'ютера.
-Comment[zh_CN]=此管�把您手�设备的时间与电脑�步。
-Comment[zh_TW]=此軟體經由 PC 時間設定您的 handheld 時間。
-Name=Time Synchronization
-Name[af]=Tyd sinkronisasie
-Name[ar]=مزامنة الوقت
-Name[be]=Сынхранізацы� ча�у
-Name[bg]=Синхронизаци�
-Name[bs]=Sinhronizacija vremena
-Name[ca]=Sincronització horària
-Name[cs]=Synchronizace �asu
-Name[cy]=Cydamseriad Amser
-Name[da]=Tidsynkronisering
-Name[de]=Zeit-Abgleich
-Name[el]=Συγχ�ονισμός ώ�ας
-Name[en_GB]=Time Synchronisation
-Name[eo]=Temposinkronigo
-Name[es]=Sincronización de hora
-Name[et]=Aja sünkroniseerimine
-Name[eu]=Ordu sinkronizazioa
-Name[fa]=همگام‌سازی زمان
-Name[fi]=Ajan synkronointi
-Name[fr]=Synchronisation de l'heure
-Name[fy]=Tiidssyngronisaasje
-Name[gl]=Sincronización Horaria
-Name[hi]=समय सिंक�रोनाइज़ेशन
-Name[hu]=Időszinkronizálás
-Name[is]=Tíma samstilling
-Name[it]=Sincronizzazione temporale
-Name[ja]=時間�期
-Name[kk]=Уақытты қадамда�тыру
-Name[km]=សមកាលកម្ម​ព�លវ�លា
-Name[lt]=Laiko sinchronizavimas
-Name[mk]=Синхронизација на време
-Name[ms]=Segerakan waktu
-Name[nb]=Tidsynkronisering
-Name[nds]=Tietsynkroniseren
-Name[ne]=समय समक�रमण
-Name[nl]=Tijdsynchronisatie
-Name[nn]=Tidsynkronisering
-Name[pl]=Synchronizacja czasu
-Name[pt]=Sincronização Horária
-Name[pt_BR]=Sincronização de Horário
-Name[ro]=Sincronizare timp
-Name[ru]=Синхронизаци� времени
-Name[sk]=Synchronizácia �asu
-Name[sl]=Usklajevanje �asa
-Name[sr]=Синхронизација времена
-Name[sr@Latn]=Sinhronizacija vremena
-Name[sv]=Tidssynkronisering
-Name[ta]=நேர ஒத�தியக�கம�
-Name[tg]=Синхронизат�и�и муддат
-Name[tr]=Zaman Senkronizasyonu
-Name[uk]=Синхронізаці� ча�у
-Name[zh_CN]=时间�步
-Name[zh_TW]=時刻�步化
-Implemented=file
-ServiceTypes=KPilotConduit
-X-KDE-Library=conduit_time
diff --git a/kpilot/conduits/timeconduit/timeconduit.kcfg b/kpilot/conduits/timeconduit/timeconduit.kcfg
deleted file mode 100644
index aafa23fc..00000000
--- a/kpilot/conduits/timeconduit/timeconduit.kcfg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
-      http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <kcfgfile name="kpilot_timeconduitrc"/>
-  <group name="Time-conduit">
-    <entry name="Direction" type="Enum">
-				<choices>
-				    <choice name="eSetHHfromPC"/>
-						<choice name="eSetPCfromHH"/>
-				</choices>
-        <default>eSetHHfromPC</default>
-    </entry>
-  </group>
-	
-</kcfg>
diff --git a/kpilot/conduits/vcalconduit/CMakeLists.txt b/kpilot/conduits/vcalconduit/CMakeLists.txt
deleted file mode 100644
index 21482355..00000000
--- a/kpilot/conduits/vcalconduit/CMakeLists.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-set(conduit_LIBS kcal)
-
-include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
-)
-
-set(conduit_SHARED
-	vcal-setupbase.cc
-	vcal-conduitbase.cc
-	teststate.cc
-	initstate.cc
-	pctohhstate.cc
-	hhtopcstate.cc
-	cleanupstate.cc
-	deleteunsyncedpcstate.cc
-	deleteunsyncedhhstate.cc
-	kcalRecord.cc
-	vcalRecord.cc
-	todoRecord.cc
-)
-
-kde3_add_kcfg_files(conduit_SHARED vcalconduitSettings.kcfgc)
-kde3_add_ui_files(conduit_SHARED korganizerConduit.ui)
-
-set(conduit_vcal_SRCS
-	${conduit_SHARED}
-	vcal-conduit.cc
-	vcal-factory.cc
-	vcal-setup.cc
-)
-
-kde3_automoc(${conduit_vcal_SRCS})
-add_library(conduit_vcal SHARED ${conduit_vcal_SRCS})
-target_link_libraries(conduit_vcal kcal)
-
-set(conduit_todo_SRCS
-	${conduit_SHARED}
-	todo-factory.cc
-	todo-setup.cc
-	todo-conduit.cc
-)
-
-kde3_automoc(${conduit_todo_SRCS})
-add_library(conduit_todo SHARED ${conduit_todo_SRCS})
-target_link_libraries(conduit_todo kcal)
-
-set_target_properties(
-	conduit_vcal PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
-	PREFIX ""
-)
-set_target_properties(
-	conduit_todo PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
-	PREFIX ""
-)
-
-kde3_install_libtool_file(conduit_vcal)
-
-install(
-	TARGETS conduit_vcal conduit_todo
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-)
-
-kde3_install_libtool_file(conduit_todo)
-
-install(
-	FILES vcal-conduit.desktop todo-conduit.desktop
-	DESTINATION ${KDE3_SERVICES_DIR}
-)
-
-install(
-	FILES vcalconduitbase.kcfg DESTINATION ${KDE3_KCFG_DIR}
-)
diff --git a/kpilot/conduits/vcalconduit/Makefile.am b/kpilot/conduits/vcalconduit/Makefile.am
deleted file mode 100644
index 546789e1..00000000
--- a/kpilot/conduits/vcalconduit/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-###
-### Makefile for vcal and todo conduits. These two conduits share most code,
-### so it seems logical to put them in one place.
-###
-
-INCLUDES= -I$(top_srcdir)/kpilot/lib -I$(top_srcdir) \
-	$(PISOCK_INCLUDE) $(all_includes)
-
-METASOURCES = AUTO
-
-servicedir  = $(kde_servicesdir)
-service_DATA = vcal-conduit.desktop todo-conduit.desktop
-
-kde_module_LTLIBRARIES = conduit_vcal.la conduit_todo.la
-noinst_LTLIBRARIES = libvcalconduit_shared.la
-
-libvcalconduit_shared_la_SOURCES = vcalconduitSettings.kcfgc \
-	korganizerConduit.ui \
-	kcalRecord.cc \
-	vcal-setupbase.cc \
-	vcal-conduitbase.cc \
-	cleanupstate.cc deleteunsyncedhhstate.cc deleteunsyncedpcstate.cc \
-	hhtopcstate.cc initstate.cc pctohhstate.cc teststate.cc
-
-conduit_vcal_la_SOURCES = vcal-conduit.cc vcalRecord.cc \
-	vcal-factory.cc vcal-setup.cc
-conduit_vcal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-conduit_vcal_la_LIBADD = ../../lib/libkpilot.la \
-	../../../libkcal/libkcal.la \
-	libvcalconduit_shared.la
-conduit_vcal_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h
-
-conduit_todo_la_SOURCES = todo-conduit.cc todoRecord.cc \
-	todo-factory.cc todo-setup.cc
-conduit_todo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-conduit_todo_la_LIBADD = ../../lib/libkpilot.la \
-	../../../libkcal/libkcal.la \
-	libvcalconduit_shared.la
-conduit_todo_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h
-
-
-kde_kcfg_DATA = vcalconduitbase.kcfg
-
diff --git a/kpilot/conduits/vcalconduit/README b/kpilot/conduits/vcalconduit/README
deleted file mode 100644
index 8d4ea49a..00000000
--- a/kpilot/conduits/vcalconduit/README
+++ /dev/null
@@ -1,11 +0,0 @@
-KPilot vCal KOrganizer conduit version 3.0
-(c) 1998 Dan Pilone, Preston Brown, Herwin Jan Steehouwer
-
-This conduit works with KPilot and KOrganizer.
-
-Things to remember:
-* When deleting from yout PalmPilot set 
-  'Save Archive Copy On PC' OFF !!!
-
-Preston Brown and Herwin Jan Steehouwer
-pbrown@kde.org, steehouwer@kde.org
diff --git a/kpilot/conduits/vcalconduit/cleanupstate.cc b/kpilot/conduits/vcalconduit/cleanupstate.cc
deleted file mode 100644
index 209a0e91..00000000
--- a/kpilot/conduits/vcalconduit/cleanupstate.cc
+++ /dev/null
@@ -1,132 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2006 by Bertjan Broeksema <b.broeksema@gmail.com>
-**
-** This file is the implementation of the CleanUpState.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <options.h>
-
-#include <kio/netaccess.h>
-#include <tqfile.h>
-
-#include "pilotDatabase.h"
-
-#include "vcal-conduitbase.h"
-#include "vcalconduitSettings.h"
-#include "cleanupstate.h"
-
-
-CleanUpState::CleanUpState()
-{
-	fState = eCleanUp;
-}
-
-CleanUpState::~CleanUpState()
-{
-}
-
-void CleanUpState::startSync( ConduitAction *ca )
-{
-	FUNCTIONSETUP;
-
-	VCalConduitBase *vccb = dynamic_cast<VCalConduitBase*>(ca);
-	if( !vccb )
-	{
-		return;
-	}
-
-	DEBUGKPILOT << fname << ": Starting CleanUpState." << endl;
-
-	vccb->addLogMessage( i18n( "Cleaning up ..." ) );
-	vccb->postSync();
-
-	if ( vccb->database() )
-	{
-		vccb->database()->resetSyncFlags();
-		vccb->database()->cleanup();
-	}
-	if ( vccb->localDatabase() )
-	{
-		vccb->localDatabase()->resetSyncFlags();
-		vccb->localDatabase()->cleanup();
-	}
-
-	KCal::Calendar *fCalendar = vccb->calendar();
-	TQString fCalendarFile = vccb->calendarFile();
-
-	if ( fCalendar )
-	{
-		KURL kurl( vccb->config()->calendarFile() );
-		switch( vccb->config()->calendarType() )
-		{
-		case VCalConduitSettings::eCalendarLocal:
-			dynamic_cast<KCal::CalendarLocal*>(fCalendar)->save( fCalendarFile );
-			if(!kurl.isLocalFile())
-			{
-				if( !KIO::NetAccess::upload( fCalendarFile
-					, vccb->config()->calendarFile(), 0L) )
-				{
-					vccb->addLogError( i18n( "An error occurred while uploading"
-						" \"%1\". You can try to upload "
-						"the temporary local file \"%2\" manually.")
-						.arg(vccb->config()->calendarFile()).arg(fCalendarFile));
-				}
-				else {
-					KIO::NetAccess::removeTempFile( fCalendarFile );
-				}
-				TQFile backup( fCalendarFile + CSL1( "~" ) );
-				backup.remove();
-			}
-			break;
-		case VCalConduitSettings::eCalendarResource:
-			fCalendar->save();
-			break;
-		default:
-			break;
-		}
-		fCalendar->close();
-	}
-
-	vccb->setHasNextRecord( false );
-}
-
-void CleanUpState::handleRecord( ConduitAction * )
-{
-	FUNCTIONSETUP;
-}
-
-void CleanUpState::finishSync( ConduitAction *ca )
-{
-	FUNCTIONSETUP;
-
-	VCalConduitBase *vccb = dynamic_cast<VCalConduitBase*>(ca);
-	if( !vccb )
-	{
-		return;
-	}
-
-	DEBUGKPILOT << fname << ": Finished CleanUpState." << endl;
-	vccb->setState( 0L );
-}
diff --git a/kpilot/conduits/vcalconduit/cleanupstate.h b/kpilot/conduits/vcalconduit/cleanupstate.h
deleted file mode 100644
index 4d599cdf..00000000
--- a/kpilot/conduits/vcalconduit/cleanupstate.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef _KPILOT_CLEANUPSTATE_H
-#define _KPILOT_CLEANUPSTATE_H
-/* cleanupstate.h                       KPilot
-**
-** Copyright (C) 2006 Bertjan Broeksema
-**
-** This file defines the cleanupstate for vcal-conduitbase.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "conduitstate.h"
-
-class ConduitAction;
-
-/**
- * State to Cleanup after all sync actions are finished. @see vcal-conduitstate.h
- */
-class CleanUpState : public ConduitState
-{
-public:
-	CleanUpState();
-	virtual ~CleanUpState();
-
-	virtual void startSync( ConduitAction* );
-	virtual void handleRecord( ConduitAction* );
-	virtual void finishSync( ConduitAction* );
-};
-
-#endif
diff --git a/kpilot/conduits/vcalconduit/conduitstate.h b/kpilot/conduits/vcalconduit/conduitstate.h
deleted file mode 100644
index 447ce1c5..00000000
--- a/kpilot/conduits/vcalconduit/conduitstate.h
+++ /dev/null
@@ -1,86 +0,0 @@
-#ifndef _KPILOT_CONDUITSTATE_H
-#define _KPILOT_CONDUITSTATE_H
-/* vcal-conduitstate.h                       KPilot
-**
-** Copyright (C) 2006 Bertjan Broeksema
-**
-** This file defines the vcal-conduitstate.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "plugin.h"
-
-/**
- * This class defines the current state of the vcal-conduitbase. Subclasses of
- * this class can do the things that are needed, in methods defined here, for 
- * the state that they define.
- */
-class ConduitState
-{
-public:
-	enum state_t {
-		eTest,
-		eInit,
-		ePCToHH,
-		eHHToPC,
-		eDeleteUnsyncedHH,
-		eDeleteUnsyncedPC,
-		eCleanUp
-	};
-
-protected:
-	state_t fState;
-	bool fStarted;
-
-public:
-	ConduitState(){ fState = eInit; fStarted = false; };
-	virtual ~ConduitState() {};
-
-	/**
-	 * Prepare for a sync in the current state. Don't forget to set fState to 
-	 * true in this method. Otherwise the state won't handle records.
-	 */
-	virtual void startSync( ConduitAction * ) = 0;
-	
-	/**
-	 * Sync the next record in row.
-	 */
-	virtual void handleRecord( ConduitAction * ) = 0;
-
-	/**
-	 * Clean up after all records are synced and enter next state.
-	 */
-	virtual void finishSync( ConduitAction * ) = 0;
-
-	/**
-	 * Returns the state type.
-	 */
-	state_t state() { return fState; };
-
-	/**
-	 * Returns wether or not this state has started.
-	 */
-	bool started() { return fStarted; };
-};
-
-#endif
diff --git a/kpilot/conduits/vcalconduit/deleteunsyncedhhstate.cc b/kpilot/conduits/vcalconduit/deleteunsyncedhhstate.cc
deleted file mode 100644
index 78fb6780..00000000
--- a/kpilot/conduits/vcalconduit/deleteunsyncedhhstate.cc
+++ /dev/null
@@ -1,115 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2006 by Bertjan Broeksema <b.broeksema@gmail.com>
-**
-** This file is the implementation of the DeleteUnsyncedHHState.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <options.h>
-#include <plugin.h>
-
-#include "pilotDatabase.h"
-#include "pilotRecord.h"
-
-#include "vcal-conduitbase.h"
-#include "deleteunsyncedhhstate.h"
-#include "deleteunsyncedpcstate.h"
-#include "cleanupstate.h"
-
-DeleteUnsyncedHHState::DeleteUnsyncedHHState()
-{
-	fState = eDeleteUnsyncedHH;
-}
-
-DeleteUnsyncedHHState::~DeleteUnsyncedHHState()
-{
-}
-
-void DeleteUnsyncedHHState::startSync( ConduitAction *ca )
-{
-	FUNCTIONSETUP;
-
-	VCalConduitBase *vccb = dynamic_cast<VCalConduitBase*>(ca);
-	if( !vccb )
-	{
-		return;
-	}
-
-	DEBUGKPILOT << fname << ": Starting DeleteUnsyncedHHState." << endl;
-	
-	fPilotIndex = 0;
-	fNextState = new DeleteUnsyncedPCState();
-	
-	vccb->setHasNextRecord( true );
-	fStarted = true;
-}
-
-void DeleteUnsyncedHHState::handleRecord( ConduitAction *ca )
-{
-	FUNCTIONSETUP;
-
-	VCalConduitBase *vccb = dynamic_cast<VCalConduitBase*>(ca);
-	if( !vccb )
-	{
-		return;
-	}
-
-	PilotRecord *r = vccb->localDatabase()->readRecordByIndex( fPilotIndex++ );
-	// if either we don't have a record, or if we're copying everything
-	// from the handheld to the pc, then we don't have anything to do
-	// here.  the latter is because if we're copying HH->PC, then by
-	// definition, we will have everything from the HH on the PC and
-	// therefore can't possibly have anything that needs to be deleted
-	// from it.
-	if ( !r
-		|| ( vccb->syncMode().mode() == ConduitAction::SyncMode::eCopyHHToPC ) )
-	{
-		vccb->setHasNextRecord( false );
-		return;
-	}
-
-	KCal::Incidence *e = vccb->privateBase()->findIncidence( r->id() );
-	if ( !e )
-	{
-		DEBUGKPILOT << "Didn't find incidence with id = " << r->id()
-			<< ", deleting it" << endl;
-		vccb->deletePalmRecord( NULL, r );
-	}
-
-	KPILOT_DELETE( r );
-}
-
-void DeleteUnsyncedHHState::finishSync( ConduitAction *ca )
-{
-	FUNCTIONSETUP;
-
-	VCalConduitBase *vccb = dynamic_cast<VCalConduitBase*>(ca);
-	if( !vccb )
-	{
-		return;
-	}
-
-	DEBUGKPILOT << fname << ": Finishing DeleteUnsyncedHHState." << endl;
-	vccb->setState( fNextState );
-}
diff --git a/kpilot/conduits/vcalconduit/deleteunsyncedhhstate.h b/kpilot/conduits/vcalconduit/deleteunsyncedhhstate.h
deleted file mode 100644
index df9b721f..00000000
--- a/kpilot/conduits/vcalconduit/deleteunsyncedhhstate.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifndef _KPILOT_DUSHHSTATE_H
-#define _KPILOT_DUSHHSTATE_H
-/* deleteunsyncedhhstate.h                       KPilot
-**
-** Copyright (C) 2006 Bertjan Broeksema
-**
-** This file defines the deleteunsyncedpcstate for vcal-conduitbase.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "conduitstate.h"
-
-class VCalConduitBase;
-
-/**
- * State to handle delete unsynced pc records. @see vcal-conduitstate.h
- */
-class DeleteUnsyncedHHState : public ConduitState
-{
-private:
-	ConduitState *fNextState;
-	int fPilotIndex;
-
-public:
-	DeleteUnsyncedHHState();
-	virtual ~DeleteUnsyncedHHState();
-
-	virtual void startSync( ConduitAction* );
-	virtual void handleRecord( ConduitAction* );
-	virtual void finishSync( ConduitAction* );
-};
-
-#endif
diff --git a/kpilot/conduits/vcalconduit/deleteunsyncedpcstate.cc b/kpilot/conduits/vcalconduit/deleteunsyncedpcstate.cc
deleted file mode 100644
index 26a0a082..00000000
--- a/kpilot/conduits/vcalconduit/deleteunsyncedpcstate.cc
+++ /dev/null
@@ -1,135 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2006 by Bertjan Broeksema <b.broeksema@gmail.com>
-**
-** This file is the implementation of the DeleteUnsyncedPCState.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <options.h>
-#include <plugin.h>
-
-#include "pilotDatabase.h"
-#include "pilotRecord.h"
-
-#include "vcal-conduitbase.h"
-#include "deleteunsyncedpcstate.h"
-#include "cleanupstate.h"
-
-DeleteUnsyncedPCState::DeleteUnsyncedPCState()
-{
-	fState = eDeleteUnsyncedPC;
-}
-
-DeleteUnsyncedPCState::~DeleteUnsyncedPCState()
-{
-}
-
-void DeleteUnsyncedPCState::startSync( ConduitAction *ca )
-{
-	FUNCTIONSETUP;
-
-	VCalConduitBase *vccb = dynamic_cast<VCalConduitBase*>(ca);
-	if( !vccb )
-	{
-		return;
-	}
-
-	DEBUGKPILOT << fname << ": Starting DeleteUnsyncedPCState." << endl;
-	
-	fPilotIndex = 0;
-	fNextState = new CleanUpState();
-	
-	vccb->setHasNextRecord( true );
-	fStarted = true;
-}
-
-void DeleteUnsyncedPCState::handleRecord( ConduitAction *ca )
-{
-	FUNCTIONSETUP;
-
-	VCalConduitBase *vccb = dynamic_cast<VCalConduitBase*>(ca);
-	if( !vccb )
-	{
-		return;
-	}
-
-	KCal::Incidence *e = 0L;
-	e = vccb->privateBase()->getNextIncidence();
-
-	// if we don't have a record, then we can't do anything.  also, if
-	// we're copying everything from the PC to our handheld, then we're
-	// guaranteed not to have anything extra on our PC that's not on
-	// our handheld that needs to get deleted, so we can return in that
-	// case too...
-
-	if( !e || ( vccb->syncMode().mode() == ConduitAction::SyncMode::eCopyPCToHH ) )
-	{
-		vccb->setHasNextRecord( false );
-		return;
-	}
-
-
-	// try to find the corresponding index on the palm.  if we can't
-	// find it, then we have a pc record that needs to be deleted.
-	recordid_t id = e->pilotId();
-	
-	PilotRecord *s = 0L;
-
-	if( id > 0 )
-	{
-		s = vccb->database()->readRecordById( id );
-	}
-
-	// if we either have a pc record with no palm id or if we can't
-	// find a palm record that matches, then we need to delete this PC
-	// record.
-	if ( id <=0 || !s )
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": found PC entry with pilotID: [" << id 
-			<< "], Description: [" << e->summary() 
-			<< "], Time: ["<< e->dtStart().toString() << "] until: ["
-			<< e->dtEnd().toString() << "]. Can't find it on Palm, "
-			<< "so I'm deleting it from the local calendar." << endl;
-#endif
-		vccb->privateBase()->removeIncidence(e);
-	}
-
-	KPILOT_DELETE( s );
-
-}
-
-void DeleteUnsyncedPCState::finishSync( ConduitAction *ca )
-{
-	FUNCTIONSETUP;
-
-	VCalConduitBase *vccb = dynamic_cast<VCalConduitBase*>(ca);
-	if( !vccb )
-	{
-		return;
-	}
-
-	DEBUGKPILOT << fname << ": Finishing DeleteUnsyncedPCState." << endl;
-	vccb->setState( fNextState );
-}
diff --git a/kpilot/conduits/vcalconduit/deleteunsyncedpcstate.h b/kpilot/conduits/vcalconduit/deleteunsyncedpcstate.h
deleted file mode 100644
index 854b2a62..00000000
--- a/kpilot/conduits/vcalconduit/deleteunsyncedpcstate.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifndef _KPILOT_DUSPCSTATE_H
-#define _KPILOT_DUSPCSTATE_H
-/* deleteunsyncedpcstate.h                       KPilot
-**
-** Copyright (C) 2006 Bertjan Broeksema
-**
-** This file defines the deleteunsyncedpcstate for vcal-conduitbase.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "conduitstate.h"
-
-class VCalConduitBase;
-
-/**
- * State to handle delete unsynced pc records. @see vcal-conduitstate.h
- */
-class DeleteUnsyncedPCState : public ConduitState
-{
-private:
-	ConduitState *fNextState;
-	int fPilotIndex;
-
-public:
-	DeleteUnsyncedPCState();
-	virtual ~DeleteUnsyncedPCState();
-
-	virtual void startSync( ConduitAction* );
-	virtual void handleRecord( ConduitAction* );
-	virtual void finishSync( ConduitAction* );
-};
-
-#endif
diff --git a/kpilot/conduits/vcalconduit/hhtopcstate.cc b/kpilot/conduits/vcalconduit/hhtopcstate.cc
deleted file mode 100644
index 82024f12..00000000
--- a/kpilot/conduits/vcalconduit/hhtopcstate.cc
+++ /dev/null
@@ -1,249 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2006 by Bertjan Broeksema <b.broeksema@gmail.com>
-**
-** This file is the implementation of the HHtoPCState
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <options.h>
-
-#include "pilotDatabase.h"
-#include "pilotRecord.h"
-
-#include "vcalconduitSettings.h"
-#include "vcal-conduitbase.h"
-#include "hhtopcstate.h"
-#include "pctohhstate.h"
-#include "cleanupstate.h"
-
-HHToPCState::HHToPCState()
-{
-	fState = eHHToPC;
-	fPilotindex = 0;
-}
-
-HHToPCState::~HHToPCState()
-{
-}
-
-void HHToPCState::startSync( ConduitAction *ca )
-{
-	FUNCTIONSETUP;
-
-	VCalConduitBase *vccb = dynamic_cast<VCalConduitBase*>(ca);
-	if( !vccb )
-	{
-		return;
-	}
-
-	DEBUGKPILOT << fname << ": Starting HHToPCState." << endl;
-
-	if ( vccb->syncMode() == ConduitAction::SyncMode::eCopyHHToPC )
-	{
-		fNextState = new CleanUpState();
-	}
-	else
-	{
-		fNextState = new PCToHHState();
-	}
-
-	fStarted = true;
-	vccb->setHasNextRecord( true );
-}
-
-void HHToPCState::handleRecord( ConduitAction *ca )
-{
-	FUNCTIONSETUP;
-
-	VCalConduitBase *vccb = dynamic_cast<VCalConduitBase*>(ca);
-	if( !vccb )
-	{
-		return;
-	}
-
-	PilotRecord *r = 0L;
-	PilotRecord *s = 0L;
-
-	if ( vccb->isFullSync() )
-	{
-		r = vccb->database()->readRecordByIndex( fPilotindex++ );
-	}
-	else
-	{
-		r = vccb->database()->readNextModifiedRec();
-	}
-
-	if (!r)
-	{
-		vccb->privateBase()->updateIncidences();
-		vccb->setHasNextRecord( false );
-		return;
-	}
-
-	// let subclasses do something with the record before we try to sync
-	vccb->preRecord( r );
-
-	bool archiveRecord = ( r->isArchived() );
-	s = vccb->localDatabase()->readRecordById( r->id() );
-	
-	if ( !s || vccb->isFirstSync() )
-	{
-#ifdef DEBUG
-		if ( r->id() > 0 && !s )
-		{
-			DEBUGKPILOT << "-------------------------------------------------";
-			DEBUGKPILOT << "--------------------------" << endl;
-			DEBUGKPILOT << fname << ": Could not read palm record with ID ";
-			DEBUGKPILOT << r->id() << endl;
-		}
-#endif
-		if ( !r->isDeleted() 
-			|| ( vccb->config()->syncArchived() && archiveRecord ) )
-		{
-			KCal::Incidence *e = vccb->addRecord( r );
-			if ( vccb->config()->syncArchived() && archiveRecord )  {
-				e->setSyncStatus( KCal::Incidence::SYNCDEL );
-			}
-		}
-	}
-	else
-	{
-		if ( r->isDeleted() )
-		{
-			if ( vccb->config()->syncArchived() && archiveRecord )
-			{
-				vccb->changeRecord( r, s );
-			}
-			else
-			{
-				vccb->deleteRecord( r, s );
-			}
-		}
-		else
-		{
-			vccb->changeRecord( r, s );
-		}
-	}
-
-	KPILOT_DELETE(r);
-	KPILOT_DELETE(s);
-}
-
-void HHToPCState::finishSync( ConduitAction *ca )
-{
-	FUNCTIONSETUP;
-
-	VCalConduitBase *vccb = dynamic_cast<VCalConduitBase*>(ca);
-	if( !vccb )
-	{
-		return;
-	}
-
-	DEBUGKPILOT << fname << ": Finished HHToPCState." << endl;
-	vccb->setState( fNextState );
-}
-
-/*
-void VCalConduitBase::slotPalmRecToPC()
-{
-	FUNCTIONSETUP;
-
-	PilotRecord *r;
-	if (isFullSync())
-	{
-		r = fDatabase->readRecordByIndex(pilotindex++);
-	}
-	else
-	{
-		r = fDatabase->readNextModifiedRec();
-	}
-	PilotRecord *s = 0L;
-
-	if (!r)
-	{
-		fP->updateIncidences();
-		if ( syncMode()==SyncMode::eCopyHHToPC )
-		{
-			emit logMessage(i18n("Cleaning up ..."));
-			TQTimer::singleShot(0, this, TQT_SLOT(cleanup()));
-			return;
-		}
-		else
-		{
-			emit logMessage(i18n("Copying records to Pilot ..."));
-			TQTimer::singleShot(0 ,this,TQT_SLOT(slotPCRecToPalm()));
-			return;
-		}
-	}
-
-	// let subclasses do something with the record before we try to sync
-	preRecord(r);
-
-//	DEBUGKPILOT<<fname<<": Event: "<<e->dtStart()<<" until "<<e->dtEnd()<<endl;
-//	DEBUGKPILOT<<fname<<": Time: "<<e->dtStart()<<" until "<<e->dtEnd()<<endl;
-	bool archiveRecord=(r->isArchived());
-
-	s = fLocalDatabase->readRecordById(r->id());
-	if (!s || isFirstSync())
-	{
-#ifdef DEBUG
-		if (r->id()>0 && !s)
-		{
-			DEBUGKPILOT<<"---------------------------------------------------------------------------"<<endl;
-			DEBUGKPILOT<< fname<<": Could not read palm record with ID "<<r->id()<<endl;
-		}
-#endif
-		if (!r->isDeleted() || (config()->syncArchived() && archiveRecord))
-		{
-			KCal::Incidence*e=addRecord(r);
-			if (config()->syncArchived() && archiveRecord)  {
-				e->setSyncStatus(KCal::Incidence::SYNCDEL);
-			}
-		}
-	}
-	else
-	{
-		if (r->isDeleted())
-		{
-			if (config()->syncArchived() && archiveRecord)
-			{
-				changeRecord(r,s);
-			}
-			else
-			{
-				deleteRecord(r,s);
-			}
-		}
-		else
-		{
-			changeRecord(r,s);
-		}
-	}
-
-	KPILOT_DELETE(r);
-	KPILOT_DELETE(s);
-
-	TQTimer::singleShot(0,this,TQT_SLOT(slotPalmRecToPC()));
-}
-*/
diff --git a/kpilot/conduits/vcalconduit/hhtopcstate.h b/kpilot/conduits/vcalconduit/hhtopcstate.h
deleted file mode 100644
index 838828e6..00000000
--- a/kpilot/conduits/vcalconduit/hhtopcstate.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef _KPILOT_HHTOPCSTATE_H
-#define _KPILOT_HHTOPCSTATE_H
-/* hhtopcstate.h                       KPilot
-**
-** Copyright (C) 2006 Bertjan Broeksema
-**
-** This file defines the teststate for vcal-conduitbase.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <libkcal/calendarlocal.h>
-
-#include "conduitstate.h"
-
-class VCalConduitBase;
-
-/**
- * State to test the vcal-conduit. @see vcal-conduitstate.h
- */
-class HHToPCState : public ConduitState
-{
-private:
-	ConduitState *fNextState;
-	int fPilotindex;
-
-public:
-	HHToPCState();
-	virtual ~HHToPCState();
-
-	virtual void startSync( ConduitAction* );
-	virtual void handleRecord( ConduitAction* );
-	virtual void finishSync( ConduitAction* );
-};
-
-#endif
diff --git a/kpilot/conduits/vcalconduit/initstate.cc b/kpilot/conduits/vcalconduit/initstate.cc
deleted file mode 100644
index 23257ff3..00000000
--- a/kpilot/conduits/vcalconduit/initstate.cc
+++ /dev/null
@@ -1,109 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2006 by Bertjan Broeksema <b.broeksema@gmail.com>
-**
-** This file is the implementation of the InitState.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <options.h>
-#include <plugin.h>
-
-#include "vcal-conduitbase.h"
-#include "initstate.h"
-#include "teststate.h"
-#include "pctohhstate.h"
-#include "hhtopcstate.h"
-
-InitState::InitState()
-{
-	fState = eInit;
-}
-
-InitState::~InitState()
-{
-}
-
-void InitState::startSync( ConduitAction *ca )
-{
-	FUNCTIONSETUP;
-
-	VCalConduitBase *vccb = dynamic_cast<VCalConduitBase*>(ca);
-	if( !vccb )
-	{
-		return;
-	}
-
-	DEBUGKPILOT << fname << ": Starting InitState." << endl;
-
-	vccb->addLogMessage( i18n( "Initializing conduit ..." ) );
-	vccb->preSync();
-
-	if ( vccb->syncMode().isTest() )
-	{
-		fNextState = new TestState();
-	}
-	else
-	{
-		switch( vccb->syncMode().mode() )
-		{
-		case ConduitAction::SyncMode::eCopyPCToHH:
-			// TODO: Clear the palm and backup database??? Or just add the
-			// new items ignore the Palm->PC side and leave the existing items
-			// on the palm?
-			fNextState = new PCToHHState();
-			break;
-		case ConduitAction::SyncMode::eCopyHHToPC:
-			// TODO: Clear the backup database and the calendar, update fP
-			//       or just add the palm items and leave the PC ones there????
-			fNextState = new HHToPCState();
-			break;
-		default:
-			fNextState = new HHToPCState();
-			break;
-		}
-	}
-
-	fStarted = true;
-	vccb->setHasNextRecord( false );
-}
-
-void InitState::handleRecord( ConduitAction *vccb )
-{
-	FUNCTIONSETUP;
-	Q_UNUSED(vccb);
-}
-
-void InitState::finishSync( ConduitAction *ca )
-{
-	FUNCTIONSETUP;
-
-	VCalConduitBase *vccb = dynamic_cast<VCalConduitBase*>(ca);
-	if( !vccb )
-	{
-		return;
-	}
-
-	DEBUGKPILOT << fname << ": Finished InitState." << endl;
-	vccb->setState( fNextState );
-}
diff --git a/kpilot/conduits/vcalconduit/initstate.h b/kpilot/conduits/vcalconduit/initstate.h
deleted file mode 100644
index 83042ba2..00000000
--- a/kpilot/conduits/vcalconduit/initstate.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef _KPILOT_INITSTATE_H
-#define _KPILOT_INITSTATE_H
-/* initstate.h                       KPilot
-**
-** Copyright (C) 2006 Bertjan Broeksema
-**
-** This file defines the teststate for vcal-conduitbase.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "conduitstate.h"
-
-class VCalConduitBase;
-
-/**
- * State to test the vcal-conduit. @see vcal-conduitstate.h
- */
-class InitState : public ConduitState
-{
-private:
-	ConduitState *fNextState;
-
-public:
-	InitState();
-	virtual ~InitState();
-
-	virtual void startSync( ConduitAction *vccb );
-	virtual void handleRecord( ConduitAction *vccb );
-	virtual void finishSync( ConduitAction *vccb );
-};
-
-#endif
diff --git a/kpilot/conduits/vcalconduit/kcalRecord.cc b/kpilot/conduits/vcalconduit/kcalRecord.cc
deleted file mode 100644
index 598866dc..00000000
--- a/kpilot/conduits/vcalconduit/kcalRecord.cc
+++ /dev/null
@@ -1,143 +0,0 @@
-/* kcalRecord.cc                       KPilot
-**
-** Copyright (C) 2006 by Adriaan de Groot <groot@kde.org>
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-** Copyright (C) 2001 by Dan Pilone
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <libkcal/calendar.h>
-#include <libkcal/calendarlocal.h>
-#include <libkcal/recurrence.h>
-#include <libkcal/vcalformat.h>
-
-#include "pilot.h"
-#include "pilotRecord.h"
-#include "kcalRecord.h"
-
-void KCalSync::setCategory(PilotRecordBase *de,
-	const KCal::Incidence *e,
-	const CategoryAppInfo &info)
-{
-	FUNCTIONSETUP;
-
-	if (!de || !e)
-	{
-		return;
-	}
-
-	TQString deCategory;
-	TQStringList eventCategories = e->categories();
-	if (eventCategories.size() < 1)
-	{
-		// This event has no categories.
-		de->setCategory(Pilot::Unfiled);
-		return;
-	}
-
-	// Quick check: does the record (not unfiled) have an entry
-	// in the categories list? If so, use that.
-	if (de->category() != Pilot::Unfiled)
-	{
-		deCategory = Pilot::categoryName(&info,de->category());
-		if (eventCategories.contains(deCategory))
-		{
-			// Found, so leave the category unchanged.
-			return;
-		}
-	}
-
-	TQStringList availableHandheldCategories = Pilot::categoryNames(&info);
-
-	// Either the record is unfiled, and should be filed, or
-	// it has a category set which is not in the list of
-	// categories that the event has. So go looking for
-	// a category that is available both for the event
-	// and on the handheld.
-	for ( TQStringList::ConstIterator it = eventCategories.begin();
-		it != eventCategories.end(); ++it )
-	{
-		// Odd, an empty category string.
-		if ( (*it).isEmpty() )
-		{
-			continue;
-		}
-
-		if (availableHandheldCategories.contains(*it))
-		{
-			// Since the string is in the list of available categories,
-			// this *can't* fail.
-			int c = Pilot::findCategory(&info,*it,false);
-			Q_ASSERT( Pilot::validCategory(c) );
-			de->setCategory(c);
-			return;
-		}
-	}
-
-	de->setCategory(Pilot::Unfiled);
-}
-
-void KCalSync::setCategory(KCal::Incidence *e,
-	const PilotRecordBase *de,
-	const CategoryAppInfo &info)
-{
-	FUNCTIONSETUP;
-
-	if (!e || !de)
-	{
-		DEBUGKPILOT << fname << ": error.  unable to set kcal category. e: ["
-			<< (void *)e << "], de: [" << (void *)de << "]" << endl;
-		return;
-	}
-
-	TQStringList cats=e->categories();
-	int cat = de->category();
-	TQString newcat = Pilot::categoryName(&info,cat);
-
-	DEBUGKPILOT << fname << ": palm category id: [" << cat <<
-		"], label: [" << newcat << "]" << endl;
-
-	if ( Pilot::validCategory(cat) && (cat != Pilot::Unfiled))
-	{
-		if (!cats.contains(newcat))
-		{
-			// if this event only has one category associated with it, then we can
-			// safely assume that what we should be doing here is changing it to match
-			// the palm.  if there's already more than one category in the event, however, we
-			// won't cause data loss--we'll just append what the palm has to the
-			// event's categories
-			if (cats.count() <=1)
-			{
-				cats.clear();
-			}
-
-			cats.append( newcat );
-			e->setCategories(cats);
-		}
-	}
-
-	DEBUGKPILOT << fname << ": kcal categories now: [" << cats.join(",") << "]" << endl;
-}
diff --git a/kpilot/conduits/vcalconduit/kcalRecord.h b/kpilot/conduits/vcalconduit/kcalRecord.h
deleted file mode 100644
index efd916e8..00000000
--- a/kpilot/conduits/vcalconduit/kcalRecord.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef _KPILOT_KCALRECORD_H
-#define _KPILOT_KCALRECORD_H
-/*
-** Copyright (C) 2006 by Adriaan de Groot <groot@kde.org>
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-** Copyright (C) 2001 by Dan Pilone
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-class PilotRecordBase;
-
-namespace KCal
-{
-	class Incidence;
-}
-
-namespace KCalSync
-{
-	void setCategory(PilotRecordBase *de,
-		const KCal::Incidence *incidence,
-		const CategoryAppInfo &info);
-	void setCategory(KCal::Incidence *e,
-		const PilotRecordBase *de,
-		const CategoryAppInfo &info);
-}
-
-#endif
-
diff --git a/kpilot/conduits/vcalconduit/korganizerConduit.ui b/kpilot/conduits/vcalconduit/korganizerConduit.ui
deleted file mode 100644
index 1a9d6557..00000000
--- a/kpilot/conduits/vcalconduit/korganizerConduit.ui
+++ /dev/null
@@ -1,275 +0,0 @@
-<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
-<class>VCalWidget</class>
-<author>Adriaan de Groot</author>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>Form1</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>593</width>
-            <height>209</height>
-        </rect>
-    </property>
-    <property name="sizePolicy">
-        <sizepolicy>
-            <hsizetype>5</hsizetype>
-            <vsizetype>5</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-        </sizepolicy>
-    </property>
-    <property name="baseSize">
-        <size>
-            <width>570</width>
-            <height>270</height>
-        </size>
-    </property>
-    <property name="caption">
-        <string>Calendar-Conduit Options</string>
-    </property>
-    <property name="layoutMargin" stdset="0">
-    </property>
-    <property name="layoutSpacing" stdset="0">
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QTabWidget" row="0" column="0">
-            <property name="name">
-                <cstring>tabWidget</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>7</hsizetype>
-                    <vsizetype>7</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="layoutMargin" stdset="0">
-            </property>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>Widget2</cstring>
-                </property>
-                <attribute name="title">
-                    <string>General</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <spacer row="2" column="0">
-                        <property name="name">
-                            <cstring>Spacer4</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QButtonGroup" row="0" column="0">
-                        <property name="name">
-                            <cstring>fSyncDestination</cstring>
-                        </property>
-                        <property name="title">
-                            <string>Sync Destination</string>
-                        </property>
-                        <grid>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
-                                <property name="name">
-                                    <cstring>fSyncStdCalendar</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>&amp;Standard calendar</string>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Select this option to synchronize with the calendar specified by the KDE calendar settings.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="QRadioButton" row="1" column="0">
-                                <property name="name">
-                                    <cstring>fSyncFile</cstring>
-                                </property>
-                                <property name="enabled">
-                                    <bool>true</bool>
-                                </property>
-                                <property name="text">
-                                    <string>Calendar &amp;file:</string>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Select this option to use a specific calendar file, instead of the standard KDE calendar. This file must be in the in the vCalendar or iCalendar format. Enter the location of this file in the edit box or select it clicking the file picker button.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                            <widget class="KURLRequester" row="1" column="1">
-                                <property name="name">
-                                    <cstring>fCalendarFile</cstring>
-                                </property>
-                                <property name="enabled">
-                                    <bool>false</bool>
-                                </property>
-                                <property name="sizePolicy">
-                                    <sizepolicy>
-                                        <hsizetype>3</hsizetype>
-                                        <vsizetype>5</vsizetype>
-                                        <horstretch>0</horstretch>
-                                        <verstretch>0</verstretch>
-                                    </sizepolicy>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>&lt;qt&gt;Enter here the location and filename of the calendar file or select it clicking the file picker button. This file must be in the iCalendar or vCalendar format.&lt;/qt&gt;</string>
-                                </property>
-                            </widget>
-                        </grid>
-                    </widget>
-                    <widget class="QCheckBox" row="1" column="0">
-                        <property name="name">
-                            <cstring>fArchive</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Store &amp;archived records in the KDE calendar</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>When this box is checked, archived records will still
-be saved in the calendar on the PC.</string>
-                        </property>
-                    </widget>
-                </grid>
-            </widget>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>tab</cstring>
-                </property>
-                <attribute name="title">
-                    <string>Conflicts</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <widget class="QLabel" row="0" column="0">
-                        <property name="name">
-                            <cstring>fTextLabel</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>4</hsizetype>
-                                <vsizetype>5</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="text">
-                            <string>Conflict &amp;resolution:</string>
-                        </property>
-                        <property name="buddy" stdset="0">
-                            <cstring>fConflictResolution</cstring>
-                        </property>
-                    </widget>
-                    <widget class="QComboBox" row="0" column="1">
-                        <item>
-                            <property name="text">
-                                <string>Use KPilot's Global Setting</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>Ask User</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>Do Nothing</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>Handheld Overrides</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>PC Overrides</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>Values From Last Sync (if possible)</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property name="text">
-                                <string>Use Both Entries</string>
-                            </property>
-                        </item>
-                        <property name="name">
-                            <cstring>fConflictResolution</cstring>
-                        </property>
-                        <property name="currentItem">
-                            <number>6</number>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;Select in this list how conflicting entries (entries which were edited both on your handheld and on the PC) are resolved. Possibly values are "Use KPilot's Global Setting" to use the settings defined in KPilot HotSync configuration, "Ask User" to let you decide case by case, "Do Nothing" to allow the entries to be different, "PC overrides", "Handheld overrides", "Use values from last sync" and "Use both entries" to create a new entry on both the PC and handheld. Note that this does &lt;i&gt;not&lt;/i&gt; handle double-scheduling conflicts.&lt;/qt&gt;</string>
-                        </property>
-                    </widget>
-                    <spacer row="1" column="1">
-                        <property name="name">
-                            <cstring>spacer2</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>20</width>
-                                <height>31</height>
-                            </size>
-                        </property>
-                    </spacer>
-                </grid>
-            </widget>
-        </widget>
-    </grid>
-</widget>
-<connections>
-    <connection>
-        <sender>fSyncFile</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>fCalendarFile</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-</connections>
-<tabstops>
-    <tabstop>tabWidget</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-<includes>
-    <include location="global" impldecl="in implementation">kurlrequester.h</include>
-    <include location="global" impldecl="in implementation">klineedit.h</include>
-    <include location="global" impldecl="in implementation">kpushbutton.h</include>
-</includes>
-</UI>
diff --git a/kpilot/conduits/vcalconduit/pctohhstate.cc b/kpilot/conduits/vcalconduit/pctohhstate.cc
deleted file mode 100644
index d2866fd1..00000000
--- a/kpilot/conduits/vcalconduit/pctohhstate.cc
+++ /dev/null
@@ -1,159 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2006 by Bertjan Broeksema <b.broeksema@gmail.com>
-**
-** This file is the implementation of the PCToHHState.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <options.h>
-
-#include "pilotDatabase.h"
-#include "pilotRecord.h"
-
-#include "vcal-conduitbase.h"
-#include "pctohhstate.h"
-#include "cleanupstate.h"
-#include "deleteunsyncedhhstate.h"
-
-PCToHHState::PCToHHState()
-{
-	fState = ePCToHH;
-}
-
-PCToHHState::~PCToHHState()
-{
-}
-
-void PCToHHState::startSync( ConduitAction *ca )
-{
-	FUNCTIONSETUP;
-	VCalConduitBase *vccb = dynamic_cast<VCalConduitBase*>(ca);
-	if( !vccb )
-	{
-		return;
-	}
-	
-	DEBUGKPILOT << fname << ": Starting PCToHHState." << endl;
-
-	// if we are asked to copy HH to PC, we shouldn't look for deleted records
-	// on the Palm, since we've just copied them all.  =:)  Otherwise, look for
-	// data on the palm that shouldn't be there and delete it if we find it....
-	if ( vccb->syncMode() == ConduitAction::SyncMode::eCopyHHToPC )
-	{
-		fNextState = new CleanUpState();
-	}
-	else
-	{
-		fNextState = new DeleteUnsyncedHHState();
-	}
-
-	vccb->addLogMessage( i18n( "Copying records to Pilot ..." ) );
-
-	fStarted = true;
-	vccb->setHasNextRecord( true );
-}
-
-void PCToHHState::handleRecord( ConduitAction *ca )
-{
-	FUNCTIONSETUP;
-	VCalConduitBase *vccb = dynamic_cast<VCalConduitBase*>(ca);
-	if( !vccb )
-	{
-		return;
-	}
-
-	KCal::Incidence *e = 0L;
-
-	if( vccb->isFullSync() )
-	{
-		e = vccb->privateBase()->getNextIncidence();
-	}
-	else
-	{
-		e = vccb->privateBase()->getNextModifiedIncidence();
-	}
-
-	// No more incidences to sync
-	if( !e )
-	{
-		vccb->setHasNextRecord( false );
-		return;
-	}
-	
-	// let subclasses do something with the event
-	vccb->preIncidence( e );
-
-	// find the corresponding index on the palm and sync. If there is none, 
-	// create it.
-	recordid_t id = e->pilotId();
-	
-	DEBUGKPILOT << fname << ": found PC entry with pilotID " << id <<endl;
-	DEBUGKPILOT << fname << ": Description: " << e->summary() << endl;
-
-	TQDateTime start_time = e->dtStart();
-	TQDateTime end_time = e->dtEnd();
-	DEBUGKPILOT << fname << ": Time: "<< start_time.toString() << " until "
-		<< end_time.toString() << endl;
-
-	PilotRecord *s = 0L;
-
-	if( id > 0 && ( s = vccb->database()->readRecordById( id ) ) )
-	{
-		if( e->syncStatus() == KCal::Incidence::SYNCDEL )
-		{
-			vccb->deletePalmRecord( e, s );
-		}
-		else
-		{
-			vccb->changePalmRecord( e, s );
-		}
-
-		KPILOT_DELETE( s );
-	} else {
-#ifdef DEBUG
-		if (id > 0 )
-		{
-			DEBUGKPILOT << "-------------------------------------------------"
-				<< "--------------------------" << endl;
-			DEBUGKPILOT << fname << ": Could not read palm record with ID "
-				<< id << endl;
-		}
-#endif
-		vccb->addPalmRecord( e );
-	}
-}
-
-void PCToHHState::finishSync( ConduitAction *ca )
-{
-	FUNCTIONSETUP;
-	
-	VCalConduitBase *vccb = dynamic_cast<VCalConduitBase*>(ca);
-	if( !vccb )
-	{
-		return;
-	}
-
-	DEBUGKPILOT << fname << ": Finished PCToHHState." << endl;
-	vccb->setState( fNextState );
-}
diff --git a/kpilot/conduits/vcalconduit/pctohhstate.h b/kpilot/conduits/vcalconduit/pctohhstate.h
deleted file mode 100644
index 44f929d6..00000000
--- a/kpilot/conduits/vcalconduit/pctohhstate.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef _KPILOT_PCTOHHSTATE_H
-#define _KPILOT_PCTOHHSTATE_H
-/* pctohhstate.h                       KPilot
-**
-** Copyright (C) 2006 Bertjan Broeksema
-**
-** This file defines the pctohhstate for vcal-conduitbase.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "conduitstate.h"
-
-class VCalConduitBase;
-
-/**
- * State that handles copying of records from pc to handheld. 
- * @see vcal-conduitstate.h
- */
-class PCToHHState : public ConduitState
-{
-private:
-	ConduitState *fNextState;
-	int fPilotindex;
-
-public:
-	PCToHHState();
-	virtual ~PCToHHState();
-
-	virtual void startSync( ConduitAction* );
-	virtual void handleRecord( ConduitAction* );
-	virtual void finishSync( ConduitAction* );
-};
-
-#endif
diff --git a/kpilot/conduits/vcalconduit/teststate.cc b/kpilot/conduits/vcalconduit/teststate.cc
deleted file mode 100644
index c762d32b..00000000
--- a/kpilot/conduits/vcalconduit/teststate.cc
+++ /dev/null
@@ -1,127 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2006 by Bertjan Broeksema <b.broeksema@gmail.com>
-**
-** This file is the implementation of the TestState.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <options.h>
-
-#include <tqdatetime.h>
-#include <tqfile.h>
-
-#include "pilotSerialDatabase.h"
-#include "pilotLocalDatabase.h"
-#include "pilotDateEntry.h"
-
-#include "teststate.h"
-#include "vcal-conduitbase.h"
-
-TestState::TestState() : fCalendar( TQString::null )
-{
-	fState = eTest;
-}
-
-TestState::~TestState()
-{
-	FUNCTIONSETUP;
-}
-
-void TestState::startSync( ConduitAction *ca )
-{
-	FUNCTIONSETUP;
-	
-	VCalConduitBase *vccb = dynamic_cast<VCalConduitBase*>(ca);
-	if( !vccb )
-	{
-		return;
-	}
-	
-	DEBUGKPILOT << fname << ": Starting teststate." << endl;
-
-	vccb->setHasNextRecord( true );
-	fPilotindex = 0;
-	fStarted = true;
-}
-
-void TestState::handleRecord( ConduitAction *ca )
-{
-	FUNCTIONSETUP;
-
-	VCalConduitBase *vccb = dynamic_cast<VCalConduitBase*>(ca);
-	if( !vccb )
-	{
-		return;
-	}
-
-	DEBUGKPILOT << fname << ": Handling record " << fPilotindex << endl;
-
-	PilotRecord *record = vccb->readRecordByIndex( fPilotindex );
-	
-	if( record )
-	{
-		KCal::Incidence *i = vccb->incidenceFromRecord( record );
-		fCalendar.addIncidence( i );
-	
-		KPILOT_DELETE(record);
-	
-		// Schedule more work.
-		++fPilotindex;
-	}
-	else
-	{
-		vccb->setHasNextRecord( false );
-	}
-}
-
-void TestState::finishSync( ConduitAction *ca )
-{
-	FUNCTIONSETUP;
-	
-	VCalConduitBase *vccb = dynamic_cast<VCalConduitBase*>(ca);
-	if( !vccb )
-	{
-		return;
-	}
-
-	DEBUGKPILOT << fname << ": finishing teststate." << endl;
-
-	// No more records present on the device so lets dump the
-	// readed records in a file.
-	TQFile f( CSL1("dump.ics") );
-	if( !f.exists() )
-	{
-		f.open( IO_WriteOnly );
-		f.close();
-	}
-
-	if( !fCalendar.save( CSL1("dump.ics") ) )
-	{
-		DEBUGKPILOT << fname << ": Can't save calendar file." << endl;
-	}
-
-	fCalendar.close();
-
-	vccb->setState( 0L );
-}
diff --git a/kpilot/conduits/vcalconduit/teststate.h b/kpilot/conduits/vcalconduit/teststate.h
deleted file mode 100644
index 76361e36..00000000
--- a/kpilot/conduits/vcalconduit/teststate.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef _KPILOT_TESTSTATE_H
-#define _KPILOT_TESTSTATE_H
-/* teststate.h                       KPilot
-**
-** Copyright (C) 2006 Bertjan Broeksema
-**
-** This file defines the teststate for vcal-conduitbase.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <libkcal/calendarlocal.h>
-
-#include "conduitstate.h"
-
-class VCalConduitBase;
-
-/**
- * State to test the vcal-conduit. @see vcal-conduitstate.h
- */
-class TestState : public ConduitState
-{
-private:
-	KCal::CalendarLocal fCalendar;
-	int fPilotindex;
-
-public:
-	TestState();
-	virtual ~TestState();
-
-	virtual void startSync( ConduitAction* );
-	virtual void handleRecord( ConduitAction* );
-	virtual void finishSync( ConduitAction* );
-};
-
-#endif
diff --git a/kpilot/conduits/vcalconduit/todo-conduit.cc b/kpilot/conduits/vcalconduit/todo-conduit.cc
deleted file mode 100644
index 9b1007c2..00000000
--- a/kpilot/conduits/vcalconduit/todo-conduit.cc
+++ /dev/null
@@ -1,373 +0,0 @@
-/* Todo-Conduit for syncing KPilot and KOrganizer
-**
-** Copyright (C) 2002-2003 Reinhold Kainhofer
-** Copyright (C) 1998-2001 Dan Pilone
-** Copyright (C) 1998-2000 Preston Brown <pbrown@kde.org>
-** Copyright (C) 1998 Herwin-Jan Steehouwer
-** Copyright (C) 2001 Cornelius Schumacher
-**
-** This file is part of the todo conduit, a conduit for KPilot that
-** synchronises the Pilot's todo application with the outside world,
-** which currently means KOrganizer.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <tqdatetime.h>
-#include <tqtextcodec.h>
-
-#include <libkcal/calendar.h>
-#include <libkcal/todo.h>
-
-#include <pilotLocalDatabase.h>
-
-#include "todo-conduit.moc"
-#include "vcalconduitSettings.h"
-#include "todo-factory.h"
-
-#include "kcalRecord.h"
-#include "todoRecord.h"
-
-// define conduit versions, one for the version when categories were synced for the first time, and the current version number
-#define CONDUIT_VERSION_CATEGORYSYNC 10
-#define CONDUIT_VERSION 10
-
-extern "C"
-{
-unsigned long version_conduit_todo = Pilot::PLUGIN_API;
-}
-
-
-TodoConduitPrivate::TodoConduitPrivate(KCal::Calendar *b) :
-	VCalConduitPrivateBase(b)
-{
-	fAllTodos.setAutoDelete(false);
-}
-
-void TodoConduitPrivate::addIncidence(KCal::Incidence*e)
-{
-	fAllTodos.append(static_cast<KCal::Todo*>(e));
-	fCalendar->addTodo(static_cast<KCal::Todo*>(e));
-}
-
-int TodoConduitPrivate::updateIncidences()
-{
-	fAllTodos = fCalendar->todos();
-	fAllTodos.setAutoDelete(false);
-	return fAllTodos.count();
-}
-
-
-void TodoConduitPrivate::removeIncidence(KCal::Incidence *e)
-{
-	fAllTodos.remove(static_cast<KCal::Todo*>(e));
-	if (!fCalendar) return;
-	fCalendar->deleteTodo(static_cast<KCal::Todo*>(e));
-	// now just in case we're in the middle of reading through our list
-	// and we delete something, set reading to false so we start at the
-	// top again next time and don't have problems with our iterator
-	reading = false;
-}
-
-
-
-KCal::Incidence *TodoConduitPrivate::findIncidence(recordid_t id)
-{
-	KCal::Todo::List::ConstIterator it;
-        for( it = fAllTodos.begin(); it != fAllTodos.end(); ++it ) {
-                KCal::Todo *todo = *it;
-		if ((recordid_t)(todo->pilotId()) == id) return todo;
-	}
-
-	return 0L;
-}
-
-
-
-KCal::Incidence *TodoConduitPrivate::findIncidence(PilotRecordBase *tosearch)
-{
-	PilotTodoEntry*entry=dynamic_cast<PilotTodoEntry*>(tosearch);
-	if (!entry) return 0L;
-
-	TQString title=entry->getDescription();
-	TQDateTime dt=readTm( entry->getDueDate() );
-
-	KCal::Todo::List::ConstIterator it;
-        for( it = fAllTodos.begin(); it != fAllTodos.end(); ++it ) {
-                KCal::Todo *event = *it;
-		if ( (event->dtDue().date() == dt.date()) && (event->summary() == title) ) return event;
-	}
-	return 0L;
-}
-
-
-
-KCal::Incidence *TodoConduitPrivate::getNextIncidence()
-{
-	FUNCTIONSETUP;
-	if (reading) {
-		++fAllTodosIterator;
-	}
-	else {
-		reading=true;
-		fAllTodosIterator = fAllTodos.begin();
-	}
-
-	return(fAllTodosIterator == fAllTodos.end()) ? 0L : *fAllTodosIterator;
-}
-
-
-
-KCal::Incidence *TodoConduitPrivate::getNextModifiedIncidence()
-{
-	FUNCTIONSETUP;
-	KCal::Todo*e=0L;
-	if (!reading)
-	{
-		reading=true;
-		fAllTodosIterator = fAllTodos.begin();
-	}
-	else
-	{
-		++fAllTodosIterator;
-	}
-	if ( fAllTodosIterator != fAllTodos.end() ) e=*fAllTodosIterator;
-	while (fAllTodosIterator != fAllTodos.end() &&
-		e && e->syncStatus()!=KCal::Incidence::SYNCMOD && e->pilotId())
-	{
-		e = (++fAllTodosIterator != fAllTodos.end()) ? *fAllTodosIterator : 0L;
-
-#ifdef DEBUG
-	if(e)
-		DEBUGKPILOT<< e->summary()<<" had SyncStatus="<<e->syncStatus()<<endl;
-#endif
-
-	}
-
-	return (fAllTodosIterator == fAllTodos.end()) ? 0L : *fAllTodosIterator;
-}
-
-
-
-/****************************************************************************
- *                          TodoConduit class                               *
- ****************************************************************************/
-
-TodoConduit::TodoConduit(KPilotLink *d,
-	const char *n,
-	const TQStringList &a) : VCalConduitBase(d,n,a),
-	fTodoAppInfo( 0L )
-{
-	FUNCTIONSETUP;
-	fConduitName=i18n("To-do");
-}
-
-
-
-TodoConduit::~TodoConduit()
-{
-//	FUNCTIONSETUP;
-}
-
-
-
-void TodoConduit::_setAppInfo()
-{
-	FUNCTIONSETUP;
-	// get the address application header information
-
-	if( !fTodoAppInfo )
-	{
-		DEBUGKPILOT << fname << ": fTodoAppInfo is NULL" << endl;
-		return;
-	}
-	if( !fDatabase )
-	{
-		DEBUGKPILOT << fname << ": fDatabase is NULL" << endl;
-		return;
-	}
-
-	fTodoAppInfo->writeTo(fDatabase);
-}
-
-void TodoConduit::_getAppInfo()
-{
-	FUNCTIONSETUP;
-	// get the address application header information
-
-	KPILOT_DELETE( fTodoAppInfo );
-	fTodoAppInfo = new PilotToDoInfo(fDatabase);
-	fTodoAppInfo->dump();
-}
-
-
-
-const TQString TodoConduit::getTitle(PilotRecordBase *de)
-{
-	PilotTodoEntry*d=dynamic_cast<PilotTodoEntry*>(de);
-	if (d)
-	{
-		return TQString(d->getDescription());
-	}
-	return TQString::null;
-}
-
-
-
-void TodoConduit::readConfig()
-{
-	FUNCTIONSETUP;
-	VCalConduitBase::readConfig();
-	// determine if the categories have ever been synce. Needed to prevent loosing
-	// the categories on the desktop. Also use a full sync for the first time to
-	// make sure the palm categories are really transferred to the desktop.
-	//
-	categoriesSynced = config()->conduitVersion()>=CONDUIT_VERSION_CATEGORYSYNC;
-	if (!categoriesSynced && !isFullSync() )
-	{
-		changeSync(SyncMode::eFullSync);
-	}
-	DEBUGKPILOT<<"categoriesSynced=" << categoriesSynced << endl;
-}
-
-void TodoConduit::preSync()
-{
-	FUNCTIONSETUP;
-	VCalConduitBase::preSync();
-	_getAppInfo();
-}
-
-void TodoConduit::postSync()
-{
-	FUNCTIONSETUP;
-	VCalConduitBase::postSync();
-	// after this successful sync the categories have been synced for sure
-	config()->setConduitVersion( CONDUIT_VERSION );
-	config()->writeConfig();
-	_setAppInfo();
-}
-
-
-
-PilotRecord *TodoConduit::recordFromIncidence(PilotRecordBase *de, const KCal::Incidence *e)
-{
-	FUNCTIONSETUP;
-
-	if (!de || !e)
-	{
-		DEBUGKPILOT << fname
-			<< ": got NULL entry or NULL incidence." << endl;
-		return 0L;
-	}
-
-	PilotTodoEntry *todoEntry = dynamic_cast<PilotTodoEntry*>(de);
-	if (!todoEntry)
-	{
-		// Secretly wasn't a todo entry after all
-		return 0L;
-	}
-
-	const KCal::Todo *todo = dynamic_cast<const KCal::Todo *>(e);
-	if (!todo)
-	{
-		DEBUGKPILOT << fname << ": Incidence is not a todo." << endl;
-		return 0L;
-	}
-
-	// don't need to check for null pointers here, the recordFromIncidence(PTE*, KCal::Todo*) will do that.
-	if (KCalSync::setTodoEntry(todoEntry,todo,*fTodoAppInfo->categoryInfo()))
-	{
-		return todoEntry->pack();
-	}
-	else
-	{
-		return 0L;
-	}
-}
-
-KCal::Incidence *TodoConduit::incidenceFromRecord(KCal::Incidence *e, const PilotRecordBase *de)
-{
-	FUNCTIONSETUP;
-
-	if (!de || !e)
-	{
-		DEBUGKPILOT << fname
-			<< ": Got NULL entry or NULL incidence." << endl;
-		return 0L;
-	}
-
-	const PilotTodoEntry *todoEntry = dynamic_cast<const PilotTodoEntry *>(de);
-	if (!todoEntry)
-	{
-		DEBUGKPILOT << fname << ": HH record not a todo entry." << endl;
-		return 0L;
-	}
-
-	KCal::Todo *todo = dynamic_cast<KCal::Todo *>(e);
-	if (!todo)
-	{
-		DEBUGKPILOT << fname << ": Incidence is not a todo." << endl;
-		return 0L;
-	}
-
-	KCalSync::setTodo(todo, todoEntry,*fTodoAppInfo->categoryInfo());
-	return e;
-}
-
-
-
-
-
-void TodoConduit::preRecord(PilotRecord*r)
-{
-	FUNCTIONSETUP;
-	if (!categoriesSynced && r)
-	{
-		const PilotRecordBase *de = newPilotEntry(r);
-		KCal::Incidence *e = fP->findIncidence(r->id());
-		KCalSync::setCategory(dynamic_cast<KCal::Todo*>(e),
-			dynamic_cast<const PilotTodoEntry*>(de),
-			*fTodoAppInfo->categoryInfo());
-	}
-}
-
-
-
-
-
-
-static VCalConduitSettings *config_vcal = 0L;
-
-VCalConduitSettings *TodoConduit::theConfig() {
-	if (!config_vcal)
-	{
-		config_vcal = new VCalConduitSettings(CSL1("Calendar"));
-	}
-
-	return config_vcal;
-}
-
-VCalConduitSettings *TodoConduit::config() {
-	return theConfig();
-}
diff --git a/kpilot/conduits/vcalconduit/todo-conduit.desktop b/kpilot/conduits/vcalconduit/todo-conduit.desktop
deleted file mode 100644
index d1101af1..00000000
--- a/kpilot/conduits/vcalconduit/todo-conduit.desktop
+++ /dev/null
@@ -1,105 +0,0 @@
-[Desktop Entry]
-Type=Service
-Comment=This conduit syncs the ToDo list from your handheld to KOrganizer.
-Comment[af]=Hierdie pad sinkroniseer die Te-doen lys vanaf jou draagbare toestel na KOrganizer.
-Comment[bg]=Синхронизаци� на �пи�ъка �ъ� задачи на мобилно у�трой�тво � организатора в KDE
-Comment[bs]=Ovaj conduit sinhronizuje listu Zadataka na ru�nom ra�unaru sa KOrganizerom.
-Comment[ca]=Aquest conducte sincronitza la llista de pendents des de la vostra agenda electrònica a KOrganizer.
-Comment[cs]=Toto propojení synchronizuje seznam úkolů s KOrganizérem
-Comment[cy]=Mae'r cwndid yma yn cydamseru'r rhestr I-Wneud o'ch llawiadur i KTrefnydd.
-Comment[da]=Denne kanal synkroniserer din gøremålsliste fra din håndholdte til KOrganizer.
-Comment[de]=Abgleich der Aufgabenlisten von Taschencomputer und KOrganizer
-Comment[el]=Αυτός ο σ�νδεσμος συγχ�ονίζει τη λίστα π�ος υλοποίηση από τον υπολογιστή παλάμης σας στο KOrganizer.
-Comment[eo]=Tiu kanalo sinkronigas la farendaĵliston de via po�komputilo kun KOrganizilo.
-Comment[es]=Este conducto sincroniza la lista de tareas pendientes de su agenda electrónica con KOrganizer.
-Comment[et]=See kanal sünkroniseerib pihuarvuti ja KOrganizeri ülesannete nimekirja.
-Comment[eu]=Kanal honek zure agenda elektronikoko egitekoen zerrenda KOrganizer-era sinkronizatzen du.
-Comment[fa]=این لوله، �هرست کارهایی که باید انجام شود را از دستی شما با KOrganizer همگام‌سازی می‌کند.
-Comment[fi]=Tämä yhdyskäytävä synkronoi taskutietokoneen tehtävälistan KOrganizeriin.
-Comment[fr]=Ce canal synchronise la liste des tâches de votre Palm sur KOrganizer.
-Comment[fy]=Dit conduit syngronisearret de takenlist fan jo handheld mei KOrganizer.
-Comment[gl]=Este conducto sincroniza a lista de tarefas pendentes dende o seu aparello portátil a KOrganizer.
-Comment[hi]=यह कन�ड�यूइट आपके हैंण�डहेल�ड से टू-डू सूची को के-आर�गेनाइज़र में सिंक करता है
-Comment[hu]=Ezzel a csatolóval a Pilot tennivalólistája és a KOrganizer tennivalói között lehet szinkronizálást végezni.
-Comment[is]=Þessi rás samstillir verkþáttalista lófatölvunnar þinnar og KOrganizer.
-Comment[it]=Questo condotto sincronizza il tuo Pilot con la lista delle cose da fare di KOrganizer.
-Comment[ja]=��コンジット��ンドヘルド� To-Do � KOrganizer を�期����。
-Comment[kk]=Қалта құрылғыдағы жо�пар тізімін KOrganizer-мен қадамда�тыру арна�ы.
-Comment[km]=បំពង់​ន�ះ​ធ្វើ​សមកាលកម្ម​បញ្ជី​ការងារ​�្រូវ​ធ្វើ​ពី​ឧបករណ�​យួរ​ដៃ​របស់​អ្នកទៅ KOrganizer ។
-Comment[lt]=Šis kanalas sinchronizuoja Jūsų darbų sąrašą iš delninuko su su KOrganizer sąrašu.
-Comment[ms]=Saluran ini mensegerakkan senarai tugasan  dari komputer telapak anda ke KOrganizer.
-Comment[nb]=Denne kanalen synkroniserer gjørelista fra PDA-en til KOrganizer.
-Comment[nds]=Synkroniseert de Opgavenlist vun den Handreekner mit KOrganizer.
-Comment[ne]=यो कन�डय�टले केडीई आयोजकमा ह�यान�डहेल�डबाट कार�य गर�ने सूचि सिन�क गर�दछ ।
-Comment[nl]=Dit conduit synchroniseert de takenlijst van uw handheld met KOrganizer.
-Comment[nn]=Denne koplinga synkroniserer oppgåvelista frå den handheldte eininga di til KOrganizer.
-Comment[pl]=Ten łącznik synchronizuje listę zadań z palmtopa z KOrganizerem.
-Comment[pt]=Esta conduta sincroniza a lista de 'A Fazer' do seu dispositivo com o KOrganizer.
-Comment[pt_BR]=Este conduíte sincroniza a lista de tarefas do seu handheld com o KOrganizer.
-Comment[ru]=Канал �инхронизации �пи�ка задач КПК и органайзера KDE.
-Comment[sk]=Táto spojka synchronizuje zoznam ToDo s KOrganizer.
-Comment[sl]=Ta veznik usklajuje seznam �akajo�ih opravil z vašega ro�nega ra�unalnika s KOrganizerjem.
-Comment[sr]=Овај провод �инхронизује ли�ту обавеза из вашег ручног рачунара �а KOrganizer-ом.
-Comment[sr@Latn]=Ovaj provod sinhronizuje listu obaveza iz vašeg ru�nog ra�unara sa KOrganizer-om.
-Comment[sv]=Den här kanalen synkroniserar uppgiftslistan i handdatorn med Korganizer.
-Comment[ta]=இந�த காப�ப�க�க�ழாய� உங�கள� கையேட�டில� இர�ந�த� செய�யவேண�டிய பட�டியலை கேஅமைபாளர�க�க� ஒத�திசைக�கிறத�
-Comment[tg]=Канали �инхронизат�и�и рӯйхати вазифоти Pilot ва органайзери KDE.
-Comment[tr]=Bu bileşen el bilgisayarınızdaki Yapılacaklar Listesini KOrganizer ile birleştirir.
-Comment[uk]=Цей акведук �инхронізує �пи�ок завдань кишенькового при�трою з тижневиком KOrganizer.
-Comment[zh_CN]=此管�会将您的待办列表与 KOrganizer �步。
-Comment[zh_TW]=此軟體將您的 handheld 與 KOrganizer 的待辦事項清單�步。
-Name=ToDos (KOrganizer)
-Name[af]=Te-doen (KOrganizer)
-Name[ar]=الواجبات (KOrganizer)
-Name[be]=Заданні (K �рганізатар)
-Name[bg]=Задачи (KOrganizer)
-Name[br]=Traoù d'ober (KOrganizer)
-Name[bs]=Zadaci (KOrganizer)
-Name[ca]=Pendents (KOrganizer)
-Name[cs]=Úkoly (KOrganizer)
-Name[da]=Gøremål (KOrganizer)
-Name[de]=Aufgaben (KOrganizer)
-Name[el]=Π�ος υλοποίηση ε�γασίες (KOrganizer)
-Name[eo]=Farendaĵoj (KOrganizilo)
-Name[es]=Tareas pendientes (KOrganizer)
-Name[et]=Ãœlesanded (KOrganizer)
-Name[eu]=Egitekoak (KOrganizer)
-Name[fa]=کارهای انجامی (KOrganizer)
-Name[fi]=Tehtävät (KOrganizer)
-Name[fr]=Tâches (KOrganizer)
-Name[fy]=Taken (KOrganizer)
-Name[ga]=Tascanna (KOrganizer)
-Name[gl]=Pendentes (KOrganizer)
-Name[he]=מטלות (�רגונית)
-Name[hu]=Feladatok (KOrganizer)
-Name[is]=Verkþáttalistar (KOrganizer)
-Name[it]=Cose da fare (KOrganizer)
-Name[ja]=To-Do (KOrganizer)
-Name[kk]=Жо�парлар (KOrganizer)
-Name[km]=ការងារ​�្រូវ​ធ្វើ (KOrganizer)
-Name[lt]=Darbai (KOrganizer)
-Name[ms]=Tugsan (KOrganizer)
-Name[nb]=Gjøreliste (KOrganizer)
-Name[nds]=Opgaven (KOrganizer)
-Name[ne]=गर�न�पर�ने कार�यहरू (केडीई आयोजक)
-Name[nl]=Taken (KOrganizer)
-Name[nn]=Oppgåveliste (KOrganizer)
-Name[pl]=Do zrobienia (Korganizer)
-Name[pt]=Por Fazer (KOrganizer)
-Name[pt_BR]=Tarefas (KOrganizer)
-Name[ru]=Задачи (KOrganizer)
-Name[se]=Barggut (KOrganizer)
-Name[sk]=Úlohy (KOrganizer)
-Name[sl]=Čakajo�a opravila (KOrganizer)
-Name[sr]=Обавезе (KOrganizer)
-Name[sr@Latn]=Obaveze (KOrganizer)
-Name[sv]=Uppgifter (Korganizer)
-Name[ta]=செய�ய வேண�டியவை(கேஅமைப�பாளர�)
-Name[tg]=Вазифот (KOrganizer)
-Name[tr]=Yapılacaklar (KOrganizer)
-Name[uk]=Завданн� (KOrganizer)
-Name[zh_CN]=待办事项 (KOrganizer)
-Name[zh_TW]=待辦事項(KOrganizer)
-Implemented=file
-ServiceTypes=KPilotConduit
-X-KDE-Library=conduit_todo
diff --git a/kpilot/conduits/vcalconduit/todo-conduit.h b/kpilot/conduits/vcalconduit/todo-conduit.h
deleted file mode 100644
index 8d8780eb..00000000
--- a/kpilot/conduits/vcalconduit/todo-conduit.h
+++ /dev/null
@@ -1,108 +0,0 @@
-#ifndef _KPILOT_TODO_CONDUIT_H
-#define _KPILOT_TODO_CONDUIT_H
-/* todo-conduit.h                       KPilot
-**
-** Copyright (C) 2002-2003 Reinhold Kainhofer
-** Copyright (C) 1998-2001 Dan Pilone
-** Copyright (C) 1998-2000 Preston Brown <pbrown@kde.org>
-** Copyright (C) 1998 Herwin-Jan Steehouwer
-**
-** This file is part of the todo conduit, a conduit for KPilot that
-** synchronises the Pilot's todo application with the outside world,
-** which currently means KOrganizer.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <libkcal/todo.h>
-#include <pilotTodoEntry.h>
-#include "vcal-conduitbase.h"
-
-class PilotSerialDatabase;
-class PilotLocalDatabase;
-
-class TodoConduitPrivate : public VCalConduitPrivateBase
-{
-public:
-	TodoConduitPrivate(KCal::Calendar *buddy);
-	virtual ~TodoConduitPrivate() {};
-
-	KCal::Todo::List fAllTodos;
-	KCal::Todo::List::ConstIterator fAllTodosIterator;
-
-	virtual int updateIncidences();
-	virtual void addIncidence(KCal::Incidence*);
-	virtual void removeIncidence(KCal::Incidence *);
-	virtual KCal::Incidence *findIncidence(recordid_t);
-	virtual KCal::Incidence *findIncidence(PilotRecordBase *tosearch);
-	virtual KCal::Incidence *getNextIncidence();
-	virtual KCal::Incidence *getNextModifiedIncidence();
-	virtual int count() {return fAllTodos.count();};
-} ;
-
-
-
-class TodoConduit : public VCalConduitBase
-{
-Q_OBJECT
-public:
-	TodoConduit(KPilotLink *,
-		const char *name=0L,
-		const TQStringList &args = TQStringList());
-	virtual ~TodoConduit();
-
-protected:
-	virtual const TQString getTitle(PilotRecordBase *de);
-
-	virtual const TQString dbname() { return CSL1("ToDoDB"); };
-	virtual void preSync();
-	virtual VCalConduitPrivateBase *createPrivateCalendarData(KCal::Calendar *fCalendar)
-	{
-		return new TodoConduitPrivate(fCalendar);
-	};
-
-	virtual void readConfig();
-	void _getAppInfo();
-	void _setAppInfo();
-	virtual void postSync();
-
-	virtual PilotRecordBase *newPilotEntry(PilotRecord*r)
-	{
-		return new PilotTodoEntry(r);
-	};
-	virtual KCal::Incidence*newIncidence() { return new KCal::Todo; };
-
-	virtual void preRecord(PilotRecord*r);
-	virtual VCalConduitSettings *config();
-public:
-	static VCalConduitSettings *theConfig();
-
-protected:
-
-	virtual PilotRecord *recordFromIncidence(PilotRecordBase *de, const KCal::Incidence *e);
-	virtual KCal::Incidence *incidenceFromRecord(KCal::Incidence *e, const PilotRecordBase *de);
-
-	PilotToDoInfo *fTodoAppInfo;
-	bool categoriesSynced;
-} ;
-
-#endif
diff --git a/kpilot/conduits/vcalconduit/todo-factory.cc b/kpilot/conduits/vcalconduit/todo-factory.cc
deleted file mode 100644
index fad8841f..00000000
--- a/kpilot/conduits/vcalconduit/todo-factory.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2002-2003 Reinhold Kainhofer
-** Copyright (C) 2001 by Dan Pilone
-**
-** This file defines the factory for the todo-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include "pluginfactory.h"
-
-#include "todo-setup.h"
-#include "todo-conduit.h"
-
-extern "C"
-{
-
-void *init_conduit_todo()
-{
-	return new ConduitFactory<ToDoWidgetSetup,TodoConduit>;
-}
-
-}
-
diff --git a/kpilot/conduits/vcalconduit/todo-factory.h b/kpilot/conduits/vcalconduit/todo-factory.h
deleted file mode 100644
index 52a2d5e4..00000000
--- a/kpilot/conduits/vcalconduit/todo-factory.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef _KPILOT_TODO_FACTORY_H
-#define _KPILOT_TODO_FACTORY_H
-/* todo-factory.h                       KPilot
-**
-** Copyright (C) 2002-2003 Reinhold Kainhofer
-** Copyright (C) 2001 by Dan Pilone
-**
-** This file defines the factory for the todo-conduit plugin.
-** It also defines the class for the behavior of the setup dialog.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-extern "C"
-{
-
-void *init_libtodoconduit();
-
-}
-
-#endif
diff --git a/kpilot/conduits/vcalconduit/todo-setup.cc b/kpilot/conduits/vcalconduit/todo-setup.cc
deleted file mode 100644
index 19a731c5..00000000
--- a/kpilot/conduits/vcalconduit/todo-setup.cc
+++ /dev/null
@@ -1,86 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2002-2003 Reinhold Kainhofer
-** Copyright (C) 2001 by Dan Pilone
-**
-** This file defines the factory for the todo-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <tqbuttongroup.h>
-#include <kaboutdata.h>
-
-#include "korganizerConduit.h"
-#include "todo-conduit.h"
-#include "todo-setup.h"
-
-
-
-ToDoWidgetSetup::ToDoWidgetSetup(TQWidget *w, const char *n) :
-	VCalWidgetSetupBase(w,n)
-{
-	FUNCTIONSETUP;
-	fConduitName = i18n("To-do");
-	KAboutData *fAbout = new KAboutData("todoConduit",
-		I18N_NOOP("To-do Conduit for KPilot"),
-		KPILOT_VERSION,
-		I18N_NOOP("Configures the To-do Conduit for KPilot"),
-		KAboutData::License_GPL,
-		"(C) 2001, Adriaan de Groot\n(C) 2002-2003, Reinhold Kainhofer");
-	fAbout->addAuthor("Dan Pilone",
-		I18N_NOOP("Original Author"));
-	fAbout->addAuthor("Preston Brown",
-		I18N_NOOP("Original Author"));
-	fAbout->addAuthor("Herwin-Jan Steehouwer",
-		I18N_NOOP("Original Author"));
-	fAbout->addAuthor("Adriaan de Groot",
-		I18N_NOOP("Maintainer"),
-		"groot@kde.org",
-		"http://www.cs.kun.nl/~adridg/kpilot");
-	fAbout->addAuthor("Reinhold Kainhofer",
-		I18N_NOOP("Maintainer"),
-		"reinhold@kainhofer.com",
-		"http://reinhold.kainhofer.com/Linux/");
-
-	ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,fAbout);
-
-	fConfigWidget->fSyncDestination->setTitle(i18n("To-do Destination"));
-}
-
-ToDoWidgetSetup::~ToDoWidgetSetup()
-{
-	FUNCTIONSETUP;
-}
-
-/* static */ ConduitConfigBase *ToDoWidgetSetup::create(TQWidget *w, const char *n)
-{
-	return new ToDoWidgetSetup(w,n);
-}
-
-VCalConduitSettings*ToDoWidgetSetup::config()
-{
-  return TodoConduit::theConfig();
-}
-
diff --git a/kpilot/conduits/vcalconduit/todo-setup.h b/kpilot/conduits/vcalconduit/todo-setup.h
deleted file mode 100644
index b9b919c9..00000000
--- a/kpilot/conduits/vcalconduit/todo-setup.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef _KPILOT_TODO_SETUP_H
-#define _KPILOT_TODO_SETUP_H
-/* todo-setup.h                         KPilot
-**
-** Copyright (C) 2002-2003 Reinhold Kainhofer
-** Copyright (C) 2001 by Dan Pilone
-**
-** This file defines the class for the behavior of the setup dialog.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "vcal-setup.h"
-
-class ToDoWidgetSetup : public VCalWidgetSetupBase
-{
-public:
-	ToDoWidgetSetup(TQWidget *,const char *);
-	virtual ~ToDoWidgetSetup();
-
-	virtual VCalConduitSettings*config();
-	static ConduitConfigBase *create(TQWidget *, const char *);
-} ;
-
-#endif
diff --git a/kpilot/conduits/vcalconduit/todoRecord.cc b/kpilot/conduits/vcalconduit/todoRecord.cc
deleted file mode 100644
index 7618df36..00000000
--- a/kpilot/conduits/vcalconduit/todoRecord.cc
+++ /dev/null
@@ -1,141 +0,0 @@
-/* vcalRecord.cc                       KPilot
-**
-** Copyright (C) 2006 by Adriaan de Groot <groot@kde.org>
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-** Copyright (C) 2001 by Dan Pilone
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <libkcal/calendar.h>
-#include <libkcal/calendarlocal.h>
-#include <libkcal/recurrence.h>
-#include <libkcal/vcalformat.h>
-
-#include "pilot.h"
-#include "pilotTodoEntry.h"
-
-#include "kcalRecord.h"
-#include "todoRecord.h"
-
-bool KCalSync::setTodoEntry(PilotTodoEntry *de,
-	const KCal::Todo *todo,
-	const CategoryAppInfo &info)
-{
-	FUNCTIONSETUP;
-	if (!de || !todo) {
-		DEBUGKPILOT << fname << ": NULL todo given... Skipping it" << endl;
-		return false;
-	}
-
-	// set secrecy, start/end times, alarms, recurrence, exceptions, summary and description:
-	if (todo->secrecy()!=KCal::Todo::SecrecyPublic)
-	{
-		de->setSecret( true );
-	}
-
-	// update it from the iCalendar Todo.
-
-	if (todo->hasDueDate()) {
-		struct tm t = writeTm(todo->dtDue());
-		de->setDueDate(t);
-		de->setIndefinite(0);
-	} else {
-		de->setIndefinite(1);
-	}
-
-	// TODO: take recurrence (code in VCAlConduit) from ActionNames
-
-	setCategory(de, todo, info);
-
-	// TODO: sync the alarm from ActionNames. Need to extend PilotTodoEntry
-	de->setPriority(todo->priority());
-
-	de->setComplete(todo->isCompleted());
-
-	// what we call summary pilot calls description.
-	de->setDescription(todo->summary());
-
-	// what we call description pilot puts as a separate note
-	de->setNote(todo->description());
-
-	DEBUGKPILOT << "-------- " << todo->summary() << endl;
-	return de->pack();
-}
-
-bool KCalSync::setTodo(KCal::Todo *e,
-	const PilotTodoEntry *de,
-	const CategoryAppInfo &info)
-{
-	FUNCTIONSETUP;
-
-	if (!e)
-	{
-		DEBUGKPILOT << fname
-			<< ": null todo entry given. skipping..." << endl;
-		return false;
-	}
-	if (!de)
-	{
-		DEBUGKPILOT << fname
-			<< "! NULL todo entry given... Skipping it" << endl;
-		return false;
-	}
-
-
-	e->setPilotId(de->id());
-	DEBUGKPILOT<<fname<<": set KCal item to pilotId: [" << e->pilotId() << "] ..."<<endl;
-
-	e->setSecrecy(de->isSecret() ? KCal::Todo::SecrecyPrivate : KCal::Todo::SecrecyPublic);
-
-	if (de->getIndefinite()) {
-		e->setHasDueDate(false);
-	} else {
-		e->setDtDue(readTm(de->getDueDate()));
-		e->setHasDueDate(true);
-	}
-
-	// Categories
-	setCategory(e, de, info);
-
-	// PRIORITY //
-	e->setPriority(de->getPriority());
-
-	// COMPLETED? //
-	e->setCompleted(de->getComplete());
-	if ( de->getComplete() && !e->hasCompletedDate() ) {
-		e->setCompleted( TQDateTime::currentDateTime() );
-	}
-
-	e->setSummary(de->getDescription());
-	e->setDescription(de->getNote());
-
-	// NOTE: This MUST be done last, since every other set* call
-	// calls updated(), which will trigger an
-	// setSyncStatus(SYNCMOD)!!!
-	e->setSyncStatus(KCal::Incidence::SYNCNONE);
-
-	return true;
-}
diff --git a/kpilot/conduits/vcalconduit/todoRecord.h b/kpilot/conduits/vcalconduit/todoRecord.h
deleted file mode 100644
index 85ffd6aa..00000000
--- a/kpilot/conduits/vcalconduit/todoRecord.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef _KPILOT_TODORECORD_H
-#define _KPILOT_TODORECORD_H
-/*
-** Copyright (C) 2006 by Adriaan de Groot <groot@kde.org>
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-** Copyright (C) 2001 by Dan Pilone
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-namespace KCal
-{
-	class Todo;
-}
-
-class PilotTodoEntry;
-
-namespace KCalSync
-{
-	bool setTodo(KCal::Todo *e,
-		const PilotTodoEntry *de,
-		const CategoryAppInfo &info);
-	bool setTodoEntry(PilotTodoEntry *de,
-		const KCal::Todo *e,
-		const CategoryAppInfo &info);
-}
-
-#endif
-
diff --git a/kpilot/conduits/vcalconduit/vcal-conduit.cc b/kpilot/conduits/vcalconduit/vcal-conduit.cc
deleted file mode 100644
index d882cf8f..00000000
--- a/kpilot/conduits/vcalconduit/vcal-conduit.cc
+++ /dev/null
@@ -1,309 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2002-2003 Reinhold Kainhofer
-** Copyright (C) 2001 by Dan Pilone
-**
-** This file defines the vcal-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <libkcal/calendar.h>
-#include <libkcal/calendarlocal.h>
-#include <libkcal/recurrence.h>
-#include <libkcal/vcalformat.h>
-
-#include "pilotDateEntry.h"
-#include "pilotDatabase.h"
-
-#include "vcal-conduit.moc"
-#include "vcalconduitSettings.h"
-
-#include "kcalRecord.h"
-#include "vcalRecord.h"
-
-
-extern "C"
-{
-
-unsigned long version_conduit_vcal = Pilot::PLUGIN_API;
-
-}
-
-
-
-
-VCalConduitPrivate::VCalConduitPrivate(KCal::Calendar *b) :
-	VCalConduitPrivateBase(b)
-{
-	fAllEvents.setAutoDelete(false);
-}
-
-void VCalConduitPrivate::addIncidence(KCal::Incidence*e)
-{
-	fAllEvents.append(dynamic_cast<KCal::Event*>(e));
-	fCalendar->addEvent(dynamic_cast<KCal::Event*>(e));
-}
-
-int VCalConduitPrivate::updateIncidences()
-{
-	FUNCTIONSETUP;
-	if (!fCalendar) return 0;
-	fAllEvents = fCalendar->events();
-	fAllEvents.setAutoDelete(false);
-	return fAllEvents.count();
-}
-
-
-void VCalConduitPrivate::removeIncidence(KCal::Incidence *e)
-{
-	// use dynamic_cast which returns a null pointer if the class does not match...
-	fAllEvents.remove(dynamic_cast<KCal::Event*>(e));
-	if (!fCalendar) return;
-	fCalendar->deleteEvent(dynamic_cast<KCal::Event*>(e));
-	// now just in case we're in the middle of reading through our list
-	// and we delete something, set reading to false so we start at the
-	// top again next time and don't have problems with our iterator
-	reading = false;
-}
-
-
-KCal::Incidence *VCalConduitPrivate::findIncidence(recordid_t id)
-{
-	KCal::Event::List::ConstIterator it;
-	for( it = fAllEvents.begin(); it != fAllEvents.end(); ++it ) {
-		KCal::Event *event = *it;
-		if ((recordid_t)event->pilotId() == id) return event;
-	}
-	return 0L;
-}
-
-KCal::Incidence *VCalConduitPrivate::findIncidence(PilotRecordBase *tosearch)
-{
-	PilotDateEntry*entry=dynamic_cast<PilotDateEntry*>(tosearch);
-	if (!entry) return 0L;
-
-	TQString title=entry->getDescription();
-	TQDateTime dt=readTm( entry->getEventStart() );
-
-	KCal::Event::List::ConstIterator it;
-	for( it = fAllEvents.begin(); it != fAllEvents.end(); ++it ) {
-		KCal::Event *event = *it;
-		if ( (event->dtStart() == dt) && (event->summary() == title) ) return event;
-	}
-	return 0L;
-}
-
-
-
-KCal::Incidence *VCalConduitPrivate::getNextIncidence()
-{
-	FUNCTIONSETUP;
-
-	if (reading) {
-		++fAllEventsIterator;
-	} else {
-		reading=true;
-		fAllEventsIterator = fAllEvents.begin();
-	}
-	// At end of list, or empty list.
-	return (fAllEventsIterator == fAllEvents.end()) ? 0L : *fAllEventsIterator;
-}
-
-/** Find the next incidence in the list which ddoes not have the SYNCNONE flag set. The
- *  current position is always stored in the iteratoor fAllEventsIterator, so we can just
- *  start from there. Only if reading==false, we haven't yet started goind through the
- *  incidents, so start at fAllEvents.begin() in that case */
-KCal::Incidence *VCalConduitPrivate::getNextModifiedIncidence()
-{
-	FUNCTIONSETUP;
-	KCal::Event*e=0L;
-	if (!reading)
-	{
-		// Start from the top
-		reading=true;
-		fAllEventsIterator = fAllEvents.begin();
-	}
-	else
-	{
-		// Move on from current position
-		++fAllEventsIterator;
-	}
-
-	// Fetch (new) current if possible.
-	if ( fAllEventsIterator != fAllEvents.end() ) e = *fAllEventsIterator;
-	// Then walk the list until we find an unsynced entry
-	while ( fAllEventsIterator != fAllEvents.end() &&
-		e && e->syncStatus()!=KCal::Incidence::SYNCMOD && e->pilotId() > 0)
-	{
-		e = (++fAllEventsIterator != fAllEvents.end()) ? *fAllEventsIterator : 0L;
-	}
-	return (fAllEventsIterator == fAllEvents.end()) ? 0L : 	*fAllEventsIterator;
-}
-
-
-
-/****************************************************************************
- *                          VCalConduit class                               *
- ****************************************************************************/
-
-VCalConduit::VCalConduit(KPilotLink *d,
-	const char *n,
-	const TQStringList &a) :
-	VCalConduitBase(d,n,a),
-	fAppointmentAppInfo( 0L )
-{
-	FUNCTIONSETUP;
-	fConduitName=i18n("Calendar");
-}
-
-
-VCalConduit::~VCalConduit()
-{
-//	FUNCTIONSETUP;
-}
-
-VCalConduitPrivateBase *VCalConduit::createPrivateCalendarData(KCal::Calendar *fCalendar) {
-	return new VCalConduitPrivate(fCalendar);
-}
-
-void VCalConduit::_getAppInfo()
-{
-	FUNCTIONSETUP;
-	// get the address application header information
-	KPILOT_DELETE(fAppointmentAppInfo);
-	fAppointmentAppInfo = new PilotDateInfo( fDatabase );
-}
-
-const TQString VCalConduit::getTitle(PilotRecordBase *de)
-{
-	PilotDateEntry*d=dynamic_cast<PilotDateEntry*>(de);
-	if (d) return TQString(d->getDescription());
-	return TQString::null;
-}
-
-
-
-PilotRecord *VCalConduit::recordFromIncidence(PilotRecordBase *de, const KCal::Incidence*e)
-{
-	FUNCTIONSETUP;
-	if (!de || !e)
-	{
-		DEBUGKPILOT << fname
-			<< ": got NULL entry or NULL incidence." << endl;
-		return 0L;
-	}
-
-	if ( (e->recurrenceType() == KCal::Recurrence::rYearlyDay) ||
-		(e->recurrenceType() ==  KCal::Recurrence::rYearlyPos) )
-	{
-		// Warn ahead of time
-		emit logMessage(i18n("Event \"%1\" has a yearly recurrence other than by month, will change this to recurrence by month on handheld.").arg(e->summary()));
-	}
-
-	PilotDateEntry *dateEntry = dynamic_cast<PilotDateEntry*>(de);
-	if (!dateEntry)
-	{
-		// Secretly wasn't a date entry after all
-		return 0L;
-	}
-
-	const KCal::Event *event = dynamic_cast<const KCal::Event *>(e);
-	if (!event)
-	{
-		DEBUGKPILOT << fname << ": Incidence is not an event." << endl;
-		return 0L;
-	}
-
-	if (KCalSync::setDateEntry(dateEntry, event,*fAppointmentAppInfo->categoryInfo()))
-	{
-		return dateEntry->pack();
-	}
-	else
-	{
-		return 0L;
-	}
-}
-
-KCal::Incidence *VCalConduit::incidenceFromRecord(KCal::Incidence *e, const PilotRecordBase  *de)
-{
-	FUNCTIONSETUP;
-
-	if (!de || !e)
-	{
-		DEBUGKPILOT << fname
-			<< ": Got NULL entry or NULL incidence." << endl;
-		return 0L;
-	}
-
-	const PilotDateEntry *dateEntry = dynamic_cast<const PilotDateEntry *>(de);
-	if (!dateEntry)
-	{
-		DEBUGKPILOT << fname << ": HH record not a date entry." << endl;
-		return 0L;
-	}
-
-	KCal::Event *event = dynamic_cast<KCal::Event *>(e);
-	if (!event)
-	{
-		DEBUGKPILOT << fname << ": Incidence is not an event." << endl;
-		return 0L;
-	}
-
-	KCalSync::setEvent(event, dateEntry,*fAppointmentAppInfo->categoryInfo());
-	return e;
-}
-
-
-
-PilotRecordBase * VCalConduit::newPilotEntry(PilotRecord*r)
-{
-	return new PilotDateEntry(r);
-}
-
-KCal::Incidence* VCalConduit::newIncidence()
-{
-  return new KCal::Event;
-}
-
-static VCalConduitSettings *config_vcal = 0L;
-
-VCalConduitSettings *VCalConduit::theConfig()
-{
-	if (!config_vcal)
-	{
-		config_vcal = new VCalConduitSettings(CSL1("Calendar"));
-	}
-
-	return config_vcal;
-}
-
-VCalConduitSettings *VCalConduit::config() {
-	return theConfig();
-}
-
-
-
-// vim: ts=4:sw=4:noexpandtab:
-
diff --git a/kpilot/conduits/vcalconduit/vcal-conduit.desktop b/kpilot/conduits/vcalconduit/vcal-conduit.desktop
deleted file mode 100644
index c123bf16..00000000
--- a/kpilot/conduits/vcalconduit/vcal-conduit.desktop
+++ /dev/null
@@ -1,103 +0,0 @@
-[Desktop Entry]
-Type=Service
-Name=Calendar (KOrganizer)
-Name[af]=Kalender (KOrganizer)
-Name[ar]=التقويم (KOrganizer)
-Name[be]=Кал�ндар (K �рганізатар)
-Name[bg]=Календар (KOrganizer)
-Name[br]=Deiziadur (KOrganizer)
-Name[bs]=Kalendar (KOrganizer)
-Name[ca]=Calendari (KOrganizer)
-Name[cs]=Kalendář (KOrganizer)
-Name[da]=Kalender (KOrganizer)
-Name[de]=Kalender (KOrganizer)
-Name[el]=Ημε�ολόγιο (KOrganizer)
-Name[eo]=Kalendaro (KOrganizilo)
-Name[es]=Calendario (KOrganizer)
-Name[et]=Kalender (KOrganizer)
-Name[eu]=Egutegia (KOrganizer)
-Name[fa]=تقویم (KOrganizer)
-Name[fi]=Kalenteri (KOrganizer)
-Name[fr]=Agenda (KOrganizer)
-Name[fy]=Aginda (KOrganizer)
-Name[ga]=Féilire (KOrganizer)
-Name[gl]=Calendario (KOrganizer)
-Name[he]=לוח שנה (�רגונית)
-Name[hu]=Naptár (KOrganizer)
-Name[is]=Dagbók (KOrganizer)
-Name[it]=Calendario (KOrganizer)
-Name[ja]=カレンダー (KOrganizer)
-Name[kk]=Күнтізбе (KOrganizer)
-Name[km]=ប្រ�ិទិន (KOrganizer)
-Name[lt]=Kalendorius (KOrganizer)
-Name[mk]=Календар (КОрганизатор)
-Name[ms]=Kalendar (KOrganizer)
-Name[nb]=Kalender (KOrganizer)
-Name[nds]=Kalenner (KOrganizer)
-Name[ne]=क�यालेन�डर (केडीई आयोजक)
-Name[nl]=Agenda (KOrganizer)
-Name[nn]=Kalender (KOrganizer)
-Name[pl]=Kalendarz (Korganizer)
-Name[pt]=Calendário (KOrganizer)
-Name[pt_BR]=Calendário (KOrganizer)
-Name[ru]=Календарь (KOrganizer)
-Name[se]=Kaleandar (KOrganizer)
-Name[sk]=Kalendár (KOrganizer)
-Name[sl]=Koledar (KOrganizer)
-Name[sr]=Календар (KOrganizer)
-Name[sr@Latn]=Kalendar (KOrganizer)
-Name[sv]=Kalender (Korganizer)
-Name[ta]=நாள�காட�டி(கேஅமைப�பாளர�)
-Name[tg]=Тақвимот (KOrganizer)
-Name[tr]=Takvim (KOrganizer)
-Name[uk]=Календар (KOrganizer)
-Name[zh_CN]=日历 (KOrganizer)
-Name[zh_TW]=行事曆(KOrganizer)
-Comment=This conduit synchronizes your handheld with the KOrganizer datebook.
-Comment[af]=Hierdie pad sinkroniseer jou draagbare toestel met die KOrganizer datum boek.
-Comment[bg]=Синхронизаци� на календара на мобилно у�трой�тво � организатора в KDE.
-Comment[ca]=Aquest conducte sincronitza la vostra agenda electrònica amb la llibreta de dates de KOrganizer.
-Comment[cs]=Toto propojení synchronizuje seznam úkolů s KOrganizérem.
-Comment[da]=Denne kanal synkroniserer din håndholdte med KOrganizer-datobogen.
-Comment[de]=Abgleich des Taschencomputers mit dem KOrganizer-Terminkalender
-Comment[el]=Αυτός ο σ�νδεσμος συγχ�ονίζει τον υπολογιστή παλάμης σας με το βιβλίο ημε�ομηνιών του KOrganizer.
-Comment[en_GB]=This conduit synchronises your handheld with the KOrganizer datebook.
-Comment[eo]=Tiu kanalo sinkronigas vian po�komputilon kun la datlibro de KOrganizilo.
-Comment[es]=Este conducto sincroniza su agenda electrónica con la libreta de fechas de KOrganizer.
-Comment[et]=See kanal sünkroniseerib pihuseadme ja KOrganizeri kalendri.
-Comment[eu]=Kanal honek zure agenda elektronikoa  KOrganizer-en data-liburuarekin sinkronizatzen du.
-Comment[fa]=این لوله، دستی شما را با کتاب دادۀ KOrganizer  همگام می‌سازد.
-Comment[fi]=Tämä yhdyskäytävä synkronoi taskutietokoneen KOrganizerin päiväkirjaan.
-Comment[fr]=Ce canal synchronise votre Palm avec l'agenda KOrganizer.
-Comment[fy]=Dit conduit syngronisearret jo handheld mei KOrganizer's datumboek.
-Comment[gl]=Este conducto sincroniza o seu aparello portátil co libro de datos de KOrganizer.
-Comment[hu]=Ezzel a csatolóval szinkronizálhatók a kézi számítógép és a KOrganizer dátumai.
-Comment[is]=Þessi rás samstillir lófatölvuna þína við dagbók KOrganizer.
-Comment[it]=Questo conduit sincronizza il tuo palmare con il calendario di KOrganizer.
-Comment[ja]=��コンジット��ンドヘルドを KOrganizer �手帳��期����。
-Comment[kk]=Қалта құрылғыдағы күнтізбені KOrganizer-мен қадамда�тыру арна�ы.
-Comment[km]=បំពង់​ន�ះ​ធ្វើ​សមកាលកម្ម​ឧបករណ�​យួរ​ដៃ​របស់​អ្នក​ជាមួយ​នឹង​សៀវភៅ​កាលបរិច្ឆ�ទ KOrganizer ។
-Comment[lt]=Šis kanalas sinchronizuoja jūsų delninuką su KOrganizer datų knyga.
-Comment[mk]=Овој канал ги �инхронизира рачниот уред и датумите од KОрганизатор.
-Comment[ms]=Saluran ini mensegerakkan komputer telapak dengan buku tarikh KOrganizer.
-Comment[nb]=Denne kanalen synkroniserer PDA-en med KOrganizers almanakk.
-Comment[nds]=Synkroniseert den Mötenkalenner vun den Handreekner mit KOrganizer.
-Comment[ne]=यो कन�ड�य�टले केडीई आयोजक मिति प�स�तिकामा ह�यान�डहेल�ड समक�रमण गर�छ ।
-Comment[nl]=Dit conduit synchroniseert uw handheld met KOrganizer's datumboek.
-Comment[pl]=Ten Å‚Ä…cznik synchronizuje palmtopa z terminarzem KOrganizera.
-Comment[pt]=Esta conduta sincroniza o seu dispositivo móvel com a agenda do KOrganizer.
-Comment[pt_BR]=Este Conduíte sincroniza seu handheld com a agenda do KOrganizer.
-Comment[ru]=Канал �инхронизации календар� КПК и органайзера KDE.
-Comment[sk]=Táto spojka synchronizuje prenosné zariadenie s KOrganizer.
-Comment[sl]=Ta veznik uskladni vaš ro�ni ra�unalnik z dnevnikom KOrganizerja.
-Comment[sr]=Овај провод �инхронизује ваш ручни рачунар �а KOrganizer-овом књигом датума.
-Comment[sr@Latn]=Ovaj provod sinhronizuje vaš ru�ni ra�unar sa KOrganizer-ovom knjigom datuma.
-Comment[sv]=Den här kanalen synkroniserar din handdator med Korganizers kalender.
-Comment[ta]=இந�த க�ழாய� உங�கள� பைலட�டை கேஅமைப�பாளர� தேதிப�த�தகத�த�டன� ஒத�திசைக�கிறத�
-Comment[tr]=Bu bileşen el bilgisayarınızı KOrganizer'daki randevu defteriyle senkronize eder.
-Comment[uk]=Цей акведук �инхронізує ваш кишеньковий при�трій з тижневиком KOrganizer.
-Comment[zh_CN]=此管�会将您的手�设备与 KOrganizer 的日程安排�步。
-Comment[zh_TW]=此軟體將您的 handheld 日期與 KOrganizer �步。
-Implemented=file
-ServiceTypes=KPilotConduit
-X-KDE-Library=conduit_vcal
diff --git a/kpilot/conduits/vcalconduit/vcal-conduit.h b/kpilot/conduits/vcalconduit/vcal-conduit.h
deleted file mode 100644
index ed47d712..00000000
--- a/kpilot/conduits/vcalconduit/vcal-conduit.h
+++ /dev/null
@@ -1,101 +0,0 @@
-#ifndef _KPILOT_VCAL_CONDUIT_H
-#define _KPILOT_VCAL_CONDUIT_H
-/* vcal-conduit.h                       KPilot
-**
-** Copyright (C) 2002-2003 Reinhold Kainhofer
-** Copyright (C) 2001 by Dan Pilone
-**
-** This file defines the vcal-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <libkcal/event.h>
-
-#include "pilotDateEntry.h"
-
-#include "vcal-conduitbase.h"
-
-class PilotRecord;
-class PilotSerialDatabase;
-class PilotLocalDatabase;
-
-class VCalConduitPrivate : public VCalConduitPrivateBase
-{
-public:
-	VCalConduitPrivate(KCal::Calendar *buddy);
-	virtual ~VCalConduitPrivate() {};
-
-	KCal::Event::List fAllEvents;
-	KCal::Event::List::ConstIterator fAllEventsIterator;
-
-	virtual int updateIncidences();
-	virtual void addIncidence(KCal::Incidence*);
-	virtual void removeIncidence(KCal::Incidence *);
-	virtual KCal::Incidence *findIncidence(recordid_t);
-	/**
-	 * Find the incidence based on tosearch's description and date information.
-	 * Returns 0L if no incidence could be found.
-	 */
-	virtual KCal::Incidence *findIncidence(PilotRecordBase *tosearch);
-	virtual KCal::Incidence *getNextIncidence();
-	virtual KCal::Incidence *getNextModifiedIncidence();
-	virtual int count() {return fAllEvents.count();};
-} ;
-
-
-
-class VCalConduit : public VCalConduitBase
-{
-Q_OBJECT
-public:
-	VCalConduit(KPilotLink *,
-		const char *name=0L,
-		const TQStringList &args = TQStringList());
-	virtual ~VCalConduit();
-
-protected:
-	virtual const TQString dbname() { return CSL1("DatebookDB"); };
-
-	virtual void preSync() {VCalConduitBase::preSync(); _getAppInfo(); };
-	virtual VCalConduitPrivateBase *createPrivateCalendarData(KCal::Calendar *fCalendar);
-
-	void _getAppInfo();
-	void _setAppInfo();
-
-	virtual PilotRecordBase *newPilotEntry(PilotRecord*r);
-	virtual KCal::Incidence*newIncidence();
-	virtual const TQString getTitle(PilotRecordBase *de);
-	virtual VCalConduitSettings *config();
-public:
-	static VCalConduitSettings *theConfig();
-
-protected:
-	virtual PilotRecord *recordFromIncidence(PilotRecordBase *de,
-		const KCal::Incidence *e);
-	virtual KCal::Incidence *incidenceFromRecord(KCal::Incidence *e,
-		const PilotRecordBase *de);
-
-	PilotDateInfo *fAppointmentAppInfo;
-};
-
-#endif
diff --git a/kpilot/conduits/vcalconduit/vcal-conduitbase.cc b/kpilot/conduits/vcalconduit/vcal-conduitbase.cc
deleted file mode 100644
index cd288ba5..00000000
--- a/kpilot/conduits/vcalconduit/vcal-conduitbase.cc
+++ /dev/null
@@ -1,622 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2002-3 by Reinhold Kainhofer
-** Copyright (C) 2001 by Dan Pilone
-**
-** Contributions:
-**    Copyright (c) 2001 David Jarvie <software@astrojar.org.uk>
-**    Copyright (C) 2006 by Bertjan Broeksema <b.broeksema@gmail.com>
-**
-** This file defines the vcal-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <options.h>
-
-#include <tqtimer.h>
-#include <tqfile.h>
-
-#include <kmessagebox.h>
-#include <kio/netaccess.h>
-
-#include "libkcal/calendar.h"
-#include "libkcal/calendarlocal.h"
-#include "libkcal/calendarresources.h"
-#include <kstandarddirs.h>
-
-#include "pilotSerialDatabase.h"
-#include "pilotLocalDatabase.h"
-#include "pilotDateEntry.h"
-
-#include "vcal-conduitbase.moc"
-#include "vcalconduitSettings.h"
-
-#ifndef LIBKCAL_IS_VERSION
-#warning "Using an old version of libkcal with timezone bug."
-#define LIBKCAL_IS_VERSION(a,b,c) (0)
-#endif
-
-#include "conduitstate.h"
-#include "initstate.h"
-
-
-/****************************************************************************
- *                          VCalConduitBase class                           *
- ****************************************************************************/
-
-VCalConduitBase::VCalConduitBase(KPilotLink *d,
-	const char *n,
-	const TQStringList &a) :
-	ConduitAction(d,n,a),
-	fCalendar(0L),
-	fP(0L)
-{
-	FUNCTIONSETUP;
-
-	fState = new InitState();
-}
-
-VCalConduitBase::~VCalConduitBase()
-{
-	FUNCTIONSETUP;
-
-	KPILOT_DELETE(fP);
-	KPILOT_DELETE(fState);
-	KPILOT_DELETE(fCalendar);
-	KPILOT_DELETE(fDatabase);
-	KPILOT_DELETE(fLocalDatabase);
-}
-
-
-/*
-	There are several different scenarios for a record on the Palm and its PC
-	counterpart. N means a new record, M flags a modified record, D a deleted
-	and - an unmodified record. First is the Palm record, second the
-	corresponding PC record:
-	(-,-) unchanged, just sync if first time or full sync
-	(N,-) no rec matching the Palm ID in the backupDB/calendar yet => add
-	      KCal::Event
-	(M,-) record is in backupDB, unchanged in calendar => modify in calendar and
-	      in backupDB
-	(D,-) deleted on Palm, exists in backupDB and calendar => just delete from
-	      calendar and backupDB
-	(-,N) no or invalid pilotID set for the KCal::Event => just add to palm and
-	      backupDB
-	(-,M) valid PilotID set => just modify on Palm
-	(-,D) Record in backupDB, but not in calendar => delete from Palm and
-	      backupDB
-	(N,N) Can't find out (the two records are not correlated in any way, they
-	      just have the same data!!
-	(M,M),(M,L),(L,M) (Record exists on Palm and the Event has the ID) CONFLICT,
-	      ask the user what to do or use a config setting
-	(L,L) already deleted on both, no need to do anything.
-
-	The sync process is as follows (for a fast sync):
-	1) HHToPCState goes through all records on Palm (just the modified one
-	   are necessary), find it in the backupDB. The following handles ([NMD],*)
-		a) if it doesn't exist and was not deleted, add it to the calendar and
-		   the backupDB
-		b) if it exists, is unchanged in the calendar and was not deleted,
-		   just modify in the calendar
-		c) if it exists and was deleted, delete it from the calendar if
-		   necessary
-	2) PCToHHState goes through all KCale::Events in the calendar (just
-	   modified, this is the modification time is later than the last sync time
-		). This handles (-,N),(-,M)
-		a) if it does not have a pilotID, add it to the palm and backupDB,
-		   store the PalmID
-		b) if it has a valid pilotID, update the Palm record and the backup
-	3) DeletedUnsyncedHHState goes through all palm records (which don't
-	   have the deleted flag) of the palm db and if one does not exist in the
-	   Calendar, it was deleted there, so delete it from the Palm and backup,
-	   too. This handles the case of (-,D)
-	4) DeletedUnsyncedPCState goes through all KCal::Events in the calendar and
-	   looks for a corresponding event in the palm database. If it does not
-	   exist, that means that it was deleted on the palm, so we need to also
-	   delete it from the local calendar.  This handles the case of (D,-).
-
-	In addition to the fast sync, where the last sync was done with this very
-	PC and calendar file, there are two special cases: a full and a first sync.
-	-) a full sync goes through all records, not just the modified ones. The
-	   pilotID setting of the calendar records is used to determine if the
-	   record already exists. if yes, the record is just modified.
-	-) a first sync completely ignores the pilotID setting of the calendar
-	   events. All records are added, so there might be duplicates. The add
-	   function for the calendar should check if a similar record already
-	   exists, but this is not done yet.
-
-	-) a full sync is done if
-	   a) there is a backupdb and a calendar, but the PC id number changed
-	   b) it was explicitly requested by pressing the full sync button in KPilot
-	   c) the setting "always full sync" was selected in the configuration dlg
-	-) a first sync is done if
-	   a) either the calendar or the backup DB does not exist.
-	   b) the calendar and the backup DB exists, but the sync is done for a
-	      different User name
-	   c) it was explicitly requested in KPilot
-*/
-
-/* virtual */ bool VCalConduitBase::exec()
-{
-	FUNCTIONSETUP;
-
-	readConfig();
-
-	// don't do a first sync by default in any case, only when explicitly
-	// requested, or the backup database or the alendar are empty.
-	setFirstSync( false );
-
-	// TODO: Check Full sync and First sync
-	bool retrieved = false;
-	if ( !openDatabases( dbname(), &retrieved ) ) goto error;
-	setFirstSync( retrieved );
-
-	// If we are in testmode we don't need the local calendar. Else a
-	// calendar *must* be opened, we want to sync something don't we?
-	if (!syncMode().isTest() && !openCalendar() ) goto error;
-
-	// Start processing the sync
-	TQTimer::singleShot(0, this, TQT_SLOT(slotProcess()));
-	return true;
-
-error:
-	emit logError( i18n( "Could not open the calendar databases." ) );
-
-	KPILOT_DELETE(fCalendar);
-	KPILOT_DELETE(fP);
-	KPILOT_DELETE(fState);
-	return false;
-}
-
-void VCalConduitBase::slotProcess() {
-	FUNCTIONSETUP;
-
-	// start the current state if necessary
-	if( fState && !fState->started() ) {
-		fState->startSync( this );
-	}
-
-	// Process next record if applicable
-	if( hasNextRecord )
-	{
-		fState->handleRecord( this );
-		TQTimer::singleShot( 0, this, TQT_SLOT( slotProcess() ) );
-	}
-	// Else finish the current state if there is one
-	else if( fState )
-	{
-		fState->finishSync( this );
-		TQTimer::singleShot( 0, this, TQT_SLOT( slotProcess() ) );
-	}
-	// No state so sync is finished
-	else
-	{
-		DEBUGKPILOT << fname << ": Sync finished." << endl;
-		delayDone();
-	}
-}
-
-/* virtual */ void VCalConduitBase::readConfig()
-{
-	config()->readConfig();
-	SyncAction::ConflictResolution res = (SyncAction::ConflictResolution)
-		(config()->conflictResolution());
-	setConflictResolution( res );
-}
-
-static void listResources( KCal::CalendarResources *p )
-{
-	FUNCTIONSETUP;
-	KCal::CalendarResourceManager *manager = p->resourceManager();
-
-	DEBUGKPILOT << fname << ": Resources in calendar:" << endl;
-	KCal::CalendarResourceManager::Iterator it;
-	for( it = manager->begin(); it != manager->end(); ++it )
-	{
-		DEBUGKPILOT << fname << ": " << (*it)->resourceName() << endl;
-	}
-}
-
-/* virtual */ bool VCalConduitBase::openCalendar()
-{
-	FUNCTIONSETUP;
-
-	KConfig korgcfg( locate( "config", CSL1("korganizerrc") ) );
-
-	// this part taken from adcalendarbase.cpp:
-	korgcfg.setGroup( "Time & Date" );
-	TQString tz(korgcfg.readEntry( "TimeZoneId" ) );
-
-	DEBUGKPILOT << fname << ": KOrganizer's time zone = " << tz << endl;
-
-	// Need a subclass ptr. for the ResourceCalendar methods
-	KCal::CalendarResources *rescal = 0L;
-
-	DEBUGKPILOT << fname << ": Got calendar type " << config()->calendarType()
-		<< endl;
-
-	switch(config()->calendarType())
-	{
-		case VCalConduitSettings::eCalendarLocal:
-		{
-			DEBUGKPILOT << fname << "Using CalendarLocal, file = "
-				<< config()->calendarFile() << endl;
-
-			if ( config()->calendarFile().isEmpty() )
-			{
-				DEBUGKPILOT << fname << "Empty calendar file name." << endl;
-
-				emit logError( i18n( "You selected to sync with an iCalendar"
-						" file, but did not give a filename. Please select a"
-						" valid file name in the conduit's configuration"
-						" dialog" ) );
-				return false;
-			}
-
-			fCalendar = new KCal::CalendarLocal( tz );
-			if ( !fCalendar )
-			{
-				WARNINGKPILOT
-					<< "Cannot initialize calendar object for file "
-					<< config()->calendarFile() << endl;
-				return false;
-			}
-
-			DEBUGKPILOT << fname << "Calendar's timezone: "
-				<< fCalendar->timeZoneId() << endl;
-			DEBUGKPILOT << fname << "Calendar is local time: "
-				<< fCalendar->isLocalTime() << endl;
-
-			emit logMessage( fCalendar->isLocalTime() ?
-				i18n( "Using local time zone: %1" ).arg( tz ) :
-				i18n( "Using non-local time zone: %1" ).arg( tz ) );
-
-			KURL kurl( config()->calendarFile() );
-			if( !KIO::NetAccess::download( config()->calendarFile(),
-				fCalendarFile, 0L ) && !kurl.isLocalFile() )
-			{
-				emit logError(i18n( "You chose to sync with the file \"%1\", which "
-					"cannot be opened. Please make sure to supply a "
-					"valid file name in the conduit's configuration dialog. "
-					"Aborting the conduit." ).arg( config()->calendarFile() ) );
-				KIO::NetAccess::removeTempFile( fCalendarFile );
-				return false;
-			}
-
-			// if there is no calendar yet, use a first sync..
-			// the calendar is initialized, so nothing more to do...
-			if (!dynamic_cast<KCal::CalendarLocal*>(fCalendar)->load(fCalendarFile) )
-			{
-				DEBUGKPILOT << fname << "Calendar file " << fCalendarFile
-					<< " could not be opened. Will create a new one" << endl;
-
-				// Try to create empty file. if it fails,
-				// no valid file name was given.
-				TQFile fl(fCalendarFile);
-				if (!fl.open(IO_WriteOnly | IO_Append))
-				{
-					DEBUGKPILOT << fname << "Invalid calendar file name "
-						<< fCalendarFile << endl;
-
-					emit logError( i18n( "You chose to sync with the file \"%1\", which "
-						"cannot be opened or created. Please make sure to supply a "
-						"valid file name in the conduit's configuration dialog. "
-						"Aborting the conduit." ).arg( config()->calendarFile() ) );
-					return false;
-				}
-				fl.close();
-				setFirstSync( true );
-			}
-			addSyncLogEntry( i18n( "Syncing with file \"%1\"" )
-				.arg( config()->calendarFile() ) );
-			break;
-		}
-
-		case VCalConduitSettings::eCalendarResource:
-			DEBUGKPILOT << "Using CalendarResource!" << endl;
-
-			rescal = new KCal::CalendarResources( tz );
-			listResources(rescal);
-			fCalendar = rescal;
-			if ( !fCalendar)
-			{
-				WARNINGKPILOT << "Cannot initialize calendar " <<
-					"object for ResourceCalendar" << endl;
-				return false;
-			}
-
-#if LIBKCAL_IS_VERSION(1,1,0)
-			rescal->readConfig();
-			rescal->load();
-#else
-#warning "Timezone bug is present."
-#endif
-			addSyncLogEntry( i18n( "Syncing with standard calendar resource." ) );
-			emit logMessage( fCalendar->isLocalTime() ?
-				i18n( "Using local time zone: %1" ).arg( tz ) :
-				i18n( "Using non-local time zone: %1" ).arg( tz ) );
-			break;
-		default:
-			break;
-	}
-
-	if ( !fCalendar )
-	{
-		WARNINGKPILOT << "Unable to initialize calendar object."
-			<< " Please check the conduit's setup." << endl;
-		emit logError( i18n( "Unable to initialize the calendar object. Please"
-			" check the conduit's setup") );
-		return false;
-	}
-	fP = createPrivateCalendarData( fCalendar );
-	if ( !fP )
-	{
-		return false;
-	}
-	int rc = fP->updateIncidences();
-	DEBUGKPILOT << fname << ": return from updateIncidences: [" << rc
-		<< "]" << endl;
-
-	if ( fP->count() < 1 )
-	{
-		setFirstSync( true );
-	}
-
-	return true;
-}
-
-KCal::Incidence* VCalConduitBase::addRecord( PilotRecord *r )
-{
-	FUNCTIONSETUP;
-
-	recordid_t id = fLocalDatabase->writeRecord( r );
-	DEBUGKPILOT<<fname<<": Pilot Record ID = " << r->id() << ", backup ID = "
-		<< id << endl;
-
-	PilotRecordBase *de = newPilotEntry( r );
-	KCal::Incidence*e = 0L;
-
-	if ( de )
-	{
-		e = fP->findIncidence( r->id() );
-		if ( !e )
-		{
-			// no corresponding entry found, so create, copy and insert it.
-			e = newIncidence();
-			incidenceFromRecord( e, de );
-			fP->addIncidence( e );
-			fCtrPC->created();
-		}
-		else
-		{
-			// similar entry found, so just copy, no need to insert again
-			incidenceFromRecord( e, de );
-			fCtrPC->updated();
-		}
-	}
-	KPILOT_DELETE( de );
-	return e;
-}
-
-int VCalConduitBase::resolveConflict( KCal::Incidence *e, PilotRecordBase *de ) {
-	if ( getConflictResolution() == SyncAction::eAskUser )
-	{
-		// TODO: This is messed up!!!
-		TQString query = i18n( "The following item was modified "
-			"both on the Handheld and on your PC:\nPC entry:\n\t" );
-		query += e->summary();
-		query += i18n( "\nHandheld entry:\n\t" );
-		query += getTitle( de );
-		query += i18n( "\n\nWhich entry do you want to keep? It will "
-			"overwrite the other entry." );
-
-		return KMessageBox::No == questionYesNo(
-			query,
-			i18n( "Conflicting Entries" ),
-			TQString::null,
-			0 /* Never timeout */,
-			i18n( "Handheld" ), i18n( "PC" ));
-	}
-	return getConflictResolution();
-}
-
-KCal::Incidence*VCalConduitBase::changeRecord(PilotRecord *r,PilotRecord *)
-{
-	FUNCTIONSETUP;
-
-	PilotRecordBase *de = newPilotEntry( r );
-	KCal::Incidence *e = fP->findIncidence( r->id() );
-
-	DEBUGKPILOT << fname << ": Pilot Record ID: [" << r->id() << "]" << endl;
-
-	if ( e && de )
-	{
-		// TODO: check for conflict, and if there is one, ask for resolution
-		if ( ( e->syncStatus() != KCal::Incidence::SYNCNONE )
-			&& r->isModified() )
-		{
-			// TODO: I have not yet found a way to complete ignore an item
-			if (resolveConflict( e, de ) )
-			{
-				// PC record takes precedence:
-				KPILOT_DELETE( de );
-				return e;
-			}
-		}
-		// no conflict or conflict resolution says, Palm overwrites, so do it:
-		incidenceFromRecord( e, de );
-
-		// NOTE: This MUST be done last, since every other set* call
-		// calls updated(), which will trigger an
-		// setSyncStatus(SYNCMOD)!!!
-		e->setSyncStatus(KCal::Incidence::SYNCNONE);
-		fLocalDatabase->writeRecord( r );
-	}
-	else
-	{
-		WARNINGKPILOT
-			<< "While changing record -- not found in iCalendar" << endl;
-		addRecord( r );
-	}
-
-	KPILOT_DELETE( de );
-	return e;
-}
-
-
-KCal::Incidence*VCalConduitBase::deleteRecord( PilotRecord *r, PilotRecord * )
-{
-	FUNCTIONSETUP;
-
-	KCal::Incidence *e = fP->findIncidence(r->id());
-	if (e)
-	{
-		// RemoveEvent also takes it out of the calendar.
-		fP->removeIncidence(e);
-		fCtrPC->deleted();
-	}
-	fLocalDatabase->writeRecord( r );
-	return NULL;
-}
-
-
-void VCalConduitBase::addPalmRecord( KCal::Incidence *e )
-{
-	FUNCTIONSETUP;
-
-	PilotRecordBase *de = newPilotEntry( 0L );
-	updateIncidenceOnPalm( e, de );
-	fCtrHH->created();
-	KPILOT_DELETE( de );
-}
-
-
-void VCalConduitBase::changePalmRecord(KCal::Incidence*e, PilotRecord*s)
-{
-	PilotRecordBase *de = newPilotEntry( s );
-	updateIncidenceOnPalm( e, de );
-	fCtrHH->updated();
-	KPILOT_DELETE( de );
-}
-
-
-void VCalConduitBase::deletePalmRecord( KCal::Incidence *e, PilotRecord *s )
-{
-	FUNCTIONSETUP;
-	if ( s )
-	{
-		DEBUGKPILOT << fname << ": deleting record " << s->id() << endl;
-		s->setDeleted();
-		fDatabase->writeRecord( s );
-		fLocalDatabase->writeRecord( s );
-		fCtrHH->deleted();
-	}
-	else
-	{
-		DEBUGKPILOT << fname << ": could not find record to delete (";
-		DEBUGKPILOT << e->pilotId() << ")" << endl;
-	}
-
-	Q_UNUSED(e);
-}
-
-/* I have to use a pointer to an existing PilotDateEntry so that I can handle
-   new records as well (and to prevent some crashes concerning the validity
-   domain of the PilotRecord*r). In syncEvent this PilotDateEntry is created. */
-void VCalConduitBase::updateIncidenceOnPalm( KCal::Incidence *e,
-	PilotRecordBase *de )
-{
-	FUNCTIONSETUP;
-	if ( !de || !e ) {
-		DEBUGKPILOT << fname << ": NULL event given... Skipping it" << endl;
-		return;
-	}
-
-	if ( e->syncStatus() == KCal::Incidence::SYNCDEL )
-	{
-		DEBUGKPILOT << fname << ": don't write deleted incidence "
-			<< e->summary() << " to the palm" << endl;
-		return;
-	}
-
-	PilotRecord *r = recordFromIncidence( de, e );
-
-	// TODO: Check for conflict!
-	if ( r )
-	{
-		recordid_t id=fDatabase->writeRecord(r);
-		r->setID(id);
-//		r->setAttrib(r->getAttrib() & ~dlpRecAttrDeleted);
-		fLocalDatabase->writeRecord( r );
-//		fDatabase->writeRecord(r);
-		e->setPilotId( id );
-
-		// NOTE: This MUST be done last, since every other set* call
-		// calls updated(), which will trigger an
-		// setSyncStatus(SYNCMOD)!!!
-		e->setSyncStatus(KCal::Incidence::SYNCNONE);
-		KPILOT_DELETE( r );
-	}
-}
-
-const TQString VCalConduitBase::dbname()
-{
-    return TQString::null;
-}
-
-PilotRecord *VCalConduitBase::readRecordByIndex( int index )
-{
-	FUNCTIONSETUP;
-	return fDatabase->readRecordByIndex( index );
-}
-
-KCal::Incidence *VCalConduitBase::incidenceFromRecord( PilotRecord *r )
-{
-	FUNCTIONSETUP;
-	PilotRecordBase *pac = newPilotEntry( r );
-	KCal::Incidence *i = newIncidence();
-	incidenceFromRecord( i, pac );
-
-	KPILOT_DELETE( pac );
-	return i;
-}
-
-void VCalConduitBase::setState( ConduitState *s )
-{
-	KPILOT_DELETE( fState );
-	fState = s;
-}
-
-/* virtual */ void VCalConduitBase::postSync( )
-{
-	FUNCTIONSETUP;
-	if (fCtrPC && fP)
-		fCtrPC->setEndCount(fP->count());
-}
-
-/* virtual */ void VCalConduitBase::preSync( )
-{
-	FUNCTIONSETUP;
-	if (fCtrPC && fP)
-		fCtrPC->setStartCount(fP->count());
-}
diff --git a/kpilot/conduits/vcalconduit/vcal-conduitbase.h b/kpilot/conduits/vcalconduit/vcal-conduitbase.h
deleted file mode 100644
index 4e2f3ae1..00000000
--- a/kpilot/conduits/vcalconduit/vcal-conduitbase.h
+++ /dev/null
@@ -1,202 +0,0 @@
-#ifndef _KPILOT_VCAL_CONDUITBASE_H
-#define _KPILOT_VCAL_CONDUITBASE_H
-/* vcal-conduit.h                       KPilot
-**
-** Copyright (C) 2002-2003 Reinhold Kainhofer
-** Copyright (C) 2001 by Dan Pilone
-**
-** This file defines the vcal-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include <tqstring.h>
-
-#include <libkcal/calendarlocal.h>
-
-#include <plugin.h>
-#include <pilotRecord.h>
-
-namespace KCal
-{
-class Calendar;
-class Incidence;
-}
-
-class PilotSerialDatabase;
-class PilotLocalDatabase;
-class VCalConduitSettings;
-
-class ConduitState;
-
-class VCalConduitPrivateBase
-{
-protected:
-	bool reading;
-	KCal::Calendar *fCalendar;
-public:
-	VCalConduitPrivateBase(KCal::Calendar *buddy) : fCalendar(buddy)
-	{
-		reading = false;
-	};
-
-	virtual ~VCalConduitPrivateBase() { } ;
-
-	virtual int updateIncidences() = 0;
-	virtual void addIncidence(KCal::Incidence*) = 0;
-	virtual void removeIncidence(KCal::Incidence*) = 0;
-	virtual KCal::Incidence *findIncidence(recordid_t) = 0;
-	virtual KCal::Incidence *findIncidence(PilotRecordBase *tosearch) = 0;
-	virtual KCal::Incidence *getNextIncidence() = 0;
-	virtual KCal::Incidence *getNextModifiedIncidence() = 0;
-	virtual int count()=0;
-} ;
-
-class VCalConduitBase : public ConduitAction
-{
-        Q_OBJECT
-public:
-	VCalConduitBase(KPilotLink *,
-		const char *name = 0L,
-		const TQStringList &args = TQStringList());
-	virtual ~VCalConduitBase();
-
-/*********************************************************************
-                D A T A   M E M B E R S ,   S E T T I N G S
- *********************************************************************/
-protected:
-	KCal::Calendar *fCalendar;
-	TQString fCalendarFile;
-	VCalConduitPrivateBase *fP;
-	ConduitState *fState;
-	bool hasNextRecord;
-
-	virtual const TQString dbname() = 0;
-	virtual const TQString getTitle(PilotRecordBase *de) = 0;
-	virtual void readConfig();
-
-	virtual bool exec();
-
-protected slots:
-	/**
-	 * This slot is used to execute the actions applicable to this conduit. What
-	 * happens in this method is defined by the state the conduit has at the
-	 * moment that this method is called. For more information about the actions
-	 * that are executed, look at the classes that are implementing ConduitState.
-	 */
-	void slotProcess();
-
-public:
-	/**
-	 * Method used by state classes to indicatie if there are more records to
-	 * deal with.
-	 */
-	void setHasNextRecord( bool b ) 
-	{
-		hasNextRecord = b;
-	}
-
-	/**
-	 * Change the current state of the conduit. The state that the conduit has
-	 * at the moment of the call will be deleted. The last state *must* set the
-	 * state to 0L when finished.
-	 */
-	void setState( ConduitState *s );
-
-	/**
-	 * Returns the privatebase, that is used to for accessing the local calendar.
-	 */
-	VCalConduitPrivateBase *privateBase() const
-	{
-		return fP;
-	}
-
-	/**
-	 * Returns the record at index from the palm or 0L if there is no record at
-	 * index.
-	 */
-	PilotRecord *readRecordByIndex( int index );
-
-	/**
-	 * Returns a KCal::Incidence constructed from PilotRecord r. If r is 0L the
-	 * it will return a KCal::Incidence that is empty.
-	 */
-	KCal::Incidence *incidenceFromRecord( PilotRecord *r );
-
-	virtual void preIncidence( KCal::Incidence* ) {};
-
-	// Getters
-	KCal::Calendar *calendar() const { return fCalendar; };
-	TQString calendarFile() const { return fCalendarFile; };
-
-	virtual VCalConduitSettings *config() = 0;
-	virtual PilotDatabase *database() const { return fDatabase; };
-	virtual PilotDatabase *localDatabase() const { return fLocalDatabase; };
-
-	// add, change or delete records from the palm
-	virtual void addPalmRecord( KCal::Incidence *e );
-	virtual void changePalmRecord( KCal::Incidence *e, PilotRecord *s );
-	virtual void deletePalmRecord( KCal::Incidence *e, PilotRecord *s );
-
-	// add, change or delete events from the calendar
-	virtual KCal::Incidence* changeRecord( PilotRecord*, PilotRecord* );
-	virtual KCal::Incidence* deleteRecord( PilotRecord*, PilotRecord* );
-	virtual KCal::Incidence* addRecord( PilotRecord * );
-
-/*********************************************************************
-          P R E -   A N D   P O S T S Y N C   F U N C T I O N S
- *********************************************************************/
-	virtual void preSync();
-	virtual void postSync();
-	virtual void preRecord(PilotRecord*) {};
-
-protected:
-	virtual void updateIncidenceOnPalm(KCal::Incidence *e, PilotRecordBase *de);
-
-/*********************************************************************
-                 	S Y N C   F U N C T I O N S
-               for creating events from Palm records or vice versa
- *********************************************************************/
-	virtual PilotRecord *recordFromIncidence(PilotRecordBase *de,
-		const KCal::Incidence *e) = 0;
-	virtual PilotRecordBase *newPilotEntry(PilotRecord *r) = 0;
-
-	virtual KCal::Incidence *newIncidence() = 0;
-	virtual KCal::Incidence *incidenceFromRecord(KCal::Incidence *e,
-		const PilotRecordBase *de) = 0;
-
-/*********************************************************************
-                M I S C   F U N C T I O N S
- *********************************************************************/
-	/**
-     * Return how to resolve conflicts. For now
-	 * PalmOverrides=0=false,
-	 * PCOverrides=1=true,
-	 * Ask=2-> ask the user using a messagebox
-	 */
-	virtual int resolveConflict(KCal::Incidence *e, PilotRecordBase *de);
-	virtual bool openCalendar();
-	virtual VCalConduitPrivateBase *createPrivateCalendarData(KCal::Calendar *fCalendar) = 0;
-} ;
-
-#endif
diff --git a/kpilot/conduits/vcalconduit/vcal-factory.cc b/kpilot/conduits/vcalconduit/vcal-factory.cc
deleted file mode 100644
index 2e157818..00000000
--- a/kpilot/conduits/vcalconduit/vcal-factory.cc
+++ /dev/null
@@ -1,50 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2002-2003 Reinhold Kainhofer
-** Copyright (C) 2001 by Dan Pilone
-**
-** This file defines the factory for the vcal-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <kaboutdata.h>
-
-#include "pluginfactory.h"
-
-#include "vcal-setup.h"
-#include "vcal-conduit.h"
-
-extern "C"
-{
-
-void *init_conduit_vcal()
-{
-	return new ConduitFactory<VCalWidgetSetup,VCalConduit>;
-}
-
-}
-
-
-
diff --git a/kpilot/conduits/vcalconduit/vcal-factory.h b/kpilot/conduits/vcalconduit/vcal-factory.h
deleted file mode 100644
index 5cd4a611..00000000
--- a/kpilot/conduits/vcalconduit/vcal-factory.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef _KPILOT_VCAL_FACTORY_H
-#define _KPILOT_VCAL_FACTORY_H
-/* vcal-factory.h                       KPilot
-**
-** Copyright (C) 2002-2003 Reinhold Kainhofer
-** Copyright (C) 2001 by Dan Pilone
-**
-** This file defines the factory for the vcal-conduit plugin.
-** It also defines the class for the behavior of the setup dialog.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-extern "C"
-{
-
-void *init_libvcalconduit();
-
-}
-
-#endif
diff --git a/kpilot/conduits/vcalconduit/vcal-factorybase.h b/kpilot/conduits/vcalconduit/vcal-factorybase.h
deleted file mode 100644
index 5a1d2a5d..00000000
--- a/kpilot/conduits/vcalconduit/vcal-factorybase.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef _KPILOT_VCAL_FACTORYBASE_H
-#define _KPILOT_VCAL_FACTORYBASE_H
-/* vcal-factory.h                       KPilot
-**
-** Copyright (C) 2002-2003 Reinhold Kainhofer
-** Copyright (C) 2001 by Dan Pilone
-**
-** This file defines the factory for the vcal-conduit plugin.
-** It also defines the class for the behavior of the setup dialog.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#define RES_PALMOVERRIDES 0
-#define RES_PCOVERRIDES 1
-#define RES_ASK 2
-
-#define SYNC_FIRST 0
-#define SYNC_FAST 1
-#define SYNC_FULL 2
-#define SYNC_MAX SYNC_FULL
-
-
-#endif
diff --git a/kpilot/conduits/vcalconduit/vcal-setup.cc b/kpilot/conduits/vcalconduit/vcal-setup.cc
deleted file mode 100644
index 0361c325..00000000
--- a/kpilot/conduits/vcalconduit/vcal-setup.cc
+++ /dev/null
@@ -1,78 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2002-2003 Reinhold Kainhofer
-** Copyright (C) 2001 by Dan Pilone
-**
-** This file defines the setup dialog for the vcal-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <tqbuttongroup.h>
-#include <kaboutdata.h>
-
-#include "korganizerConduit.h"
-#include "vcal-conduit.h"
-#include "vcal-setup.h"
-
-
-VCalWidgetSetup::VCalWidgetSetup(TQWidget *w, const char *n) :
-	VCalWidgetSetupBase(w,n)
-{
-	KAboutData *fAbout = new KAboutData("vcalConduit",
-		I18N_NOOP("VCal Conduit for KPilot"),
-		KPILOT_VERSION,
-		I18N_NOOP("Configures the VCal Conduit for KPilot"),
-		KAboutData::License_GPL,
-		"(C) 2001, Adriaan de Groot\n(C) 2002-2003, Reinhold Kainhofer");
-	fAbout->addAuthor("Adriaan de Groot",
-		I18N_NOOP("Maintainer"),
-		"groot@kde.org",
-		"http://www.kpilot.org/");
-	fAbout->addAuthor("Reinhold Kainhofer",
-		I18N_NOOP("Maintainer"),
-		"reinhold@kainhofer.com",
-		"http://reinhold.kainhofer.com/Linux/");
-	fAbout->addAuthor("Dan Pilone",
-		I18N_NOOP("Original Author"));
-	fAbout->addAuthor("Preston Brown",
-		I18N_NOOP("Original Author"));
-	fAbout->addAuthor("Herwin-Jan Steehouwer",
-		I18N_NOOP("Original Author"));
-	fAbout->addCredit("Cornelius Schumacher",
-		I18N_NOOP("iCalendar port"));
-	fAbout->addCredit("Philipp Hullmann",
-		I18N_NOOP("Bugfixer"));
-
-	ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget, fAbout);
-	fConfigWidget->fSyncDestination->setTitle(i18n("Calendar Destination"));
-	fConduitName=i18n("Calendar");
-
-}
-
-/* static */ ConduitConfigBase *VCalWidgetSetup::create(TQWidget *w,const char *n)
-{
-	return new VCalWidgetSetup(w,n);
-}
-VCalConduitSettings*VCalWidgetSetup::config() { return VCalConduit::theConfig(); }
diff --git a/kpilot/conduits/vcalconduit/vcal-setup.h b/kpilot/conduits/vcalconduit/vcal-setup.h
deleted file mode 100644
index 20723ceb..00000000
--- a/kpilot/conduits/vcalconduit/vcal-setup.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef _KPILOT_VCAL_SETUP_H
-#define _KPILOT_VCAL_SETUP_H
-/* vcal-setup.h                       KPilot
-**
-** Copyright (C) 2002-2003 Reinhold Kainhofer
-** Copyright (C) 2001 by Dan Pilone
-**
-** It also defines the class for the behavior of the setup dialog.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "vcal-setupbase.h"
-
-class VCalWidget;
-class VCalConduitSettings;
-
-class VCalWidgetSetup : public VCalWidgetSetupBase
-{
-public:
-	VCalWidgetSetup(TQWidget *, const char *);
-	static ConduitConfigBase *create(TQWidget *, const char *);
-protected:
-	virtual VCalConduitSettings*config();
-} ;
-
-#endif
diff --git a/kpilot/conduits/vcalconduit/vcal-setupbase.cc b/kpilot/conduits/vcalconduit/vcal-setupbase.cc
deleted file mode 100644
index 643dee64..00000000
--- a/kpilot/conduits/vcalconduit/vcal-setupbase.cc
+++ /dev/null
@@ -1,110 +0,0 @@
-/* vcal-setup.cc                        KPilot
-**
-** Copyright (C) 2002-2003 Reinhold Kainhofer
-** Copyright (C) 2001 by Dan Pilone
-**
-** This file defines the setup dialog for the vcal-conduit plugin.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <tqcheckbox.h>
-#include <tqbuttongroup.h>
-#include <tqcombobox.h>
-
-#include <kurlrequester.h>
-
-#include "korganizerConduit.h"
-#include "vcalconduitSettings.h"
-#include "vcal-setupbase.h"
-
-VCalWidgetSetupBase::VCalWidgetSetupBase(TQWidget *w, const char *n) :
-	ConduitConfigBase(w,n),
-	fConfigWidget(new VCalWidget(w))
-{
-	FUNCTIONSETUP;
-	fWidget=fConfigWidget;
-
-	fConfigWidget->fCalendarFile->setMode(KFile::File);
-	fConfigWidget->fCalendarFile->setFilter(CSL1("*.vcs *.ics|ICalendars\n*.*|All Files (*.*)"));
-
-#define CM(a,b) connect(fConfigWidget->a,b,this,TQT_SLOT(modified()));
-	CM(fSyncDestination,TQT_SIGNAL(clicked(int)));
-	CM(fCalendarFile,TQT_SIGNAL(textChanged(const TQString &)));
-	CM(fArchive,TQT_SIGNAL(toggled(bool)));
-	CM(fConflictResolution,TQT_SIGNAL(activated(int)));
-#undef CM
-}
-
-VCalWidgetSetupBase::~VCalWidgetSetupBase()
-{
-	FUNCTIONSETUP;
-}
-
-/* virtual */ void VCalWidgetSetupBase::commit()
-{
-	FUNCTIONSETUP;
-	config()->readConfig();
-
-	// General page
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Selected type="
-		<< fConfigWidget->fSyncDestination->selected()
-		<< " with id="
-		<< fConfigWidget->fSyncDestination->id(fConfigWidget->fSyncDestination->selected())
-		<< endl;
-#endif
-	config()->setCalendarType( fConfigWidget->fSyncDestination->id(
-			fConfigWidget->fSyncDestination->selected()));
-	config()->setCalendarFile( fConfigWidget->fCalendarFile->url());
-
-	config()->setSyncArchived( fConfigWidget->fArchive->isChecked() );
-
-	// Conflicts page
-	config()->setConflictResolution(
-		fConfigWidget->fConflictResolution->currentItem()+SyncAction::eCROffset);
-
-	config()->writeConfig();
-	unmodified();
-}
-
-/* virtual */ void VCalWidgetSetupBase::load()
-{
-	FUNCTIONSETUP;
-	config()->readConfig();
-
-	// General page
-	fConfigWidget->fSyncDestination->setButton( config()->calendarType());
-	fConfigWidget->fCalendarFile->setURL( config()->calendarFile() );
-
-	fConfigWidget->fArchive->setChecked( config()->syncArchived() );
-
-	// Conflicts page
-	fConfigWidget->fConflictResolution->setCurrentItem(
-		config()->conflictResolution() - SyncAction::eCROffset);
-
-	config()->writeConfig();
-	unmodified();
-}
-
diff --git a/kpilot/conduits/vcalconduit/vcal-setupbase.h b/kpilot/conduits/vcalconduit/vcal-setupbase.h
deleted file mode 100644
index a14bf14d..00000000
--- a/kpilot/conduits/vcalconduit/vcal-setupbase.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef _KPILOT_VCAL_SETUPBASE_H
-#define _KPILOT_VCAL_SETUPBASE_H
-/* vcal-setup.h                       KPilot
-**
-** Copyright (C) 2002-2003 Reinhold Kainhofer
-** Copyright (C) 2001 by Dan Pilone
-**
-** It also defines the class for the behavior of the setup dialog.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "plugin.h"
-
-class VCalWidget;
-class VCalConduitSettings;
-
-class VCalWidgetSetupBase : public ConduitConfigBase
-{
-public:
-	VCalWidgetSetupBase(TQWidget *, const char *);
-	virtual ~VCalWidgetSetupBase();
-
-	virtual void load();
-	virtual void commit();
-
-protected:
-	virtual VCalConduitSettings*config()=0;
-	VCalWidget *fConfigWidget;
-} ;
-
-#endif
diff --git a/kpilot/conduits/vcalconduit/vcalRecord.cc b/kpilot/conduits/vcalconduit/vcalRecord.cc
deleted file mode 100644
index 898bc798..00000000
--- a/kpilot/conduits/vcalconduit/vcalRecord.cc
+++ /dev/null
@@ -1,548 +0,0 @@
-/* vcalRecord.cc                       KPilot
-**
-** Copyright (C) 2006 by Adriaan de Groot <groot@kde.org>
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-** Copyright (C) 2001 by Dan Pilone
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <libkcal/calendar.h>
-#include <libkcal/calendarlocal.h>
-#include <libkcal/recurrence.h>
-#include <libkcal/vcalformat.h>
-
-#include "pilot.h"
-#include "pilotDateEntry.h"
-
-#include "kcalRecord.h"
-#include "vcalRecord.h"
-
-
-static void setStartEndTimes(KCal::Event *e, const PilotDateEntry *de)
-{
-	FUNCTIONSETUP;
-	DEBUGKPILOT << fname
-		<< "# Start time on Palm: "
-		<< readTm(de->getEventStart()).toString() << endl;
-
-	e->setDtStart(readTm(de->getEventStart()));
-	e->setFloats(de->isEvent());
-
-	if (de->isMultiDay())
-	{
-		e->setDtEnd(readTm(de->getRepeatEnd()));
-	}
-	else
-	{
-		e->setDtEnd(readTm(de->getEventEnd()));
-	}
-}
-
-static void setAlarms(KCal::Event *e, const PilotDateEntry *de)
-{
-	FUNCTIONSETUP;
-
-	if (!e) return;
-	// Delete all the alarms now and add them one by one later on.
-	e->clearAlarms();
-	if (!de->isAlarmEnabled()) return;
-
-//	TQDateTime alarmDT = readTm(de->getEventStart());
-	int advanceUnits = de->getAdvanceUnits();
-
-	switch (advanceUnits)
-	{
-	case advMinutes:
-		advanceUnits = 1;
-		break;
-	case advHours:
-		advanceUnits = 60;
-		break;
-	case advDays:
-		advanceUnits = 60*24;
-		break;
-	default:
-#ifdef DEBUG
-		DEBUGKPILOT << fname
-			<< ": Unknown advance units "
-			<< advanceUnits
-			<< endl;
-#endif
-		advanceUnits=1;
-	}
-
-	KCal::Duration adv(-60*advanceUnits*de->getAdvance());
-	KCal::Alarm*alm=e->newAlarm();
-	if (!alm) return;
-
-	alm->setStartOffset(adv);
-	alm->setEnabled(true);
-}
-
-static void setRecurrence(KCal::Event *event,const PilotDateEntry *dateEntry)
-{
-	FUNCTIONSETUP;
-
-	if ((dateEntry->getRepeatType() == repeatNone) || dateEntry->isMultiDay())
-	{
-#ifdef DEBUG
-		DEBUGKPILOT<<fname<<": no recurrence to set"<<endl;
-#endif
-		return;
-	}
-
-	KCal::Recurrence *recur = event->recurrence();
-	int freq = dateEntry->getRepeatFrequency();
-	bool repeatsForever = dateEntry->getRepeatForever();
-	TQDate endDate, evt;
-
-	if (!repeatsForever)
-	{
-		endDate = readTm(dateEntry->getRepeatEnd()).date();
-#ifdef DEBUG
-		DEBUGKPILOT << fname << "-- end " << endDate.toString() << endl;
-	}
-	else
-	{
-		DEBUGKPILOT << fname << "-- noend" << endl;
-#endif
-	}
-
-	TQBitArray dayArray(7);
-
-	switch(dateEntry->getRepeatType())
-	{
-	case repeatDaily:
-		recur->setDaily(freq);
-		break;
-	case repeatWeekly:
-		{
-		const int *days = dateEntry->getRepeatDays();
-
-#ifdef DEBUG
-		DEBUGKPILOT << fname
-			<< ": Got repeat-weekly entry, by-days="
-			<< days[0] << " "<< days[1] << " "<< days[2] << " "
-			<< days[3] << " "
-			<< days[4] << " "<< days[5] << " "<< days[6] << " "
-			<< endl;
-#endif
-
-		// Rotate the days of the week, since day numbers on the Pilot and
-		// in vCal / Events are different.
-		//
-		if (days[0]) dayArray.setBit(6);
-		for (int i = 1; i < 7; i++)
-		{
-			if (days[i]) dayArray.setBit(i-1);
-		}
-		recur->setWeekly( freq, dayArray );
-		}
-		break;
-	case repeatMonthlyByDay: {
-		// Palm: Day=0(sun)-6(sat); week=0-4, 4=last week; pos=week*7+day
-		// libkcal: day=bit0(mon)-bit6(sun); week=-5to-1(from end) and 1-5 (from beginning)
-		// Palm->PC: w=pos/7
-		// week: if w=4 -> week=-1, else week=w+1;
-		// day: day=(pos-1)%7 (rotate by one day!)
-		recur->setMonthly( freq );
-
-		int day=dateEntry->getRepeatDay();
-		int week=day/7;
-		// week=4 means last, otherwise convert to 0-based
-		if (week==4) week=-1; else week++;
-		dayArray.setBit((day+6) % 7);
-		recur->addMonthlyPos(week, dayArray);
-		break;}
-	case repeatMonthlyByDate:
-		recur->setMonthly( freq );
-		recur->addMonthlyDate( dateEntry->getEventStart().tm_mday );
-		break;
-	case repeatYearly:
-		recur->setYearly( freq );
-		evt=readTm(dateEntry->getEventStart()).date();
-		recur->addYearlyMonth( evt.month() );
-//		dayArray.setBit((evt.day()-1) % 7);
-//		recur->addYearlyMonthPos( ( (evt.day()-1) / 7) + 1, dayArray );
-		break;
-	case repeatNone:
-	default :
-#ifdef DEBUG
-		DEBUGKPILOT << fname
-			<< ": Can't handle repeat type "
-			<< dateEntry->getRepeatType()
-			<< endl;
-#endif
-		break;
-	}
-	if (!repeatsForever)
-	{
-		recur->setEndDate(endDate);
-	}
-}
-
-static void setExceptions(KCal::Event *vevent,const PilotDateEntry *dateEntry)
-{
-	FUNCTIONSETUP;
-
-	// Start from an empty exception list, and if necessary, add exceptions.
-	// At the end of the function, apply the (possibly empty) exception list.
-	KCal::DateList dl;
-
-	if ( !(dateEntry->isMultiDay() ) && dateEntry->getExceptionCount()>0 )
-	{
-		for (int i = 0; i < dateEntry->getExceptionCount(); i++)
-		{
-//			vevent->addExDate(readTm(dateEntry->getExceptions()[i]).date());
-			dl.append(readTm(dateEntry->getExceptions()[i]).date());
-		}
-	}
-	else
-	{
-#ifdef DEBUG
-	if (dateEntry->getExceptionCount()>0)
-	DEBUGKPILOT << fname
-		<< ": WARNING Exceptions ignored for multi-day event "
-		<< dateEntry->getDescription()
-		<< endl ;
-#endif
-		return;
-	}
-	vevent->recurrence()->setExDates(dl);
-}
-
-static void setStartEndTimes(PilotDateEntry*de, const KCal::Event *e)
-{
-	FUNCTIONSETUP;
-	struct tm ttm=writeTm(e->dtStart());
-	de->setEventStart(ttm);
-	de->setFloats( e->doesFloat() );
-
-	if (e->hasEndDate() && e->dtEnd().isValid())
-	{
-		ttm=writeTm(e->dtEnd());
-	}
-	else
-	{
-		ttm=writeTm(e->dtStart());
-	}
-	de->setEventEnd(ttm);
-}
-
-
-
-
-static void setAlarms(PilotDateEntry*de, const KCal::Event *e)
-{
-	FUNCTIONSETUP;
-
-	if (!de || !e )
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": NULL entry given to setAlarms. "<<endl;
-#endif
-		return;
-	}
-
-	if ( !e->isAlarmEnabled() )
-	{
-		de->setAlarmEnabled( false );
-		return;
-	}
-
-	// find the first enabled alarm
-	KCal::Alarm::List alms=e->alarms();
-	KCal::Alarm* alm=0;
-	KCal::Alarm::List::ConstIterator it;
-	for ( it = alms.begin(); it != alms.end(); ++it ) {
-		if ((*it)->enabled()) alm=*it;
-	}
-
-	if (!alm )
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": no enabled alarm found (should exist!!!)"<<endl;
-#endif
-		de->setAlarmEnabled( false );
-		return;
-	}
-
-	// palm and PC offsets have a different sign!!
-	int aoffs=-alm->startOffset().asSeconds()/60;
-	int offs=(aoffs>0)?aoffs:-aoffs;
-
-	// find the best Advance Unit
-	if (offs>=100 || offs==60)
-	{
-		offs/=60;
-		if (offs>=48 || offs==24)
-		{
-			offs/=24;
-			de->setAdvanceUnits(advDays);
-		}
-		else
-		{
-			de->setAdvanceUnits(advHours);
-		}
-	}
-	else
-	{
-		de->setAdvanceUnits(advMinutes);
-	}
-	de->setAdvance((aoffs>0)?offs:-offs);
-	de->setAlarmEnabled( true );
-}
-
-
-
-static void setRecurrence(PilotDateEntry*dateEntry, const KCal::Event *event)
-{
-	FUNCTIONSETUP;
-	bool isMultiDay=false;
-
-	// first we have 'fake type of recurrence' when a multi-day event is passed to the pilot, it is converted to an event
-	// which recurs daily a number of times. if the event itself recurs, this will be overridden, and
-	// only the first day will be included in the event!!!!
-	TQDateTime startDt(readTm(dateEntry->getEventStart())), endDt(readTm(dateEntry->getEventEnd()));
-	if (startDt.daysTo(endDt))
-	{
-		isMultiDay=true;
-		dateEntry->setRepeatType(repeatDaily);
-		dateEntry->setRepeatFrequency(1);
-		dateEntry->setRepeatEnd(dateEntry->getEventEnd());
-#ifdef DEBUG
-		DEBUGKPILOT << fname <<": Setting single-day recurrence (" << startDt.toString() << " - " << endDt.toString() << ")" <<endl;
-#endif
-	}
-
-
-	KCal::Recurrence*r=event->recurrence();
-	if (!r) return;
-	ushort recType=r->recurrenceType();
-	if ( recType==KCal::Recurrence::rNone )
-	{
-		if (!isMultiDay) dateEntry->setRepeatType(repeatNone);
-		return;
-	}
-
-
-	int freq=r->frequency();
-	TQDate endDate=r->endDate();
-
-	if ( r->duration() < 0 || !endDate.isValid() )
-	{
-		dateEntry->setRepeatForever();
-	}
-	else
-	{
-		dateEntry->setRepeatEnd(writeTm(endDate));
-	}
-	dateEntry->setRepeatFrequency(freq);
-#ifdef DEBUG
-	DEBUGKPILOT<<" Event: "<<event->summary()<<" ("<<event->description()<<")"<<endl;
-	DEBUGKPILOT<< "duration: "<<r->duration() << ", endDate: "<<endDate.toString()<< ", ValidEndDate: "<<endDate.isValid()<<", NullEndDate: "<<endDate.isNull()<<endl;
-#endif
-
-	TQBitArray dayArray(7), dayArrayPalm(7);
-	switch(recType)
-	{
-	case KCal::Recurrence::rDaily:
-		dateEntry->setRepeatType(repeatDaily);
-		break;
-	case KCal::Recurrence::rWeekly:
-		dateEntry->setRepeatType(repeatWeekly);
-		dayArray=r->days();
-		// rotate the bits by one
-		for (int i=0; i<7; i++)
-		{
-			dayArrayPalm.setBit( (i+1)%7, dayArray[i]);
-		}
-		dateEntry->setRepeatDays(dayArrayPalm);
-		break;
-	case KCal::Recurrence::rMonthlyPos:
-		// Palm: Day=0(sun)-6(sat); week=0-4, 4=last week; pos=week*7+day
-		// libkcal: day=bit0(mon)-bit6(sun); week=-5to-1(from end) and 1-5 (from beginning)
-		// PC->Palm: pos=week*7+day
-		//  week: if w=-1 -> week=4, else week=w-1
-		//  day: day=(daybit+1)%7  (rotate because of the different offset)
-		dateEntry->setRepeatType(repeatMonthlyByDay);
-		if (r->monthPositions().count()>0)
-		{
-			// Only take the first monthly position, as the palm allows only one
-			TQValueList<KCal::RecurrenceRule::WDayPos> mps=r->monthPositions();
-			KCal::RecurrenceRule::WDayPos mp=mps.first();
-			int week = mp.pos();
-			int day = (mp.day()+1) % 7; // rotate because of different offset
-			// turn to 0-based and include starting from end of month
-			// TODO: We don't handle counting from the end of the month yet!
-			if (week==-1) week=4; else week--;
-			dateEntry->setRepeatDay(static_cast<DayOfMonthType>(7*week + day));
-		}
-		break;
-	case KCal::Recurrence::rMonthlyDay:
-		dateEntry->setRepeatType(repeatMonthlyByDate);
-//TODO: is this needed?		dateEntry->setRepeatDay(static_cast<DayOfMonthType>(startDt.day()));
-		break;
-	case KCal::Recurrence::rYearlyDay:
-	case KCal::Recurrence::rYearlyPos:
-		DEBUGKPILOT << fname
-			<< "! Unsupported yearly recurrence type." << endl;
-	case KCal::Recurrence::rYearlyMonth:
-		dateEntry->setRepeatType(repeatYearly);
-		break;
-	case KCal::Recurrence::rNone:
-		if (!isMultiDay) dateEntry->setRepeatType(repeatNone);
-		break;
-	default:
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": Unknown recurrence type "<< recType << " with frequency "
-			<< freq << " and duration " << r->duration() << endl;
-#endif
-		break;
-	}
-}
-
-
-static void setExceptions(PilotDateEntry *dateEntry, const KCal::Event *vevent )
-{
-	FUNCTIONSETUP;
-	struct tm *ex_List;
-
-	if (!dateEntry || !vevent)
-	{
-		WARNINGKPILOT << "NULL dateEntry or NULL vevent given for exceptions. Skipping exceptions" << endl;
-		return;
-	}
-	// first, we need to delete the old exceptions list, if it existed...
-	// This is no longer needed, as I fixed PilotDateEntry::setExceptions to do this automatically
-/*	ex_List=const_cast<structdateEntry->getExceptions();
-	if (ex_List)
-		KPILOT_DELETE(ex_List);*/
-
-	KCal::DateList exDates = vevent->recurrence()->exDates();
-	size_t excount = exDates.size();
-	if (excount<1)
-	{
-		dateEntry->setExceptionCount(0);
-		dateEntry->setExceptions(0);
-		return;
-	}
-
-	// we have exceptions, so allocate mem and copy them there...
-	ex_List=new struct tm[excount];
-	if (!ex_List)
-	{
-		WARNINGKPILOT << "Couldn't allocate memory for the exceptions" << endl;
-		dateEntry->setExceptionCount(0);
-		dateEntry->setExceptions(0);
-		return;
-	}
-
-	size_t n=0;
-
-	KCal::DateList::ConstIterator dit;
-	for (dit = exDates.begin(); dit != exDates.end(); ++dit ) {
-		struct tm ttm=writeTm(*dit);
-		ex_List[n++]=ttm;
-	}
-	dateEntry->setExceptionCount(excount);
-	dateEntry->setExceptions(ex_List);
-}
-
-
-bool KCalSync::setEvent(KCal::Event *e,
-	const PilotDateEntry *de,
-	const CategoryAppInfo &info)
-{
-	FUNCTIONSETUP;
-	if (!e)
-	{
-		DEBUGKPILOT << fname
-			<< "! NULL event given... Skipping it" << endl;
-		return false;
-	}
-	if (!de)
-	{
-		DEBUGKPILOT << fname
-			<< "! NULL date entry given... Skipping it" << endl;
-		return false;
-	}
-
-
-	e->setSecrecy(de->isSecret() ?
-		KCal::Event::SecrecyPrivate :
-		KCal::Event::SecrecyPublic);
-
-	e->setPilotId(de->id());
-
-	setStartEndTimes(e,de);
-	setAlarms(e,de);
-	setRecurrence(e,de);
-	setExceptions(e,de);
-
-	e->setSummary(de->getDescription());
-	e->setDescription(de->getNote());
-	e->setLocation(de->getLocation());
-
-	// used by e.g. Agendus and Datebk
-	setCategory(e, de, info);
-
-	// NOTE: This MUST be done last, since every other set* call
-	// calls updated(), which will trigger an
-	// setSyncStatus(SYNCMOD)!!!
-	e->setSyncStatus(KCal::Incidence::SYNCNONE);
-
-	return true;
-}
-
-bool KCalSync::setDateEntry(PilotDateEntry *de,
-	const KCal::Event *e,
-	const CategoryAppInfo &info)
-{
-	FUNCTIONSETUP;
-	if (!de || !e) {
-		DEBUGKPILOT << fname
-			<< ": NULL event given... Skipping it" << endl;
-		return false;
-	}
-
-	// set secrecy, start/end times, alarms, recurrence, exceptions, summary and description:
-	if (e->secrecy()!=KCal::Event::SecrecyPublic)
-	{
-		de->setSecret( true );
-	}
-
-	setStartEndTimes(de, e);
-	setAlarms(de, e);
-	setRecurrence(de, e);
-	setExceptions(de, e);
-	de->setDescription(e->summary());
-	de->setNote(e->description());
-	de->setLocation(e->location());
-	setCategory(de, e, info);
-	return true;
-}
-
diff --git a/kpilot/conduits/vcalconduit/vcalRecord.h b/kpilot/conduits/vcalconduit/vcalRecord.h
deleted file mode 100644
index 4cad14b5..00000000
--- a/kpilot/conduits/vcalconduit/vcalRecord.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef _KPILOT_VCALRECORD_H
-#define _KPILOT_VCALRECORD_H
-/* vcal-conduit.h                       KPilot
-**
-** Copyright (C) 2006 by Adriaan de Groot <groot@kde.org>
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-** Copyright (C) 2001 by Dan Pilone
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-class PilotDateEntry;
-
-namespace KCal
-{
-	class Event;
-}
-
-namespace KCalSync
-{
-	bool setEvent( KCal::Event *e,
-		const PilotDateEntry *de,
-		const CategoryAppInfo &info);
-	bool setDateEntry(PilotDateEntry *de,
-		const KCal::Event *e,
-		const CategoryAppInfo &info);
-}
-
-#endif
-
-
diff --git a/kpilot/conduits/vcalconduit/vcalconduitSettings.kcfgc b/kpilot/conduits/vcalconduit/vcalconduitSettings.kcfgc
deleted file mode 100644
index 7855ad24..00000000
--- a/kpilot/conduits/vcalconduit/vcalconduitSettings.kcfgc
+++ /dev/null
@@ -1,7 +0,0 @@
-File=vcalconduitbase.kcfg
-ClassName=VCalConduitSettings
-#Singleton=true
-ItemAccessors=true
-Mutators=true
-GlobalEnums=true
-SetUserTexts=true
diff --git a/kpilot/conduits/vcalconduit/vcalconduitbase.kcfg b/kpilot/conduits/vcalconduit/vcalconduitbase.kcfg
deleted file mode 100644
index c35e7907..00000000
--- a/kpilot/conduits/vcalconduit/vcalconduitbase.kcfg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
-      http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <kcfgfile name="kpilot_vcalconduitsrc">
-    <parameter name="conduit" />
-  </kcfgfile>
-
-  <group name="$(conduit)-Conduit">
-    <entry name="ConduitVersion"  type="UInt">
-    </entry>
-    <entry name="CalendarType"  type="Enum">
-				<choices>
-						<choice name="eCalendarResource"/>
-						<choice name="eCalendarLocal"/>
-				</choices>
-        <default>eCalendarLocal</default>
-    </entry>
-    <entry name="CalendarFile" key="CalFile"  type="Path">
-        <default>$HOME/.kde/share/apps/korganizer/std.ics</default>
-    </entry>
-    <entry name="SyncArchived"  type="Bool">
-        <default>true</default>
-    </entry>
-    <entry name="ConflictResolution"  type="Int">
-        <default>0</default>
-    </entry>		
-  </group>
-
-</kcfg>
diff --git a/kpilot/config.h.cmake b/kpilot/config.h.cmake
deleted file mode 100644
index 7d1be45a..00000000
--- a/kpilot/config.h.cmake
+++ /dev/null
@@ -1,43 +0,0 @@
-#cmakedefine HAVE_STDINT_H
-#cmakedefine HAVE_ALLOCA_H
-#cmakedefine HAVE_SYS_TIME_H
-#cmakedefine HAVE_SYS_STAT_H
-#cmakedefine HAVE_CFSETSPEED
-#cmakedefine HAVE_STRDUP
-#cmakedefine HAVE_SETENV
-#cmakedefine HAVE_UNSETENV
-#cmakedefine HAVE_USLEEP
-#cmakedefine HAVE_RANDOM
-#cmakedefine HAVE_PUTENV
-#cmakedefine HAVE_SETEUID
-#cmakedefine HAVE_MKSTEMPS
-#cmakedefine HAVE_MKSTEMP
-#cmakedefine HAVE_MKDTEMP
-#cmakedefine HAVE_REVOKE
-#cmakedefine HAVE_STRLCPY
-#cmakedefine HAVE_STRLCAT
-#cmakedefine HAVE_INET_ATON
-
-#if !defined(HAVE_STRLCAT)
-#ifdef __cplusplus
-extern "C" {
-#endif
-unsigned long strlcat(char*, const char*, unsigned long);
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-
-
-#if !defined(HAVE_STRLCPY)
-#ifdef __cplusplus
-extern "C" {
-#endif
-unsigned long strlcpy(char*, const char*, unsigned long);
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-
diff --git a/kpilot/configure b/kpilot/configure
deleted file mode 100755
index 48706b27..00000000
--- a/kpilot/configure
+++ /dev/null
@@ -1,213 +0,0 @@
-#!/bin/sh
-
-# simple configure script for user-friendliness
-
-# file to put output into for cmake to read in...
-OUTFILE=$(dirname $0)/Makefile.cmake.in
-CMAKEOUTFILE=$(dirname $0)/CMakeOptions.txt
-
-# --- FUNCTIONS ---
-
-usage()
-{
-echo "
-
-Hi there.  You can use this script to configure parameters used by cmake.
-Currently, understood parameters are as follows:
-
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-  --enable-debug=ARG      enables debug symbols (yes|no) default=no
-  --enable-tests=ARG      enable test suite (yes|no) default=no
-  --with-pilot-link=PATH  set prefix for pilot-link files [default=check]
-  --with-mal=PATH         set path for libmal files [default=check]
-
-  --show                  show existing configuration values
-
-More obscure options:
-
-  --with-simple-builddir=ARG      use 'build' instead of longer name (yes|no) default=no
-  --with-pilot-link-includes=PATH set include directory for pilot-link
-  --with-pilot-link-lib=PATH      set full path to libpisock.so
-
-"
-}
-
-getvalue()
-{
-	KEY="$1"
-	# use dynamic variable...
-	eval VAL='$'$KEY
-
-	ECHO="$2"
-	
-	if test -n "$VAL"
-	then
-		CMAKE_FLAGS="${CMAKE_FLAGS}set(${KEY} \"${VAL}\")
-"
-		if [ "$ECHO" = "y" ]
-		then
-			echo "$KEY=\"$VAL\""
-		fi
-	fi
-
-}
-
-outputCmakeValues()
-{
-
-# only include what we're passed
-CMAKE_FLAGS=""
-
-getvalue CMAKE_INSTALL_PREFIX n
-getvalue CMAKE_BUILD_TYPE n
-getvalue ENABLE_TESTS n
-#getvalue BUILD_DIR y
-getvalue PILOTLINK_BASE n
-getvalue MAL_BASE n
-getvalue PILOTLINK_INCLUDE_DIR n
-getvalue PILOTLINK_LIBRARY n
-
-echo "$CMAKE_FLAGS"
-}
-
-outputMakeValues()
-{
-getvalue BUILD_DIR y
-}
-
-# --- MAIN ---
-
-# first, if there's no args, don't lose what we had stored (badness).
-# simply show what available arguments are and exit...
-if test -z "$1"; then
-	usage
-	exit
-fi
-
-CMAKE_BUILD_TYPE="normal"
-ENABLE_TESTS="NO"
-BUILD_DIR=build-`uname -sr | tr -d [:space:] | tr -Cs a-zA-Z0-9 _`
-
-while test -n "$1"
-do
-	case "$1" in
-		--prefix=*)
-			CMAKE_INSTALL_PREFIX=$(echo $1 | cut -d "=" -f2)
-			;;
-		--enable-debug*)
-			T=$(echo $1 | cut -d "=" -f2 | tr '[A-Z]' '[a-z]')
-			if test "$T" = "$1" || test "yes" = "$T" || test "full" = "$T" ; then
-				CMAKE_BUILD_TYPE=debug
-			else
-				CMAKE_BUILD_TYPE=normal
-			fi
-			;;
-		--enable-test*)
-			T=$(echo "$1" | cut -d = -f2 | tr '[A-Z]' '[a-z]')
-			if test "$T" = "$1" || test "yes" = "$T" ; then
-				ENABLE_TESTS=YES
-			else
-				ENABLE_TESTS=NO
-			fi
-			;;
-		--with-simple-builddir*)
-			T=$(echo "$1" | cut -d = -f2 | tr '[A-Z]' '[a-z]')
-			if test "$T" = "$1" || test "yes" = "$T" ; then
-				BUILD_DIR=build
-			fi
-			;;
-		--with-pilot-link-includes=*)
-			PILOTLINK_INCLUDE_DIR=$(echo $1 | cut -d = -f2)
-			;;
-		--with-pilot-link-lib=*)
-			PILOTLINK_LIBRARY=$(echo $1 | cut -d = -f2)
-			;;
-		--with-pilot-link=*)
-			PILOTLINK_BASE=$(echo $1 | cut -d "=" -f2)
-			;;
-		--with-mal=*)
-			MAL_BASE=$(echo $1 | cut -d "=" -f2)
-			;;
-		--show)
-			echo "Existing configuration values:"
-			echo "-----------"
-			cat "$OUTFILE" 2>/dev/null
-			sed 's/^set(\([A-Z_]*\) "\(.*\)")/\1="\2"/' "$CMAKEOUTFILE" 2>/dev/null
-			echo "-----------"
-			exit
-			;;
-		*)
-			usage
-			exit
-			;;
-	esac
-
-	shift
-
-done
-
-###
-#
-# BSD uses gmake for the GNU make which we need ...
-#
-if uname -s | grep BSD > /dev/null 2>&1 ; then
-	MAKE=gmake
-else
-	MAKE=make
-fi
-
-outputCmakeValues > "$CMAKEOUTFILE.new"
-outputMakeValues > "$OUTFILE.new"
-
-
-###
-#
-# If the configure values have changed, then we should update the 
-# CMakeLists.txt in order to prompt a re-run of cmake.
-#
-update=no
-failed=no
-if test -f "$CMAKEOUTFILE" ; then
-	diff -q "$CMAKEOUTFILE" "$CMAKEOUTFILE.new" > /dev/null 2>&1 || update=yes
-else
-	update=yes
-fi
-
-if test -f "$OUTFILE" ; then
-	diff -q "$OUTFILE" "$OUTFILE.new" > /dev/null 2>&1 || update=yes
-else
-	update=yes
-fi
-
-if test yes = "$update" ; then
-	cp "$CMAKEOUTFILE.new" "$CMAKEOUTFILE"
-	cp "$OUTFILE.new" "$OUTFILE"
-	touch CMakeLists.txt
-	$MAKE -f Makefile.cmake build-check || failed=yes
-fi
-
-rm -f "$CMAKEOUTFILE.new"
-rm -f "$OUTFILE.new"
-rm -f build*/CMakeCache.txt
-
-###
-#
-# Inform user and create settings file.
-#
-echo "
-Thanks.  Here are the values I will be using...
-
-$(outputCmakeValues)
-
-$(outputMakeValues)
-
-To compile KPilot, now run GNU make, like so:
-
-    $MAKE -f Makefile.cmake
-
-"
-
-if test "yes" = "$failed" ; then
-	echo "Configuration failed, so take a good look at the build output."
-fi
-
diff --git a/kpilot/configure.in.bot b/kpilot/configure.in.bot
deleted file mode 100644
index aca4de56..00000000
--- a/kpilot/configure.in.bot
+++ /dev/null
@@ -1,18 +0,0 @@
-if test "$HAVE_PISOCK" = "0" ; then
-	echo ""
-	echo "You're missing a compatible version of pilot-link for KPilot."
-	echo "KPilot will not be built."
-	echo ""
-	all_tests=bad
-else
-	if test "x$HAVE_BAD_PISOCK" = "xYES" ; then
-		echo ""
-		echo "You have a version of pilot-link < 0.12.0."
-		echo "This version is old and is known to cause problems"
-		echo "with KPilot.  Please compile KPilot with "
-		echo "pilot-link version 0.12.0 or greater."
-		echo "KPilot will not be built."
-		echo ""
-		all_tests=bad
-	fi
-fi
diff --git a/kpilot/configure.in.in b/kpilot/configure.in.in
deleted file mode 100644
index 863e3e4c..00000000
--- a/kpilot/configure.in.in
+++ /dev/null
@@ -1,256 +0,0 @@
-dnl Configure.in.in for KPilot.
-dnl
-dnl Copyright (C) 2000,2001 Adriaan de Groot
-dnl
-dnl This file is released under the terms of the Gnu General Public
-dnl Licence (GPL) Version 2.
-
-dnl
-dnl Check to see if pisock header and library are available
-dnl
-
-dnl
-dnl Questions and comments can be sent to groot@kde.org
-dnl
-
-dnl Check for the headers first. The first test is the somewhat-
-dnl sophisticated one AC uses, and incorporates all the extra-includes
-dnl and whatnot stuff.
-dnl
-dnl We need to explicitly use the --with-extra-includes passed in,
-dnl since AC_CHECK_HEADER does not do so.
-dnl
-
-
-AC_DEFUN([KPILOT_CHECK_PISOCK],
-[
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-AC_MSG_CHECKING(for pilot-link (for KPilot))
-AC_ARG_WITH(pilot_link,
-[  --with-pilot-link=PATH  set prefix for pilot-link files @<:@default=check@:>@],
-[
-  case "$withval" in
-  yes)
-    with_pilot_link=CHECK
-    ;;
-  esac ],
-[ with_pilot_link=CHECK ]
-)dnl
-
-case "$with_pilot_link" in
-CHECK)
-	AC_MSG_RESULT([autodetect])
-	;;
-*)
-	if test -d "$with_pilot_link" ; then
-		AC_MSG_RESULT([$with_pilot_link])
-	else
-		AC_MSG_RESULT([autodetect])
-		with_pilot_link=CHECK
-		AC_MSG_WARN([The path provided for pilot-link, $with_pilot_link, does not exist.])
-	fi
-	;;
-esac
-
-
-
-AC_LANG_PUSH(C++)
-
-kpilot_save_cflags="$CPPFLAGS"
-kpilot_save_ldflags="$LDFLAGS"
-
-
-CPPFLAGS="$CPPFLAGS $all_includes"
-LDFLAGS="$LDFLAGS $all_libraries"
-
-HAVE_PISOCK=0
-HAVE_BAD_PISOCK=NO
-
-PISOCK_LIB=""
-PISOCK_LDFLAGS=""
-PISOCK_INCLUDE=""
-pisock_path=""
-
-dnl Try looking normally
-dnl
-dnl
-if test "x$with_pilot_link" = "xCHECK" ; then
-AC_CHECK_HEADER(pi-file.h,[HAVE_PISOCK=1], )
-fi
-
-dnl If nothing found, try some other places that might have
-dnl pilot-link installed. These can be extended for particular
-dnl distro's; /vol/kde is where I install stuff on Suns and BSD.
-dnl
-dnl
-if  test "$HAVE_PISOCK" = "0" ; then
-	pisock_path=""
-	AC_MSG_CHECKING([for pi-file.h alternate])
-	if test "x$with_pilot_link" = "xCHECK" ; then
-		for i in /usr/local/pilot/include /usr/local/include /vol/kde/support/include /usr/include /usr/include/libpisock ; do
-			test -f $i/pi-file.h && HAVE_PISOCK=1
-			test -f $i/pi-file.h && PISOCK_INCLUDE="-I$i"
-			test -f $i/pi-file.h && pisock_path="$i"
-		done
-	else
-		test -f "$with_pilot_link/include/pi-file.h" && HAVE_PISOCK=1
-		test -f "$with_pilot_link/include/pi-file.h" && PISOCK_INCLUDE="-I$with_pilot_link/include"
-		test -f "$with_pilot_link/include/pi-file.h" && pisock_path="$with_pilot_link/include"
-	fi
-
-	if test "$pisock_path" ; then
-		AC_MSG_RESULT([found $pisock_path])
-	else
-		AC_MSG_RESULT([still not found])
-		HAVE_PISOCK="0"
-	fi
-
-fi
-
-dnl Next, check the version of pilot-link to make sure it's sufficiently new.
-dnl
-dnl
-if test -z "$pisock_path" ; then
-	AC_CHECK_HEADER(pi-version.h,[HAVE_PISOCK=1], )
-else
-	test -d "$pisock_path" || HAVE_PISOCK="0"
-	test -f "$pisock_path/pi-version.h" || HAVE_PISOCK="0"
-fi
-
-dnl Now we know where the includes are, we need to
-dnl check the version more closely.
-dnl
-dnl
-CPPFLAGS="$CPPFLAGS $PISOCK_INCLUDE"
-if test "$HAVE_PISOCK" = "1" ; then
-	AC_MSG_CHECKING([pilot-link version])
-	AC_TRY_RUN([
-	#include <pi-version.h>
-	int main()
-	{ if (PILOT_LINK_VERSION==0) {
-            if ((PILOT_LINK_MAJOR==12) && (PILOT_LINK_MINOR>=0)) return (0);
-	  }
-	  return (1);
-	}
-	]
-	,
-	[AC_MSG_RESULT([pilot-link version >= 0.12.0 found])],
-	[AC_MSG_RESULT([Your version of pilot-link won't work with KPilot])]
-	HAVE_PISOCK="0"
-	,
-	[AC_MSG_RESULT([Cross-compiling KPilot is doomed])
-	HAVE_PISOCK="0"
-	])
-fi
-
-if test "x$with_pilot_link" = "xCHECK" ; then
-
-# Fairly random collection of possible extra libraries needed
-# to link pilot-link against.
-if test "$HAVE_PISOCK" = "1" ; then
-	HAVE_PISOCK=0
-
-	AC_CHECK_LIB(pisock,
-		pi_accept,
-		[PISOCK_LIB="-lpisock"
-		HAVE_PISOCK=1
-		],
-		[
-		unset ac_cv_lib_pisock_pi_accept
-		AC_CHECK_LIB(pisock,
-			pi_accept,
-			[PISOCK_LIB="-lpisock -lsocket"
-			HAVE_PISOCK=1
-			],
-			[
-			unset ac_cv_lib_pisock_pi_accept
-			AC_CHECK_LIB(pisock,
-				pi_accept,
-				[PISOCK_LIB="-lpisock -lsocket -lxnet"
-				HAVE_PISOCK=1
-				],
-				[
-					AC_CHECK_LIB(pisock,
-					pi_accept,
-					[PISOCK_LIB="-lpisock -lnsl -lsocket"
-					HAVE_PISOCK=1
-					],
-					[HAVE_PISOCK=0
-					])
-				],
-				[-lsocket -lxnet]
-				)
-			],
-			[-lsocket]
-			)
-		]
-		)
-fi
-fi
-
-# No libpisock found yet, but the headers have been found
-if test -z "$PISOCK_LIB" ; then
-if test "$HAVE_PISOCK" = "1" ; then
-
-HAVE_PISOCK=0
-
-if test "x$with_pilot_link" = "xCHECK" ; then
-dnl Run through the loop *anyway*, even if we've already found
-dnl the library. The inner if makes sure that we only check until
-dnl we've found the library once.
-dnl
-dnl
-for i in /usr/local/pilot/lib /usr/local/lib /vol/kde/support/lib ; do
-	if test "$HAVE_PISOCK" = "0" ; then
-		CPPFLAGS="$kpilot_save_cflags  $all_includes $PISOCK_INCLUDE"
-		LDFLAGS="$kpilot_save_ldflags  $all_libraries -L$i -R$i"
-
-		unset ac_cv_lib_pisock_pi_accept
-		AC_CHECK_LIB(pisock,pi_accept,
-			[PISOCK_LDFLAGS="-L$i -R$i"
-			PISOCK_LIB="-lpisock"
-			HAVE_PISOCK=1],[],[])
-	fi
-done
-else
-	CPPFLAGS="$kpilot_save_cflags  $all_includes $PISOCK_INCLUDE"
-	LDFLAGS="$kpilot_save_ldflags  $all_libraries -L$with_pilot_link/lib -R$with_pilot_link/lib"
-
-	unset ac_cv_lib_pisock_pi_accept
-	AC_CHECK_LIB(pisock,pi_accept,
-		[PISOCK_LDFLAGS="-L$with_pilot_link/lib -R$with_pilot_link/lib"
-		PISOCK_LIB="-lpisock"
-		HAVE_PISOCK=1],[],[])
-fi
-fi
-fi
-
-
-if test "$HAVE_PISOCK" = "0" ; then
-	PISOCK_LIB=""
-	PISOCK_LDFLAGS=""
-	PISOCK_INCLUDE=""
-	DO_NOT_COMPILE="$DO_NOT_COMPILE kpilot"
-fi
-
-AC_SUBST(PISOCK_LIB)
-AC_SUBST(PISOCK_LDFLAGS)
-AC_SUBST(PISOCK_INCLUDE)
-AM_CONDITIONAL(compile_kpilot, test "$HAVE_PISOCK" = 1)
-
-
-CPPFLAGS="$kpilot_save_cflags"
-LDFLAGS="$kpilot_save_ldflags"
-unset kpilot_save_cflags
-unset kpilot_save_ldflags
-
-AC_LANG_POP(C++)
-
-dnl Remainder is for standalone use
-AC_HEADER_TIME
-AC_CHECK_GETDOMAINNAME
-
-])
-KPILOT_CHECK_PISOCK
-
diff --git a/kpilot/kpilot/CMakeLists.txt b/kpilot/kpilot/CMakeLists.txt
deleted file mode 100644
index 9be24467..00000000
--- a/kpilot/kpilot/CMakeLists.txt
+++ /dev/null
@@ -1,180 +0,0 @@
-link_directories(${CMAKE_BINARY_DIR}/lib ${CMAKE_CURRENT_BINARY_DIR})
-
-# Don't forget to include output directory, otherwise
-# the UI file won't be wrapped!
-include_directories(
-	${CMAKE_BINARY_DIR}/lib
-	${CMAKE_SOURCE_DIR}/lib
-	${CMAKE_CURRENT_BINARY_DIR}
-)
-
-
-###
-#
-# Settings (KConfigXT) shared between various parts of KPilot
-#
-set(settings_SRC
-	kpilotConfig.cc
-)
-
-kde3_add_kcfg_files(settings_SRC kpilotSettings.kcfgc)
-
-###
-#
-# The KCM for KPilot, used by the config dialog and the embedding in Kontact
-#
-set(kcmpilot_SRCS
-	${settings_SRC}
-	kpilotConfigWizard.cc
-	dbSelectionDialog.cc
-	kpilotConfigDialog.cc
-	conduitConfigDialog.cc
-	kpilotProbeDialog.cc
-)
-
-set(kcmpilot_KCFGS
-	kpilotConfigWizard_address.kcfgc
-	kpilotConfigWizard_notes.kcfgc
-	kpilotConfigWizard_vcal.kcfgc
-)
-
-set(kcmpilot_UIS
-	kpilotConfigDialog_device.ui
-	kpilotConfigDialog_sync.ui
-	kpilotConfigDialog_startup.ui
-	kpilotConfigDialog_viewers.ui
-	kpilotConfigDialog_backup.ui
-	kpilotConfigWizard_user.ui
-	kpilotConfigWizard_app.ui
-	dbSelection_base.ui
-)
-
-kde3_add_ui_files(kcmpilot_SRCS ${kcmpilot_UIS})
-kde3_add_kcfg_files(kcmpilot_SRCS ${kcmpilot_KCFGS})
-kde3_add_dcop_stubs(kcmpilot_SRCS pilotDaemonDCOP.h)
-kde3_automoc(${kcmpilot_SRCS})
-
-# Now add these generated files to the ADD_LIBRARY step
-# If this is NOT done, then the ui_*.h files will not be generated
-add_library(kcm_kpilot SHARED ${kcmpilot_SRCS})
-set_target_properties(kcm_kpilot PROPERTIES
-	LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	PREFIX ""
-)
-
-###
-#
-# Most simple daemon-like application: kpilotTest, which
-# runs whatever the command-line tells it to.
-#
-set(kpilotTest_SRCS
-	${settings_SRC}
-	hotSync.cc
-	logWidget.cc
-	pilotComponent.cc
-	main-test.cc
-)
-# Acts as a receiver for DCOP log messages
-kde3_add_dcop_skels(kpilotTest_SRCS loggerDCOP.h)
-
-kde3_automoc(${kpilotTest_SRCS})
-add_executable(kpilotTest ${kpilotTest_SRCS})
-target_link_libraries(kpilotTest ${QT_LIBRARIES} kpilot kdeui kio)
-kpilot_rpath(kpilotTest)
-
-###
-#
-# The real KPilot daemon.
-#
-set(kpilotDaemon_SRCS
-	${settings_SRC}
-	hotSync.cc
-	fileInstaller.cc
-	internalEditorAction.cc
-	logFile.cc
-	pilotDaemon.cc
-)
-# Both sends and receives DCOP log messages. Talks to KPilot.
-kde3_add_dcop_skels(kpilotDaemon_SRCS loggerDCOP.h pilotDaemonDCOP.h)
-kde3_add_dcop_stubs(kpilotDaemon_SRCS loggerDCOP.h kpilotDCOP.h)
-kde3_automoc(${kpilotDaemon_SRCS})
-add_executable(kpilotDaemon ${kpilotDaemon_SRCS})
-target_link_libraries(kpilotDaemon ${QT_LIBRARIES} kpilot kdeui kio)
-kpilot_rpath(kpilotDaemon)
-
-###
-#
-# The KPilot executable (viewer / editor / configuration).
-#
-set(kpilot_SRCS
-	${settings_SRC}
-	logWidget.cc
-	kpilot.cc
-	dbviewerWidget.cc
-	dbFlagsEditor.cc
-	dbRecordEditor.cc
-	dbAppInfoEditor.cc
-	pilotComponent.cc
-	memoWidget.cc
-	addressWidget.cc
-	addressEditor.cc
-	datebookWidget.cc
-	todoWidget.cc
-	todoEditor.cc
-	fileInstaller.cc
-	fileInstallWidget.cc
-	listItems.cc
-)
-
-set(kpilot_UIS
-	dbFlagsEditor_base.ui
-	todoEditor_base.ui
-)
-
-kde3_add_ui_files(kpilot_SRCS ${kpilot_UIS})
-# Talks to the daemon. Listens as itself.
-kde3_add_dcop_skels(kpilot_SRCS loggerDCOP.h kpilotDCOP.h)
-kde3_add_dcop_stubs(kpilot_SRCS pilotDaemonDCOP.h)
-kde3_automoc(${kpilot_SRCS})
-add_executable(kpilot_bin ${kpilot_SRCS})
-target_link_libraries(kpilot_bin ${QT_LIBRARIES} kpilot kutils kdeui kio)
-kpilot_rpath(kpilot_bin)
-set_target_properties(kpilot_bin PROPERTIES
-	OUTPUT_NAME kpilot
-)
-
-######################### INSTALL STUFF #######################################
-
-kde3_install_libtool_file(kcm_kpilot)
-
-install(
-	TARGETS kcm_kpilot kpilot_bin kpilotDaemon
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-	RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-	RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-)
-
-install( FILES kpilotui.rc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/kpilot)
-
-install(
-	FILES kpilot.desktop kpilotdaemon.desktop DESTINATION ${KDE3_XDG_APPS_DIR}
-)
-
-install(
-	FILES kpilotconduit.desktop DESTINATION ${KDE3_SERVICETYPES_DIR}
-)
-
-install(
-	FILES kpilot_config.desktop DESTINATION ${KDE3_SERVICES_DIR}
-)
-
-install ( 
-	FILES kpilot.upd 
-	DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/kconf_update
-)
-
-install(
-	FILES kpilot.kcfg DESTINATION ${KDE3_KCFG_DIR}
-)
-
-add_subdirectory(Icons)
diff --git a/kpilot/kpilot/Icons/CMakeLists.txt b/kpilot/kpilot/Icons/CMakeLists.txt
deleted file mode 100644
index b0be5caa..00000000
--- a/kpilot/kpilot/Icons/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-
-kde3_install_icons_custom( hicolor )
-
-install( FILES kpilot-splash.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/kpilot/pics/)
diff --git a/kpilot/kpilot/Icons/Makefile.am b/kpilot/kpilot/Icons/Makefile.am
deleted file mode 100644
index 9dc8ffcc..00000000
--- a/kpilot/kpilot/Icons/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-METASOURCES = AUTO
-
-kpilotDaemonicondir = $(kde_datadir)/kpilot/icons
-kpilotDaemonicon_ICON = hotsync busysync nosync
-
-kpiloticondir = $(kde_datadir)/kpilot/icons
-kpiloticon_ICON = backup fastsync fullsync listsync restore \
-	kpilotaddress \
-	kpilotknotes \
-	kpilotfileinstaller \
-	kpilotdb \
-	kpilotcalendar \
-	kpilottodo \
-	kpilotbhotsync
-
-KDE_ICON = kpilot kpilotDaemon
-
-kpilotpicsdir = $(kde_datadir)/kpilot/pics
-kpilotpics_DATA = kpilot-splash.png
diff --git a/kpilot/kpilot/Icons/busysync.png b/kpilot/kpilot/Icons/busysync.png
deleted file mode 100644
index 189ec1b1..00000000
--- a/kpilot/kpilot/Icons/busysync.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr16-action-backup.png b/kpilot/kpilot/Icons/cr16-action-backup.png
deleted file mode 100644
index da55d07d..00000000
--- a/kpilot/kpilot/Icons/cr16-action-backup.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr16-action-busysync.png b/kpilot/kpilot/Icons/cr16-action-busysync.png
deleted file mode 100644
index 66e8837c..00000000
--- a/kpilot/kpilot/Icons/cr16-action-busysync.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr16-action-fastsync.png b/kpilot/kpilot/Icons/cr16-action-fastsync.png
deleted file mode 100644
index 6eca11fa..00000000
--- a/kpilot/kpilot/Icons/cr16-action-fastsync.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr16-action-fullsync.png b/kpilot/kpilot/Icons/cr16-action-fullsync.png
deleted file mode 100644
index d6501b5b..00000000
--- a/kpilot/kpilot/Icons/cr16-action-fullsync.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr16-action-hotsync.png b/kpilot/kpilot/Icons/cr16-action-hotsync.png
deleted file mode 100644
index bdcaf824..00000000
--- a/kpilot/kpilot/Icons/cr16-action-hotsync.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr16-action-listsync.png b/kpilot/kpilot/Icons/cr16-action-listsync.png
deleted file mode 100644
index 817f34ca..00000000
--- a/kpilot/kpilot/Icons/cr16-action-listsync.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr16-action-nosync.png b/kpilot/kpilot/Icons/cr16-action-nosync.png
deleted file mode 100644
index 61bf3bda..00000000
--- a/kpilot/kpilot/Icons/cr16-action-nosync.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr16-action-restore.png b/kpilot/kpilot/Icons/cr16-action-restore.png
deleted file mode 100644
index 69af2c81..00000000
--- a/kpilot/kpilot/Icons/cr16-action-restore.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr16-app-kpilotDaemon.png b/kpilot/kpilot/Icons/cr16-app-kpilotDaemon.png
deleted file mode 100644
index f37c5ffc..00000000
--- a/kpilot/kpilot/Icons/cr16-app-kpilotDaemon.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr22-action-backup.png b/kpilot/kpilot/Icons/cr22-action-backup.png
deleted file mode 100644
index d1ab921d..00000000
--- a/kpilot/kpilot/Icons/cr22-action-backup.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr22-action-busysync.png b/kpilot/kpilot/Icons/cr22-action-busysync.png
deleted file mode 100644
index 71f5ba9c..00000000
--- a/kpilot/kpilot/Icons/cr22-action-busysync.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr22-action-fastsync.png b/kpilot/kpilot/Icons/cr22-action-fastsync.png
deleted file mode 100644
index 926b3bf5..00000000
--- a/kpilot/kpilot/Icons/cr22-action-fastsync.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr22-action-fullsync.png b/kpilot/kpilot/Icons/cr22-action-fullsync.png
deleted file mode 100644
index ea3b8d52..00000000
--- a/kpilot/kpilot/Icons/cr22-action-fullsync.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr22-action-hotsync.png b/kpilot/kpilot/Icons/cr22-action-hotsync.png
deleted file mode 100644
index 11eceb43..00000000
--- a/kpilot/kpilot/Icons/cr22-action-hotsync.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr22-action-listsync.png b/kpilot/kpilot/Icons/cr22-action-listsync.png
deleted file mode 100644
index 3453a1f7..00000000
--- a/kpilot/kpilot/Icons/cr22-action-listsync.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr22-action-nosync.png b/kpilot/kpilot/Icons/cr22-action-nosync.png
deleted file mode 100644
index 3728404f..00000000
--- a/kpilot/kpilot/Icons/cr22-action-nosync.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr22-action-restore.png b/kpilot/kpilot/Icons/cr22-action-restore.png
deleted file mode 100644
index 8b183f8d..00000000
--- a/kpilot/kpilot/Icons/cr22-action-restore.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr22-app-kpilotDaemon.png b/kpilot/kpilot/Icons/cr22-app-kpilotDaemon.png
deleted file mode 100644
index 4a1baeba..00000000
--- a/kpilot/kpilot/Icons/cr22-app-kpilotDaemon.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr32-action-fastsync.png b/kpilot/kpilot/Icons/cr32-action-fastsync.png
deleted file mode 100644
index f6a07151..00000000
--- a/kpilot/kpilot/Icons/cr32-action-fastsync.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr32-action-fullsync.png b/kpilot/kpilot/Icons/cr32-action-fullsync.png
deleted file mode 100644
index 158b23e9..00000000
--- a/kpilot/kpilot/Icons/cr32-action-fullsync.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr32-action-hotsync.png b/kpilot/kpilot/Icons/cr32-action-hotsync.png
deleted file mode 100644
index 8316a161..00000000
--- a/kpilot/kpilot/Icons/cr32-action-hotsync.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr32-action-listsync.png b/kpilot/kpilot/Icons/cr32-action-listsync.png
deleted file mode 100644
index a6b5268b..00000000
--- a/kpilot/kpilot/Icons/cr32-action-listsync.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr32-app-kpilotDaemon.png b/kpilot/kpilot/Icons/cr32-app-kpilotDaemon.png
deleted file mode 100644
index 5b44f689..00000000
--- a/kpilot/kpilot/Icons/cr32-app-kpilotDaemon.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr48-action-fastsync.png b/kpilot/kpilot/Icons/cr48-action-fastsync.png
deleted file mode 100644
index 23d353f7..00000000
--- a/kpilot/kpilot/Icons/cr48-action-fastsync.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr48-action-fullsync.png b/kpilot/kpilot/Icons/cr48-action-fullsync.png
deleted file mode 100644
index d1be74d1..00000000
--- a/kpilot/kpilot/Icons/cr48-action-fullsync.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr48-action-hotsync.png b/kpilot/kpilot/Icons/cr48-action-hotsync.png
deleted file mode 100644
index dfc98ff4..00000000
--- a/kpilot/kpilot/Icons/cr48-action-hotsync.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr48-action-listsync.png b/kpilot/kpilot/Icons/cr48-action-listsync.png
deleted file mode 100644
index b3384e4b..00000000
--- a/kpilot/kpilot/Icons/cr48-action-listsync.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr48-app-kpilotDaemon.png b/kpilot/kpilot/Icons/cr48-app-kpilotDaemon.png
deleted file mode 100644
index 85710e5f..00000000
--- a/kpilot/kpilot/Icons/cr48-app-kpilotDaemon.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr64-action-kpilotaddress.png b/kpilot/kpilot/Icons/cr64-action-kpilotaddress.png
deleted file mode 100644
index a73e1482..00000000
--- a/kpilot/kpilot/Icons/cr64-action-kpilotaddress.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr64-action-kpilotbhotsync.png b/kpilot/kpilot/Icons/cr64-action-kpilotbhotsync.png
deleted file mode 100644
index c01b6e8e..00000000
--- a/kpilot/kpilot/Icons/cr64-action-kpilotbhotsync.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr64-action-kpilotcalendar.png b/kpilot/kpilot/Icons/cr64-action-kpilotcalendar.png
deleted file mode 100644
index 6bbe65db..00000000
--- a/kpilot/kpilot/Icons/cr64-action-kpilotcalendar.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr64-action-kpilotdb.png b/kpilot/kpilot/Icons/cr64-action-kpilotdb.png
deleted file mode 100644
index f14bd858..00000000
--- a/kpilot/kpilot/Icons/cr64-action-kpilotdb.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr64-action-kpilotfileinstaller.png b/kpilot/kpilot/Icons/cr64-action-kpilotfileinstaller.png
deleted file mode 100644
index 39837225..00000000
--- a/kpilot/kpilot/Icons/cr64-action-kpilotfileinstaller.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr64-action-kpilotknotes.png b/kpilot/kpilot/Icons/cr64-action-kpilotknotes.png
deleted file mode 100644
index ecf90278..00000000
--- a/kpilot/kpilot/Icons/cr64-action-kpilotknotes.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/cr64-action-kpilottodo.png b/kpilot/kpilot/Icons/cr64-action-kpilottodo.png
deleted file mode 100644
index 2d5275c5..00000000
--- a/kpilot/kpilot/Icons/cr64-action-kpilottodo.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/fastsync.png b/kpilot/kpilot/Icons/fastsync.png
deleted file mode 100644
index 926b3bf5..00000000
--- a/kpilot/kpilot/Icons/fastsync.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/hi16-app-kpilot.png b/kpilot/kpilot/Icons/hi16-app-kpilot.png
deleted file mode 100644
index f37c5ffc..00000000
--- a/kpilot/kpilot/Icons/hi16-app-kpilot.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/hi22-app-kpilot.png b/kpilot/kpilot/Icons/hi22-app-kpilot.png
deleted file mode 100644
index 4a1baeba..00000000
--- a/kpilot/kpilot/Icons/hi22-app-kpilot.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/hi32-app-kpilot.png b/kpilot/kpilot/Icons/hi32-app-kpilot.png
deleted file mode 100644
index 5b44f689..00000000
--- a/kpilot/kpilot/Icons/hi32-app-kpilot.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/hi48-app-kpilot.png b/kpilot/kpilot/Icons/hi48-app-kpilot.png
deleted file mode 100644
index 85710e5f..00000000
--- a/kpilot/kpilot/Icons/hi48-app-kpilot.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/hotsync.png b/kpilot/kpilot/Icons/hotsync.png
deleted file mode 100644
index 62025ef7..00000000
--- a/kpilot/kpilot/Icons/hotsync.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/kpilot-splash.png b/kpilot/kpilot/Icons/kpilot-splash.png
deleted file mode 100644
index fadf0d21..00000000
--- a/kpilot/kpilot/Icons/kpilot-splash.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/mini-kpilot.png b/kpilot/kpilot/Icons/mini-kpilot.png
deleted file mode 100644
index 550c8f37..00000000
--- a/kpilot/kpilot/Icons/mini-kpilot.png
+++ /dev/null
diff --git a/kpilot/kpilot/Icons/nosync.png b/kpilot/kpilot/Icons/nosync.png
deleted file mode 100644
index 61bf3bda..00000000
--- a/kpilot/kpilot/Icons/nosync.png
+++ /dev/null
diff --git a/kpilot/kpilot/Makefile-standalone b/kpilot/kpilot/Makefile-standalone
deleted file mode 100644
index fbaa7a77..00000000
--- a/kpilot/kpilot/Makefile-standalone
+++ /dev/null
@@ -1,167 +0,0 @@
-# Makefile for a standalone kpilotConfig
-
-QTDIR=/usr/lib/qt-2.3.0
-KDEDIR=/vol/kde/kde-2.2
-
-MOC=$(QTDIR)/bin/moc
-UIC=$(QTDIR)/bin/uic
-DCOPIDL=$(KDEDIR)/bin/dcopidl
-DCOPIDL2CPP=$(KDEDIR)/bin/dcopidl2cpp
-
-CXX=g++
-CXXFLAGS=-DDEBUG -DDEBUG_CERR
-# INCLUDES=-I$(QTDIR)/include -I$(KDEDIR)/include
-#
-# Or, for stupid RH 7.1 systems:
-INCLUDES=-I$(QTDIR)/include -I$(KDEDIR)/include -I../lib
-LDFLAGS=-L$(KDEDIR)/lib -Wl,-R -Wl,$(KDEDIR)/lib \
-	-L$(QTDIR)/lib -Wl,-R -Wl,$(QTDIR)/lib \
-	-L../lib/.libs
-
-CONFIG_DISTDIR=kpilotConfig-0.2
-CONFIG_OBJS=kpilotConfig.o \
-	kpilotConfigDialog.o kpilotConfigDialog_base.o \
-	conduitConfigDialog.o conduitConfigDialog_base.o \
-	main-config.o
-CONFIG_MOCS=kpilotConfigDialog_base.moc kpilotConfigDialog.moc \
-	conduitConfigDialog.moc conduitConfigDialog_base.moc
-	
-CONFIG_EXTRA=kpilotConfigDialog_base.ui conduitConfigDialog_base.ui
-CONFIG_LIBS=-lkdeui -lkfile -lkdecore -lqt -lkpilot
-
-TEST_DISTDIR=kpilotTest-0.2
-TEST_OBJS=kpilotConfig.o \
-	pilotComponent.o logWidget.o \
-	hotSync.o interactiveSync.o main-test.o
-TEST_MOCS= pilotComponent.moc logWidget.moc \
-	interactiveSync.moc hotSync.moc
-TEST_EXTRA=pilotUser.h
-TEST_LIBS=-lkpilot -lkfile -lkdeui -lqt -lpisock 
-
-KPILOT_DISTDIR=kpilot-4.2.9
-KPILOT_OBJS= pilotDaemonDCOP_stub.o \
-	kpilotDCOP_skel.o \
-	kpilot.o kpilotConfig.o \
-	kpilotConfigDialog.o kpilotConfigDialog_base.o \
-	pilotComponent.o logWidget.o memoWidget.o addressWidget.o \
-	addressEditor.o \
-	listItems.o \
-	fileInstaller.o fileInstallWidget.o \
-	conduitConfigDialog.o conduitConfigDialog_base.o
-KPILOT_MOCS=pilotComponent.moc logWidget.moc memoWidget.moc addressWidget.moc \
-	fileInstaller.moc addressEditor.moc \
-	fileInstallWidget.moc \
-	kpilotConfigDialog_base.moc kpilotConfigDialog.moc \
-	kpilot.moc 
-KPILOT_EXTRA=kpilotConfigDialog_base.ui conduitConfigDialog_base.ui \
-	pilotDaemonDCOP.h kpilotDCOP.h \
-	pilotAppCategory.h pilotDatabase.h kpilot_on_pp.h
-KPILOT_LIBS=-lkfile -lkdeui -lqt -lkpilot -lpisock
-
-DAEMON_DISTDIR=kpilotDaemon-4.2.9
-DAEMON_OBJS= pilotDaemonDCOP_skel.o kpilotDCOP_stub.o \
-	pilotDaemon.o kpilotConfig.o \
-	fileInstaller.o \
-	hotSync.o interactiveSync.o
-DAEMON_MOCS=pilotDaemon.moc \
-	fileInstaller.moc
-DAEMON_EXTRA=pilotDaemonDCOP.h kpilotDCOP.h pilotUser.h \
-	hotsync.h busysync.h
-DAEMON_LIBS=-lkfile -lkdeui -lqt -lkpilot -lpisock
-
-DISTFILES=kpilotConfig.tar.gz kpilotTest.tar.gz kpilot.tar.gz kpilotDaemon.tar.gz
-
-all : kpilotConfig kpilotTest kpilot kpilotDaemon
-
-kpilotConfig : $(CONFIG_MOCS) $(CONFIG_OBJS)
-	g++ -o $@ $(CONFIG_OBJS) $(LDFLAGS) $(CONFIG_LIBS)
-
-kpilotTest : $(TEST_MOCS) $(TEST_OBJS)
-	g++ -o $@ $(TEST_OBJS) $(LDFLAGS) $(TEST_LIBS)
-
-kpilot : $(KPILOT_MOCS) $(KPILOT_OBJS)
-	g++ -o $@ $(KPILOT_OBJS) $(LDFLAGS) $(KPILOT_LIBS)
-
-kpilotDaemon : $(DAEMON_MOCS) $(DAEMON_OBJS)
-	g++ -o $@ $(DAEMON_OBJS) $(LDFLAGS) $(DAEMON_LIBS)
-	
-clean :
-	rm -f $(CONFIG_OBJS) $(CONFIG_MOCS) $(KPILOT_OBJS) $(DAEMON_OBJS)
-	rm -f $(TEST_OBJS) $(TEST_MOCS) $(KPILOT_MOCS) $(DAEMON_MOCS)
-	rm -f $(DISTFILES)
-
-dist : $(DISTFILES)
-
-kpilotConfig.tar.gz :
-	test -d $(CONFIG_DISTDIR) || mkdir $(CONFIG_DISTDIR)
-	sed -e 's/^all *:.*/all : kpilotConfig/' Makefile-standalone \
-		> $(CONFIG_DISTDIR)/Makefile
-	-cp $(CONFIG_OBJS:%.o=%.cc) $(CONFIG_OBJS:%.o=%.h) $(CONFIG_DISTDIR)
-	-cp $(CONFIG_EXTRA) $(CONFIG_DISTDIR)
-	tar cvzf $@ $(CONFIG_DISTDIR)
-	-rm -f $(CONFIG_DISTDIR)/*
-	-rmdir $(CONFIG_DISTDIR)
-
-kpilotTest.tar.gz :
-	test -d $(TEST_DISTDIR) || mkdir $(TEST_DISTDIR)
-	sed -e 's/^all *:.*/all : kpilotTest/' Makefile-standalone \
-		> $(TEST_DISTDIR)/Makefile
-	-cp $(TEST_OBJS:%.o=%.cc) $(TEST_OBJS:%.o=%.h) $(TEST_DISTDIR)
-	-cp $(TEST_EXTRA) $(TEST_DISTDIR)
-	tar cvzf $@ $(TEST_DISTDIR)
-	-rm -f $(TEST_DISTDIR)/*
-	-rmdir $(TEST_DISTDIR)
-
-kpilot.tar.gz :
-	test -d $(KPILOT_DISTDIR) || mkdir $(KPILOT_DISTDIR)
-	sed -e 's/^all *:.*/all : kpilot/' Makefile-standalone \
-		> $(KPILOT_DISTDIR)/Makefile
-	-cp $(KPILOT_OBJS:%.o=%.cc) $(KPILOT_OBJS:%.o=%.h) $(KPILOT_DISTDIR)
-	-cp $(KPILOT_EXTRA) $(KPILOT_DISTDIR)
-	tar cvzf $@ $(KPILOT_DISTDIR)
-	-rm -f $(KPILOT_DISTDIR)/*
-	-rmdir $(KPILOT_DISTDIR)
-
-kpilotDaemon.tar.gz :
-	test -d $(DAEMON_DISTDIR) || mkdir $(DAEMON_DISTDIR)
-	sed -e 's/^all *:.*/all : kpilotDaemon/' Makefile-standalone \
-		> $(DAEMON_DISTDIR)/Makefile
-	-cp $(DAEMON_OBJS:%.o=%.cc) $(DAEMON_OBJS:%.o=%.h) $(DAEMON_DISTDIR)
-	-cp $(DAEMON_EXTRA) $(DAEMON_DISTDIR)
-	tar cvzf $@ $(DAEMON_DISTDIR)
-	-rm -f $(DAEMON_DISTDIR)/*
-	-rmdir $(DAEMON_DISTDIR)
-
-conduitConfigDialog_base.cc : conduitConfigDialog_base.h conduitConfigDialog_base.ui
-	echo '#include <klocale.h>' > $@
-	$(UIC) -tr i18n -i conduitConfigDialog_base.h conduitConfigDialog_base.ui | \
-		sed -e "s,i18n( \"\" ),QString::null,g" >> $@
-	echo '#include "conduitConfigDialog_base.moc"' >> $@
-
-conduitConfigDialog_base.h : conduitConfigDialog_base.ui
-	$(UIC) -o $@ $<
-
-kpilotConfigDialog_base.cc : kpilotConfigDialog_base.h kpilotConfigDialog_base.ui
-	echo '#include <klocale.h>' > $@
-	$(UIC) -tr i18n -i kpilotConfigDialog_base.h kpilotConfigDialog_base.ui | \
-		sed -e "s,i18n( \"\" ),QString::null,g" >> $@
-	echo '#include "kpilotConfigDialog_base.moc"' >> $@
-
-kpilotConfigDialog_base.h : kpilotConfigDialog_base.ui
-	$(UIC) -o $@ $<
-
-
-%.kidl : %.h
-	$(DCOPIDL) $< > $@ || ( rm -f $@ ; /bin/false )
-
-%_stub.cc : %.kidl
-	$(DCOPIDL2CPP) --c++-suffix cc --no-skel $<
-
-%_skel.cc : %.kidl
-	$(DCOPIDL2CPP) --c++-suffix cc --no-stub $<
-	
-%.o : %.cc
-	g++ -c $(CXXFLAGS) $(INCLUDES) -o $@ $<
-
-%.moc : %.h
-	$(MOC) -o $@ $<
diff --git a/kpilot/kpilot/Makefile.am b/kpilot/kpilot/Makefile.am
deleted file mode 100644
index a5b49091..00000000
--- a/kpilot/kpilot/Makefile.am
+++ /dev/null
@@ -1,104 +0,0 @@
-### Makefile.am for KPilot
-###
-### This is a bit of a mess, but that's partly because we build two
-### executables and one library from the sources in this dir.
-###
-###
-###
-
-SUBDIRS = Icons
-
-noinst_LTLIBRARIES = libconfiguration.la
-noinst_PROGRAMS = kpilotTest
-bin_PROGRAMS = kpilot kpilotDaemon
-kde_module_LTLIBRARIES = kcm_kpilot.la
-
-METASOURCES = AUTO
-
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/kpilot/lib $(all_includes)
-
-libconfiguration_la_SOURCES = kpilotConfig.cc kpilotSettings.kcfgc
-libconfiguration_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries)
-
-kcm_kpilot_la_SOURCES = pilotDaemonDCOP.stub  kpilotConfigDialog.cc \
-	kpilotConfigDialog_device.ui \
-	kpilotConfigDialog_sync.ui \
-	kpilotConfigDialog_startup.ui \
-	kpilotConfigDialog_viewers.ui \
-	kpilotConfigDialog_backup.ui \
-	conduitConfigDialog.cc \
-	kpilotProbeDialog.cc \
-	kpilotConfigWizard_address.kcfgc \
-	kpilotConfigWizard_notes.kcfgc \
-	kpilotConfigWizard_vcal.kcfgc \
-	kpilotConfigWizard_user.ui \
-	kpilotConfigWizard_app.ui \
-	kpilotConfigWizard.cc \
-	dbSelectionDialog.cc dbSelection_base.ui
-kcm_kpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) -module -avoid-version -no-undefined
-kcm_kpilot_la_LIBADD = $(LIB_KFILE) $(PISOCK_LIB) \
-	../lib/libkpilot.la \
-	libconfiguration.la
-
-
-kpilot_SOURCES	= \
-	pilotDaemonDCOP.stub kpilotDCOP.skel loggerDCOP.skel \
-	kpilot.cc \
-	pilotComponent.cc logWidget.cc memoWidget.cc \
-	addressWidget.cc addressEditor.cc \
-	dbviewerWidget.cc dbFlagsEditor.cc dbFlagsEditor_base.ui \
-	dbRecordEditor.cc dbAppInfoEditor.cc \
-	datebookWidget.cc \
-	todoWidget.cc todoEditor.cc todoEditor_base.ui \
-	fileInstaller.cc fileInstallWidget.cc \
-	listItems.cc
-kpilot_COMPILE_FIRST = kpilotSettings.h
-
-
-kpilotDaemon_SOURCES = \
-	pilotDaemonDCOP.skel kpilotDCOP.stub loggerDCOP.stub loggerDCOP.skel \
-	pilotDaemon.cc logFile.cc \
-	hotSync.cc internalEditorAction.cc \
-	fileInstaller.cc
-
-kpilotTest_SOURCES = \
-	logWidget.cc pilotComponent.cc \
-	hotSync.cc internalEditorAction.cc \
-	loggerDCOP.skel \
-	main-test.cc
-
-
-kpilot_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH)
-kpilotDaemon_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH)
-kpilotTest_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH)
-
-
-# the libraries to link against. Be aware of the order. First the libraries,
-# that depend on the following ones.
-kpilot_LDADD		= $(LIB_KFILE) $(PISOCK_LIB) -lkutils \
-	../lib/libkpilot.la  libconfiguration.la
-kpilotDaemon_LDADD	= $(LIB_KFILE) $(PISOCK_LIB) \
-	../lib/libkpilot.la libconfiguration.la
-kpilotTest_LDADD	= $(LIB_KFILE) $(PISOCK_LIB) \
-	../lib/libkpilot.la libconfiguration.la
-
-xdg_apps_DATA = kpilot.desktop  kpilotdaemon.desktop
-kde_kcfg_DATA = kpilot.kcfg
-kde_services_DATA = kpilot_config.desktop
-
-servicetypedir = $(kde_servicetypesdir)
-servicetype_DATA = kpilotconduit.desktop
-
-rcdir = $(kde_datadir)/kpilot
-rc_DATA = kpilotui.rc
-
-update_DATA = kpilot.upd
-updatedir = $(kde_datadir)/kconf_update
-
-DOXYGEN_REFERENCES = kdeui kpilot/lib
-include $(top_srcdir)/admin/Doxyfile.am
-
-### Some additional dependencies:
-
-kpilotConfigDialog.lo : kpilotSettings.h
-
diff --git a/kpilot/kpilot/addressEditor.cc b/kpilot/kpilot/addressEditor.cc
deleted file mode 100644
index cfab322e..00000000
--- a/kpilot/kpilot/addressEditor.cc
+++ /dev/null
@@ -1,271 +0,0 @@
-// -*- C++ -*-
-/* KPilot
-**
-** Copyright (C) 2000 by Dan Pilone
-**
-** This is a dialog window that edits one single address record.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#ifndef _KPILOT_OPTIONS_H
-#include "options.h"
-#endif
-
-#ifndef QLINEEDIT_H
-#include <tqlineedit.h>
-#endif
-#ifndef QLAYOUT_H
-#include <tqlayout.h>
-#endif
-#ifndef QLABEL_H
-#include <tqlabel.h>
-#endif
-#ifndef _KDEBUG_H
-#include <kdebug.h>
-#endif
-
-#ifndef _KPILOT_PILOTADDRESS_H
-#include "pilotAddress.h"
-#endif
-
-#include "addressEditor.moc"
-
-
-AddressEditor::AddressEditor(PilotAddress * p,
-	PilotAddressInfo *appInfo,
-	TQWidget * parent,
-	const char *name) :
-	KDialogBase(KDialogBase::Plain,
-		i18n("Address Editor"),
-		Ok | Cancel, Cancel,
-		parent, name, false /* non-modal */ ),
-	fDeleteOnCancel(p == 0L),
-	fAddress(p),
-	fAppInfo(appInfo)
-{
-	FUNCTIONSETUP;
-
-	initLayout();
-	fillFields();
-
-	connect(parent, TQT_SIGNAL(recordChanged(PilotAddress *)),
-		this, TQT_SLOT(updateRecord(PilotAddress *)));
-
-}
-
-AddressEditor::~AddressEditor()
-{
-	FUNCTIONSETUP;
-
-	if (fDeleteOnCancel && fAddress)
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname
-			<< ": Deleting private address record." << endl;
-#endif
-
-		delete fAddress;
-
-		fAddress = 0L;
-	}
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Help! I'm deleting!" << endl;
-#endif
-}
-
-
-
-/*
- * Return phone label from AddressAppInfo + some sanity checking
- */
-TQString AddressEditor::phoneLabelText(PilotAddress * addr, const PhoneSlot &i)
-{
-	FUNCTIONSETUP;
-	if (!addr)
-	{
-		return i18n("Phone");
-	}
-
-	PilotAddressInfo::EPhoneType idx = addr->getPhoneType(i);
-	TQString ret = fAppInfo->phoneLabel(idx) + CSL1(":");
-
-	return ret;
-}
-
-
-
-void AddressEditor::fillFields()
-{
-	FUNCTIONSETUP;
-
-	if (fAddress == 0L)
-	{
-		fAddress = new PilotAddress();
-		fDeleteOnCancel = true;
-	}
-
-	// phone labels
-	unsigned int index = 0;
-	for ( PhoneSlot i = PhoneSlot::begin(); i.isValid(); ++i,++index )
-	{
-		m_phoneLabel[index]->setText(phoneLabelText(fAddress, i));
-		fPhoneField[index]->setText(fAddress->getField(i));
-	}
-
-	// fields
-	fLastNameField->setText(fAddress->getField(entryLastname));
-	fFirstNameField->setText(fAddress->getField(entryFirstname));
-	fCompanyField->setText(fAddress->getField(entryCompany));
-	fAddressField->setText(fAddress->getField(entryAddress));
-	fCityField->setText(fAddress->getField(entryCity));
-	fStateField->setText(fAddress->getField(entryState));
-	fZipField->setText(fAddress->getField(entryZip));
-	fCountryField->setText(fAddress->getField(entryCountry));
-	fTitleField->setText(fAddress->getField(entryTitle));
-	fCustom1Field->setText(fAddress->getField(entryCustom1));
-	fCustom2Field->setText(fAddress->getField(entryCustom2));
-	fCustom3Field->setText(fAddress->getField(entryCustom3));
-	fCustom4Field->setText(fAddress->getField(entryCustom4));
-}
-
-
-
-
-#define MakeField(text,field,row,column) \
-		t=new TQLabel(text,p); \
-		field = new TQLineEdit(p); \
-		field->setMinimumWidth(20*SPACING); \
-		t->setBuddy(field); \
-		grid->addWidget(t,row,column); \
-		grid->addWidget(field,row,column+1);
-
-#define MakeFieldL(text,label,field,row,column) \
-		label = new TQLabel(text,p); \
-		field = new TQLineEdit(p); \
-		field->setMinimumWidth(20*SPACING); \
-		label->setBuddy(field); \
-		grid->addWidget(label,row,column); \
-		grid->addWidget(field,row,column+1);
-
-void AddressEditor::initLayout()
-{
-	FUNCTIONSETUP;
-
-	TQFrame *p = plainPage();
-	TQGridLayout *grid = new TQGridLayout(p, 10, 5, 0, SPACING);
-
-	TQLabel *t;
-
-	MakeField(i18n("Last name:"), fLastNameField, 0, 0);
-	MakeField(i18n("First name:"), fFirstNameField, 1, 0);
-	MakeField(i18n("Title:"), fTitleField, 2, 0);
-	MakeField(i18n("Company:"), fCompanyField, 3, 0);
-
-	PhoneSlot slot = PhoneSlot::begin();
-	for (int i = 0; slot.isValid(); ++i,++slot)
-	{
-		MakeFieldL(phoneLabelText(NULL, slot),
-			m_phoneLabel[i], fPhoneField[i], 4 + i, 0);
-	}
-
-	MakeField(i18n("Address:"), fAddressField, 0, 4);
-	MakeField(i18n("City:"), fCityField, 1, 4);
-	MakeField(i18n("State:"), fStateField, 2, 4);
-	MakeField(i18n("Zip code:"), fZipField, 3, 4);
-	MakeField(i18n("Country:"), fCountryField, 4, 4);
-	MakeField(i18n("Custom 1:"), fCustom1Field, 5, 4);
-	MakeField(i18n("Custom 2:"), fCustom2Field, 6, 4);
-	MakeField(i18n("Custom 3:"), fCustom3Field, 7, 4);
-	MakeField(i18n("Custom 4:"), fCustom4Field, 8, 4);
-
-	grid->addRowSpacing(9, SPACING);
-	grid->addColSpacing(2, SPACING);
-	grid->setRowStretch(9, 100);
-	grid->setColStretch(2, 50);
-}
-
-/* slot */ void AddressEditor::slotCancel()
-{
-	FUNCTIONSETUP;
-
-	if (fDeleteOnCancel && fAddress)
-	{
-		delete fAddress;
-
-		fAddress = 0L;
-	}
-	KDialogBase::slotCancel();
-}
-
-/* slot */ void AddressEditor::slotOk()
-{
-	FUNCTIONSETUP;
-
-	// Commit changes here
-	fAddress->setField(entryLastname, fLastNameField->text());
-	fAddress->setField(entryFirstname, fFirstNameField->text());
-	fAddress->setField(entryCompany, fCompanyField->text());
-	fAddress->setField(entryPhone1, fPhoneField[0]->text());
-	fAddress->setField(entryPhone2, fPhoneField[1]->text());
-	fAddress->setField(entryPhone3, fPhoneField[2]->text());
-	fAddress->setField(entryPhone4, fPhoneField[3]->text());
-	fAddress->setField(entryPhone5, fPhoneField[4]->text());
-	fAddress->setField(entryAddress, fAddressField->text());
-	fAddress->setField(entryCity, fCityField->text());
-	fAddress->setField(entryState, fStateField->text());
-	fAddress->setField(entryZip, fZipField->text());
-	fAddress->setField(entryCountry, fCountryField->text());
-	fAddress->setField(entryTitle, fTitleField->text());
-	fAddress->setField(entryCustom1, fCustom1Field->text());
-	fAddress->setField(entryCustom2, fCustom2Field->text());
-	fAddress->setField(entryCustom3, fCustom3Field->text());
-	fAddress->setField(entryCustom4, fCustom4Field->text());
-
-	emit(recordChangeComplete(fAddress));
-	KDialogBase::slotOk();
-}
-
-/* slot */ void AddressEditor::updateRecord(PilotAddress * p)
-{
-	FUNCTIONSETUP;
-	if (p != fAddress)
-	{
-		// Not meant for me
-		//
-		//
-		return;
-	}
-
-	if (p->isDeleted())
-	{
-		delayedDestruct();
-		return;
-	}
-	else
-	{
-		fillFields();
-	}
-}
-
diff --git a/kpilot/kpilot/addressEditor.h b/kpilot/kpilot/addressEditor.h
deleted file mode 100644
index 6c4d1223..00000000
--- a/kpilot/kpilot/addressEditor.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// -*- C++ -*-
-/* addressEditor.h		KPilot
-**
-** Copyright (C) 1998-2000 by Dan Pilone
-**
-** This is a dialog window that is used to edit a single address record.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#ifndef _KPILOT_ADDRESSEDITOR_H
-#define _KPILOT_ADDRESSEDITOR_H
-
-#include <kdialogbase.h>
-
-#include "pilotAddress.h"
-
-class TQLineEdit;
-
-class AddressEditor : public KDialogBase
-{
-	Q_OBJECT
-
-
-public:
-	AddressEditor(PilotAddress *address,
-		PilotAddressInfo *appInfo,
-		TQWidget *parent, const char *name=0L);
-	~AddressEditor();
-
-
-signals:
-	void recordChangeComplete ( PilotAddress* );
-
-public slots:
-	void slotOk();
-	void slotCancel();
-	void updateRecord(PilotAddress *);
-
-private:
-	bool fDeleteOnCancel;
-
-	PilotAddress* fAddress;
-	PilotAddressInfo *fAppInfo;
-	// entry fields
-	TQLineEdit *fCustom4Field;
-	TQLineEdit *fCustom3Field;
-	TQLineEdit *fCustom2Field;
-	TQLineEdit *fCustom1Field;
-	TQLineEdit *fCountryField;
-	TQLineEdit *fZipField;
-	TQLineEdit *fStateField;
-	TQLineEdit *fCityField;
-	TQLineEdit *fAddressField;
-	TQLineEdit *fPhoneField[5];
-	TQLineEdit *fCompanyField;
-	TQLineEdit *fTitleField;
-	TQLineEdit *fFirstNameField;
-	TQLineEdit *fLastNameField;
-	// phone labels (changing!)
-	TQLabel    *m_phoneLabel[5];
-
-	void initLayout();
-	void fillFields();
-	TQString phoneLabelText(PilotAddress *, const PhoneSlot &i);
-};
-#endif
-
diff --git a/kpilot/kpilot/addressWidget.cc b/kpilot/kpilot/addressWidget.cc
deleted file mode 100644
index e72b33ab..00000000
--- a/kpilot/kpilot/addressWidget.cc
+++ /dev/null
@@ -1,733 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003 Reinhold Kainhofer <reinhold@kainhofer.com>
-** Copyright (C) 2004 by Adriaan de Groot
-**
-** This file defines the addressWidget, that part of KPilot that
-** displays address records from the Pilot.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#ifndef _KPILOT_OPTIONS_H
-#include "options.h"
-#endif
-
-#include <iostream>
-#include <cstring>
-#include <cstdlib>
-
-#include <tqptrlist.h>
-#include <tqlistbox.h>
-#include <tqfile.h>
-#include <tqpushbutton.h>
-#include <tqtextstream.h>
-#include <tqlayout.h>
-#include <tqlabel.h>
-#include <tqmultilineedit.h>
-#include <tqcombobox.h>
-#include <tqwhatsthis.h>
-#include <tqtextview.h>
-#include <tqtextcodec.h>
-#include <tqregexp.h>
-
-#include <kapplication.h>
-#include <kmessagebox.h>
-#include <kdebug.h>
-#include <kfiledialog.h>
-
-#include "kpilotConfig.h"
-#include "listItems.h"
-#include "addressEditor.h"
-#include "pilotLocalDatabase.h"
-
-#include "addressWidget.moc"
-
-
-AddressWidget::AddressWidget(TQWidget * parent,
-	const TQString & path) :
-	PilotComponent(parent, "component_address", path),
-	fAddrInfo(0L),
-	fAddressAppInfo(0L),
-	fPendingAddresses(0)
-{
-	FUNCTIONSETUP;
-
-	setupWidget();
-	fAddressList.setAutoDelete(true);
-}
-
-AddressWidget::~AddressWidget()
-{
-	FUNCTIONSETUP;
-}
-
-int AddressWidget::getAllAddresses(PilotDatabase * addressDB)
-{
-	FUNCTIONSETUP;
-
-	int currentRecord = 0;
-	PilotRecord *pilotRec;
-	PilotAddress *address;
-
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Reading AddressDB..." << endl;
-#endif
-
-	while ((pilotRec = addressDB->readRecordByIndex(currentRecord)) != 0L)
-	{
-		if (!(pilotRec->isDeleted()) &&
-			(!(pilotRec->isSecret()) || KPilotSettings::showSecrets()))
-		{
-			address = new PilotAddress(pilotRec);
-			if (address == 0L)
-			{
-				WARNINGKPILOT << "Couldn't allocate record "
-					<< currentRecord++
-					<< endl;
-				break;
-			}
-			fAddressList.append(address);
-		}
-		delete pilotRec;
-
-		currentRecord++;
-	}
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Total " << currentRecord << " records" << endl;
-#endif
-
-	return currentRecord;
-}
-
-void AddressWidget::showComponent()
-{
-	FUNCTIONSETUP;
-	if ( fPendingAddresses>0 ) return;
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Reading from directory " << dbPath() << endl;
-#endif
-
-	PilotDatabase *addressDB =
-		new PilotLocalDatabase(dbPath(), CSL1("AddressDB"));
-
-	fAddressList.clear();
-
-	if (addressDB->isOpen())
-	{
-		KPILOT_DELETE(fAddressAppInfo);
-		fAddressAppInfo = new PilotAddressInfo(addressDB);
-		populateCategories(fCatList, fAddressAppInfo->categoryInfo());
-		getAllAddresses(addressDB);
-
-	}
-	else
-	{
-		populateCategories(fCatList, 0L);
-		WARNINGKPILOT << "Could not open local AddressDB" << endl;
-	}
-
-	KPILOT_DELETE( addressDB );
-
-	updateWidget();
-}
-
-void AddressWidget::hideComponent()
-{
-	FUNCTIONSETUP;
-	if (fPendingAddresses==0 )
-	{
-		fAddressList.clear();
-		fListBox->clear();
-
-		updateWidget();
-	}
-}
-
-/* virtual */ bool AddressWidget::preHotSync(TQString &s)
-{
-	FUNCTIONSETUP;
-
-	if ( fPendingAddresses )
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname
-			<< ": fPendingAddress="
-			<< fPendingAddresses
-			<< endl;
-#endif
-
-#if KDE_VERSION<220
-		s = i18n("There are still %1 address editing windows open.")
-			.arg(TQString::number(fPendingAddresses));
-#else
-		s = i18n("There is still an address editing window open.",
-			"There are still %n address editing windows open.",
-			fPendingAddresses);
-#endif
-		return false;
-	}
-
-	return true;
-}
-
-void AddressWidget::postHotSync()
-{
-	FUNCTIONSETUP;
-
-	if ( shown )
-	{
-		fAddressList.clear();
-		showComponent();
-	}
-}
-
-
-void AddressWidget::setupWidget()
-{
-	FUNCTIONSETUP;
-
-	TQLabel *label;
-	TQGridLayout *grid = new TQGridLayout(this, 6, 4, SPACING);
-
-	fCatList = new TQComboBox(this);
-	grid->addWidget(fCatList, 0, 1);
-	connect(fCatList, TQT_SIGNAL(activated(int)),
-		this, TQT_SLOT(slotSetCategory(int)));
-	TQWhatsThis::add(fCatList,
-		i18n("<qt>Select the category of addresses to display here.</qt>"));
-
-	label = new TQLabel(i18n("Category:"), this);
-	label->setBuddy(fCatList);
-	grid->addWidget(label, 0, 0);
-
-	fListBox = new TQListBox(this);
-	grid->addMultiCellWidget(fListBox, 1, 1, 0, 1);
-	connect(fListBox, TQT_SIGNAL(highlighted(int)),
-		this, TQT_SLOT(slotShowAddress(int)));
-	connect(fListBox, TQT_SIGNAL(selected(int)),
-		this, TQT_SLOT(slotEditRecord()));
-	TQWhatsThis::add(fListBox,
-		i18n("<qt>This list displays all the addresses "
-			"in the selected category. Click on "
-			"one to display it to the right.</qt>"));
-
-	label = new TQLabel(i18n("Address info:"), this);
-	grid->addWidget(label, 0, 2);
-
-	// address info text view
-	fAddrInfo = new TQTextView(this);
-	grid->addMultiCellWidget(fAddrInfo, 1, 4, 2, 2);
-
-	TQPushButton *button;
-	TQString wt;
-
-	fEditButton = new TQPushButton(i18n("Edit Record..."), this);
-	grid->addWidget(fEditButton, 2, 0);
-	connect(fEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditRecord()));
-	wt = KPilotSettings::internalEditors() ?
-		i18n("<qt>You can edit an address when it is selected.</qt>") :
-		i18n("<qt><i>Editing is disabled by the 'internal editors' setting.</i></qt>");
-	TQWhatsThis::add(fEditButton,wt);
-
-	button = new TQPushButton(i18n("New Record..."), this);
-	grid->addWidget(button, 2, 1);
-	connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCreateNewRecord()));
-	wt = KPilotSettings::internalEditors() ?
-		i18n("<qt>Add a new address to the address book.</qt>") :
-		i18n("<qt><i>Adding is disabled by the 'internal editors' setting.</i></qt>") ;
-	TQWhatsThis::add(button, wt);
-	button->setEnabled(KPilotSettings::internalEditors());
-
-
-	fDeleteButton = new TQPushButton(i18n("Delete Record"), this);
-	grid->addWidget(fDeleteButton, 3, 0);
-	connect(fDeleteButton, TQT_SIGNAL(clicked()),
-		this, TQT_SLOT(slotDeleteRecord()));
-	wt = KPilotSettings::internalEditors() ?
-		i18n("<qt>Delete the selected address from the address book.</qt>") :
-		i18n("<qt><i>Deleting is disabled by the 'internal editors' setting.</i></qt>") ;
-
-	button = new TQPushButton(i18n("Export addresses to file","Export..."), this);
-	grid->addWidget(button, 3,1);
-	connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExport()));
-	TQWhatsThis::add(button,
-		i18n("<qt>Export all addresses in the selected category to CSV format.</qt>") );
-
-	TQWhatsThis::add(fDeleteButton,wt);
-}
-
-void AddressWidget::updateWidget()
-{
-	FUNCTIONSETUP;
-
-	if( !fAddressAppInfo )
-			return;
-	int addressDisplayMode = KPilotSettings::addressDisplayMode();
-
-	int listIndex = 0;
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Display Mode=" << addressDisplayMode << endl;
-#endif
-
-	int currentCatID = findSelectedCategory(fCatList,
-		fAddressAppInfo->categoryInfo());
-
-	fListBox->clear();
-	fAddressList.first();
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Adding records..." << endl;
-#endif
-
-	while (fAddressList.current())
-	{
-		if ((currentCatID == -1) ||
-			(fAddressList.current()->category() == currentCatID))
-		{
-			TQString title = createTitle(fAddressList.current(),
-				addressDisplayMode);
-
-			if (!title.isEmpty())
-			{
-				title.remove(TQRegExp(CSL1("\n.*")));
-				PilotListItem *p = new PilotListItem(title,
-					listIndex,
-					fAddressList.current());
-
-				fListBox->insertItem(p);
-			}
-		}
-		listIndex++;
-		fAddressList.next();
-	}
-
-	fListBox->sort();
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": " << listIndex << " records" << endl;
-#endif
-
-	slotUpdateButtons();
-}
-
-
-
-TQString AddressWidget::createTitle(PilotAddress * address, int displayMode)
-{
-	// FUNCTIONSETUP;
-
-	TQString title;
-
-	switch (displayMode)
-	{
-	case 1:
-		if (!address->getField(entryCompany).isEmpty())
-		{
-			title.append(address->getField(entryCompany));
-		}
-		if (!address->getField(entryLastname).isEmpty())
-		{
-			if (!title.isEmpty())
-			{
-				title.append( CSL1(", "));
-			}
-
-			title.append(address->getField(entryLastname));
-		}
-		break;
-	case 0:
-	default:
-		if (!address->getField(entryLastname).isEmpty())
-		{
-			title.append(address->getField(entryLastname));
-		}
-
-		if (!address->getField(entryFirstname).isEmpty())
-		{
-			if (!title.isEmpty())
-			{
-				title.append( CSL1(", "));
-			}
-			title.append(address->getField(entryFirstname));
-		}
-		break;
-	}
-
-	if (title.isEmpty())	// One last try
-	{
-		if (!fAddressList.current()->getField(entryCompany).isEmpty())
-		{
-			title.append(fAddressList.current()->
-				getField(entryCompany));
-		}
-		if (title.isEmpty())
-		{
-			title = i18n("[unknown]");
-		}
-	}
-
-	return title;
-}
-
-
-/* slot */ void AddressWidget::slotUpdateButtons()
-{
-	FUNCTIONSETUP;
-
-	bool enabled = (fListBox->currentItem() != -1);
-
-	enabled &= KPilotSettings::internalEditors();
-	fEditButton->setEnabled(enabled);
-	fDeleteButton->setEnabled(enabled);
-}
-
-void AddressWidget::slotSetCategory(int)
-{
-	FUNCTIONSETUP;
-
-	updateWidget();
-}
-
-void AddressWidget::slotEditRecord()
-{
-	FUNCTIONSETUP;
-	if ( !shown ) return;
-
-	int item = fListBox->currentItem();
-
-	if (item == -1)
-		return;
-
-	PilotListItem *p = (PilotListItem *) fListBox->item(item);
-	PilotAddress *selectedRecord = (PilotAddress *) p->rec();
-
-	if (selectedRecord->id() == 0)
-	{
-		KMessageBox::error(0L,
-			i18n("Cannot edit new records until "
-				"HotSynced with Pilot."),
-			i18n("HotSync Required"));
-		return;
-	}
-
-	AddressEditor *editor = new AddressEditor(selectedRecord,
-		fAddressAppInfo, this);
-
-	connect(editor, TQT_SIGNAL(recordChangeComplete(PilotAddress *)),
-		this, TQT_SLOT(slotUpdateRecord(PilotAddress *)));
-	connect(editor, TQT_SIGNAL(cancelClicked()),
-		this, TQT_SLOT(slotEditCancelled()));
-	editor->show();
-
-	fPendingAddresses++;
-}
-
-void AddressWidget::slotCreateNewRecord()
-{
-	FUNCTIONSETUP;
-	if ( !shown ) return;
-
-	// Response to bug 18072: Don't even try to
-	// add records to an empty or unopened database,
-	// since we don't have the DBInfo stuff to deal with it.
-	//
-	//
-	PilotDatabase *myDB = new PilotLocalDatabase(dbPath(), CSL1("AddressDB"));
-
-	if (!myDB || !myDB->isOpen())
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname
-			<< ": Tried to open "
-			<< dbPath()
-			<< "/AddressDB"
-			<< " and got pointer @"
-			<< (long) myDB
-			<< " with status "
-			<< ( myDB ? myDB->isOpen() : false )
-			<< endl;
-#endif
-
-		KMessageBox::sorry(this,
-			i18n("You cannot add addresses to the address book "
-				"until you have done a HotSync at least once "
-				"to retrieve the database layout from your Pilot."),
-			i18n("Cannot Add New Address"));
-
-		if (myDB)
-			KPILOT_DELETE( myDB );
-
-		return;
-	}
-
-	AddressEditor *editor = new AddressEditor(0L,
-		fAddressAppInfo, this);
-
-	connect(editor, TQT_SIGNAL(recordChangeComplete(PilotAddress *)),
-		this, TQT_SLOT(slotAddRecord(PilotAddress *)));
-	connect(editor, TQT_SIGNAL(cancelClicked()),
-		this, TQT_SLOT(slotEditCancelled()));
-	editor->show();
-
-	fPendingAddresses++;
-}
-
-void AddressWidget::slotAddRecord(PilotAddress * address)
-{
-	FUNCTIONSETUP;
-	if ( !shown && fPendingAddresses==0 ) return;
-
-	int currentCatID = findSelectedCategory(fCatList,
-		fAddressAppInfo->categoryInfo(), true);
-
-
-	address->PilotRecordBase::setCategory(currentCatID);
-	fAddressList.append(address);
-	writeAddress(address);
-	// TODO: Just add the new record to the lists
-	updateWidget();
-
-	// k holds the item number of the address just added.
-	//
-	//
-	int k = fListBox->count() - 1;
-
-	fListBox->setCurrentItem(k);	// Show the newest one
-	fListBox->setBottomItem(k);
-
-	fPendingAddresses--;
-	if ( !shown && fPendingAddresses==0 ) hideComponent();
-}
-
-void AddressWidget::slotUpdateRecord(PilotAddress * address)
-{
-	FUNCTIONSETUP;
-	if ( !shown && fPendingAddresses==0 ) return;
-
-	writeAddress(address);
-	int currentRecord = fListBox->currentItem();
-
-	// TODO: Just change the record
-	updateWidget();
-	fListBox->setCurrentItem(currentRecord);
-
-	emit(recordChanged(address));
-
-	fPendingAddresses--;
-	if ( !shown && fPendingAddresses==0 ) hideComponent();
-}
-
-void AddressWidget::slotEditCancelled()
-{
-	FUNCTIONSETUP;
-
-	fPendingAddresses--;
-	if ( !shown && fPendingAddresses==0 ) hideComponent();
-}
-
-void AddressWidget::slotDeleteRecord()
-{
-	FUNCTIONSETUP;
-	if ( !shown ) return;
-
-	int item = fListBox->currentItem();
-
-	if (item == -1)
-		return;
-
-	PilotListItem *p = (PilotListItem *) fListBox->item(item);
-	PilotAddress *selectedRecord = (PilotAddress *) p->rec();
-
-	if (selectedRecord->id() == 0)
-	{
-		KMessageBox::error(this,
-			i18n("New records cannot be deleted until "
-				"HotSynced with pilot."),
-			i18n("HotSync Required"));
-		return;
-	}
-
-	if (KMessageBox::questionYesNo(this,
-			i18n("Delete currently selected record?"),
-			i18n("Delete Record?"), KStdGuiItem::del(), KStdGuiItem::cancel()) == KMessageBox::No)
-		return;
-
-	selectedRecord->setDeleted( true );
-	writeAddress(selectedRecord);
-	emit(recordChanged(selectedRecord));
-	showComponent();
-}
-
-
-
-void AddressWidget::slotShowAddress(int which)
-{
-	FUNCTIONSETUP;
-	if (!shown) return;
-
-	PilotListItem *p = (PilotListItem *) fListBox->item(which);
-	PilotAddress *addr = (PilotAddress *) p->rec();
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Showing "
-		<< addr->getField(entryLastname)
-		<< " "
-		<< addr->getField(entryFirstname)
-		<< endl;
-#endif
-
-	TQString text(CSL1("<qt>"));
-	text += addr->getTextRepresentation(fAddressAppInfo,Qt::RichText);
-	text += CSL1("</qt>\n");
-	fAddrInfo->setText(text);
-
-	slotUpdateButtons();
-}
-
-
-
-void AddressWidget::writeAddress(PilotAddress * which,
-	PilotDatabase * addressDB)
-{
-	FUNCTIONSETUP;
-
-	// Open a database (myDB) only if needed,
-	// i.e. only if the passed-in addressDB
-	// isn't valid.
-	//
-	//
-	PilotDatabase *myDB = addressDB;
-	bool usemyDB = false;
-
-	if (myDB == 0L || !myDB->isOpen())
-	{
-		myDB = new PilotLocalDatabase(dbPath(), CSL1("AddressDB"));
-		usemyDB = true;
-	}
-
-	// Still no valid address database...
-	//
-	//
-	if (!myDB->isOpen())
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": Address database is not open" <<
-			endl;
-#endif
-		return;
-	}
-
-
-	// Do the actual work.
-	PilotRecord *pilotRec = which->pack();
-
-	myDB->writeRecord(pilotRec);
-	markDBDirty(CSL1("AddressDB"));
-	delete pilotRec;
-
-	// Clean up in the case that we allocated our own DB.
-	//
-	//
-	if (usemyDB)
-	{
-		KPILOT_DELETE( myDB );
-	}
-}
-
-#define plu_quiet 1
-#include "pilot-addresses.c"
-
-void AddressWidget::slotExport()
-{
-	FUNCTIONSETUP;
-	if( !fAddressAppInfo ) return;
-	int currentCatID = findSelectedCategory(fCatList,
-		fAddressAppInfo->categoryInfo());
-
-	TQString prompt = (currentCatID==-1) ?
-		i18n("Export All Addresses") :
-		i18n("Export Address Category %1").arg(fAddressAppInfo->categoryName(currentCatID)) ;
-
-
-	TQString saveFile = KFileDialog::getSaveFileName(
-		TQString::null,
-		CSL1("*.csv|Comma Separated Values"),
-		this,
-		prompt
-		);
-	if (saveFile.isEmpty())
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": No save file selected." << endl;
-#endif
-		return;
-	}
-	if (TQFile::exists(saveFile) &&
-		KMessageBox::warningContinueCancel(this,
-			i18n("The file <i>%1</i> exists. Overwrite?").arg(saveFile),
-			i18n("Overwrite File?"),
-			i18n("Overwrite"))!=KMessageBox::Continue)
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": Overwrite file canceled." << endl;
-#endif
-		return;
-	}
-
-	FILE *f = fopen(TQFile::encodeName(saveFile),"w");
-	if (!f)
-	{
-		KMessageBox::sorry(this,
-			i18n("The file <i>%1</i> could not be opened for writing.").arg(saveFile));
-		return;
-	}
-	fAddressList.first();
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Adding records..." << endl;
-#endif
-
-	while (fAddressList.current())
-	{
-		const PilotAddress *a = fAddressList.current();
-		if ((currentCatID == -1) ||
-			(a->category() == currentCatID))
-		{
-			write_record_CSV(f, fAddressAppInfo->info(), a->address(),
-				a->attributes(), a->category(), 0);
-		}
-		fAddressList.next();
-	}
-
-	fclose(f);
-}
-
diff --git a/kpilot/kpilot/addressWidget.h b/kpilot/kpilot/addressWidget.h
deleted file mode 100644
index 9a7b2a8c..00000000
--- a/kpilot/kpilot/addressWidget.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/* addressWidget.h			KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This file defines the address-viewing widget used in KPilot
-** to display the Pilot's address records.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-#ifndef _KPILOT_ADDRESSWIDGET_H
-#define _KPILOT_ADDRESSWIDGET_H
-
-class TQMultiLineEdit;
-class TQListBox;
-class TQComboBox;
-class TQTextView;
-
-class PilotDatabase;
-
-
-#include "pilotComponent.h"
-#include "pilotAddress.h"
-
-class AddressWidget : public PilotComponent
-{
-Q_OBJECT
-
-public:
-	AddressWidget(TQWidget* parent,const TQString& dbpath);
-	~AddressWidget();
-
-	// Pilot Component Methods:
-	virtual void showComponent();
-	virtual void hideComponent();
-	virtual bool preHotSync(TQString &);
-	virtual void postHotSync();
-
-public slots:
-	/**
-	* Called when a particular address is selected. This slot displays
-	* it in the viewer widget.
-	*/
-	void slotShowAddress(int);
-	void slotEditRecord();
-	void slotCreateNewRecord();
-	void slotDeleteRecord();
-	void slotEditCancelled();
-	void slotExport();
-
-	void slotUpdateButtons();	// Enable/disable buttons
-
-signals:
-	void recordChanged(PilotAddress *);
-
-protected slots:
-	/**
-	* When an edit window is closed, the corresponding record
-	* is updated and possibly re-displayed.
-	*/
-	void slotUpdateRecord(PilotAddress*);
-
-	/**
-	* Pop up an edit window for a new record.
-	*/
-	void slotAddRecord(PilotAddress*);
-
-	/**
-	* Change category. This means that the display should be
-	* cleared and that the list should be repopulated.
-	*/
-	void slotSetCategory(int);
-
-private:
-	void setupWidget();
-	void updateWidget(); // Called with the lists have changed..
-	void writeAddress(PilotAddress* which,PilotDatabase *db=0L);
-
-	/**
-	* getAllAddresses reads the database and places all
-	* the addresses from the database in the list
-	* in memory --- not the list on the screen.
-	* @see fAddressList
-	*/
-	int getAllAddresses(PilotDatabase *addressDB);
-
-	/**
-	* Create a sensible "title" for an address, composed
-	* of first + last name if possible.
-	*/
-	TQString createTitle(PilotAddress *,int displayMode);
-
-	/**
-	* We use a TQComboBox fCatList to hold the user-visible names
-	* of all the categories. The TQTextView fAddrInfo is for
-	* displaying the currently selected address, if any.
-	* The TQListBox fListBox lists all the addresses in the
-	* currently selected category.
-	*
-	* The entire address database is read into memory in the
-	* QList fAddressList. We need the appinfo block from the
-	* database to determine which categories there are; this
-	* is held in fAddressAppInfo.
-	*
-	* The two buttons should speak for themselves.
-	*/
-	TQComboBox            *fCatList;
-	TQTextView            *fAddrInfo;
-	PilotAddressInfo     *fAddressAppInfo;
-	TQPtrList<PilotAddress>   fAddressList;
-	TQListBox             *fListBox;
-	QPushButton	     *fEditButton,*fDeleteButton;
-
-protected:
-	/**
-	* Keep track of how many open address editing windows there
-	* are. You can't sync when there are open windows.
-	*/
-	int fPendingAddresses;
-
-public:
-	typedef enum { PhoneNumberLength=16 } Constants ;
-};
-
-#endif
diff --git a/kpilot/kpilot/conduitConfigDialog.cc b/kpilot/kpilot/conduitConfigDialog.cc
deleted file mode 100644
index 3ea444d3..00000000
--- a/kpilot/kpilot/conduitConfigDialog.cc
+++ /dev/null
@@ -1,849 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2001 by Dan Pilone
-** Copyright (C) 2002-2004 by Adriaan de Groot
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This file defines a .ui-based configuration dialog for conduits.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <tqlistview.h>
-#include <tqlabel.h>
-#include <tqtooltip.h>
-#include <tqfile.h>
-#include <tqpushbutton.h>
-#include <tqhbox.h>
-#include <tqlayout.h>
-#include <tqwidgetstack.h>
-#include <tqvbox.h>
-#include <tqsplitter.h>
-#include <tqheader.h>
-#include <tqtimer.h>
-
-#include <kservice.h>
-#include <kservicetype.h>
-#include <kuserprofile.h>
-#include <kprocess.h>
-#include <kmessagebox.h>
-#include <kglobal.h>
-#include <kstandarddirs.h>
-#include <klibloader.h>
-#include <kseparator.h>
-#include <kconfigskeleton.h>
-#include <kdialogbase.h>
-
-#include "plugin.h"
-#include "kpilotConfig.h"
-#include "kpilotConfigDialog.h"
-
-#include "kpilotConfigWizard.h"
-
-#include "conduitConfigDialog.moc"
-
-#define CONDUIT_NAME    (0)
-#define CONDUIT_COMMENT (1)
-#define CONDUIT_DESKTOP (2)
-#define CONDUIT_LIBRARY (3)
-#define CONDUIT_ORDER	(4)
-
-
-extern "C"
-{
-	KDE_EXPORT KCModule *create_kpilotconfig( TQWidget *parent, const char * )
-	{
-		FUNCTIONSETUP;
-		return new ConduitConfigWidget( parent, "kcmkpilotconfig" );
-	}
-
-	KDE_EXPORT ConfigWizard *create_wizard(TQWidget *parent, int m)
-	{
-		FUNCTIONSETUP;
-		return new ConfigWizard(parent,"Wizard", m);
-	}
-}
-
-
-class ConduitTip : public QToolTip
-{
-public:
-	ConduitTip(TQListView *parent);
-	virtual ~ConduitTip();
-
-protected:
-	virtual void maybeTip(const TQPoint &);
-
-	TQListView *fListView;
-} ;
-
-
-ConduitTip::ConduitTip(TQListView *p) :
-	TQToolTip(p->viewport(),0L),
-	fListView(p)
-{
-	FUNCTIONSETUP;
-}
-
-ConduitTip::~ConduitTip()
-{
-	FUNCTIONSETUP;
-}
-
-/* virtual */ void ConduitTip::maybeTip(const TQPoint &p)
-{
-	FUNCTIONSETUP;
-
-	TQListViewItem *l = fListView->itemAt(p);
-
-	if (!l) return;
-
-	// ConduitListItem *q = static_cast<ConduitListItem *>(l);
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Tip over "
-		<< l->text(CONDUIT_NAME)
-		<< " with text "
-		<< l->text(CONDUIT_COMMENT)
-		<< endl;
-#endif
-
-	TQString s = l->text(CONDUIT_COMMENT);
-
-	if (s.isEmpty()) return;
-	if (s.find(CSL1("<qt>"),0,false) == -1)
-	{
-		s.prepend(CSL1("<qt>"));
-		s.append(CSL1("</qt>"));
-	}
-
-	tip(fListView->itemRect(l),s);
-}
-
-// implement our own check list items so we can detect if a given item was checked/unchecked. We need
-// this to prevent the modified signal if one only wants to display a conduit's config widget. Currently,
-// KListView doesn't provide any signal that indicates that the checked state of a checklist item was changed.
-class KPilotCheckListItem : public QCheckListItem
-{
-public:
-	KPilotCheckListItem ( TQListViewItem * parent, const TQString & text, Type tt = RadioButtonController ) : TQCheckListItem(parent, text, tt),mOriginalState(false) {}
-	~KPilotCheckListItem() {}
-
-	void setOriginalState(bool state) { mOriginalState=state; setOn(state);}
-	bool isOriginalState() { return isOn() == mOriginalState; }
-
-protected:
-	bool mOriginalState;
-};
-
-
-// Page numbers in the widget stack
-#define OLD_CONDUIT      (1)
-#define BROKEN_CONDUIT   (2)
-#define INTERNAL_CONDUIT (3)
-#define INTERNAL_EXPLN   (4)
-#define CONDUIT_EXPLN    (5)
-#define GENERAL_EXPLN    (6)
-#define GENERAL_ABOUT    (7)
-#define NEW_CONDUIT      (8)
-
-
-/*
-** Create a page in the widget stack @p parent on page @p pageno,
-** bearing the given @p text. The remainder of the parameters are
-** for esoteric things like:
-**  @p buttons set to non-null to include (and return) a TQHBox suitable
-**     for displaying a row of buttons in on the page.
-**  @p label set to non-null to return the TQLabel used to display @p text.
-*/
-static void addDescriptionPage(TQWidgetStack *parent,
-	int pageno,
-	const TQString &text,
-	TQHBox **buttons = 0L,
-	TQLabel **label = 0L)
-{
-	TQVBox *v = new TQVBox(parent);
-	TQLabel *l = 0L;
-
-	v->setFrameShape(TQLabel::NoFrame);
-	v->setMargin(SPACING);
-
-	l = new TQLabel(v);
-	l->setText(text);
-	l->setAlignment(Qt::AlignLeft | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
-
-	if (label) { *label = l; }
-
-	if (buttons)
-	{
-		*buttons = new TQHBox(v);
-		l = new TQLabel(v);
-	}
-
-	parent->addWidget(v,pageno);
-}
-
-
-ConduitConfigWidgetBase::ConduitConfigWidgetBase(TQWidget *parent, const char *n) :
-	KCModule(parent, n),
-	fConduitList(0L),
-	fStack(0L),
-	fConfigureButton(0L),
-	fConfigureWizard(0L),
-	fConfigureKontact(0L),
-	fActionDescription(0L)
-{
-	FUNCTIONSETUP;
-
-	TQWidget *w = 0L; // For spacing purposes only.
-	TQHBox *btns = 0L;
-
-	TQHBoxLayout *mainLayout = new TQHBoxLayout(this);
-	mainLayout->setSpacing(10);
-
-	// Create the left hand column
-	fConduitList = new TQListView(this ,"ConduitList");
-	fConduitList->addColumn(TQString::null);
-	fConduitList->header()->hide();
-	fConduitList->setSizePolicy(
-		TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
-	mainLayout->addWidget(fConduitList);
-
-	// Create the title
-	TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, KDialog::spacingHint());
-	// String below is just to make space; no need to translate.
-	fTitleText = new TQLabel(CSL1("Conduit Setup - Addressbook"), this);
-	TQFont titleFont(fTitleText->font());
-	titleFont.setBold(true);
-	fTitleText->setFont(titleFont);
-	vbox->addWidget(fTitleText, 0, AlignLeft);
-	vbox->addWidget(new KSeparator(TQFrame::HLine|TQFrame::Plain, this));
-
-	// Right hand column
-	fStack = new TQWidgetStack(this, "RightPart");
-	vbox->addWidget(fStack, 10);
-
-	mainLayout->addLayout(vbox);
-
-	// First page in stack (right hand column)
-	addDescriptionPage(fStack,BROKEN_CONDUIT,
-		i18n("<qt>This conduit appears to be broken and cannot "
-		"be configured.</qt>"));
-
-	// Second page, now with layout in a single column
-	//
-	// Probably deprecated.
-	//
-	addDescriptionPage(fStack,OLD_CONDUIT,
-		i18n("<qt>This is an old-style conduit.</qt>"),&btns);
-	w = new TQWidget(btns);
-	btns->setStretchFactor(w,50);
-	fConfigureButton = new TQPushButton(btns);
-	fConfigureButton->setText(i18n("Configure..."));
-	w = new TQWidget(btns);
-	btns->setStretchFactor(w,50);
-
-	// Page 3
-	addDescriptionPage(fStack,INTERNAL_CONDUIT,
-		TQString::null,0L,&fActionDescription);
-
-	// Page 5 - explanation about conduits
-	addDescriptionPage(fStack,CONDUIT_EXPLN,
-		i18n("<qt><i>Conduits</i> are external (possibly third-party) "
-		"programs that perform synchronization actions. They may "
-		"have individual configurations. Select a conduit to configure it, "
-		"and enable it by clicking on its checkbox. "
-		"</qt>"));
-
-	// Page 6 - explanation about general setup
-	addDescriptionPage(fStack,GENERAL_EXPLN,
-		i18n("<qt><p>The <i>general</i> portion of KPilot's setup "
-		"contains settings for your hardware and the way KPilot "
-		"should display your data. For the basic setup, which should fulfill "
-		"the need of most users, just use the setup wizard below.</p>"
-		"If you need some special settings, this dialog provides all the options "
-		"for fine-tuning KPilot. But be warned: The HotSync settings are "
-		"various esoteric things.</p>"
-		"<p>You can enable an action or conduit by clicking on its checkbox. "
-		"Checked conduits will be run during a HotSync. "
-		"Select a conduit to configure it.</p>"
-		"</qt>"),&btns);
-	w = new TQWidget(btns);
-	btns->setStretchFactor(w,50);
-	fConfigureWizard = new TQPushButton(i18n("Configuration Wizard"),btns);
-	w = new TQWidget(btns);
-	btns->setStretchFactor(w,50);
-
-
-	fStack->addWidget(ConduitConfigBase::aboutPage(fStack,0L),GENERAL_ABOUT);
-}
-
-ConduitConfigWidget::ConduitConfigWidget(TQWidget *parent, const char *n,
-	bool) :
-	ConduitConfigWidgetBase(parent,n),
-	fConfigure(0L),
-	fCurrentConduit(0L),
-	fGeneralPage(0L),
-	fCurrentConfig(0L)
-{
-	FUNCTIONSETUP;
-
-	fConduitList->setSorting(-1);
-	fConduitList->setRootIsDecorated(true);
-	fConduitList->setTreeStepSize(10);
-	// fConduitList->removeColumn(CONDUIT_COMMENT);
-	fillLists();
-
-	fConduitList->resize(fConduitList->sizeHint());
-	fConduitList->setMinimumSize(fConduitList->sizeHint());
-	fConduitList->setColumnWidth(0, fConduitList->sizeHint().width());
-	fConduitList->setResizeMode(TQListView::AllColumns);
-
-	fStack->resize(fStack->sizeHint()+TQSize(10,40));
-	fStack->setMinimumSize(fStack->sizeHint()+TQSize(10,40));
-
-	TQObject::connect(fConduitList,
-		TQT_SIGNAL(selectionChanged(TQListViewItem *)),
-		this,TQT_SLOT(selected(TQListViewItem *)));
-	TQObject::connect(fConduitList,
-		TQT_SIGNAL(clicked(TQListViewItem*)),
-		this, TQT_SLOT(conduitsChanged(TQListViewItem*)));
-
-	// Deprecated?
-	TQObject::connect(fConfigureButton,
-		TQT_SIGNAL(clicked()),
-		this,TQT_SLOT(configure()));
-
-	TQObject::connect(fConfigureWizard,TQT_SIGNAL(clicked()),
-		this,TQT_SLOT(configureWizard()));
-
-	fGeneralPage->setSelected(true);
-	fConduitList->setCurrentItem(fGeneralPage);
-	selected(fGeneralPage);
-
-	(void) new ConduitTip(fConduitList);
-	setButtons(Apply);
-
-}
-
-ConduitConfigWidget::~ConduitConfigWidget()
-{
-	FUNCTIONSETUP;
-	release();
-}
-
-void ConduitConfigWidget::fillLists()
-{
-	FUNCTIONSETUP;
-
-	// 3 QListViewItems for the three headings in the list
-	TQListViewItem *general,*conduits;
-
-	// And two generic pointers for the rest.
-	TQListViewItem *q = 0L;
-	KPilotCheckListItem *p = 0L;
-
-	q = new TQListViewItem(fConduitList, i18n("About"));
-	q->setText(CONDUIT_COMMENT, i18n("About KPilot. Credits."));
-	q->setText(CONDUIT_LIBRARY, CSL1("general_about"));
-
-	conduits = new TQListViewItem(fConduitList, i18n("Conduits"));
-
-	general = new TQListViewItem( fConduitList, i18n("General Setup" ) );
-	fGeneralPage = general;
-
-	// Give them identifiers so they can be handled specially when selected.
-	conduits->setText(CONDUIT_LIBRARY,CSL1("expln_conduits"));
-	general->setText( CONDUIT_LIBRARY, CSL1("expln_general") );
-
-	general->setText( CONDUIT_COMMENT,
-		i18n("General setup of KPilot (User name, port, general sync settings)") );
-	conduits->setText( CONDUIT_COMMENT,
-		i18n("Actions for HotSync with individual configuration."));
-
-	conduits->setOpen(true);
-	general->setOpen(true);
-
-
-	// Create entries under general.
-#define CE(a,b,c) q = new TQListViewItem(general,a) ; \
-	q->setText(CONDUIT_COMMENT,b) ; \
-	q->setText(CONDUIT_LIBRARY,c) ;
-
-	CE(i18n("Startup and Exit"), i18n("Behavior at startup and exit."), CSL1("general_startexit") );
-	CE(i18n("Viewers"), i18n("Viewer settings."), CSL1("general_view") );
-	CE(i18n("Backup"),i18n("Special settings for backup."),CSL1("general_backup"));
-	CE(i18n("HotSync"),i18n("Special behavior during HotSync."),CSL1("general_sync"));
-	CE(i18n("Device"),i18n("Hardware settings and startup and exit options."),CSL1("general_setup"));
-
-#undef CE
-
-
-	// List of installed (enabled) actions and conduits.
-	TQStringList potentiallyInstalled = KPilotSettings::installedConduits();
-
-	//  Create internal conduits.
-	//
-	//
-
-#define IC(a,b,c) p = new KPilotCheckListItem(conduits,i18n(a),TQCheckListItem::CheckBox); \
-	p->setText(CONDUIT_COMMENT,i18n(c)); \
-	p->setText(CONDUIT_LIBRARY,CSL1("internal_" b)); \
-	p->setText(CONDUIT_DESKTOP,CSL1("internal_" b)); \
-	if (potentiallyInstalled.findIndex(p->text(CONDUIT_DESKTOP))>=0) \
-		p->setOriginalState(true);
-
-	IC("Install Files","fileinstall",
-		"Install files that are dragged to KPilot onto the handheld.");
-#undef IC
-
-
-
-	KServiceTypeProfile::OfferList offers =
-		KServiceTypeProfile::offers(CSL1("KPilotConduit"));
-
-	TQValueListIterator < KServiceOffer > availList(offers.begin());
-	while (availList != offers.end())
-	{
-		KSharedPtr < KService > o = (*availList).service();
-
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": "
-			<< o->desktopEntryName()
-			<< " = " << o->name() << endl;
-#endif
-
-		if (!o->exec().isEmpty())
-		{
-			WARNINGKPILOT << "Old-style conduit found "
-				<< o->name()
-				<< endl;
-		}
-
-		p = new KPilotCheckListItem(conduits,
-			o->name(),
-			TQCheckListItem::CheckBox);
-		p->setMultiLinesEnabled(true);
-		p->setText(CONDUIT_COMMENT,o->comment());
-		p->setText(CONDUIT_DESKTOP,o->desktopEntryName());
-		p->setText(CONDUIT_LIBRARY,o->library());
-
-		if (potentiallyInstalled.findIndex(o->desktopEntryName()) < 0)
-		{
-			p->setOriginalState(false);
-		}
-		else
-		{
-			p->setOriginalState(true);
-		}
-
-		++availList;
-	}
-}
-
-static void dumpConduitInfo(const KLibrary *lib)
-{
-#ifdef DEBUG
-	FUNCTIONSETUP;
-	DEBUGKPILOT << "Plugin version = " << PluginUtility::pluginVersion(lib) << endl;
-	DEBUGKPILOT << "Plugin id      = " << PluginUtility::pluginVersionString(lib) << endl;
-#endif
-}
-
-static ConduitConfigBase *handleGeneralPages(TQWidget *w, TQListViewItem *p)
-{
-	ConduitConfigBase *o = 0L;
-
-	TQString s = p->text(CONDUIT_LIBRARY) ;
-
-	if (s.startsWith(CSL1("general_setup")))
-	{
-		o = new DeviceConfigPage( w, "generalSetup" );
-	}
-	else if (s.startsWith(CSL1("general_sync")))
-	{
-		o = new SyncConfigPage( w, "syncSetup" );
-	}
-	else if (s.startsWith(CSL1("general_view")))
-	{
-		o = new ViewersConfigPage( w, "viewSetup" );
-	}
-	else if (s.startsWith(CSL1("general_startexit")))
-	{
-		o = new StartExitConfigPage(w,"startSetup");
-	}
-	else if (s.startsWith(CSL1("general_backup")))
-	{
-		o = new BackupConfigPage(w,"backupSetup");
-	}
-
-	return o;
-}
-
-void ConduitConfigWidget::loadAndConfigure(TQListViewItem *p) // ,bool exec)
-{
-	FUNCTIONSETUP;
-
-	if (!p)
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname
-			<< ": Executed NULL conduit?"
-			<< endl;
-#endif
-		fStack->raiseWidget(GENERAL_EXPLN);
-		return;
-	}
-
-	TQString libraryName = p->text(CONDUIT_LIBRARY);
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Executing conduit "
-		<< p->text(CONDUIT_NAME)
-		<< " (library " << libraryName << ")"
-		<< endl;
-#endif
-
-
-	if (libraryName.isEmpty())
-	{
-		fStack->raiseWidget(BROKEN_CONDUIT);
-		warnNoExec(p);
-		return;
-	}
-
-	if (libraryName.startsWith(CSL1("internal_")))
-	{
-		fStack->raiseWidget(INTERNAL_CONDUIT);
-		fActionDescription->setText(
-			i18n("<qt>This is an internal action which has no "
-			"configuration options. "
-			"The action's description is: <i>%1</i> "
-			"</qt>").arg(p->text(CONDUIT_COMMENT)));
-		return;
-	}
-
-	if (libraryName == CSL1("expln_conduits"))
-	{
-		fStack->raiseWidget(CONDUIT_EXPLN);
-		return;
-	}
-	if (libraryName == CSL1("expln_general"))
-	{
-		fStack->raiseWidget(GENERAL_EXPLN);
-		return;
-	}
-
-	if (libraryName == CSL1("general_about"))
-	{
-		fStack->raiseWidget(GENERAL_ABOUT);
-		return;
-	}
-
-	TQObject *o = 0L;
-
-	// Page 4: General setup
-	if (libraryName.startsWith(CSL1("general_")))
-	{
-		o = handleGeneralPages(fStack,p);
-	}
-	else
-	{
-		TQCString library = TQFile::encodeName(libraryName);
-
-		KLibFactory *f = KLibLoader::self()->factory(library);
-		if (!f)
-		{
-#ifdef DEBUG
-			DEBUGKPILOT << fname
-				<< ": No conduit library "
-				<< library.data()
-				<< " [" << library.size() << "]"
-				<< " (" << libraryName << ")"
-				<< " found."
-				<< endl;
-#endif
-			fStack->raiseWidget(BROKEN_CONDUIT);
-			warnNoLibrary(p);
-			return;
-		}
-
-		dumpConduitInfo(KLibLoader::self()->library(library));
-
-		TQStringList a;
-		a.append(CSL1("modal"));
-
-		o = f->create(fStack, 0L, "ConduitConfigBase", a);
-
-		if (!o)
-		{
-#ifdef DEBUG
-			DEBUGKPILOT << fname
-				<< ": Can't create ConduitConfigBase - must be old conduit."
-				<< endl;
-#endif
-
-			KLibLoader::self()->unloadLibrary(
-				library);
-			fStack->raiseWidget(BROKEN_CONDUIT);
-			warnNoLibrary(p);
-			return;
-		}
-	}
-
-	ConduitConfigBase *d = dynamic_cast<ConduitConfigBase *>(o);
-
-	if (!d)
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname
-			<< ": Can't cast to config base object."
-			<< endl;
-#endif
-		fStack->raiseWidget(BROKEN_CONDUIT);
-		warnNoLibrary(p);
-		return;
-	}
-
-	// Remove the config widget from the stack before we can add the new one
-	TQWidget *oldConfigWidget = fStack->widget( NEW_CONDUIT );
-	if ( oldConfigWidget )
-	{
-		fStack->removeWidget( oldConfigWidget );
-		KPILOT_DELETE( oldConfigWidget );
-	}
-	if (fStack->addWidget(d->widget(),NEW_CONDUIT)<0)
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname
-			<< ": Can't add config widget to stack."
-			<< endl;
-#endif
-	}
-	else
-	{
-		d->load();
-		fStack->raiseWidget(NEW_CONDUIT);
-		d->widget()->show();
-		fCurrentConfig=d;
-		// make sure the changed signal is propagated to the KCM*Dialog
-		// and the apply button is enabled correspondingly.
-		connect(d, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
-	}
-}
-
-bool ConduitConfigWidget::release()
-{
-	FUNCTIONSETUP;
-	if (fCurrentConfig)
-	{
-		if (!fCurrentConfig->maybeSave())
-			return false;
-		fStack->raiseWidget(0);
-		delete fCurrentConfig;
-	}
-	if (fCurrentConduit)
-	{
-		KLibLoader::self()->unloadLibrary(
-			TQFile::encodeName(fCurrentConduit->text(CONDUIT_LIBRARY)));
-	}
-	fCurrentConduit=0L;
-	fCurrentConfig=0L;
-	return true;
-}
-
-void ConduitConfigWidget::unselect()
-{
-	fConduitList->setSelected( fCurrentConduit, true );
-	fConduitList->setCurrentItem( fCurrentConduit );
-}
-
-void ConduitConfigWidget::selected(TQListViewItem *p)
-{
-	FUNCTIONSETUP;
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": "
-		<< ( p ? p->text(CONDUIT_NAME) : CSL1("None") )
-		<< endl;
-#endif
-	if (p!=fCurrentConduit)
-	{
-		if (!release())
-		{
-			fConduitList->blockSignals(true);
-			TQTimer::singleShot(1,this,TQT_SLOT(unselect()));
-			return;
-		}
-	}
-	fCurrentConduit=p;
-	loadAndConfigure(p);
-//	fStack->adjustSize();
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": New widget size "
-		<< fStack->size().width() << "x" << fStack->size().height() << endl;
-	DEBUGKPILOT << fname << ": Current size "
-		<< size().width() << "x"
-		<< size().height() << endl;
-#endif
-	emit sizeChanged();
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": New size "
-		<< size().width() << "x"
-		<< size().height() << endl;
-#endif
-
-	// set the dialog title to the selected item
-	TQListViewItem *pParent = p->parent();
-	TQString title;
-	title = pParent ? pParent->text(CONDUIT_NAME) + CSL1(" - ") : TQString() ;
-	title += p ? p->text(CONDUIT_NAME) : i18n("KPilot Setup");
-	fTitleText->setText(title);
-}
-
-void ConduitConfigWidget::configure()
-{
-	loadAndConfigure(fConduitList->selectedItem());
-}
-
-void ConduitConfigWidget::warnNoExec(const TQListViewItem * p)
-{
-	FUNCTIONSETUP;
-
-	TQString msg = i18n("<qt>No library could be "
-		"found for the conduit %1. This means that the "
-		"conduit was not installed properly.</qt>")
-		.arg(p->text(CONDUIT_NAME));
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": No library for "
-		<< p->text(CONDUIT_NAME) << endl;
-#endif
-
-	KMessageBox::error(this, msg, i18n("Conduit Error"));
-}
-
-void ConduitConfigWidget::warnNoLibrary(const TQListViewItem *p)
-{
-	FUNCTIONSETUP;
-
-	TQString msg = i18n("<qt>There was a problem loading the library "
-		"for the conduit %1. This means that the "
-		"conduit was not installed properly.</qt>")
-		.arg(p->text(CONDUIT_NAME));
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Can't load library for "
-		<< p->text(CONDUIT_NAME) << endl;
-#endif
-
-	KMessageBox::error(this, msg, i18n("Conduit Error"));
-}
-
-void ConduitConfigWidget::save()
-{
-	FUNCTIONSETUP;
-
-	// Only new-style conduits and the general setup have changes that need to be commited
-	// old-style conduits have their own config dlg which commits them itself
-	if ( fStack->id( fStack->visibleWidget())==NEW_CONDUIT )
-	{
-		if (fCurrentConfig) fCurrentConfig->commit();
-	}
-
-	TQStringList activeConduits;
-	TQListViewItemIterator it( fConduitList );
-	while ( it.current() ) {
-		KPilotCheckListItem*p = dynamic_cast<KPilotCheckListItem*>(it.current());
-		if ( p )
-		{
-			p->setOriginalState( p->isOn() );
-			if ( p->isOn() )
-			activeConduits.append(p->text(CONDUIT_DESKTOP));
-		}
-		++it;
-	}
-	KPilotSettings::setInstalledConduits(activeConduits);
-	KPilotSettings::self()->writeConfig();
-}
-
-
-void ConduitConfigWidget::load()
-{
-	FUNCTIONSETUP;
-	KPilotSettings::self()->readConfig();
-
-	TQStringList potentiallyInstalled = KPilotSettings::installedConduits();
-	TQListViewItem*p = fConduitList->firstChild();
-	while (p)
-	{
-		TQListViewItem*q = p->firstChild();
-		while (q)
-		{
-			TQCheckListItem*qq=dynamic_cast<TQCheckListItem*>(q);
-			if (qq)
-			{
-				qq->setOn(! (potentiallyInstalled.findIndex(qq->text(CONDUIT_DESKTOP))<0) );
-			}
-			q = q->nextSibling();
-		}
-		p=p->nextSibling();
-	}
-
-
-	// Only new-style conduits and the general setup have changes that need to be commited
-	// old-style conduits have their own config dlg which commits them itself
-	if ( fStack->id( fStack->visibleWidget())==NEW_CONDUIT )
-	{
-		if (fCurrentConfig) fCurrentConfig->load();
-	}
-}
-
-
-void ConduitConfigWidget::conduitsChanged(TQListViewItem*item)
-{
-	KPilotCheckListItem*i=dynamic_cast<KPilotCheckListItem*>(item);
-	if (i)
-	{
-		if (!i->isOriginalState()) emit changed(true);
-	}
-}
-
-void ConduitConfigWidget::reopenItem(TQListViewItem *i)
-{
-	i->setOpen(true);
-}
-
-void ConduitConfigWidget::configureWizard()
-{
-	FUNCTIONSETUP;
-	ConfigWizard wiz(this, "Wizard");
-	if (wiz.exec()) {
-		KPilotSettings::self()->readConfig();
-		load();
-	}
-}
-
-
diff --git a/kpilot/kpilot/conduitConfigDialog.h b/kpilot/kpilot/conduitConfigDialog.h
deleted file mode 100644
index 9873e057..00000000
--- a/kpilot/kpilot/conduitConfigDialog.h
+++ /dev/null
@@ -1,112 +0,0 @@
-#ifndef _KPILOT_CONDUITCONFIGDIALOG_H
-#define _KPILOT_CONDUITCONFIGDIALOG_H
-/* conduitConfigDialog.h                 KPilot
-**
-** Copyright (C) 2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This file defines a dialog that uses the .ui-defined widget for
-** configuring conduits.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-// #include "conduitConfigDialog_base.h"
-#include "kcmodule.h"
-
-class TQListView;
-class TQListViewItem;
-class TQPushButton;
-class TQLabel;
-class TQWidgetStack;
-class KProcess;
-class ConduitConfigBase;
-class ConduitConfig;
-
-class ConduitConfigWidgetBase : public KCModule
-{
-Q_OBJECT
-public:
-	ConduitConfigWidgetBase(TQWidget *p=0L,const char *n=0L);
-
-	TQListView *fConduitList;
-	TQWidgetStack *fStack;
-	TQPushButton *fConfigureButton;
-	TQPushButton *fConfigureWizard,*fConfigureKontact;
-	TQLabel *fActionDescription;
-	TQLabel *fTitleText;  // Dialog title above fStack
-} ;
-
-class ConduitConfigWidget : public ConduitConfigWidgetBase
-{
-Q_OBJECT
-public:
-	ConduitConfigWidget(TQWidget *,
-		const char *name=0L, bool ownButtons=false);
-	virtual ~ConduitConfigWidget();
-
-protected:
-	void fillLists();
-
-	void warnNoExec(const TQListViewItem *);
-	void warnNoLibrary(const TQListViewItem *);
-
-	void loadAndConfigure(TQListViewItem *); // ,bool);
-
-public:
-	/**
-	* Get rid of the current conduit configuration widget,
-	* saving changes if necessary. Returns false if the user
-	* selects cancel for the action that is supposed to
-	* release the conduit (ie. selecting a different one,
-	* or closing the dialog.)
-	*/
-	bool release();
-	bool validate() {return release(); }
-
-public slots:
-	virtual void save();
-	virtual void load();
-//	void slotOk();
-//	void slotApply();
-
-signals:
-	void selectionChanged(TQListViewItem *);
-	void sizeChanged();
-
-protected slots:
-	void configure();
-	void configureWizard();
-
-	void unselect(); // Helper slot when cancelling a change in selection
-	void selected(TQListViewItem *);
-	void conduitsChanged(TQListViewItem*);
-	void reopenItem(TQListViewItem *);
-
-private:
-	TQPushButton *fConfigure;
-	TQListViewItem *fCurrentConduit;
-	TQListViewItem *fGeneralPage;
-	ConduitConfigBase *fCurrentConfig;
-};
-
-#endif
diff --git a/kpilot/kpilot/datebookWidget.cc b/kpilot/kpilot/datebookWidget.cc
deleted file mode 100644
index bc2dff5e..00000000
--- a/kpilot/kpilot/datebookWidget.cc
+++ /dev/null
@@ -1,133 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2003 by Dan Pilone.
-**	Authored by Adriaan de Groot
-**
-** This is the viewer for datebook data.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include "options.h"
-
-
-#include <tqlayout.h>
-#include <tqdir.h>
-#include <tqpushbutton.h>
-
-#include <klistview.h>
-#include <kdatepicker.h>
-#include <kmessagebox.h>
-
-#include "datebookWidget.moc"
-
-DatebookWidget::DatebookWidget(TQWidget *parent, const TQString &dbpath) :
-	PilotComponent(parent,"component_generic",dbpath)
-{
-	FUNCTIONSETUP;
-
-	TQGridLayout *g = new TQGridLayout(this,1,1,SPACING);
-
-	fDatePicker = new KDatePicker( this, "fDatePicker" );
-	fDatePicker->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)5, 0, 0, fDatePicker->sizePolicy().hasHeightForWidth() ) );
-	g->addMultiCellWidget(fDatePicker,0,0,0,2);
-
-	TQSpacerItem* spacer = new TQSpacerItem( 20, 180, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-	g->addItem( spacer, 1, 1 );
-
-	fAddButton = new TQPushButton( i18n( "&Add..." ), this, "pushButton1" );
-	g->addWidget( fAddButton, 2, 0 );
-
-	fEditButton = new TQPushButton( i18n( "&Edit..." ), this, "pushButton2" );
-	g->addWidget( fEditButton, 2, 1 );
-
-	fDeleteButton = new TQPushButton( i18n( "&Delete..." ), this, "pushButton3" );
-	g->addWidget( fDeleteButton, 2, 2 );
-
-	fEventList = new KListView( this, "kListView1" );
-	fEventList->addColumn( i18n( "Time" ) );
-	fEventList->addColumn( i18n( "Al" ) );
-	fEventList->addColumn( i18n( "Rec" ) );
-	fEventList->addColumn( i18n( "Description" ) );
-//	fEventList->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, fEventList->sizePolicy().hasHeightForWidth() ) );
-	fEventList->setAllColumnsShowFocus( TRUE );
-	fEventList->setShowSortIndicator( TRUE );
-	fEventList->setResizeMode( KListView::/*LastColumn*/AllColumns );
-	fEventList->setFullWidth( TRUE );
-//	fEventList->setAlternateBackground( TQColor( 221, 146, 240 ) );
-	g->addMultiCellWidget(fEventList, 0, 2, 3, 3);
-
-	connect(fDatePicker, TQT_SIGNAL(dateChanged()), TQT_SLOT(slotDayChanged()));
-	connect(fAddButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddEvent()));
-	connect(fEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditEvent()));
-	connect(fDeleteButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteEvent()));
-}
-
-DatebookWidget::~DatebookWidget()
-{
-	FUNCTIONSETUP;
-}
-
-
-void DatebookWidget::showComponent()
-{
-	FUNCTIONSETUP;
-
-	// TODO: Open the calendar database
-	// TODO: Initialize the current month
-	// TODO: Fill the calendar and the event list
-}
-
-void DatebookWidget::hideComponent()
-{
-	FUNCTIONSETUP;
-
-	// TODO: Close the calendar database if open
-	// TODO: clear the calendar and the event list
-}
-
-void DatebookWidget::slotDayChanged()
-{
-	FUNCTIONSETUP;
-	KMessageBox::information(this, CSL1("slotDayChanged"));
-}
-
-void DatebookWidget::slotAddEvent()
-{
-	FUNCTIONSETUP;
-	KMessageBox::information(this, CSL1("slotAddEvent"));
-}
-
-void DatebookWidget::slotEditEvent()
-{
-	FUNCTIONSETUP;
-	KMessageBox::information(this, CSL1("slotEditEvent"));
-}
-
-void DatebookWidget::slotDeleteEvent()
-{
-	FUNCTIONSETUP;
-	KMessageBox::information(this, CSL1("slotDeleteEvent"));
-}
-
-
diff --git a/kpilot/kpilot/datebookWidget.h b/kpilot/kpilot/datebookWidget.h
deleted file mode 100644
index 3b44a204..00000000
--- a/kpilot/kpilot/datebookWidget.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef _KPILOT_DATEBOOKWIDGET_H
-#define _KPILOT_DATEBOOKWIDGET_H
-/* datebookWidget.h		KPilot
-**
-** Copyright (C) 2003 by Dan Pilone.
-**	Authored by Adriaan de Groot
-**
-** This is the viewer widget for viewing datebook entries in
-** a marginally useful form.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "pilotComponent.h"
-
-class KDatePicker;
-class TQPushButton;
-class KListView;
-
-class DatebookWidget : public PilotComponent
-{
-Q_OBJECT
-
-public:
-	DatebookWidget(TQWidget* parent, const TQString& dbpath);
-	virtual ~DatebookWidget();
-
-	// Pilot component methods
-	void hideComponent();
-	void showComponent();
-
-protected slots:
-	void slotDayChanged();
-	void slotAddEvent();
-	void slotEditEvent();
-	void slotDeleteEvent();
-
-private:
-	KDatePicker*fDatePicker;
-	TQPushButton*fAddButton;
-	TQPushButton*fEditButton;
-	TQPushButton*fDeleteButton;
-	KListView*fEventList;
-};
-
-
-#endif
diff --git a/kpilot/kpilot/dbAppInfoEditor.cc b/kpilot/kpilot/dbAppInfoEditor.cc
deleted file mode 100644
index 2e9e4b5f..00000000
--- a/kpilot/kpilot/dbAppInfoEditor.cc
+++ /dev/null
@@ -1,105 +0,0 @@
-/* dbRecordEditor.cc                KPilot
-**
-** Copyright (C) 2003 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-**/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <tqtextedit.h>
-#include <tqlabel.h>
-#include <kdialogbase.h>
-#include <kmessagebox.h>
-
-#include "dbAppInfoEditor.h"
-
-#include <khexedit/byteseditinterface.h>
-using namespace KHE;
-
-
-/*************************************************
-**************************************************/
-
-DBAppInfoEditor::DBAppInfoEditor(char*appInfoData, int l, TQWidget *parent) :
-	KDialogBase(parent, "AppBlock Editor",false,
-		i18n("Edit AppInfo Block"),
-		Ok|Cancel), 
-	appInfo(appInfoData), 
-	len(l)
-{
-	fAppInfoEdit = KHE::createBytesEditWidget( this, "fAppInfoEdit" );
-	if( fAppInfoEdit )
-	{
-		 // fetch the editor interface
-		KHE::BytesEditInterface* fAppInfoEditIf = KHE::bytesEditInterface( fAppInfoEdit );
-		Q_ASSERT( fAppInfoEditIf ); // This should not fail!
-		if( fAppInfoEditIf )
-		{
-			fAppInfoEditIf->setData( (char*)appInfoData, l );
-			fAppInfoEditIf->setMaxDataSize( l );
-			// TODO_RK: Make the app info editable. I need to find a way 
-			// to sync the appInfoBlock to the handheld
-			fAppInfoEditIf->setReadOnly( true );
-		}
-	}
-	else
-	{
-		TQLabel*tmpW = new TQLabel( i18n("To view the Application info block data, please install a hex editor (e.g. khexedit from kdeutils)."), this );
-		tmpW->setBackgroundMode( Qt::PaletteMid );
-		tmpW->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter | Qt::WordBreak);
-		tmpW->setFrameShape( TQFrame::Panel );
-		tmpW->setFrameShadow( TQFrame::Sunken );
-		fAppInfoEdit = tmpW;
-	}
-	setMainWidget( fAppInfoEdit );
-	fillWidgets();
-}
-
-
-DBAppInfoEditor::~DBAppInfoEditor()
-{
-}
-
-void DBAppInfoEditor::slotOk()
-{
-	KMessageBox::sorry(this, i18n("Changing the AppInfo block isn't yet supported by KPilot!"));
-/*	if (KMessageBox::questionYesNo(this, i18n("Changing the AppInfo block "
-		"might corrupt the whole database. \n\nReally assign the new AppInfo "
-		"block?"), i18n("Changing AppInfo Block"), i18n("Assign"), KStdGuiItem::cancel())==KMessageBox::Yes)
-	{
-		// TODO: Copy the data over
-		// TODO: set the length
-		// (*len)=..;
-	}*/
-	KDialogBase::slotOk();
-}
-
-void DBAppInfoEditor::fillWidgets()
-{
-	// FUNCTIONSETUP
-}
-
-
-
-#include "dbAppInfoEditor.moc"
diff --git a/kpilot/kpilot/dbAppInfoEditor.h b/kpilot/kpilot/dbAppInfoEditor.h
deleted file mode 100644
index cee9336a..00000000
--- a/kpilot/kpilot/dbAppInfoEditor.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef _KPILOT_DBAPPINFOEDITOR_H
-#define _KPILOT_DBAPPINFOEDITOR_H
-/* dbAppInfoEditor.h                 KPilot
-**
-** Copyright (C) 2003 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-#include <kdialogbase.h>
-
-class TQWidget;
-
-class DBAppInfoEditor : public KDialogBase
-{
-Q_OBJECT
-public:
-	DBAppInfoEditor(char*appInfoData, int l, TQWidget *parent = 0);
-	~DBAppInfoEditor();
-	char*appInfo;
-	int len;
-protected:
-	void fillWidgets();
-	TQWidget*fAppInfoEdit;
-protected slots:
-	virtual void slotOk();
-};
-
-
-#endif
diff --git a/kpilot/kpilot/dbFlagsEditor.cc b/kpilot/kpilot/dbFlagsEditor.cc
deleted file mode 100644
index 89f14d03..00000000
--- a/kpilot/kpilot/dbFlagsEditor.cc
+++ /dev/null
@@ -1,157 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2003 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-**/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <pi-dlp.h>
-
-#include <tqlineedit.h>
-#include <tqcheckbox.h>
-#include <kdatewidget.h>
-#include <ktimewidget.h>
-#include <kmessagebox.h>
-
-#include "pilotRecord.h"
-#include "dbFlagsEditor.h"
-#include "dbFlagsEditor_base.h"
-
-
-DBFlagsEditor::DBFlagsEditor(DBInfo*dbinfo, TQWidget *parent) :
-	KDialogBase(parent, "FlagsEditor",false,
-		i18n("Edit Database Flags"), Ok|Cancel),
-	dbi(dbinfo)
-{
-	widget=new DBFlagsEditorWidget(this);
-	setMainWidget(widget);
-	fillWidgets();
-}
-
-
-DBFlagsEditor::~DBFlagsEditor()
-{
-}
-
-void DBFlagsEditor::slotOk()
-{
-	if (KMessageBox::questionYesNo(this, i18n("Changing the database flags might corrupt the whole database, or make the data unusable. Do not change the values unless you are absolutely sure you know what you are doing.\n\nReally assign these new flags?"), i18n("Changing Database Flags"),i18n("Assign"),KStdGuiItem::cancel())==KMessageBox::Yes)
-	{
-		Pilot::toPilot(widget->fDBName->text(),dbi->name,33);
-
-		char buff[5];
-		strlcpy(buff, widget->fType->text().latin1(), 5);
-		dbi->type=get_long(buff);
-
-		strlcpy(buff, widget->fCreator->text().latin1(), 5);
-		dbi->creator=get_long(buff);
-
-
-#define setflag(ctrl, flag) if (widget->ctrl->isChecked()) dbi->flags |=flag;\
-	else dbi->flags &= ~flag;
-
-		setflag(fRessourceDB, dlpDBFlagResource);
-		setflag(fReadOnly, dlpDBFlagReadOnly);
-		setflag(fBackupDB, dlpDBFlagBackup);
-		setflag(fCopyProtect, dlpDBFlagCopyPrevention);
-		setflag(fReset, dlpDBFlagReset);
-#undef setflag
-
-		if (widget->fExcludeDB->isChecked())
-			dbi->miscFlags |= dlpDBMiscFlagExcludeFromSync;
-		else	dbi->miscFlags &= ~dlpDBMiscFlagExcludeFromSync;
-
-		TQDateTime ttime;
-		ttime.setDate(widget->fCreationDate->date());
-#if KDE_IS_VERSION(3,1,9)
-		ttime.setTime(widget->fCreationTime->time());
-#endif
-		dbi->createDate=ttime.toTime_t();
-
-		ttime.setDate(widget->fModificationDate->date());
-#if KDE_IS_VERSION(3,1,9)
-		ttime.setTime(widget->fModificationTime->time());
-#endif
-		dbi->modifyDate=ttime.toTime_t();
-
-		ttime.setDate(widget->fBackupDate->date());
-#if KDE_IS_VERSION(3,1,9)
-		ttime.setTime(widget->fBackupTime->time());
-#endif
-		dbi->backupDate=ttime.toTime_t();
-
-		KDialogBase::slotOk();
-	}
-}
-
-void DBFlagsEditor::slotCancel()
-{
-	KDialogBase::slotCancel();
-}
-
-void DBFlagsEditor::fillWidgets()
-{
-	// FUNCTIONSETUP
-
-	widget->fDBName->setText(TQString::fromLatin1(dbi->name));
-
-	char buff[5];
-	set_long(buff, dbi->type);
-	buff[4]='\0';
-	widget->fType->setText(TQString::fromLatin1(buff));
-	set_long(buff, dbi->creator);
-	buff[4]='\0';
-	widget->fCreator->setText(TQString::fromLatin1(buff));
-
-	widget->fRessourceDB->setChecked(dbi->flags & dlpDBFlagResource);
-	widget->fReadOnly->setChecked(dbi->flags & dlpDBFlagReadOnly);
-	widget->fBackupDB->setChecked(dbi->flags & dlpDBFlagBackup);
-	widget->fCopyProtect->setChecked(dbi->flags & dlpDBFlagCopyPrevention);
-
-	widget->fReset->setChecked(dbi->flags & dlpDBFlagReset);
-	widget->fExcludeDB->setChecked(dbi->miscFlags & dlpDBMiscFlagExcludeFromSync);
-
-	TQDateTime ttime;
-	ttime.setTime_t(dbi->createDate);
-	widget->fCreationDate->setDate(ttime.date());
-#if KDE_IS_VERSION(3,1,9)
-	widget->fCreationTime->setTime(ttime.time());
-#endif
-
-	ttime.setTime_t(dbi->modifyDate);
-	widget->fModificationDate->setDate(ttime.date());
-#if KDE_IS_VERSION(3,1,9)
-	widget->fModificationTime->setTime(ttime.time());
-#endif
-
-	ttime.setTime_t(dbi->backupDate);
-	widget->fBackupDate->setDate(ttime.date());
-#if KDE_IS_VERSION(3,1,9)
-	widget->fBackupTime->setTime(ttime.time());
-#endif
-}
-
-
-#include "dbFlagsEditor.moc"
diff --git a/kpilot/kpilot/dbFlagsEditor.h b/kpilot/kpilot/dbFlagsEditor.h
deleted file mode 100644
index c5ad3c08..00000000
--- a/kpilot/kpilot/dbFlagsEditor.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef _KPILOT_DBFLAGSEDITOR_H
-#define _KPILOT_DBFLAGSEDITOR_H
-/* dbFlagsEditor.h                 KPilot
-**
-** Copyright (C) 2003 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-#include <kdialogbase.h>
-
-class DBFlagsEditorWidget;
-struct DBInfo;
-/**
-@author Reinhold Kainhofer
-*/
-class DBFlagsEditor : public KDialogBase
-{
-Q_OBJECT
-public:
-	DBFlagsEditor(DBInfo*dbinfo=0L, TQWidget *parent = 0);
-	~DBFlagsEditor();
-
-protected:
-	void fillWidgets();
-	DBInfo*dbi;
-	DBFlagsEditorWidget*widget;
-protected slots:
-	virtual void slotOk();
-	virtual void slotCancel();
-
-
-};
-
-#endif
diff --git a/kpilot/kpilot/dbFlagsEditor_base.ui b/kpilot/kpilot/dbFlagsEditor_base.ui
deleted file mode 100644
index ce00cf3b..00000000
--- a/kpilot/kpilot/dbFlagsEditor_base.ui
+++ /dev/null
@@ -1,376 +0,0 @@
-<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
-<class>DBFlagsEditorWidget</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DBFlagsEditorWidget</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>465</width>
-            <height>353</height>
-        </rect>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>fDBNameLabel</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>4</hsizetype>
-                    <vsizetype>5</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="text">
-                <string>Database &amp;name:</string>
-            </property>
-            <property name="buddy" stdset="0">
-                <cstring>fDBName</cstring>
-            </property>
-        </widget>
-        <widget class="QLabel" row="1" column="3">
-            <property name="name">
-                <cstring>fCreatorLabel</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>4</hsizetype>
-                    <vsizetype>5</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="text">
-                <string>&amp;Creator:</string>
-            </property>
-            <property name="buddy" stdset="0">
-                <cstring>fCreator</cstring>
-            </property>
-        </widget>
-        <widget class="QLabel" row="1" column="0">
-            <property name="name">
-                <cstring>fTypeLabel</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>4</hsizetype>
-                    <vsizetype>5</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="text">
-                <string>&amp;Type:</string>
-            </property>
-            <property name="buddy" stdset="0">
-                <cstring>fType</cstring>
-            </property>
-        </widget>
-        <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>fType</cstring>
-            </property>
-            <property name="maxLength">
-                <number>4</number>
-            </property>
-        </widget>
-        <widget class="QLineEdit" row="1" column="4" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>fCreator</cstring>
-            </property>
-            <property name="maxLength">
-                <number>4</number>
-            </property>
-        </widget>
-        <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="5">
-            <property name="name">
-                <cstring>fDBFlagsGroup</cstring>
-            </property>
-            <property name="title">
-                <string>Database Flags</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="QCheckBox" row="0" column="0">
-                    <property name="name">
-                        <cstring>fRessourceDB</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Ressource database</string>
-                    </property>
-                </widget>
-                <widget class="QCheckBox" row="1" column="0">
-                    <property name="name">
-                        <cstring>fReadOnly</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Rea&amp;d-only</string>
-                    </property>
-                </widget>
-                <widget class="QCheckBox" row="2" column="0">
-                    <property name="name">
-                        <cstring>fBackupDB</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Database is &amp;backed up</string>
-                    </property>
-                </widget>
-                <widget class="QCheckBox" row="3" column="0">
-                    <property name="name">
-                        <cstring>fCopyProtect</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Copy &amp;protected</string>
-                    </property>
-                </widget>
-                <spacer row="4" column="0">
-                    <property name="name">
-                        <cstring>spacer4</cstring>
-                    </property>
-                    <property name="orientation">
-                        <enum>Vertical</enum>
-                    </property>
-                    <property name="sizeType">
-                        <enum>Expanding</enum>
-                    </property>
-                    <property name="sizeHint">
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>
-            </grid>
-        </widget>
-        <widget class="QButtonGroup" row="2" column="5" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>fMiscFlagsGroup</cstring>
-            </property>
-            <property name="title">
-                <string>Misc Flags</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <spacer row="2" column="0">
-                    <property name="name">
-                        <cstring>spacer3</cstring>
-                    </property>
-                    <property name="orientation">
-                        <enum>Vertical</enum>
-                    </property>
-                    <property name="sizeType">
-                        <enum>Expanding</enum>
-                    </property>
-                    <property name="sizeHint">
-                        <size>
-                            <width>21</width>
-                            <height>60</height>
-                        </size>
-                    </property>
-                </spacer>
-                <widget class="QCheckBox" row="0" column="0">
-                    <property name="name">
-                        <cstring>fReset</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Reset after &amp;installation</string>
-                    </property>
-                </widget>
-                <widget class="QCheckBox" row="1" column="0">
-                    <property name="name">
-                        <cstring>fExcludeDB</cstring>
-                    </property>
-                    <property name="text">
-                        <string>E&amp;xclude from sync</string>
-                    </property>
-                </widget>
-            </grid>
-        </widget>
-        <widget class="QGroupBox" row="3" column="0" rowspan="1" colspan="7">
-            <property name="name">
-                <cstring>fTimeStampGroup</cstring>
-            </property>
-            <property name="title">
-                <string>Time Stamps</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="QLabel" row="0" column="0">
-                    <property name="name">
-                        <cstring>fCreationLabel</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>4</hsizetype>
-                            <vsizetype>5</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <property name="text">
-                        <string>Cr&amp;eation time:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>fCreationDate</cstring>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="1" column="0">
-                    <property name="name">
-                        <cstring>fModificationlabel</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Modification time:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>fModificationDate</cstring>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="2" column="0">
-                    <property name="name">
-                        <cstring>fBackupLabel</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Back&amp;up time:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>fBackupDate</cstring>
-                    </property>
-                </widget>
-                <widget class="KTimeWidget" row="0" column="2">
-                    <property name="name">
-                        <cstring>fCreationTime</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>4</hsizetype>
-                            <vsizetype>5</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <property name="focusPolicy">
-                        <enum>StrongFocus</enum>
-                    </property>
-                </widget>
-                <widget class="KTimeWidget" row="1" column="2">
-                    <property name="name">
-                        <cstring>fModificationTime</cstring>
-                    </property>
-                    <property name="focusPolicy">
-                        <enum>StrongFocus</enum>
-                    </property>
-                </widget>
-                <widget class="KTimeWidget" row="2" column="2">
-                    <property name="name">
-                        <cstring>fBackupTime</cstring>
-                    </property>
-                    <property name="focusPolicy">
-                        <enum>StrongFocus</enum>
-                    </property>
-                </widget>
-                <widget class="KDateWidget" row="2" column="1">
-                    <property name="name">
-                        <cstring>fBackupDate</cstring>
-                    </property>
-                    <property name="focusPolicy">
-                        <enum>StrongFocus</enum>
-                    </property>
-                </widget>
-                <widget class="KDateWidget" row="1" column="1">
-                    <property name="name">
-                        <cstring>fModificationDate</cstring>
-                    </property>
-                    <property name="focusPolicy">
-                        <enum>StrongFocus</enum>
-                    </property>
-                </widget>
-                <widget class="KDateWidget" row="0" column="1">
-                    <property name="name">
-                        <cstring>fCreationDate</cstring>
-                    </property>
-                    <property name="focusPolicy">
-                        <enum>StrongFocus</enum>
-                    </property>
-                </widget>
-            </grid>
-        </widget>
-        <spacer row="1" column="6">
-            <property name="name">
-                <cstring>spacer1</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Horizontal</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>180</width>
-                    <height>21</height>
-                </size>
-            </property>
-        </spacer>
-        <widget class="QLineEdit" row="0" column="2" rowspan="1" colspan="5">
-            <property name="name">
-                <cstring>fDBName</cstring>
-            </property>
-            <property name="maxLength">
-                <number>34</number>
-            </property>
-        </widget>
-        <spacer row="4" column="5">
-            <property name="name">
-                <cstring>spacer2</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Vertical</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>31</width>
-                    <height>70</height>
-                </size>
-            </property>
-        </spacer>
-    </grid>
-</widget>
-<tabstops>
-    <tabstop>fDBName</tabstop>
-    <tabstop>fType</tabstop>
-    <tabstop>fCreator</tabstop>
-    <tabstop>fRessourceDB</tabstop>
-    <tabstop>fReadOnly</tabstop>
-    <tabstop>fBackupDB</tabstop>
-    <tabstop>fCopyProtect</tabstop>
-    <tabstop>fReset</tabstop>
-    <tabstop>fExcludeDB</tabstop>
-    <tabstop>fCreationDate</tabstop>
-    <tabstop>fCreationTime</tabstop>
-    <tabstop>fModificationDate</tabstop>
-    <tabstop>fModificationTime</tabstop>
-    <tabstop>fBackupDate</tabstop>
-    <tabstop>fBackupTime</tabstop>
-</tabstops>
-<includes>
-    <include location="local" impldecl="in implementation">dbFlagsEditor_base.ui.h</include>
-    <include location="system" impldecl="in implementation">kdatewidget.h</include>
-</includes>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/kpilot/kpilot/dbFlagsEditor_base.ui.h b/kpilot/kpilot/dbFlagsEditor_base.ui.h
deleted file mode 100644
index 189f09d1..00000000
--- a/kpilot/kpilot/dbFlagsEditor_base.ui.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/****************************************************************************
-** ui.h extension file, included from the uic-generated form implementation.
-**
-** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
-** init() function in place of a constructor, and a destroy() function in
-** place of a destructor.
-*****************************************************************************/
-#ifndef KDE_VERSION
-#include <kdeversion.h>
-#endif
-
-#if KDE_IS_VERSION(3,1,90)
-#include <ktimewidget.h>
-#else
-#warning "Workaround for KTimeWidget in KDE 3.1"
-class KTimeWidget : public QWidget
-{
-public:
-	KTimeWidget(TQWidget *p, const char *n) : TQWidget(p,n) {};
-} ;
-
-
-#endif
diff --git a/kpilot/kpilot/dbRecordEditor.cc b/kpilot/kpilot/dbRecordEditor.cc
deleted file mode 100644
index b3dfd8f7..00000000
--- a/kpilot/kpilot/dbRecordEditor.cc
+++ /dev/null
@@ -1,235 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2003 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-**/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <tqlineedit.h>
-#include <tqcheckbox.h>
-#include <tqtooltip.h>
-#include <tqwhatsthis.h>
-#include <tqbuttongroup.h>
-#include <tqlabel.h>
-#include <tqpushbutton.h>
-#include <tqlayout.h>
-
-#include <kmessagebox.h>
-
-#include "pilotRecord.h"
-#include "dbRecordEditor.h"
-//#include "dbRecordEditor_base.h"
-
-#include <khexedit/byteseditinterface.h>
-#include <khexedit/valuecolumninterface.h>
-#include <khexedit/charcolumninterface.h>
-using namespace KHE;
-
-
-
-DBRecordEditor::DBRecordEditor(PilotRecord*r, int n, TQWidget *parent)
-	: KDialogBase(parent, "RecordEditor",false,i18n("Edit Record"),
-				Ok|Cancel), rec(r), nr(n)
-{
-//	fWidget=new DBRecordEditorBase(this);
-	fWidget=new TQWidget(this);
-	setMainWidget(fWidget);
-	fBuffer = new char[4096];
-
-	initWidgets();
-	fillWidgets();
-}
-
-
-DBRecordEditor::~DBRecordEditor()
-{
-	KPILOT_DELETE( fBuffer );
-}
-
-
-void DBRecordEditor::slotOk()
-{
-	FUNCTIONSETUP;
-	if (KMessageBox::questionYesNo(this, i18n("Changing the record data and flags might corrupt the whole record, or even make the database unusable. Do not change the values unless you are absolutely sure you know what you are doing.\n\nReally assign these new flags?"), i18n("Changing Record"),i18n("Assign"),KStdGuiItem::cancel())==KMessageBox::Yes)
-	{
-		int att=rec->attributes();
-#define setFlag(ctrl, flag) if (ctrl->isChecked()) att|=flag; else att &= ~flag;
-		setFlag(fDirty, dlpRecAttrDirty);
-		setFlag(fDeleted, dlpRecAttrDeleted);
-		setFlag(fBusy, dlpRecAttrBusy);
-		setFlag(fSecret, dlpRecAttrSecret);
-		setFlag(fArchived, dlpRecAttrArchived);
-		rec->setAttributes(att);
-#undef setFlag
-
-		if ( fRecordDataIf->isModified() )
-		{
-			DEBUGKPILOT << "record data changed, new Length of record: " <<
-				fRecordDataIf->dataSize() << endl;
-			// take over data
-			rec->setData( fRecordDataIf->data(), fRecordDataIf->dataSize() );
-		}
-
-		KDialogBase::slotOk();
-	}
-}
-
-void DBRecordEditor::slotCancel()
-{
-	KDialogBase::slotCancel();
-}
-
-void DBRecordEditor::languageChange()
-{
-	fRecordIndexLabel->setText( tr2i18n( "Record index:" ) );
-	fRecordIDLabel->setText( tr2i18n( "Record ID:" ) );
-	fRecordIndex->setText( tr2i18n( "1" ) );
-	fRecordID->setText( tr2i18n( "1" ) );
-	fFlagsGroup->setTitle( tr2i18n( "Flags" ) );
-	fDirty->setText( tr2i18n( "&Dirty" ) );
-	fDeleted->setText( tr2i18n( "De&leted" ) );
-	fBusy->setText( tr2i18n( "&Busy" ) );
-	fSecret->setText( tr2i18n( "&Secret" ) );
-	fArchived->setText( tr2i18n( "&Archived" ) );
-}
-
-void DBRecordEditor::initWidgets()
-{
-	// FUNCTIONSETUP
-
-	DBRecordEditorBaseLayout = new TQGridLayout( fWidget, 1, 1, 11, 6, "DBRecordEditorBaseLayout");
-
-	fRecordIndexLabel = new TQLabel( fWidget, "fRecordIndexLabel" );
-	DBRecordEditorBaseLayout->addWidget( fRecordIndexLabel, 0, 0 );
-
-	fRecordIDLabel = new TQLabel( fWidget, "fRecordIDLabel" );
-	DBRecordEditorBaseLayout->addWidget( fRecordIDLabel, 0, 2 );
-
-	fRecordIndex = new TQLineEdit( fWidget, "fRecordIndex" );
-	fRecordIndex->setReadOnly( TRUE );
-
-	DBRecordEditorBaseLayout->addWidget( fRecordIndex, 0, 1 );
-
-	fRecordID = new TQLineEdit( fWidget, "fRecordID" );
-	fRecordID->setReadOnly( TRUE );
-
-	DBRecordEditorBaseLayout->addWidget( fRecordID, 0, 3 );
-
-	fFlagsGroup = new TQButtonGroup( fWidget, "fFlagsGroup" );
-	fFlagsGroup->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5,
-		(TQSizePolicy::SizeType)4, 0, 0, fFlagsGroup->sizePolicy().hasHeightForWidth() ) );
-	fFlagsGroup->setColumnLayout(0, Qt::Vertical );
-	fFlagsGroup->layout()->setSpacing( 6 );
-	fFlagsGroup->layout()->setMargin( 11 );
-	fFlagsGroupLayout = new TQGridLayout( fFlagsGroup->layout() );
-	fFlagsGroupLayout->setAlignment( Qt::AlignTop );
-
-	fDirty = new TQCheckBox( fFlagsGroup, "fDirty" );
-	fFlagsGroupLayout->addWidget( fDirty, 0, 0 );
-
-	fDeleted = new TQCheckBox( fFlagsGroup, "fDeleted" );
-	fFlagsGroupLayout->addWidget( fDeleted, 1, 0 );
-
-	fBusy = new TQCheckBox( fFlagsGroup, "fBusy" );
-	fFlagsGroupLayout->addWidget( fBusy, 0, 1 );
-
-	fSecret = new TQCheckBox( fFlagsGroup, "fSecret" );
-	fFlagsGroupLayout->addMultiCellWidget( fSecret, 1, 1, 1, 2 );
-
-	fArchived = new TQCheckBox( fFlagsGroup, "fArchived" );
-	fFlagsGroupLayout->addWidget( fArchived, 0, 2 );
-
-	DBRecordEditorBaseLayout->addMultiCellWidget( fFlagsGroup, 1, 1, 0, 3 );
-
-	fRecordData = KHE::createBytesEditWidget( fWidget, "fRecordData" );
-	if( fRecordData )
-	{
-		// fetch the editor interface
-		fRecordDataIf = KHE::bytesEditInterface( fRecordData );
-		Q_ASSERT( fRecordDataIf ); // This should not fail!
-
-		KHE::ValueColumnInterface *ValueColumn = valueColumnInterface( fRecordData );
-		if( ValueColumn )
-		{
-			ValueColumn->setNoOfBytesPerLine( 16 );
-			ValueColumn->setResizeStyle( KHE::ValueColumnInterface::LockGrouping );
-//			ValueColumn->setCoding( ValueColumnInterface::HexadecimalCoding );
-//			ValueColumn->setByteSpacingWidth( 2 );
-			ValueColumn->setNoOfGroupedBytes( 4 );
-			ValueColumn->setGroupSpacingWidth( 8 );
-		}
-
-		KHE::CharColumnInterface *CharColumn = charColumnInterface( fRecordData );
-		if( CharColumn )
-		{
-			CharColumn->setShowUnprintable( false );
-//			CharColumn->setSubstituteChar( '*' );
-		}
-	}
-	else
-	{
-		TQLabel*tmpW = new TQLabel( i18n("To view and edit the record data, please install a hex editor (e.g. kbytesedit from kdeutils)."), fWidget );
-		tmpW->setBackgroundMode( Qt::PaletteMid );
-		tmpW->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter | Qt::WordBreak);
-		tmpW->setFrameShape( TQFrame::Panel );
-		tmpW->setFrameShadow( TQFrame::Sunken );
-		fRecordData = tmpW;
-		fRecordDataIf = 0;
-	}
-
-	DBRecordEditorBaseLayout->addMultiCellWidget( fRecordData, 2, 2, 0, 3 );
-
-	languageChange();
-	resize( TQSize(600, 561).expandedTo(minimumSizeHint()) );
-}
-
-void DBRecordEditor::fillWidgets()
-{
-	// FUNCTIONSETUP
-
-	fRecordIndex->setText(TQString::number(nr));
-	fRecordID->setText(TQString::number(rec->id()));
-
-	int att=rec->attributes();
-	fDirty->setChecked(att & dlpRecAttrDirty);
-	fDeleted->setChecked(att & dlpRecAttrDeleted);
-	fBusy->setChecked(att & dlpRecAttrBusy);
-	fSecret->setChecked(att & dlpRecAttrSecret);
-	fArchived->setChecked(att & dlpRecAttrArchived);
-
-	if( fRecordDataIf )
-	{
-		int len = rec->size();
-		memcpy( fBuffer, rec->data(), len );
-		fRecordDataIf->setData( fBuffer, len, 4096 );
-		fRecordDataIf->setMaxDataSize( 4096 );
-		fRecordDataIf->setReadOnly( false );
-		// We are managing the buffer ourselves:
-		fRecordDataIf->setAutoDelete( false );
-	}
-}
-
-
-#include "dbRecordEditor.moc"
diff --git a/kpilot/kpilot/dbRecordEditor.h b/kpilot/kpilot/dbRecordEditor.h
deleted file mode 100644
index 627af55f..00000000
--- a/kpilot/kpilot/dbRecordEditor.h
+++ /dev/null
@@ -1,94 +0,0 @@
-#ifndef _KPILOT_DBRECORDEDITOR_H
-#define _KPILOT_DBRECORDEDITOR_H
-/* dbRecordEditor.h                 KPilot
-**
-** Copyright (C) 2003 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-#include <kdialogbase.h>
-
-class TQVBoxLayout;
-class TQHBoxLayout;
-class TQGridLayout;
-
-namespace KHE {
-class BytesEditInterface;
-}
-using namespace KHE;
-
-class TQButtonGroup;
-class TQCheckBox;
-class TQLabel;
-class TQLineEdit;
-
-class DBRecordEditorBase;
-class PilotRecord;
-
-/**
-@author Reinhold Kainhofer
-*/
-class DBRecordEditor : public KDialogBase
-{
-Q_OBJECT
-public:
-	DBRecordEditor(PilotRecord*r=0L, int n=-1, TQWidget *parent = 0);
-	~DBRecordEditor();
-	
-protected:
-	TQLabel* fRecordIndexLabel;
-	TQLabel* fRecordIDLabel;
-	TQLineEdit* fRecordIndex;
-	TQLineEdit* fRecordID;
-	TQButtonGroup* fFlagsGroup;
-	TQCheckBox* fDirty;
-	TQCheckBox* fDeleted;
-	TQCheckBox* fBusy;
-	TQCheckBox* fSecret;
-	TQCheckBox* fArchived;
-	TQWidget* fRecordData;
-	KHE::BytesEditInterface*fRecordDataIf;
-	
-protected:
-	TQGridLayout* DBRecordEditorBaseLayout;
-	TQGridLayout* fFlagsGroupLayout;
-
-protected:
-//	DBRecordEditorBase*fWidget;
-	TQWidget*fWidget;
-	char*fBuffer;
-protected slots:
-    virtual void languageChange();
-protected:
-	void initWidgets();
-	void fillWidgets();
-	PilotRecord*rec;
-	int nr;
-protected slots:
-	virtual void slotOk();
-	virtual void slotCancel();
-};
-
-#endif
diff --git a/kpilot/kpilot/dbRecordEditor_base.ui b/kpilot/kpilot/dbRecordEditor_base.ui
deleted file mode 100644
index c9983743..00000000
--- a/kpilot/kpilot/dbRecordEditor_base.ui
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
-<class>DBRecordEditorBase</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DBRecordEditorBase</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>600</width>
-            <height>561</height>
-        </rect>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <widget class="QLabel" row="0" column="0">
-            <property name="name">
-                <cstring>fRecordIndexLabel</cstring>
-            </property>
-            <property name="text">
-                <string>Record index:</string>
-            </property>
-        </widget>
-        <widget class="QLabel" row="0" column="2">
-            <property name="name">
-                <cstring>fRecordIDLabel</cstring>
-            </property>
-            <property name="text">
-                <string>Record ID:</string>
-            </property>
-        </widget>
-        <widget class="QLineEdit" row="0" column="1">
-            <property name="name">
-                <cstring>fRecordIndex</cstring>
-            </property>
-            <property name="text">
-                <string>1</string>
-            </property>
-            <property name="readOnly">
-                <bool>true</bool>
-            </property>
-        </widget>
-        <widget class="QLineEdit" row="0" column="3">
-            <property name="name">
-                <cstring>fRecordID</cstring>
-            </property>
-            <property name="text">
-                <string>1</string>
-            </property>
-            <property name="readOnly">
-                <bool>true</bool>
-            </property>
-        </widget>
-        <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="4">
-            <property name="name">
-                <cstring>fFlagsGroup</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>5</hsizetype>
-                    <vsizetype>4</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="title">
-                <string>Flags</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="QCheckBox" row="0" column="0">
-                    <property name="name">
-                        <cstring>fDirty</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Dirty</string>
-                    </property>
-                </widget>
-                <widget class="QCheckBox" row="1" column="0">
-                    <property name="name">
-                        <cstring>fDeleted</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Deleted</string>
-                    </property>
-                </widget>
-                <widget class="QCheckBox" row="0" column="1">
-                    <property name="name">
-                        <cstring>fBusy</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Busy</string>
-                    </property>
-                </widget>
-                <widget class="QCheckBox" row="1" column="1" rowspan="1" colspan="2">
-                    <property name="name">
-                        <cstring>fSecret</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Secret</string>
-                    </property>
-                </widget>
-                <widget class="QCheckBox" row="0" column="2">
-                    <property name="name">
-                        <cstring>fArchived</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Archived</string>
-                    </property>
-                </widget>
-            </grid>
-        </widget>
-        <widget class="KHE::KHexEdit" row="2" column="0" rowspan="1" colspan="4">
-            <property name="name">
-                <cstring>fRecordData</cstring>
-            </property>
-        </widget>
-    </grid>
-</widget>
-<customwidgets>
-    <customwidget>
-        <class>KHE::KHexEdit</class>
-        <sizehint>
-            <width>-1</width>
-            <height>-1</height>
-        </sizehint>
-        <container>0</container>
-        <sizepolicy>
-            <hordata>5</hordata>
-            <verdata>5</verdata>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-        </sizepolicy>
-        <pixmap>image0</pixmap>
-    </customwidget>
-</customwidgets>
-<images>
-    <image name="image0">
-        <data format="XPM.GZ" length="2926">789c9d95594f32591086effd15c4ba3393fae895ee4ce6824540141011b7c95cf406a202caa6f065fefb549faaea0b24996fc623cb937aeb3d55754e871f67a587eb6ee9ecc7c96a1dada74929798e96a5b374339bedfefceb8f9f27a7b65da27fcb724bf6e96f27a783752929f516f32c070402289b3fc39d8203c3136157e276c1260eac0f0ade0907927f2d9c58261f929cad72be0cef8535ff5959e277c201ef0fa02cf1ae7022f9efca12ff301ca81e87c21a5f32db5acf95b0eebfcdd92e2be3a5b0fa7986435bfd6e981d99278c0ae6795c288b3e2b98e3036157d8f839961308af985df51b1b0e9dc0098ddf5a3811fd7dceaee52a370d475e28f9b7ca1c07539f67173c144e65be2fcae2d763f62d89df2acb7cc282393e57b6b9ff58d893fca632c7d1ccc78bbcd48b4c7cc2ec4bfdf0aa2cfbf50be6fa2c65d9af2aacfd2c94e53cccf9fa7645eb7794a59ebdb027fe5565895f09cb7e981a267f9febaf3117fab6702af599e7a5e2049e6dce1377c25affa6608e4786e34a58894dfc8b59f5f890731087e28f2de648fbdb16ccfd6c9465bf7365c732f12f61ed3f5016fd4a59f4e6790fddd00a5d137f638eb4bfa532df5ffc148ea4be5ac17c5ea9b2ecd72b98efff403893fa1accb12d5c5696fd4d7f6152c41f95c53f2a98f56b6597fbf3857da9b75e30fb5584b59fa78239de5596fd3e0be6fdccf311b99115f1fcdaccb12fe77927ac7e2365f1c382793e63e14cfccdf3132571e69b1f07e83327d23fbac2bee4d785d57f2a9c89de9c6fecaa1fce98135bf845b9e2189e2a07e6fee287b0cfcf3bce9525ff5d38927a1bcca9cc1b66ca528ff93d89d338e3f9e182b9c86f31a752ff609d2f847f5f83b5ea31c218137a4f8fac0cc738e10cd6d3b7189f718a2ff88a6f38c339ad05adfcf31d3f7089ab037d42ea356e708b9ff8853bdc6395de6b58c706ad736c1ee823f2de608b146dbcc08e8976f012afb04b3975ec1de853aa2457f749d5c16b1ce00d0ecdf75b1ce1dd11fd1b55d236cef7f8808ff88465b4d02676d03da29f51dd9e513fa28f150c3004246d07002288bfe9e7d45f0712f22635a490d15ef730361e3b389c67aedf2390ea3157e73dc333e9a6f042d13ebc7ed32f6882405d3ee1c678030ee10d6630a76f162c8ee8f37adeb14c0aaa0b3e68b725ac80a2b039a29f630db6e46bc127d5fd45de4b5226b0833d8ea07a445f871ae96dacc218ead08073c835136842eba8be016db830e77a419f21aca143f76c025b9ae7e5813ea35bd5a0731fd1c4877a7f614fde57d085deb7f31ad31dccf54fd087883ab7a88f6baabb45fdf760003707fa09ddd826f66048af1826f00a0bb3aa7009b73082bb03fd2faeffa7fff58cfffcbcfffdfbc93f7f7d62d7</data>
-    </image>
-</images>
-<includes>
-    <include location="local" impldecl="in implementation">dbRecordEditor_base.ui.h</include>
-</includes>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/kpilot/kpilot/dbSelectionDialog.cc b/kpilot/kpilot/dbSelectionDialog.cc
deleted file mode 100644
index 683b8a8c..00000000
--- a/kpilot/kpilot/dbSelectionDialog.cc
+++ /dev/null
@@ -1,144 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2003 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This file defines a dialog box that lets the
-** user select a set of databases (e.g. which databases
-** should be ignored  when doing a backup)
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <tqlistview.h>
-#include <tqpushbutton.h>
-#include <klistview.h>
-#include <kmessagebox.h>
-#include <kpushbutton.h>
-#include <klineedit.h>
-
-#include "dbSelection_base.h"
-#include "dbSelectionDialog.moc"
-
-
-KPilotDBSelectionDialog::KPilotDBSelectionDialog(TQStringList &selectedDBs, TQStringList &deviceDBs,
-		TQStringList &addedDBs, TQWidget *w, const char *n) :
-	KDialogBase(w, n, true, TQString::null, KDialogBase::Ok | KDialogBase::Cancel,
-		KDialogBase::Ok, false),
-	fSelectedDBs(selectedDBs),
-	fAddedDBs(addedDBs),
-	fDeviceDBs(deviceDBs)
-{
-	FUNCTIONSETUP;
-
-	fSelectionWidget = new KPilotDBSelectionWidget(this);
-	setMainWidget(fSelectionWidget);
-
-	// Fill the encodings list
-	TQStringList items(deviceDBs);
-	for ( TQStringList::Iterator it = fAddedDBs.begin(); it != fAddedDBs.end(); ++it ) {
-		if (items.contains(*it)==0) items << (*it);
-	}
-	for ( TQStringList::Iterator it = fSelectedDBs.begin(); it != fSelectedDBs.end(); ++it ) {
-		if (items.contains(*it)==0) items << (*it);
-	}
-	items.sort();
-
-	for ( TQStringList::Iterator it = items.begin(); it != items.end(); ++it ) {
-		TQCheckListItem*checkitem=new TQCheckListItem(fSelectionWidget->fDatabaseList,
-			*it, TQCheckListItem::CheckBox);
-		if (fSelectedDBs.contains(*it)) checkitem->setOn(true);
-	}
-
-	connect(fSelectionWidget->fNameEdit, TQT_SIGNAL(textChanged( const TQString & )),
-		this, TQT_SLOT(slotTextChanged( const TQString &)));
-	connect(fSelectionWidget->fAddButton, TQT_SIGNAL(clicked()),
-		this, TQT_SLOT(addDB()));
-	connect(fSelectionWidget->fRemoveButton, TQT_SIGNAL(clicked()),
-		this, TQT_SLOT(removeDB()));
-}
-
-KPilotDBSelectionDialog::~KPilotDBSelectionDialog()
-{
-	FUNCTIONSETUP;
-}
-
-void KPilotDBSelectionDialog::addDB()
-{
-	FUNCTIONSETUP;
-	TQString dbname(fSelectionWidget->fNameEdit->text());
-	if (!dbname.isEmpty())
-	{
-		fSelectionWidget->fNameEdit->clear();
-		new TQCheckListItem(fSelectionWidget->fDatabaseList, dbname,
-			TQCheckListItem::CheckBox);
-		fAddedDBs << dbname;
-	}
-}
-
-void KPilotDBSelectionDialog::removeDB()
-{
-	FUNCTIONSETUP;
-	TQListViewItem*item(fSelectionWidget->fDatabaseList->selectedItem());
-	if (item)
-	{
-		TQString dbname=item->text(0);
-		if (fDeviceDBs.contains(dbname))
-		{
-			KMessageBox::error(this, i18n("This is a database that exists on the device. It was not added manually, so it can not removed from the list."), i18n("Database on Device"));
-		}
-		else
-		{
-			fSelectedDBs.remove(dbname);
-			fAddedDBs.remove(dbname);
-			KPILOT_DELETE(item);
-		}
-	}
-	else
-	{
-		KMessageBox::information(this, i18n("You need to select a database to delete in the list."),i18n("No Database Selected"), CSL1("NoDBSelected"));
-	}
-}
-
-TQStringList KPilotDBSelectionDialog::getSelectedDBs()
-{
-	fSelectedDBs.clear();
-
-	//  update the list of selected databases
-	TQListViewItemIterator it( fSelectionWidget->fDatabaseList );
-	while ( it.current() ) {
-		TQCheckListItem *item = dynamic_cast<TQCheckListItem*>(it.current());
-		++it;
-
-		if ( item && item->isOn() )
-			fSelectedDBs << item->text();
-	}
-
-	return fSelectedDBs;
-}
-
-void KPilotDBSelectionDialog::slotTextChanged( const TQString& dbname)
-{
-	FUNCTIONSETUP;
-	fSelectionWidget->fAddButton->setDisabled(dbname.isEmpty());
-}
diff --git a/kpilot/kpilot/dbSelectionDialog.h b/kpilot/kpilot/dbSelectionDialog.h
deleted file mode 100644
index ee0df63d..00000000
--- a/kpilot/kpilot/dbSelectionDialog.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef _KPILOT_DBSELECTIONDIALOG_H
-#define _KPILOT_DBSELECTIONDIALOG_H
-/* dbSelectionDialog.h                 KPilot
-**
-** Copyright (C) 2003 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This file defines a dialog box that lets the
-** user select a set of databases (e.g. which databases
-** should be ignored  when doing a backup)
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <kdialogbase.h>
-
-class KPilotDBSelectionWidget;
-
-class KPilotDBSelectionDialog : public KDialogBase
-{
-Q_OBJECT
-public:
-	KPilotDBSelectionDialog(TQStringList &selectedDBs, TQStringList &deviceDBs,
-		TQStringList &addedDBs,  TQWidget *, const char *);
-	virtual ~KPilotDBSelectionDialog();
-
-	TQStringList getSelectedDBs();
-	TQStringList getAddedDBs() const {return fAddedDBs; };
-private:
-	TQStringList fSelectedDBs;
-	TQStringList fAddedDBs;
-	TQStringList fDeviceDBs;
-protected slots:
-	void addDB();
-	void removeDB();
-	void slotTextChanged( const TQString& dbname);
-
-private:
-	KPilotDBSelectionWidget *fSelectionWidget;
-} ;
-
-#endif
diff --git a/kpilot/kpilot/dbSelection_base.ui b/kpilot/kpilot/dbSelection_base.ui
deleted file mode 100644
index d692ca34..00000000
--- a/kpilot/kpilot/dbSelection_base.ui
+++ /dev/null
@@ -1,80 +0,0 @@
-<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
-<class>KPilotDBSelectionWidget</class>
-<author>Reinhold Kainhofer</author>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DBSelectionWidgetForm</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>318</width>
-            <height>218</height>
-        </rect>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <widget class="KListView" row="0" column="0" rowspan="1" colspan="3">
-            <column>
-                <property name="text">
-                    <string>Database</string>
-                </property>
-                <property name="clickable">
-                    <bool>true</bool>
-                </property>
-                <property name="resizable">
-                    <bool>true</bool>
-                </property>
-            </column>
-            <property name="name">
-                <cstring>fDatabaseList</cstring>
-            </property>
-            <property name="resizeMode">
-                <enum>LastColumn</enum>
-            </property>
-            <property name="itemsRenameable">
-                <bool>true</bool>
-            </property>
-        </widget>
-        <widget class="KPushButton" row="1" column="2">
-            <property name="name">
-                <cstring>fRemoveButton</cstring>
-            </property>
-            <property name="text">
-                <string>&amp;Remove</string>
-            </property>
-        </widget>
-        <widget class="KLineEdit" row="1" column="0">
-            <property name="name">
-                <cstring>fNameEdit</cstring>
-            </property>
-        </widget>
-        <widget class="KPushButton" row="1" column="1">
-            <property name="name">
-                <cstring>fAddButton</cstring>
-            </property>
-            <property name="text">
-                <string>&amp;Add</string>
-            </property>
-        </widget>
-    </grid>
-</widget>
-<connections>
-    <connection>
-        <sender>fNameEdit</sender>
-        <signal>returnPressed()</signal>
-        <receiver>fAddButton</receiver>
-        <slot>animateClick()</slot>
-    </connection>
-</connections>
-<layoutdefaults spacing="6" margin="11"/>
-<includes>
-	<include location="system" impldecl="in implementation">klistview.h</include>
-	<include location="system" impldecl="in implementation">kpushbutton.h</include>
-	<include location="system" impldecl="in implementation">klineedit.h</include>
-	<include location="system" impldecl="in implementation">kpushbutton.h</include>
-</includes>
-</UI>
diff --git a/kpilot/kpilot/dbviewerWidget.cc b/kpilot/kpilot/dbviewerWidget.cc
deleted file mode 100644
index b5f04632..00000000
--- a/kpilot/kpilot/dbviewerWidget.cc
+++ /dev/null
@@ -1,440 +0,0 @@
-/* dbViewerWidget.cc		KPilot
-**
-** Copyright (C) 2003 by Dan Pilone.
-** Copyright (C) 2003 Reinhold Kainhofer <reinhold@kainhofer.com>
-**	Written 2003 by Reinhold Kainhofer and Adriaan de Groot
-**
-** This is the generic DB viewer widget.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include "options.h"
-
-#include <unistd.h>
-#include <stdio.h>
-
-#include <pi-file.h>
-#include <pi-dlp.h>
-
-#include <tqlayout.h>
-#include <tqdir.h>
-#include <tqregexp.h>
-#include <tqlistview.h>
-
-#include <klistbox.h>
-#include <ktextedit.h>
-#include <kpushbutton.h>
-#include <kcombobox.h>
-#include <kmessagebox.h>
-
-#include "listCat.h"
-#include "listItems.h"
-
-#include "dbviewerWidget.h"
-#include "pilotLocalDatabase.h"
-#include "pilotDatabase.h"
-#include "pilotRecord.h"
-#include "dbFlagsEditor.h"
-#include "dbRecordEditor.h"
-#include "dbAppInfoEditor.h"
-#include "kpilotConfig.h"
-
-
-#include "dbviewerWidget.moc"
-
-
-GenericDBWidget::GenericDBWidget(TQWidget *parent, const TQString &dbpath) :
-	PilotComponent(parent,"component_generic",dbpath), fDB(0L)
-{
-	FUNCTIONSETUP;
-	setupWidget();
-	fRecList.setAutoDelete(true);
-}
-
-
-void GenericDBWidget::setupWidget()
-{
-	TQGridLayout *g = new TQGridLayout( this, 1, 1, SPACING);
-
-	fDBList = new KListBox( this );
-	g->addWidget( fDBList, 0, 0 );
-	fDBType = new KComboBox( FALSE, this );
-	g->addWidget( fDBType, 1, 0 );
-	fDBType->insertItem( i18n( "All Databases" ) );
-	fDBType->insertItem( i18n( "Only Applications (*.prc)" ) );
-	fDBType->insertItem( i18n( "Only Databases (*.pdb)" ) );
-
-	TQGridLayout *g1 = new TQGridLayout( 0, 1, 1);
-	fDBInfo = new KTextEdit( this );
-	fDBInfo->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)0, 0, 0, fDBInfo->sizePolicy().hasHeightForWidth() ) );
-	fDBInfo->setReadOnly( TRUE );
-	g1->addWidget( fDBInfo, 0, 0 );
-	fDBInfoButton = new KPushButton( i18n( "General Database &Information" ), this );
-	g1->addWidget( fDBInfoButton, 1, 0 );
-	fAppInfoButton = new KPushButton( i18n( "&Application Info Block (Categories etc.)" ), this );
-	g1->addWidget( fAppInfoButton, 2, 0 );
-
-	TQGridLayout *g2 = new TQGridLayout( 0, 1, 1);
-	fRecordList = new KListView( this );
-	g2->addMultiCellWidget( fRecordList, 0, 0, 0, 2 );
-	fRecordList->addColumn(i18n("Rec. Nr."));
-	fRecordList->addColumn(i18n("Length"));
-	fRecordList->addColumn(i18n("Record ID"));
-	fRecordList->setAllColumnsShowFocus(true);
-	fRecordList->setResizeMode( KListView::LastColumn );
-	fRecordList->setFullWidth( TRUE );
-	fRecordList->setItemsMovable( FALSE );
-
-	fAddRecord = new KPushButton( i18n("&Add..."), this );
-	g2->addWidget( fAddRecord, 1, 0 );
-	fEditRecord = new KPushButton( i18n("&Edit..."), this );
-	g2->addWidget( fEditRecord, 1, 1 );
-	fDeleteRecord = new KPushButton( i18n("&Delete"), this );
-	g2->addWidget( fDeleteRecord, 1, 2 );
-
-	g1->addLayout( g2, 3, 0 );
-
-
-	g->addMultiCellLayout( g1, 0, 1, 1, 1 );
-	resize( TQSize(682, 661).expandedTo(minimumSizeHint()) );
-
-	connect(fDBList, TQT_SIGNAL(highlighted(const TQString &)),
-		this, TQT_SLOT(slotSelected(const TQString &)));
-	connect(fDBType, TQT_SIGNAL(activated(int)),
-		this, TQT_SLOT(slotDBType(int)));
-	connect(fDBInfoButton,  TQT_SIGNAL(clicked()),
-		this, TQT_SLOT(slotShowDBInfo()));
-	connect(fAppInfoButton,  TQT_SIGNAL(clicked()),
-		this, TQT_SLOT(slotShowAppInfo()));
-	connect(fAddRecord,  TQT_SIGNAL(clicked()),
-		this, TQT_SLOT(slotAddRecord()));
-	connect(fEditRecord,  TQT_SIGNAL(clicked()),
-		this, TQT_SLOT(slotEditRecord()));
-	connect(fDeleteRecord,  TQT_SIGNAL(clicked()),
-		this, TQT_SLOT(slotDeleteRecord()));
-	connect(fRecordList, TQT_SIGNAL(executed(TQListViewItem*)),
-		this, TQT_SLOT(slotEditRecord(TQListViewItem*)));
-
-}
-
-GenericDBWidget::~GenericDBWidget()
-{
-	FUNCTIONSETUP;
-	if (fDB) KPILOT_DELETE(fDB);
-}
-
-
-void GenericDBWidget::showComponent()
-{
-	FUNCTIONSETUP;
-	fDBInfo->setText(TQString::null);
-	slotDBType(0);
-
-	fDBList->show();
-	fDBInfo->show();
-}
-
-void GenericDBWidget::hideComponent()
-{
-	reset();
-}
-
-void GenericDBWidget::slotSelected(const TQString &dbname)
-{
-	FUNCTIONSETUP;
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Selected DB " << dbname << endl;
-#endif
-	struct DBInfo dbinfo;
-	TQString display;
-	fRecList.clear();
-	fRecordList->clear();
-
-	if (fDB) KPILOT_DELETE(fDB);
-	currentDB=dbname;
-
-	if (!shown) return;
-
-	if (dbname.endsWith(CSL1(".pdb")) || dbname.endsWith(CSL1(".PDB")))
-	{
-		// We are dealing with a database
-		currentDBtype=eDatabase;
-
-		currentDB.remove( TQRegExp(CSL1(".(pdb|PDB)$")) );
-
-		fDB=new PilotLocalDatabase(dbPath(), currentDB, false);
-		if (!fDB || !fDB->isOpen())
-		{
-			fDBInfo->setText(i18n("<B>Warning:</B> Cannot read "
-				"database file %1.").arg(currentDB));
-			return;
-		}
-		dbinfo=fDB->getDBInfo();
-		display.append(i18n("<B>Database:</B> %1, %2 records<BR>")
-			.arg(TQString::fromLatin1(dbinfo.name)).arg(fDB->recordCount()));
-		char buff[5];
-		set_long(buff, dbinfo.type);
-		buff[4]='\0';
-		TQString tp = TQString::fromLatin1(buff);
-		set_long(buff, dbinfo.creator);
-		buff[4]='\0';
-		TQString cr = TQString::fromLatin1(buff);
-		display.append(i18n("<B>Type:</B> %1, <B>Creator:</B> %2<br><br>").arg(tp).arg(cr));
-
-		int currentRecord = 0;
-		PilotRecord *pilotRec;
-
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": Reading database "<<dbname<<"..." << endl;
-#endif
-
-		while ((pilotRec = fDB->readRecordByIndex(currentRecord)) != 0L)
-		{
-//			if (!(pilotRec->isDeleted()) )
-			{
-				PilotListViewItem*item=new PilotListViewItem(fRecordList,
-					TQString::number(currentRecord), TQString::number(pilotRec->size()),
-					TQString::number(pilotRec->id()),
-					TQString::null,
-					pilotRec->id(), pilotRec);
-				item->setNumericCol(0, true);
-				item->setNumericCol(1, true);
-				item->setNumericCol(2, true);
-			}
-			fRecList.append(pilotRec);
-
-			currentRecord++;
-		}
-
-#ifdef DEBUG
-		DEBUGKPILOT << fname
-			<< ": Total " << currentRecord << " records" << endl;
-#endif
-
-	}
-	else
-	{
-		// we are dealing with an application
-		currentDBtype=eApplication;
-
-		TQCString filename = TQFile::encodeName(dbPath() + CSL1("/") + dbname);
-		const char *s = filename;
-		struct pi_file *pf = pi_file_open(const_cast<char *>(s));
-		if (!pf)
-		{
-			fDBInfo->setText(i18n("<B>Warning:</B> Cannot read "
-				"application file %1.").arg(dbname));
-			return;
-		}
-#if PILOT_LINK_NUMBER < PILOT_LINK_0_12_0
-		if (pi_file_get_info(pf,&dbinfo))
-		{
-			fDBInfo->setText(i18n("<B>Warning:</B> Cannot read "
-				"application file %1.").arg(dbname));
-			return;
-		}
-#else
-		pi_file_get_info(pf,&dbinfo);
-#endif
-		display.append(i18n("<B>Application:</B> %1<BR><BR>").arg(dbname));
-	}
-	enableWidgets(currentDBtype==eDatabase);
-
-	TQDateTime ttime;
-
-	ttime.setTime_t(dbinfo.createDate);
-	display.append(i18n("Created: %1<BR>").arg(ttime.toString()));
-
-	ttime.setTime_t(dbinfo.modifyDate);
-	display.append(i18n("Modified: %1<BR>").arg(ttime.toString()));
-
-	ttime.setTime_t(dbinfo.backupDate);
-	display.append(i18n("Backed up: %1<BR>").arg(ttime.toString()));
-
-	fDBInfo->setText(display);
-}
-
-void GenericDBWidget::slotDBType(int mode)
-{
-	FUNCTIONSETUP;
-	if (!shown) return;
-
-	reset();
-
-	TQDir dir(dbPath());
-	switch (mode)
-	{
-		case 1:
-			dir.setNameFilter(CSL1("*.prc")); break;
-		case 2:
-			dir.setNameFilter(CSL1("*.pdb")); break;
-		case 0:
-		default:
-			dir.setNameFilter(CSL1("*.pdb;*.prc")); break;
-	}
-	TQStringList l = dir.entryList();
-	fDBList->insertStringList(l);
-}
-
-void GenericDBWidget::reset()
-{
-	FUNCTIONSETUP;
-	fDBList->clear();
-	fDBInfo->clear();
-	fRecordList->clear();
-	if (fDB)  KPILOT_DELETE(fDB);
-	currentDB=TQString::null;
-}
-
-void GenericDBWidget::slotAddRecord()
-{
-	FUNCTIONSETUP;
-	pi_buffer_t *b = pi_buffer_new(0);
-	PilotRecord *rec=new PilotRecord(b, 0, 0, 0);
-	PilotListViewItem*item=new PilotListViewItem(fRecordList,
-		TQString::number(-1), TQString::number(rec->size()),
-		TQString::number(rec->id()), TQString::null,
-		rec->id(), rec);
-	if (slotEditRecord(item))
-	{
-		fRecList.append(rec);
-	}
-	else
-	{
-		KPILOT_DELETE(item);
-		KPILOT_DELETE(rec);
-	}
-}
-
-bool GenericDBWidget::slotEditRecord(TQListViewItem*item)
-{
-	FUNCTIONSETUP;
-	PilotListViewItem*currRecItem=dynamic_cast<PilotListViewItem*>(item);
-	if (currRecItem)
-	{
-		PilotRecord*rec=(PilotRecord*)currRecItem->rec();
-		int nr=currRecItem->text(0).toInt();
-		DBRecordEditor*dlg=new DBRecordEditor(rec, nr, this);
-		if (dlg->exec())
-		{
-			currRecItem->setText(1, TQString::number(rec->size()));
-			currRecItem->setText(2, TQString::number(rec->id()));
-			fRecordList->triggerUpdate();
-			writeRecord(rec);
-			KPILOT_DELETE(dlg);
-			return true;
-		}
-		KPILOT_DELETE(dlg);
-	}
-	else
-	{
-		// Either nothing selected, or some error occurred...
-		KMessageBox::information(this, i18n("You must select a record for editing."), i18n("No Record Selected"), CSL1("norecordselected"));
-	}
-	return false;
-}
-void GenericDBWidget::slotEditRecord()
-{
-	slotEditRecord(fRecordList->selectedItem());
-}
-
-void GenericDBWidget::slotDeleteRecord()
-{
-	FUNCTIONSETUP;
-	PilotListViewItem*currRecItem=dynamic_cast<PilotListViewItem*>(fRecordList->selectedItem());
-	if (currRecItem && (KMessageBox::questionYesNo(this, i18n("<qt>Do you really want to delete the selected record? This cannot be undone.<br><br>Delete record?<qt>"), i18n("Deleting Record"), KStdGuiItem::del(), KStdGuiItem::cancel())==KMessageBox::Yes) )
-	{
-		PilotRecord*rec=(PilotRecord*)currRecItem->rec();
-		rec->setDeleted();
-		writeRecord(rec);
-		// fRecordList->triggerUpdate();
-		KPILOT_DELETE(currRecItem);
-	}
-}
-
-void GenericDBWidget::slotShowAppInfo()
-{
-	FUNCTIONSETUP;
-	if (!fDB) return;
-	char*appBlock=new char[0xFFFF];
-	int len=fDB->readAppBlock((unsigned char*)appBlock, 0xFFFF);
-	DBAppInfoEditor*dlg=new DBAppInfoEditor(appBlock, len, this);
-	if (dlg->exec())
-	{
-		fDB->writeAppBlock( (unsigned char*)(dlg->appInfo), dlg->len );
-
-		KPilotConfig::addAppBlockChangedDatabase(getCurrentDB());
-		KPilotSettings::writeConfig();
-	}
-	KPILOT_DELETE(dlg);
-	delete[] appBlock;
-}
-
-void GenericDBWidget::slotShowDBInfo()
-{
-	FUNCTIONSETUP;
-	if ( !fDB || !shown ) return;
-	DBInfo db=fDB->getDBInfo();
-	DBFlagsEditor*dlg=new DBFlagsEditor(&db, this);
-	if (dlg->exec())
-	{
-#ifdef DEBUG
-		DEBUGKPILOT<<"OK pressed, assiging DBInfo, flags="<<
-			db.flags<<",  miscFlag="<<db.miscFlags<<endl;
-#endif
-		fDB->setDBInfo(db);
-
-		KPilotConfig::addFlagsChangedDatabase(getCurrentDB());
-		KPilotSettings::writeConfig();
-
-		slotSelected(fDBList->currentText());
-	}
-	KPILOT_DELETE(dlg);
-}
-
-void GenericDBWidget::enableWidgets(bool enable)
-{
-	//FUNCTIONSETUP;
-	fDBInfoButton->setEnabled(enable);
-	fAppInfoButton->setEnabled(enable);
-	fRecordList->setEnabled(enable);
-	fAddRecord->setEnabled(enable);
-	fEditRecord->setEnabled(enable);
-	fDeleteRecord->setEnabled(enable);
-}
-
-void GenericDBWidget::writeRecord(PilotRecord*r)
-{
-	// FUNCTIONSETUP;
-	if (fDB && r)
-	{
-		fDB->writeRecord(r);
-		markDBDirty(getCurrentDB());
-	}
-}
-
-
-
-
-
diff --git a/kpilot/kpilot/dbviewerWidget.h b/kpilot/kpilot/dbviewerWidget.h
deleted file mode 100644
index 877a8699..00000000
--- a/kpilot/kpilot/dbviewerWidget.h
+++ /dev/null
@@ -1,91 +0,0 @@
-#ifndef _KPILOT_DBVIEWERWIDGET_H
-#define _KPILOT_DBVIEWERWIDGET_H
-/* dbViewerWidget.h		KPilot
-**
-** Copyright (C) 2003 by Dan Pilone.
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**	Written 2003 by Reinhold Kainhofer and Adriaan de Groot
-**
-** This is the generic DB viewer widget.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "pilotComponent.h"
-
-class KListBox;
-class KTextEdit;
-class KPushButton;
-class KComboBox;
-class PilotLocalDatabase;
-class PilotRecord;
-class KListView;
-
-class GenericDBWidget : public PilotComponent
-{
-Q_OBJECT
-
-public:
-	GenericDBWidget(TQWidget* parent, const TQString& dbpath);
-	virtual ~GenericDBWidget();
-
-	// Pilot component methods
-	/* virtual */ void showComponent();
-	/* virtual */ void hideComponent();
-
-	TQString getCurrentDB() const {  return currentDB; }
-protected:
-	void setupWidget();
-
-protected slots:
-	void slotSelected(const TQString &dbname);
-	void slotDBType(int mode);
-	void reset();
-	void slotAddRecord();
-	void slotEditRecord();
-	bool slotEditRecord(TQListViewItem*);
-	void slotDeleteRecord();
-	void slotShowAppInfo();
-	void slotShowDBInfo();
-	void enableWidgets(bool enable);
-	void writeRecord(PilotRecord*r);
-
-private:
-	KListBox*fDBList;
-	KComboBox*fDBType;
-	KTextEdit*fDBInfo;
-	KPushButton*fDBInfoButton, *fAppInfoButton;
-	KListView*fRecordList;
-	KPushButton*fAddRecord, *fEditRecord, *fDeleteRecord;
-
-	enum eDBType {
-		eDatabase,
-		eApplication
-	} currentDBtype;
-
-	PilotLocalDatabase*fDB;
-	TQString currentDB;
-	TQPtrList<PilotRecord> fRecList;
-};
-
-
-#endif
diff --git a/kpilot/kpilot/fileInstallWidget.cc b/kpilot/kpilot/fileInstallWidget.cc
deleted file mode 100644
index 69909302..00000000
--- a/kpilot/kpilot/fileInstallWidget.cc
+++ /dev/null
@@ -1,304 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-**
-** This file defines the internal conduit "File Installer"
-** that accepts drags of URLs containing Palm DBs, prcs, and
-** such. It also does the HotSync part of installing files
-** on the Pilot.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#ifndef _KPILOT_OPTIONS_H
-#include "options.h"
-#endif
-
-#include <unistd.h>
-
-#include <tqlistbox.h>
-#include <tqstring.h>
-#include <tqlabel.h>
-#include <tqpushbutton.h>
-#include <tqlayout.h>
-#include <tqwhatsthis.h>
-#include <tqmultilineedit.h>
-#include <tqpixmap.h>
-#include <tqpopupmenu.h>
-
-#include <kfiledialog.h>
-#include <kurldrag.h>
-#include <kiconloader.h>
-#include <kiconview.h>
-#include <kglobal.h>
-#include <kurl.h>
-
-#include "kpilotConfig.h"
-#include "fileInstaller.h"
-
-
-#include "fileInstallWidget.moc"
-
-FileInstallWidget::FileInstallWidget(TQWidget * parent,
-	const TQString & path) :
-	PilotComponent(parent, "component_files", path),
-	fSaveFileList(false),
-	fInstaller(0L)
-{
-	FUNCTIONSETUP;
-
-	TQGridLayout *grid = new TQGridLayout(this, 5, 5, SPACING);
-
-	TQLabel *label = new TQLabel(i18n("Files to install:"), this);
-
-	grid->addWidget(label, 1, 1);
-
-	TQPushButton *abutton;
-
-    abutton = addButton = new TQPushButton(i18n("Add File..."), this);
-	connect(abutton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddFile()));
-	grid->addWidget(abutton, 3, 1);
-	TQWhatsThis::add(abutton,
-		i18n("<qt>Choose a file to add to the list of files to install.</qt>"));
-
-	abutton = clearButton= new TQPushButton(i18n("Clear List"), this);
-	connect(abutton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClearButton()));
-	grid->addWidget(abutton, 4, 1);
-	TQWhatsThis::add(abutton,
-		i18n("<qt>Clear the list of files to install. No files will be installed.</qt>"));
-
-	fIconView = new KIconView(this);
-	connect(fIconView, TQT_SIGNAL(dropped(TQDropEvent *, const TQValueList<TQIconDragItem> &)),
-		this, TQT_SLOT(slotDropEvent(TQDropEvent *, const TQValueList<TQIconDragItem> &)));
-	grid->addMultiCellWidget(fIconView, 1, 4, 2, 3);
-	TQWhatsThis::add(fIconView,
-		i18n
-		("<qt>This lists files that will be installed on the Pilot during the next HotSync. Drag files here or use the Add button.</qt>"));
-	fIconView->setAcceptDrops(true);
-    fIconView->setSelectionMode(TQIconView::Extended);
-	fIconView->viewport()->installEventFilter(this);
-
-	grid->setRowStretch(2, 100);
-	grid->setColStretch(2, 50);
-	grid->setColStretch(2, 50);
-	grid->addColSpacing(4, SPACING);
-	grid->addRowSpacing(5, SPACING);
-
-	fInstaller = new FileInstaller;
-	connect(fInstaller, TQT_SIGNAL(filesChanged()),
-		this, TQT_SLOT(refreshFileInstallList()));
-
-}
-
-FileInstallWidget::~FileInstallWidget()
-{
-	KPILOT_DELETE(fInstaller);
-}
-
-static inline bool pdbOrPrc(const TQString &s)
-{
-	return s.endsWith(CSL1(".pdb"),false) || s.endsWith(CSL1(".prc"),false) ;
-}
-
-void FileInstallWidget::dragEnterEvent(TQDragEnterEvent *event)
-{
-	FUNCTIONSETUP;
-
-	KURL::List urls;
-	if(!KURLDrag::decode(event, urls)) {
-		event->accept(false);
-		return;
-	}
-
-	KURL::List::const_iterator it;
-	TQString filename;
-    for ( it = urls.begin(); it != urls.end(); ++it ) {
-		filename = (*it).fileName();
-		if(!pdbOrPrc(filename)) {
-			event->accept(false);
-			return;
-		}
-	}
-	event->accept(true);
-}
-
-bool FileInstallWidget::eventFilter(TQObject *watched, TQEvent *event)
-{
-	FUNCTIONSETUP;
-
-    if(watched == fIconView->viewport())
-    {
-        if(event->type() == TQEvent::DragEnter) {
-    		dragEnterEvent(static_cast<TQDragEnterEvent*>(event));
-            return true;
-        }
-
-        // We have to skip the DragMove event, because it seems to override the
-        // accept state, when it is set to false by dragEnterEvent() (event->accept(false);)
-        if(event->type() == TQEvent::DragMove) {
-            return true;
-        }
-
-        if(event->type() == TQEvent::MouseButtonPress) {
-            contextMenu(static_cast<TQMouseEvent*>(event));
-        }
-    }
-
-	return false;
-}
-
-void FileInstallWidget::dropEvent(TQDropEvent * drop)
-{
-	FUNCTIONSETUP;
-	if (!shown) return;
-
-	KURL::List list;
-
-	if (!KURLDrag::decode(drop, list) || list.isEmpty())
-		return;
-
-#ifdef DEBUG
-	DEBUGKPILOT << ": Got " << list.first().prettyURL() << endl;
-#endif
-
-	TQStringList files;
-	for(KURL::List::ConstIterator it = list.begin(); it != list.end(); ++it)
-	{
-	   if ((*it).isLocalFile())
-	      files << (*it).path();
-	}
-
-	fInstaller->addFiles(files, this );
-}
-
-void FileInstallWidget::slotDropEvent(TQDropEvent * drop, const TQValueList<TQIconDragItem> & /*lst*/)
-{
-	FUNCTIONSETUP;
-	dropEvent(drop);
-}
-
-void FileInstallWidget::slotClearButton()
-{
-	FUNCTIONSETUP;
-	fInstaller->clearPending();
-}
-
-void FileInstallWidget::showComponent()
-{
-	FUNCTIONSETUP;
-	refreshFileInstallList();
-}
-
-void FileInstallWidget::slotAddFile()
-{
-	FUNCTIONSETUP;
-	if (!shown) return;
-
-	TQStringList fileNames = KFileDialog::getOpenFileNames(
-		TQString::null, i18n("*.pdb *.prc|PalmOS Databases (*.pdb *.prc)"));
-
-	for (TQStringList::Iterator fileName = fileNames.begin(); fileName != fileNames.end(); ++fileName)
-	{
-		fInstaller->addFile(*fileName, this );
-	}
-}
-
-bool FileInstallWidget::preHotSync(TQString &)
-{
-	FUNCTIONSETUP;
-
-	fIconView->setEnabled(false);
-	fInstaller->setEnabled(false);
-	addButton->setEnabled(false);
-	clearButton->setEnabled(false);
-
-	return true;
-}
-
-void FileInstallWidget::postHotSync()
-{
-	FUNCTIONSETUP;
-
-	fInstaller->setEnabled(true);
-	fIconView->setEnabled(true);
-	addButton->setEnabled(true);
-	clearButton->setEnabled(true);
-	if (shown) refreshFileInstallList();
-}
-
-
-void FileInstallWidget::refreshFileInstallList()
-{
-	FUNCTIONSETUP;
-
-	TQStringList fileNames = fInstaller->fileNames();
-	TQPixmap kpilotIcon = KGlobal::iconLoader()->loadIcon(CSL1("kpilot"), KIcon::Desktop);
-
-	fIconView->clear();
-
-	for (TQStringList::Iterator fileName = fileNames.begin(); fileName != fileNames.end(); ++fileName)
-	{
-		if(pdbOrPrc(*fileName))
-		{
-			new KIconViewItem(fIconView, *fileName, kpilotIcon);
-		}
-		else
-		{
-			new KIconViewItem(fIconView, *fileName);
-		}
-	}
-}
-
-void FileInstallWidget::contextMenu(TQMouseEvent *event)
-{
-    FUNCTIONSETUP;
-
-    if(event->button() == Qt::LeftButton)
-        return;
-
-    TQIconViewItem *item;
-    TQStringList files;
-    for(item = fIconView->firstItem(); item; item = item->nextItem())
-    {
-        if(item->isSelected())
-            files.append(item->text());
-    }
-
-    TQPopupMenu popup(fIconView);
-
-    item = fIconView->findItem(event->pos());
-    if(item) {
-        // Popup for the right clicked item
-        popup.insertItem(i18n("Delete a single file item","Delete"), 10);
-    }
-
-    popup.insertItem(i18n("Delete selected files"), 11);
-    if(files.empty())
-        popup.setItemEnabled(11, false);
-
-    int id = popup.exec(fIconView->viewport()->mapToGlobal(event->pos()));
-    if(id == 10)
-        fInstaller->deleteFile(item->text());
-    else if(id == 11)
-        fInstaller->deleteFiles(files);
-
-}
diff --git a/kpilot/kpilot/fileInstallWidget.h b/kpilot/kpilot/fileInstallWidget.h
deleted file mode 100644
index 4bc59468..00000000
--- a/kpilot/kpilot/fileInstallWidget.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#ifndef _KPILOT_FILEINSTALLWIDGET_H
-#define _KPILOT_FILEINSTALLWIDGET_H
-/* fileInstallWidget.h			KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-**
-** This file defines the file install widget, which is the thing
-** that accepts file drags for later installation into the Pilot.
-**
-** This file also defines the log window widget, which logs
-** sync-messages during a HotSync.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "pilotComponent.h"
-
-class TQMultiLineEdit;
-class TQPushButton;
-class TQIconDragItem;
-
-class KIconView;
-class KPilotInstaller;
-class FileInstaller;
-
-class FileInstallWidget : public PilotComponent
-{
-Q_OBJECT
-
-public:
-	FileInstallWidget(TQWidget* parent, const TQString& dbPath);
-	virtual ~FileInstallWidget();
-
-	// Pilot Component Methods:
-	void showComponent();
-	bool preHotSync(TQString &);
-	void postHotSync();
-
-
-signals:
-	void fileInstallWidgetDone();
-
-protected:
-	void setSaveFileList(bool saveIt) { fSaveFileList = saveIt; }
-	bool getSaveFileList() { return fSaveFileList; }
-
-	/* virtual */ void dragEnterEvent(TQDragEnterEvent* event);
-	/* virtual */ void dropEvent(TQDropEvent* drop);
-	/* virtual */ bool eventFilter (TQObject *watched, TQEvent *event );
-
-    void contextMenu(TQMouseEvent *event);
-
-	KPilotInstaller* getPilotInstallerApp() { return fKPilotInstaller; }
-
-private:
-	KIconView  *fIconView;
-	bool        fSaveFileList;
-
-	KPilotInstaller* fKPilotInstaller;
-	FileInstaller *fInstaller;
-	TQPushButton *clearButton,*addButton;
-
-protected slots:
-	void slotClearButton();
-	void slotAddFile();
-
-	void slotDropEvent(TQDropEvent * drop, const TQValueList<TQIconDragItem> & lst);
-
-public slots:
-	void refreshFileInstallList();
-};
-
-#endif
diff --git a/kpilot/kpilot/fileInstaller.cc b/kpilot/kpilot/fileInstaller.cc
deleted file mode 100644
index d46c67d2..00000000
--- a/kpilot/kpilot/fileInstaller.cc
+++ /dev/null
@@ -1,184 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-**
-** This is a class that does "the work" of adding and deleting
-** files in the pending_install directory of KPilot. It is used
-** by the fileInstallWidget and by the daemon's drag-and-drop
-** file accepter.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include "options.h"
-
-#include <unistd.h>
-
-#include <tqstring.h>
-#include <tqstrlist.h>
-#include <tqdir.h>
-
-#include <kglobal.h>
-#include <kstandarddirs.h>
-#include <kurl.h>
-#include <kio/netaccess.h>
-#include <kmessagebox.h>
-
-#include "fileInstaller.moc"
-
-FileInstaller::FileInstaller() :
-	enabled(true)
-{
-	FUNCTIONSETUP;
-
-	fDirName = KGlobal::dirs()->saveLocation("data",
-		CSL1("kpilot/pending_install/"));
-	fPendingCopies = 0;
-
-}
-
-/* virtual */ FileInstaller::~FileInstaller()
-{
-	FUNCTIONSETUP;
-}
-
-
-void FileInstaller::clearPending()
-{
-	FUNCTIONSETUP;
-
-	unsigned int i;
-
-	TQDir installDir(fDirName);
-
-	// Start from 2 to skip . and ..
-	//
-	for (i = 2; i < installDir.count(); i++)
-	{
-		TQFile::remove(fDirName + installDir[i]);
-	}
-
-	if (i > 2)
-	{
-		emit filesChanged();
-	}
-}
-
-void FileInstaller::deleteFile(const TQString &file)
-{
-    TQFile::remove(fDirName + file);
-    emit filesChanged();
-}
-
-void FileInstaller::deleteFiles(const TQStringList &files)
-{
-    if(files.empty())
-        return;
-
-    for(TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it)
-        TQFile::remove(fDirName + *it);
-    
-    emit filesChanged();
-}
-
-/* virtual */ bool FileInstaller::runCopy(const TQString & s, TQWidget* w )
-{
-	FUNCTIONSETUP;
-
-	if(!(s.endsWith(CSL1(".pdb"), false) || s.endsWith(CSL1(".prc"), false))) {
-		KMessageBox::detailedSorry(w, i18n("Cannot install %1").arg(s),
-			i18n("Only PalmOS database files (like *.pdb and *.prc) can be installed by the file installer."));
-		return false;
-	}
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Copying " << s << endl;
-#endif
-
-	KURL srcName;
-	srcName.setPath(s);
-	KURL destDir(fDirName + CSL1("/") + srcName.fileName());
-
-#if KDE_IS_VERSION(3,1,9)
-	return KIO::NetAccess::copy(srcName, destDir, w);
-#else
-	return KIO::NetAccess::copy(srcName,destDir);
-#endif
-}
-
-
-void FileInstaller::addFiles(const TQStringList & fileList, TQWidget* w)
-{
-	FUNCTIONSETUP;
-
-	if (!enabled) return;
-
-	unsigned int succ = 0;
-
-	for(TQStringList::ConstIterator it = fileList.begin();
-	    it != fileList.end(); ++it)
-	{
-		if (runCopy( *it, w ))
-			succ++;
-	}
-
-	if (succ)
-	{
-		emit filesChanged();
-	}
-}
-
-void FileInstaller::addFile( const TQString & file, TQWidget* w )
-{
-	FUNCTIONSETUP;
-
-	if (!enabled) return;
-
-	if (runCopy(file, w))
-	{
-		emit(filesChanged());
-	}
-}
-
-/* slot */ void FileInstaller::copyCompleted()
-{
-	FUNCTIONSETUP;
-}
-
-const TQStringList FileInstaller::fileNames() const
-{
-	FUNCTIONSETUP;
-
-	TQDir installDir(fDirName);
-
-	return installDir.entryList(TQDir::Files |
-		TQDir::NoSymLinks | TQDir::Readable);
-}
-
-/* slot */ void FileInstaller::setEnabled(bool b)
-{
-	FUNCTIONSETUP;
-	enabled=b;
-}
-
-
diff --git a/kpilot/kpilot/fileInstaller.h b/kpilot/kpilot/fileInstaller.h
deleted file mode 100644
index 3009de77..00000000
--- a/kpilot/kpilot/fileInstaller.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* fileInstaller.h			KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This is a class that does "the work" of adding and deleting
-** files in the pending_install directory of KPilot. It is used
-** by the fileInstallWidget and by the daemon's drag-and-drop
-** file accepter.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#ifndef _KPILOT_FILEINSTALLER_H
-#define _KPILOT_FILEINSTALLER_H
-
-#include <tqobject.h>
-
-
-class TQStringList;
-class TQString;
-
-class FileInstaller : public QObject
-{
-	Q_OBJECT
-public:
-	FileInstaller();
-	virtual ~FileInstaller();
-
-	void clearPending();
-
-	void addFiles( const TQStringList&, TQWidget* w );
-	void addFile( const TQString&, TQWidget* w );
-
-    void deleteFile(const TQString &);
-    void deleteFiles(const TQStringList &);
-
-	/**
-	* Returns information about this installer. Note particularly
-	* that fileNames() returns only filenames, not paths. In particular,
-	* you'll need to prepend dir()+"/" to get pathnames.
-	*/
-	const TQString &dir() const { return fDirName; } ;
-	const TQStringList fileNames() const ;
-
-
-
-protected:
-	virtual bool runCopy( const TQString &src, TQWidget*w );
-
-public slots:
-	void copyCompleted();
-	void setEnabled(bool);
-
-signals:
-	void filesChanged();
-private:
-	TQString fDirName;
-	int fPendingCopies;
-	bool enabled;
-} ;
-
-#endif
diff --git a/kpilot/kpilot/hotSync.cc b/kpilot/kpilot/hotSync.cc
deleted file mode 100644
index 7a4d3e44..00000000
--- a/kpilot/kpilot/hotSync.cc
+++ /dev/null
@@ -1,1156 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-** Copyright (C) 2006 Adriaan de Groot <groot@kde.org>
-**
-** This file defines SyncActions, which are used to perform some specific
-** task during a HotSync. Conduits are not included here, nor are
-** sync actions requiring user interaction. Those can be found in the
-** conduits subdirectory or interactiveSync.h.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org.
-*/
-
-
-#include "options.h"
-
-#include <time.h>
-#include <unistd.h>
-#include <stdio.h>
-
-#include <pi-file.h>
-#include <pi-util.h>
-
-#include <tqtimer.h>
-#include <tqfile.h>
-#include <tqfileinfo.h>
-#include <tqdir.h>
-#include <tqvaluelist.h>
-#include <tqregexp.h>
-#include <tqstringlist.h>
-#include <tqthread.h>
-
-#include <kglobal.h>
-#include <kstandarddirs.h>
-#include <kapplication.h>
-#include <kmessagebox.h>
-
-#include "pilotUser.h"
-#include "pilotRecord.h"
-#include "actionQueue.h"
-#include "pilotSerialDatabase.h"
-#include "pilotLocalDatabase.h"
-#include "pilotDatabase.h"
-#include "kpilotSettings.h"
-
-#include "hotSync.moc"
-
-class BackupAction::Thread : public QThread
-{
-public:
-	Thread( BackupAction *parent,
-		KPilotLink *link,
-		const TQString &filename,
-		const DBInfo *info );
-
-	enum {
-		TerminateOK = TQEvent::User,
-		TerminateFailure
-	} ;
-
-protected:
-	virtual void run();
-private:
-	BackupAction *fParent;
-	KPilotLink *fLink;
-	TQString fFilename;
-	struct DBInfo fDBInfo;
-} ;
-
-class BackupAction::Private
-{
-public:
-	bool fFullBackup; ///< Is this a full backup (all DBs, not just changed ones)?
-	TQStringList fNoBackupDBs;
-	TQValueList<unsigned long> fNoBackupCreators;
-	TQStringList fDeviceDBs;
-
-	TQString fPreferBackupDir; ///< Directory to write backup in, overrides default
-
-	// Remainder is used to hand around info during sync
-
-	int fDBIndex;       ///< Database number we're now doing
-	TQString fBackupDir; ///< Directory to write backup in.
-
-	/**
-	* Add the database described by the info block to the list of
-	* databases definitely found on the handheld.
-	*/
-	void addDBInfo( const DBInfo *info )
-	{
-		FUNCTIONSETUP;
-		fDBIndex = info->index + 1;
-
-		// Each character of buff[] is written to
-		char buff[7];
-		buff[0] = '[';
-		set_long( &buff[1], info->creator );
-		buff[5] = ']';
-		buff[6] = '\0';
-		TQString creator = TQString::fromLatin1( buff );
-
-		TQString dbname = Pilot::fromPilot( info->name, 32 );
-
-		if ( !fDeviceDBs.contains( creator ) )
-		{
-			fDeviceDBs << creator;
-		}
-		if ( !fDeviceDBs.contains( dbname ) )
-		{
-			fDeviceDBs << dbname;
-		}
-
-		DEBUGKPILOT << fname << ": Added <" << dbname
-			<< "> " << creator << endl;
-	}
-
-
-	/**
-	* Check if this database, described by @p info , should
-	* be backed up (i.e. is allowed to be backed up by the
-	* user settings for no-backup DBs).
-	*
-	* @return @c true if the database may be backed up.
-	*/
-	bool allowBackup( const DBInfo *info ) const
-	{
-		// Special case - skip database Unsaved Preferences
-		if (   (info->creator == pi_mktag('p','s','y','s'))  &&
-			(info->type == pi_mktag('p','r','e','f')) )
-		{
-			return false;
-		}
-
-		if (fNoBackupCreators.findIndex(info->creator) != -1)
-		{
-			return false;
-		}
-
-		// Now take wildcards into account
-		TQString db = Pilot::fromPilot(info->name);
-		for (TQStringList::const_iterator i = fNoBackupDBs.begin();
-			i != fNoBackupDBs.end(); ++i)
-		{
-			TQRegExp re(*i,true,true); // Wildcard match
-			if (re.exactMatch(db))
-			{
-				return false;
-			}
-		}
-		return true;
-	}
-
-} ;
-
-BackupAction::BackupAction(KPilotLink * p, bool full) :
-	SyncAction(p, "backupAction"),
-	fP( new Private ),
-	fBackupThread( 0L )
-{
-	FUNCTIONSETUP;
-
-	fP->fFullBackup = full;
-}
-
-/* virtual */ TQString BackupAction::statusString() const
-{
-	FUNCTIONSETUP;
-	TQString s(CSL1("BackupAction="));
-
-	switch (status())
-	{
-	case Init:
-		s.append(CSL1("Init"));
-		break;
-	case Error:
-		s.append(CSL1("Error"));
-		break;
-	case FullBackup:
-		s.append(CSL1("FullBackup"));
-		break;
-	case FastBackup:
-		s.append(CSL1("FastBackup"));
-		break;
-	case BackupEnded:
-		s.append(CSL1("BackupEnded"));
-		break;
-	case BackupIncomplete:
-		s.append(CSL1("BackupIncomplete"));
-		break;
-	case BackupComplete:
-		s.append(CSL1("BackupComplete"));
-		break;
-	default:
-		s.append(CSL1("(unknown "));
-		s.append(TQString::number(status()));
-		s.append(CSL1(")"));
-	}
-
-	return s;
-}
-
-void BackupAction::setDirectory( const TQString &p )
-{
-	fP->fPreferBackupDir = p;
-	if (!p.endsWith(CSL1("/")))
-	{
-		fP->fPreferBackupDir.append(CSL1("/"));
-	}
-}
-
-static inline void initNoBackup(TQStringList &dbnames,
-	TQValueList<unsigned long> &dbcreators)
-{
-	FUNCTIONSETUP;
-	dbnames.clear();
-	dbcreators.clear();
-
-	TQStringList configuredSkip = KPilotSettings::skipBackupDB();
-	TQStringList::const_iterator e = configuredSkip.end();
-	for (TQStringList::const_iterator i = configuredSkip.begin();
-		i!= e; ++i)
-	{
-		TQString s = *i;
-		if (s.startsWith(CSL1("[")) && s.endsWith(CSL1("]")))
-		{
-			if (s.length() != 6)
-			{
-				WARNINGKPILOT << "Creator ID " << s << " is malformed." << endl;
-			}
-			else
-			{
-				TQCString data =  s.mid(1,4).latin1();
-				unsigned long creator = pi_mktag(data[0],data[1],data[2],data[3]);
-				dbcreators.append(creator);
-			}
-		}
-		else
-		{
-			dbnames.append(s);
-		}
-	}
-
-	DEBUGKPILOT << fname << ": Will skip databases "
-		<< dbnames.join(CSL1(",")) << endl;
-	TQString creatorids;
-	char buf[5];
-	for (TQValueList<unsigned long>::const_iterator i = dbcreators.begin();
-		i != dbcreators.end(); ++i)
-	{
-		unsigned long tag = *i;
-		pi_untag(buf,tag);
-		buf[4]=0;
-		creatorids.append(CSL1("[%1]").arg(buf));
-	}
-	DEBUGKPILOT << fname << ": Will skip creators " << creatorids << endl;
-}
-
-/** Make sure that the backup directory @p backupDir
-*   exists and is a directory; returns @c false
-*   if this is not the case. This method will try
-*   to create the directory if it doesn't exist yet.
-*/
-static inline bool checkBackupDirectory( const TQString &backupDir )
-{
-	FUNCTIONSETUP;
-	TQFileInfo fi(backupDir);
-
-	if (fi.exists() && fi.isDir())
-	{
-		return true;
-	}
-
-	if (fi.exists() && !fi.isDir())
-	{
-		WARNINGKPILOT << "Requested backup directory "
-			<< backupDir
-			<< " exists but is not a directory."
-			<< endl;
-		return false;
-	}
-
-	if ( !backupDir.endsWith("/") )
-	{
-		WARNINGKPILOT << "Backup dir does not end with a / "
-			<< endl;
-		return false;
-	}
-
-	Q_ASSERT(!fi.exists());
-
-	DEBUGKPILOT << fname
-		<< ": Creating directory " << backupDir << endl;
-
-	KStandardDirs::makeDir( backupDir );
-
-	fi = TQFileInfo(backupDir);
-
-	return fi.exists() && fi.isDir();
-}
-
-
-/* virtual */ bool BackupAction::exec()
-{
-	FUNCTIONSETUP;
-
-	fP->fDeviceDBs = KPilotSettings::deviceDBs();
-
-	if (fP->fPreferBackupDir.isEmpty())
-	{
-		fP->fBackupDir =
-			KGlobal::dirs()->saveLocation("data",CSL1("kpilot/DBBackup/")) +
-				deviceLink()->getPilotUser().name() + '/';
-	}
-	else
-	{
-		fP->fBackupDir = fP->fPreferBackupDir;
-	}
-
-	logMessage(i18n("Backup directory: %1.").arg(fP->fBackupDir));
-
-	DEBUGKPILOT << fname
-		<< ": This Pilot user's name is \""
-		<< deviceLink()->getPilotUser().name() << "\"" << endl;
-	DEBUGKPILOT << fname
-		<< ": Using backup dir: " << fP->fBackupDir << endl;
-	DEBUGKPILOT << fname
-		<< ": Full Backup? " << fP->fFullBackup << endl;
-
-
-	if (fP->fFullBackup)
-	{
-		fActionStatus = FullBackup;
-		addSyncLogEntry(i18n("Full backup started."));
-	}
-	else
-	{
-		fActionStatus = FastBackup;
-		addSyncLogEntry(i18n("Fast backup started"));
-	}
-
-	if (!checkBackupDirectory(fP->fBackupDir))
-	{
-		fActionStatus=BackupIncomplete;
-		// Don't issue an error message, checkBackupDirectory
-		// did this already...
-		return false;
-	}
-
-	initNoBackup( fP->fNoBackupDBs, fP->fNoBackupCreators );
-
-	fP->fDBIndex = 0;
-	TQTimer::singleShot(0,this,TQT_SLOT(backupOneDB()));
-	return true;
-}
-
-/* slot */ void BackupAction::backupOneDB()
-{
-	FUNCTIONSETUP;
-
-	struct DBInfo info;
-
-	// TODO: make the progress reporting more accurate
-	emit logProgress(TQString::null, fP->fDBIndex);
-
-	if (openConduit() < 0)
-	{
-		addSyncLogEntry(i18n("Exiting on cancel."));
-		endBackup();
-		fActionStatus = BackupIncomplete;
-		return;
-	}
-
-	// TODO: Is there a way to skip unchanged databases?
-	int res = deviceLink()->getNextDatabase( fP->fDBIndex, &info );
-	if (res < 0)
-	{
-		if ( fP->fFullBackup )
-		{
-			addSyncLogEntry( i18n("Full backup complete.") );
-		}
-		else
-		{
-			addSyncLogEntry( i18n("Fast backup complete.") );
-		}
-		endBackup();
-		fActionStatus = BackupComplete;
-		return;
-	}
-
-	fP->addDBInfo( &info );
-
-	// see if user told us not to back this creator or database up...
-	if (fP->allowBackup(&info))
-	{
-		// back up DB if this is a full backup *or* in non-full backups,
-		// only backup data, not applications.
-		if ( (fP->fFullBackup) || !PilotDatabase::isResource(&info) )
-		{
-			addSyncLogEntry(i18n("Backing up: %1").arg(Pilot::fromPilot(info.name)));
-
-			if (!startBackupThread(&info))
-			{
-				WARNINGKPILOT << "Could not create local database for <"
-					<< info.name << ">" << endl;
-			}
-			else
-			{
-				// The thread has started, so we will be woken
-				// up by it eventually when it is done. Do *NOT*
-				// fall through to the single-shot timer below,
-				// because that would return us to the backup
-				// function too soon.
-				return;
-			}
-		}
-		else
-		{
-			// Just skip resource DBs during an update hotsync.
-			DEBUGKPILOT << fname << ": Skipping database <" << info.name
-				<< "> (resource database)" << endl;
-		}
-	}
-	else
-	{
-		DEBUGKPILOT << fname << ": Skipping database <" << info.name
-			<< "> (no-backup list)" << endl;
-		TQString s = i18n("Skipping %1")
-			.arg(Pilot::fromPilot(info.name));
-		addSyncLogEntry(s);
-	}
-	TQTimer::singleShot(0,this,TQT_SLOT(backupOneDB()));
-}
-
-/**
- * This method will back up a single database from the Pilot to a directory on
- * our filesystem.  If our user asks us to do a full backup, then we will unconditionally
- * copy the database file from the Pilot into the backup directory.  Otherwise, we will
- * check to see if the database has any modified records in it on the pilot.  If the
- * database has not changed on the Pilot, then there's nothing to backup and we return.
- *
- * @return @c true if the backup has started (in another thread).
- *           You must wait on the thread to end with a User or User+1
- *            type event and not start another backup thread.
- * @return @c false if there is no backup to do. Diagnostic messages
- *           will already have been printed.
- */
-bool BackupAction::startBackupThread(DBInfo *info)
-{
-	FUNCTIONSETUP;
-
-	// now we look to see if the database on the pilot has at least one changed record
-	// in it.  we do this so that we don't waste time backing up a database that has
-	// not changed.  note: don't bother with this check if we're doing a full backup.
-	if (!fP->fFullBackup)
-	{
-		// Check if this DB has modified records.
-		PilotDatabase *serial=deviceLink()->database(info);
-		if (!serial->isOpen())
-		{
-			WARNINGKPILOT << "Unable to open database <" << info->name << ">" << endl;
-			KPILOT_DELETE(serial);
-			addSyncLogEntry(i18n("Backup of %1 failed.\n")
-				.arg(Pilot::fromPilot(info->name)));
-			return false;
-		}
-
-		int index=0;
-		PilotRecord*rec=serial->readNextModifiedRec(&index);
-		if (!rec)
-		{
-			DEBUGKPILOT << fname << ": No modified records." << endl;
-			KPILOT_DELETE(serial);
-			return false;
-		}
-		// Exists, with modified records.
-		KPILOT_DELETE(rec);
-		KPILOT_DELETE(serial);
-	}
-
-
-	// if we're here then we are going to back this database up.  do some basic sanity
-	// checks and proceed....
-	TQString databaseName(Pilot::fromPilot(info->name));
-	databaseName.replace('/', '_');
-
-	TQString fullBackupName = fP->fBackupDir + databaseName;
-
-	if (PilotDatabase::isResource(info))
-	{
-		fullBackupName.append(CSL1(".prc"));
-	}
-	else
-	{
-		fullBackupName.append(CSL1(".pdb"));
-	}
-
-	DEBUGKPILOT << fname
-		<< ": Backing up database to: [" << fullBackupName << "]" << endl;
-
-	/* Ensure that DB-open flag is not kept */
-	info->flags &= ~dlpDBFlagOpen;
-
-	if (fBackupThread)
-	{
-		WARNINGKPILOT << "Starting new backup thread before the old one is done." << endl;
-		return false;
-	}
-
-	fBackupThread  = new Thread(this,deviceLink(),fullBackupName,info);
-	fBackupThread->start();
-	return true;
-}
-
-/* virtual */ bool BackupAction::event( TQEvent *e )
-{
-	if (e->type() == (TQEvent::Type)Thread::TerminateOK)
-	{
-		KPILOT_DELETE(fBackupThread);
-		// This was a successful termination.
-		addSyncLogEntry( i18n("... OK.\n"), false );
-		TQTimer::singleShot(0,this,TQT_SLOT(backupOneDB()));
-		return true;
-	}
-	if (e->type() == (TQEvent::Type)Thread::TerminateFailure)
-	{
-		KPILOT_DELETE(fBackupThread);
-		// Unsuccessful termination.
-		addSyncLogEntry( i18n("Backup failed.") );
-		TQTimer::singleShot(0,this,TQT_SLOT(backupOneDB()));
-		return true;
-	}
-	return SyncAction::event(e);
-}
-
-void BackupAction::endBackup()
-{
-	FUNCTIONSETUP;
-
-	fP->fDBIndex = (-1);
-	fActionStatus = BackupEnded;
-	fP->fDeviceDBs.sort();
-	TQString old( TQString::null );
-	TQStringList::Iterator itr = fP->fDeviceDBs.begin();
-	while ( itr != fP->fDeviceDBs.end() ) {
-		if ( old == *itr ) {
-			itr = fP->fDeviceDBs.remove( itr );
-		} else {
-			old = *itr;
-			++itr;
-		}
-	}
-	KPilotSettings::setDeviceDBs( fP->fDeviceDBs );
-
-	emit syncDone(this);
-}
-
-FileInstallAction::FileInstallAction(KPilotLink * p,
-	const TQString & d) :
-	SyncAction(p, "fileInstall"),
-	fDBIndex(-1),
-	fTimer(0L),
-	fDir(d)
-{
-	FUNCTIONSETUP;
-}
-
-FileInstallAction::~FileInstallAction()
-{
-	FUNCTIONSETUP;
-
-	KPILOT_DELETE(fTimer);
-}
-
-/* virtual */ bool FileInstallAction::exec()
-{
-	FUNCTIONSETUP;
-
-	TQDir installDir(fDir);
-	fList = installDir.entryList(TQDir::Files |
-		TQDir::NoSymLinks | TQDir::Readable);
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Installing " << fList.count() << " files" << endl;
-#endif
-
-	fDBIndex = 0;
-	emit logMessage(i18n("[File Installer]"));
-
-	// Possibly no files to install?
-	if (!fList.count())
-	{
-		emit logMessage(i18n("No Files to install"));
-		delayDone();
-		return true;
-	}
-
-	fTimer = new TQTimer(this);
-	TQObject::connect(fTimer, TQT_SIGNAL(timeout()),
-		this, TQT_SLOT(installNextFile()));
-
-	fTimer->start(0, false);
-
-	emit logProgress(i18n("Installing one file",
-		"Installing %n Files",fList.count()), 0);
-	return true;
-}
-
-/* slot */ void FileInstallAction::installNextFile()
-{
-	FUNCTIONSETUP;
-
-	Q_ASSERT(fDBIndex >= 0);
-	Q_ASSERT((unsigned) fDBIndex <= fList.count());
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Installing file index "
-		<< fDBIndex << " (of " << fList.count() << ")" << endl;
-#endif
-
-	if ((!fList.count()) || ((unsigned) fDBIndex >= fList.count()))
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname
-			<< ": Peculiar file index, bailing out." << endl;
-#endif
-		KPILOT_DELETE(fTimer);
-		fDBIndex = (-1);
-		emit logProgress(i18n("Done Installing Files"), 100);
-		delayDone();
-		return;
-	}
-
-	const TQString filePath = fDir + fList[fDBIndex];
-	const TQString fileName = fList[fDBIndex];
-
-	fDBIndex++;
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Installing file " << filePath << endl;
-#endif
-
-	TQString m = i18n("Installing %1").arg(fileName);
-	emit logProgress(m,(100 * fDBIndex) / (fList.count()+1));
-	m+=CSL1("\n");
-	emit addSyncLogEntry(m,false /* Don't print in KPilot's log. */ );
-
-	struct pi_file *f = 0L;
-
-	// Check DB is ok, return false after warning user
-	if (!resourceOK(fileName,filePath)) goto nextFile;
-
-	f = pi_file_open(const_cast <char *>
-		((const char *) TQFile::encodeName(filePath)));
-
-
-#if PILOT_LINK_NUMBER < PILOT_LINK_0_12_0
-	if (pi_file_install(f, pilotSocket(), 0) < 0)
-#else
-	if (pi_file_install(f, pilotSocket(), 0, NULL) < 0)
-#endif
-	{
-		WARNINGKPILOT << "Failed to install." << endl;
-
-
-		emit logError(i18n("Cannot install file &quot;%1&quot;.").
-			arg(fileName));
-	}
-	else
-	{
-		TQFile::remove(filePath);
-	}
-
-
-nextFile:
-	if (f) pi_file_close(f);
-	if (fDBIndex == -1)
-	{
-		fTimer->stop();
-		delayDone();
-		// emit syncDone(this);
-	}
-}
-
-// Check that the given file path is a good resource
-// file - in particular that the resource name is ok.
-bool FileInstallAction::resourceOK(const TQString &fileName, const TQString &filePath)
-{
-	FUNCTIONSETUP;
-
-	if (!TQFile::exists(filePath))
-	{
-		emit logError(i18n("Unable to open file &quot;%1&quot;.").
-			arg(fileName));
-		return false;
-	}
-
-	struct pi_file *f = pi_file_open(const_cast <char *>
-		((const char *) TQFile::encodeName(filePath)));
-
-	if (!f)
-	{
-		emit logError(i18n("Unable to open file &quot;%1&quot;.").
-			arg(fileName));
-		return false;
-	}
-
-	struct DBInfo info;
-#if PILOT_LINK_NUMBER < PILOT_LINK_0_12_0
-	if (pi_file_get_info(f,&info) < 0)
-	{
-		emit logError(i18n("Unable to read file &quot;%1&quot;.").
-			arg(fileName));
-		return false;
-	}
-#else
-	pi_file_get_info(f,&info);
-#endif
-
-	// Looks like strlen, but we can't be sure of a NUL
-	// termination.
-	info.name[sizeof(info.name)-1]=0;
-	bool r = (strlen(info.name) < 32);
-	pi_file_close(f);
-
-	if (!r)
-	{
-		emit logError(i18n("The database in &quot;%1&quot; has a "
-			"resource name that is longer than 31 characters. "
-			"This suggests a bug in the tool used to create the database. "
-			"KPilot cannot install this database.").arg(fileName));
-	}
-
-	return r;
-}
-
-/* virtual */ TQString FileInstallAction::statusString() const
-{
-	FUNCTIONSETUP;
-	if (fDBIndex < 0)
-	{
-		return TQString(CSL1("Idle"));
-	}
-	else
-	{
-		if ((unsigned) fDBIndex >= fList.count())
-		{
-			return TQString(CSL1("Index out of range"));
-		}
-		else
-		{
-			return TQString(CSL1("Installing %1")).arg(fList[fDBIndex]);
-		}
-	}
-}
-
-CheckUser::CheckUser(KPilotLink * p, TQWidget * vp):
-	SyncAction(p, vp, "userCheck")
-{
-	FUNCTIONSETUP;
-
-}
-
-CheckUser::~CheckUser()
-{
-	FUNCTIONSETUP;
-}
-
-/* virtual */ bool CheckUser::exec()
-{
-	FUNCTIONSETUP;
-
-	TQString guiUserName = KPilotSettings::userName();
-	TQString pilotUserName = fHandle->getPilotUser().name();
-	bool pilotUserEmpty = pilotUserName.isEmpty();
-	// 4 cases to handle:
-	//    guiUserName empty / not empty
-	//    pilotUserName empty / not empty
-	//
-	//
-	if (guiUserName.isEmpty())
-	{
-		if (pilotUserEmpty)
-		{
-			TQString defaultUserName =
-				i18n("A common name", "John Doe");
-
-			TQString q = i18n("<qt>Neither KPilot nor the "
-				"handheld have a username set. "
-				"They <i>should</i> be set. "
-				"Should KPilot set them to a default value "
-				"(<i>%1</i>)?</qt>").arg(defaultUserName);
-
-			if (questionYesNo(q, i18n("User Unknown") /* ,"askUserNone" */) ==
-				KMessageBox::Yes)
-			{
-				KPilotSettings::setUserName(defaultUserName);
-				fHandle->getPilotUser().setName(defaultUserName);
-				guiUserName=defaultUserName;
-				pilotUserName=defaultUserName;
-			}
-
-		}
-		else
-		{
-			TQString q = i18n("<qt>The handheld has a username set "
-				"(<i>%1</i>) but KPilot does not. Should "
-				"KPilot use this username in future?</qt>").
-				arg(pilotUserName);
-
-			if (questionYesNo(q, i18n("User Unknown") /* ,"askUserSome" */ ) ==
-				KMessageBox::Yes)
-			{
-				KPilotSettings::setUserName(pilotUserName);
-				guiUserName=pilotUserName;
-			}
-		}
-	}
-	else
-	{
-		if (pilotUserEmpty)
-		{
-			TQString q = CSL1("<qt>");
-			q += i18n("KPilot has a username set "
-				"(<i>%1</i>) but the handheld does not. "
-				"Should KPilot's username be set in the "
-				"handheld as well?").arg(guiUserName);
-			q += i18n("<br/>(<i>Note:</i> If your handheld "
-				"has been reset to factory defaults, you "
-				"should use <i>Restore</i> instead of a "
-				"regular HotSync. Click on Cancel to "
-				"stop this sync.)");
-			q += CSL1("</qt>");
-
-			int r = questionYesNoCancel(q, i18n("User Unknown"));
-			switch (r)
-			{
-			case KMessageBox::Yes:
-				DEBUGKPILOT << fname
-					<< ": Setting user name in pilot to "
-					<< guiUserName << endl;
-				fHandle->getPilotUser().setName(guiUserName);
-				pilotUserName=guiUserName;
-				break;
-			case KMessageBox::No:
-				// Nothing to do .. continue with sync
-				break;
-			case KMessageBox::Cancel:
-			default:
-				return false;
-			}
-		}
-		else
-		{
-			if (guiUserName != pilotUserName)
-			{
-				TQString q = i18n("<qt>The handheld thinks that "
-					"the username is %1; "
-					"however, KPilot says you are %2."
-					"Which of these is the correct name?\n"
-					"If you click on Cancel, the sync will proceed, "
-					"but the usernames will not be changed.</qt>").
-					arg(pilotUserName).
-					arg(guiUserName);
-
-				int r = questionYesNoCancel(q,
-					i18n("User Mismatch"),
-					TQString::null,
-					20,
-					i18n("Use KPilot Name"),
-					i18n("Use Handheld Name"));
-				switch (r)
-				{
-				case KMessageBox::Yes:
-					fHandle->getPilotUser().setName(guiUserName);
-					pilotUserName=guiUserName;
-					break;
-				case KMessageBox::No:
-					KPilotSettings::setUserName(pilotUserName);
-					guiUserName=pilotUserName;
-					break;
-				case KMessageBox::Cancel:
-				default:
-					// TODO: cancel the sync... Or just don't change any user name?
-					break;
-				}
-			}
-		}
-	}
-
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": User name set to pc <"
-		<< guiUserName
-		<< "> hh <"
-		<< fHandle->getPilotUser().name() << ">" << endl;
-#endif
-
-	KPilotSettings::writeConfig();
-
-	// Now we've established which user will be used,
-	// fix the database location for local databases.
-	//
-	//
-	TQString pathName = KGlobal::dirs()->saveLocation("data",
-		CSL1("kpilot/DBBackup/"));
-	if (!guiUserName.isEmpty())
-	{
-		pathName.append(guiUserName);
-		pathName.append(CSL1("/"));
-	}
-	PilotLocalDatabase::setDBPath(pathName);
-
-	delayDone();
-	return true;
-}
-
-class RestoreInfo
-{
-public:
-	struct DBInfo DBInfo;
-	TQString path;
-} ;
-
-class RestoreAction::Private
-{
-public:
-	TQString fPreferRestoreDir; /**< Preference setting where to get data from. */
-
-	TQValueList<RestoreInfo> fDBList;
-	TQTimer fTimer;
-	TQValueList<RestoreInfo>::ConstIterator fDBIterator;
-	int fDBIndex;
-};
-
-
-RestoreAction::RestoreAction(KPilotLink * p, TQWidget * visible ) :
-	SyncAction(p, visible, "restoreAction")
-{
-	FUNCTIONSETUP;
-
-	fP = new Private;
-}
-
-void RestoreAction::setDirectory( const TQString &path )
-{
-	fP->fPreferRestoreDir = path;
-}
-
-/* virtual */ bool RestoreAction::exec()
-{
-	FUNCTIONSETUP;
-
-	TQString dirname;
-	if (fP->fPreferRestoreDir.isEmpty())
-	{
-		dirname = PilotLocalDatabase::getDBPath();
-	}
-	else
-	{
-		dirname = fP->fPreferRestoreDir;
-	}
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Restoring user " << dirname << endl;
-#endif
-
-	TQDir dir(dirname, TQString::null, TQDir::Name,
-		TQDir::Files | TQDir::Readable | TQDir::NoSymLinks);
-
-	if (!dir.exists())
-	{
-		WARNINGKPILOT << "Restore directory "
-			<< dirname << " does not exist." << endl;
-		fActionStatus = Error;
-		addSyncLogEntry(i18n("Restore directory does not exist.") +
-			CSL1(" ") + i18n("Restore not performed."));
-		return false;
-	}
-
-	dirname = dir.absPath();
-	if (questionYesNo(i18n("<qt>Are you sure you want to completely "
-				"restore your Pilot from the backup directory "
-				"(<i>%1</i>)? This will erase any information "
-				"you currently have on your Pilot.</qt>").
-			arg(dirname),
-			i18n("Restore Pilot")) != KMessageBox::Yes)
-	{
-		emit logError(i18n("Restore <i>not</i> performed."));
-
-		addSyncLogEntry(i18n("Canceled by user.") + CSL1(" ") +
-			i18n("Restore not performed."));
-
-		// You might call this an error, but that causes
-		// a frightening message in the log .. and the
-		// user already _knows_ the restore didn't happen.
-		// So instead, act as if everything was ok.
-		delayDone();
-		return true;
-	}
-
-
-	emit logProgress(i18n("Restoring %1...").arg(TQString::null),1);
-
-	for (unsigned int i = 0; i < dir.count(); i++)
-	{
-		TQString s;
-		RestoreInfo info;
-
-		s = dirname + TQDir::separator() + dir[i];
-
-		DEBUGKPILOT << fname
-			<< ": Adding " << s << " to restore list." << endl;
-
-		if ( PilotLocalDatabase::infoFromFile( s, &info.DBInfo ) )
-		{
-			info.path = s;
-			fP->fDBList.append(info);
-		}
-		else
-		{
-			WARNINGKPILOT << "Can't open " << s << endl;
-			logMessage(i18n("File '%1' cannot be read.").arg(s));
-		}
-	}
-
-	fP->fDBIndex = 0;
-	fP->fDBIterator = fP->fDBList.begin();
-	fActionStatus = InstallingFiles;
-
-	TQObject::connect(&(fP->fTimer), TQT_SIGNAL(timeout()),
-		this, TQT_SLOT(installNextFile()));
-
-	fP->fTimer.start(0, false);
-	return true;
-}
-
-/* slot */ void RestoreAction::installNextFile()
-{
-	FUNCTIONSETUP;
-
-	Q_ASSERT(fActionStatus == InstallingFiles);
-
-
-	if (fP->fDBIterator == fP->fDBList.end())
-	{
-		fP->fTimer.stop();
-
-		fActionStatus = Done;
-		addSyncLogEntry(i18n("OK."));
-		delayDone();
-		return;
-	}
-
-	const RestoreInfo dbi = *(fP->fDBIterator);
-	++(fP->fDBIterator);
-	++(fP->fDBIndex);
-
-	DEBUGKPILOT << fname << ": Trying to install " << dbi.path << endl;
-
-	if (openConduit() < 0)
-	{
-		WARNINGKPILOT << "Restore apparently canceled." << endl;
-		logMessage(i18n("Restore incomplete."));
-		fActionStatus = Done;
-		emit syncDone(this);
-
-		return;
-	}
-
-	TQFileInfo databaseInfo(dbi.path);
-	addSyncLogEntry(databaseInfo.fileName());
-	emit logProgress(i18n("Restoring %1...").arg(databaseInfo.fileName()),
-		(100*fP->fDBIndex) / (fP->fDBList.count()+1)) ;
-
-	if ( !deviceLink()->installFiles( dbi.path, false /* don't delete */ ) )
-	{
-		WARNINGKPILOT << "Couldn't  restore " << dbi.path << endl;
-		logError(i18n("Cannot restore file `%1'.")
-			.arg(databaseInfo.fileName()));
-	}
-}
-
-/* virtual */ TQString RestoreAction::statusString() const
-{
-	FUNCTIONSETUP;
-	TQString s;
-
-	switch (status())
-	{
-	case InstallingFiles:
-		s.append(CSL1("Installing Files ("));
-		s.append(TQString::number(fP->fDBIndex));
-		s.append(CSL1(")"));
-		break;
-	case GettingFileInfo:
-		s.append(CSL1("Getting File Info ("));
-		s.append(TQString::number(fP->fDBIndex));
-		s.append(CSL1(")"));
-		break;
-	default:
-		return SyncAction::statusString();
-	}
-
-	return s;
-}
-
-
-
-BackupAction::Thread::Thread( BackupAction *parent,
-	KPilotLink *link,
-	const TQString &filename,
-	const DBInfo *info )
-{
-	fParent = parent;
-	fLink = link;
-	fFilename = filename;
-	memcpy(&fDBInfo,info,sizeof(DBInfo));
-}
-
-void BackupAction::Thread::run()
-{
-	if (fLink->retrieveDatabase(fFilename,&fDBInfo))
-	{
-		// Successful.
-		TQApplication::postEvent( fParent, new TQEvent( (TQEvent::Type)TerminateOK ) );
-	}
-	else
-	{
-		// Failed
-		TQApplication::postEvent( fParent, new TQEvent( (TQEvent::Type)TerminateFailure ) );
-	}
-}
-
-
diff --git a/kpilot/kpilot/hotSync.h b/kpilot/kpilot/hotSync.h
deleted file mode 100644
index f100e639..00000000
--- a/kpilot/kpilot/hotSync.h
+++ /dev/null
@@ -1,175 +0,0 @@
-#ifndef _KPILOT_HOTSYNC_H
-#define _KPILOT_HOTSYNC_H
-/* hotSync.h                            KPilot
-**
-** Copyright (C) 2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-** Copyright (C) 2006 Adriaan de Groot <groot@kde.org>
-**
-** This file defines SyncActions, which are used to perform some specific
-** task during a HotSync. Conduits are not included here, nor are
-** sync actions requiring user interaction. Those can be found in the
-** conduits subdirectory or interactiveSync.h.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-class TQTimer;
-
-#include "syncAction.h"
-
-class CheckUser : public SyncAction
-{
-public:
-	CheckUser(KPilotLink *p,TQWidget *w=0L);
-	virtual ~CheckUser();
-
-protected:
-	virtual bool exec();
-} ;
-
-
-class BackupAction : public SyncAction
-{
-Q_OBJECT
-
-public:
-	/** Constructor. Back up all the databases on
-	*   the link to a directory on the local disk.
-	*   If @p full is @c true, then a full backup,
-	*   including applications, is done. Otherwise,
-	*   only user data is backed-up.
-	*
-	* @see setDirectory()
-	*/
-	BackupAction(KPilotLink *, bool full);
-
-	enum Status { Init,
-		Error,
-		FastBackup,
-		FullBackup,
-		BackupIncomplete,
-		BackupEnded,
-		BackupComplete
-		} ;
-	virtual TQString statusString() const;
-
-	/** By default, a path based on the user name (either
-	*   on the handheld or set in KPilot) is used to
-	*   determine the backup directory name ( generally
-	*   $KDEHOME/share/apps/kpilot/DBBackup/_user_name_ ).
-	*   Use setDirectory() to change that and use a given
-	*   @p path as target for the backup. Use an empty
-	*   @p path to restore the default behavior of using
-	*   the username.
-	*/
-	void setDirectory( const TQString &path );
-
-	// Reimplemented to support threaded backup.
-	virtual bool event( TQEvent *e );
-
-protected:
-	virtual bool exec();
-
-private:
-	/** Finish the backup and clean up resources. */
-	void endBackup();
-
-	/** Copy the database indicated by @p info to the local
-	*   disk; returns @c false on failure.
-	*/
-	bool startBackupThread(DBInfo *info);
-
-private slots:
-	/** Implementation detail: databases get backed-up
-	*   one at a time because the backup function in
-	*   pilot-link isn't threaded.
-	*/
-	void backupOneDB();
-
-private:
-	class Private;
-	Private *fP;
-	class Thread;
-	Thread *fBackupThread;
-} ;
-
-class FileInstallAction : public SyncAction
-{
-Q_OBJECT
-public:
-	FileInstallAction(KPilotLink *,
-		const TQString &fileDir);
-	virtual ~FileInstallAction();
-
-	virtual TQString statusString() const;
-
-protected:
-	virtual bool exec();
-
-protected slots:
-	void installNextFile();
-
-private:
-	int fDBIndex;
-	TQTimer *fTimer;
-	TQString fDir;
-	TQStringList fList;
-
-	// TODO: not const because it calls logError(), which is
-	// non-const (but might be - can signals be const, anyway?)
-	bool resourceOK(const TQString &, const TQString &) /* const */ ;
-} ;
-
-class RestoreAction : public SyncAction
-{
-Q_OBJECT
-public:
-	RestoreAction(KPilotLink *,TQWidget *w=0L);
-
-	typedef enum { InstallingFiles, GettingFileInfo,Done } Status;
-	virtual TQString statusString() const;
-
-	/** By default, a path based on the user name (either
-	*   on the handheld or set in KPilot) is used to
-	*   determine the restory directory name ( generally
-	*   $KDEHOME/share/apps/kpilot/DBBackup/_user_name_ ).
-	*   Use setDirectory() to change that and use a given
-	*   @p path as target for the source. Use an empty
-	*   @p path to restore the default behavior of using
-	*   the username.
-	*/
-	void setDirectory( const TQString &path );
-
-protected:
-	virtual bool exec();
-
-protected slots:
-	void installNextFile();
-
-private:
-	class Private;
-	Private *fP;
-} ;
-
-#endif
diff --git a/kpilot/kpilot/internalEditorAction.cc b/kpilot/kpilot/internalEditorAction.cc
deleted file mode 100644
index bc4bdb3e..00000000
--- a/kpilot/kpilot/internalEditorAction.cc
+++ /dev/null
@@ -1,394 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2003 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <options.h>
-
-#include <tqtimer.h>
-#include <tqlayout.h>
-#include <tqlabel.h>
-#include <kmessagebox.h>
-#include <kdialog.h>
-#include <ktextedit.h>
-#include <kdialogbase.h>
-
-#include <pilotRecord.h>
-#include <pilotLocalDatabase.h>
-#include <pilotDatabase.h>
-#include <pilotSerialDatabase.h>
-#include "kpilotConfig.h"
-#include "internalEditorAction.h"
-
-#include <pilotAddress.h>
-#include <pilotMemo.h>
-#include <pilotDateEntry.h>
-#include <pilotTodoEntry.h>
-
-#include "khexedit/byteseditinterface.h"
-using namespace KHE;
-
-InternalEditorAction::InternalEditorAction(KPilotLink * p) :
-	SyncAction(p, "internalSync")
-{
-	FUNCTIONSETUP;
-}
-
-bool InternalEditorAction::exec()
-{
-	FUNCTIONSETUP;
-	emit logMessage(i18n("[Internal Editors]"));
-	fInternalEditorSyncStatus=eSyncStarted;
-	TQTimer::singleShot(0, this, TQT_SLOT(syncDirtyDB()));
-	return true;
-}
-
-void InternalEditorAction::syncDirtyDB()
-{
-	FUNCTIONSETUP;
-
-	if (fInternalEditorSyncStatus!=eSyncDirtyDB)
-	{
-		fInternalEditorSyncStatus=eSyncDirtyDB;
-		dirtyDBs=KPilotSettings::dirtyDatabases();
-		emit logMessage(i18n("Databases with changed records: %1").arg(dirtyDBs.join(CSL1(", "))));
-		dbIter=dirtyDBs.begin();
-	}
-	else
-	{
-		dbIter++;
-	}
-	if (dbIter==dirtyDBs.end())
-	{
-		KPilotSettings::setDirtyDatabases(TQStringList());
-		KPilotConfig::sync();
-		TQTimer::singleShot(0, this, TQT_SLOT(syncFlagsChangedDB()));
-		return;
-	}
-#ifdef DEBUG
-	DEBUGKPILOT<<"syncDirtyDB for DB "<<(*dbIter)<<endl;
-#endif
-	// open the local and the serial database and copy every
-	// changed record from the PC to the handheld
-
-	PilotRecord*rec=0L;
-	PilotLocalDatabase*localDB=new PilotLocalDatabase(*dbIter, false);
-	PilotDatabase *serialDB= deviceLink()->database(*dbIter);
-	if (!localDB->isOpen() || !serialDB->isOpen())
-	{
-		emit logError(i18n("Unable to open the serial or local database for %1. "
-			"Skipping it.").arg(*dbIter));
-		goto nextDB;
-	}
-	while ( (rec=localDB->readNextModifiedRec()) )
-	{
-		int id=rec->id();
-#ifdef DEBUG
-		DEBUGKPILOT<<"ID of modified record is "<<id<<endl;
-		DEBUGKPILOT<<endl<<endl;
-#endif
-		if (id>0)
-		{
-			PilotRecord*serrec=serialDB->readRecordById(id);
-			if (serrec && (serrec->isModified()) )
-			{
-				bool kpilotOverrides=queryUseKPilotChanges(*dbIter, id, rec, serrec, localDB);
-				if (kpilotOverrides)
-					serialDB->writeRecord(rec);
-				else
-					localDB->writeRecord(serrec);
-			}
-			else
-				serialDB->writeRecord(rec);
-		}
-		else
-		{
-#ifdef DEBUG
-			DEBUGKPILOT<<"Generating ID for Record "<<rec->id()<<" with data "<<endl;
-			DEBUGKPILOT<<rec->data()<<endl;
-			DEBUGKPILOT<<"-----------------------------------------"<<endl;
-#endif
-			int id=serialDB->writeRecord(rec);
-			rec->setID(id);
-#ifdef DEBUG
-			DEBUGKPILOT<<"New ID is "<<id<<endl;
-			DEBUGKPILOT<<endl<<endl<<endl;
-#endif
-			//localDB->writeRecord(rec);
-			localDB->updateID(id);
-		}
-		KPILOT_DELETE(rec);
-	}
-
-nextDB:
-	localDB->resetSyncFlags();
-	KPILOT_DELETE(localDB);
-	KPILOT_DELETE(serialDB);
-	TQTimer::singleShot(0, this, TQT_SLOT(syncDirtyDB()));
-}
-
-bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id, PilotRecord*localrec, PilotRecord*serialrec, PilotDatabase*db)
-{
-	FUNCTIONSETUP;
-	bool knownDB=true;
-	TQString localEntry, serialEntry, recType(i18n("record"));
-
-	if (dbName==CSL1("AddressDB") && db)
-	{
-		PilotAddressInfo info(db);
-
-		PilotAddress localAddr(localrec);
-		PilotAddress serialAddr(serialrec);
-		localEntry=localAddr.getTextRepresentation(&info,Qt::RichText);
-		serialEntry=serialAddr.getTextRepresentation(&info,Qt::RichText);
-		recType=i18n("address");
-	}
-	else
-	if (dbName==CSL1("ToDoDB") && db)
-	{
-		PilotToDoInfo info(db);
-
-		PilotTodoEntry localTodo(localrec);
-		PilotTodoEntry serialTodo(serialrec);
-		localEntry=localTodo.getTextRepresentation(Qt::RichText);
-		serialEntry=serialTodo.getTextRepresentation(Qt::RichText);
-		recType=i18n("to-do entry");
-	}
-	else
-	if (dbName==CSL1("MemoDB"))
-	{
-		PilotMemo localMemo(localrec);
-		PilotMemo serialMemo(serialrec);
-		localEntry=localMemo.getTextRepresentation(Qt::RichText);
-		serialEntry=serialMemo.getTextRepresentation(Qt::RichText);
-		recType=i18n("memo");
-	}
-	else
-	if (dbName==CSL1("DatebookDB"))
-	{
-		PilotDateInfo info(db);
-
-		PilotDateEntry localEvent(localrec);
-		PilotDateEntry serialEvent(serialrec);
-		localEntry=localEvent.getTextRepresentation(Qt::RichText);
-		serialEntry=serialEvent.getTextRepresentation(Qt::RichText);
-		recType=i18n("calendar entry");
-	}
-	else
-	{
-		knownDB=false;
-	}
-
-	TQString dialogText(i18n("The %1 with ID %2 of the database \"%3\" was changed "
-		"on the handheld and in the internal editor. Shall the changes in KPilot be copied to the handheld, and so override the changes there?").
-		arg(recType).arg(id).arg(dbName));
-
-	KDialogBase*resdlg=new KDialogBase(0L, "internalresolutiondialog", true,
-		i18n("Conflict in database  %1").arg(*dbIter),
-		KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true,
-		i18n("Use KPilot"), i18n("Use Handheld") );
-	resdlg->setButtonText(KDialogBase::Ok,  i18n("Use &KPilot"));
-	resdlg->setButtonText(KDialogBase::Cancel, i18n("Use &Handheld"));
-
-	TQWidget*page=new TQWidget(resdlg);
-	resdlg->setMainWidget(page);
-	TQGridLayout*layout = new TQGridLayout( page, 1, 1);
-
-	TQLabel *label=new TQLabel(dialogText, page);
-	label->setAlignment( TQLabel::WordBreak );
-	layout->addMultiCellWidget( label,  0,0, 0,1 );
-
- 	layout->addItem( new TQSpacerItem( 20, 10, TQSizePolicy::Minimum,
-		TQSizePolicy::Fixed ), 1, 0 );
-
-	if (knownDB)
-	{
-		label=new TQLabel(i18n("Entry in KPilot"), page);
-		layout->addWidget( label, 2,0);
-
-		KTextEdit*textBrowser = new KTextEdit(CSL1("<qt>")+localEntry+CSL1("</qt>"), TQString::null, page);
-		textBrowser->setReadOnly(true);
-		layout->addWidget( textBrowser, 3,0);
-
-		label=new TQLabel(i18n("Entry on Handheld"), page);
-		layout->addWidget( label, 2,1);
-
-		textBrowser = new KTextEdit(CSL1("<qt>")+serialEntry+CSL1("</qt>"), TQString::null, page);
-		textBrowser->setReadOnly(true);
-		layout->addWidget( textBrowser, 3,1);
-	}
-	else
-	{
-		label=new TQLabel(i18n("Entry in KPilot"), page);
-		layout->addMultiCellWidget( label, 2,2,0,1);
-
-		// directly display the record's data:
-		TQWidget *hexEdit = KHE::createBytesEditWidget( page, "LocalBufferEdit" );
-		if( hexEdit )
-		{
-			KHE::BytesEditInterface* hexEditIf = KHE::bytesEditInterface( hexEdit );
-			Q_ASSERT( hexEditIf ); // This should not fail!
-			if( hexEditIf )
-			{
-				hexEditIf->setData( localrec->data(), localrec->size() );
-// 					Do we need the following call at all???
-//				hexEditIf->setMaxDataSize( localrec->getLen() );
-				hexEditIf->setReadOnly( true );
-			}
-		}
-		else
-		{
-			TQLabel*tmpW = new TQLabel( i18n("To view and edit the record data, please install a hex editor (e.g. khexedit from kdeutils)."), page );
-			tmpW->setBackgroundMode( Qt::PaletteMid );
-			tmpW->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter | Qt::WordBreak);
-			tmpW->setFrameShape( TQFrame::Panel );
-			tmpW->setFrameShadow( TQFrame::Sunken );
-			hexEdit = tmpW;
-		}
-		layout->addMultiCellWidget( hexEdit, 3,3,0,1);
-
-		label=new TQLabel(i18n("Entry on Handheld"), page);
-		layout->addMultiCellWidget( label, 4,4,0,1);
-
-		// directly display the record's data:
-		hexEdit = KHE::createBytesEditWidget( page, "SerialBufferEdit" );
-		if( hexEdit )
-		{
-			KHE::BytesEditInterface* hexEditIf = KHE::bytesEditInterface( hexEdit );
-			Q_ASSERT( hexEditIf ); // This should not fail!
-			if( hexEditIf )
-			{
-				hexEditIf->setData( serialrec->data(), serialrec->size() );
-// 					Do we need the following call at all???
-//				hexEditIf->setMaxDataSize( serialrec->getLen() );
-				hexEditIf->setReadOnly( true );
-			}
-		}
-		else
-		{
-			TQLabel*tmpW = new TQLabel( i18n("To view and edit the record data, please install a hex editor (e.g. khexedit from kdeutils)."), page );
-			tmpW->setBackgroundMode( Qt::PaletteMid );
-			tmpW->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter | Qt::WordBreak);
-			tmpW->setFrameShape( TQFrame::Panel );
-			tmpW->setFrameShadow( TQFrame::Sunken );
-			hexEdit = tmpW;
-		}
-		layout->addMultiCellWidget( hexEdit, 5,5,0,1);
-	}
-
-	int res=resdlg->exec();
-	KPILOT_DELETE(resdlg);
-
-	return res==KDialogBase::Accepted;
-}
-
-
-void InternalEditorAction::syncFlagsChangedDB()
-{
-	FUNCTIONSETUP;
-	if (fInternalEditorSyncStatus!=eSyncFlagsChangedDB)
-	{
-		fInternalEditorSyncStatus=eSyncFlagsChangedDB;
-		dirtyDBs=KPilotSettings::flagsChangedDatabases();
-		emit logMessage(i18n("Databases with changed flags: %1").arg(dirtyDBs.join(CSL1(", "))));
-		dbIter=dirtyDBs.begin();
-	}
-	else
-	{
-		dbIter++;
-	}
-	if (dbIter==dirtyDBs.end())
-	{
-		KPilotSettings::setFlagsChangedDatabases(TQStringList());
-		KPilotConfig::sync();
-		TQTimer::singleShot(0, this, TQT_SLOT(syncAppBlockChangedDB()));
-		return;
-	}
-
-#ifdef DEBUG
-	DEBUGKPILOT<<"syncFlagsChangedDB for DB "<<(*dbIter)<<endl;
-#endif
-emit logError(i18n("Setting the database flags on the handheld is not yet supported."));
-TQTimer::singleShot(0, this, TQT_SLOT(syncAppBlockChangedDB()));
-return;
-
-	PilotLocalDatabase*localDB=new PilotLocalDatabase(*dbIter, false);
-	PilotDatabase *serialDB=deviceLink()->database(*dbIter);
-
-	// open the local and the serial database and copy the flags over
-	// TODO: Implement the copying
-	// TODO: Is there a way to detect if the flags were changed on the handheld?
-
-	KPILOT_DELETE(localDB);
-	KPILOT_DELETE(serialDB);
-	TQTimer::singleShot(0, this, TQT_SLOT(syncAppBlockChangedDB()));
-}
-
-void InternalEditorAction::syncAppBlockChangedDB()
-{
-	FUNCTIONSETUP;
-	if (fInternalEditorSyncStatus!=eSyncAppBlockChangedDB)
-	{
-		fInternalEditorSyncStatus=eSyncAppBlockChangedDB;
-		dirtyDBs=KPilotSettings::appBlockChangedDatabases();
-		emit logMessage(i18n("Databases with changed AppBlock: %1").arg(dirtyDBs.join(CSL1(", "))));
-		dbIter=dirtyDBs.begin();
-	}
-	else
-	{
-		dbIter++;
-	}
-	if (dbIter==dirtyDBs.end())
-	{
-		KPilotSettings::setAppBlockChangedDatabases(TQStringList());
-		KPilotConfig::sync();
-		TQTimer::singleShot(0, this, TQT_SLOT(cleanup()));
-		return;
-	}
-#ifdef DEBUG
-	DEBUGKPILOT<<"syncAppBlockChangedDB for DB "<<(*dbIter)<<endl;
-#endif
-
-	PilotLocalDatabase*localDB=new PilotLocalDatabase(*dbIter, false);
-	PilotDatabase *serialDB=deviceLink()->database(*dbIter);
-
-	unsigned char*appBlock=new unsigned char[0xFFFF];
-	int len=localDB->readAppBlock(appBlock, 0xFFFF);
-	// TODO: Check if the app block was changed on the handheld, and if so, do conflict resolution
-	serialDB->writeAppBlock(appBlock, len);
-
-	KPILOT_DELETE(localDB);
-	KPILOT_DELETE(serialDB);
-	TQTimer::singleShot(0, this, TQT_SLOT(syncAppBlockChangedDB()));
-}
-
-void InternalEditorAction::cleanup()
-{
-	FUNCTIONSETUP;
-	fInternalEditorSyncStatus=eSyncFinished;
-	emit syncDone(this);
-}
-
-#include "internalEditorAction.moc"
diff --git a/kpilot/kpilot/internalEditorAction.h b/kpilot/kpilot/internalEditorAction.h
deleted file mode 100644
index ed26cb35..00000000
--- a/kpilot/kpilot/internalEditorAction.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef _INTERNALEDITORACTION_H_
-#define _INTERNALEDITORACTION_H_
-/* internalEditorAction.h                            KPilot
-**
-** Copyright (C) 2003 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include <tqstringlist.h>
-
-#include "syncAction.h"
-
-
-class InternalEditorAction : public SyncAction
-{
-Q_OBJECT
-
-public:
-	InternalEditorAction(KPilotLink *);
-	~InternalEditorAction() {}
-
-protected:
-	virtual bool exec();
-
-private:
-private slots:
-	void syncDirtyDB();
-	void syncFlagsChangedDB();
-	void syncAppBlockChangedDB();
-	void cleanup();
-
-private:
-	bool queryUseKPilotChanges(TQString dbName, recordid_t id,
-		PilotRecord*localrec, PilotRecord*serialrec, PilotDatabase*db);
-	TQStringList dirtyDBs;
-	TQStringList::Iterator dbIter;
-	enum eInternalEditorSyncStatus {
-		eSyncStarted,
-		eSyncDirtyDB,
-		eSyncFlagsChangedDB,
-		eSyncAppBlockChangedDB,
-		eSyncFinished
-	} fInternalEditorSyncStatus;
-} ;
-
-#endif
diff --git a/kpilot/kpilot/kpilot.cc b/kpilot/kpilot/kpilot.cc
deleted file mode 100644
index 4b38c509..00000000
--- a/kpilot/kpilot/kpilot.cc
+++ /dev/null
@@ -1,1136 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This is the main program in KPilot.
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include "options.h"
-
-#include <tqfile.h>
-#include <tqptrlist.h>
-#include <tqstring.h>
-#include <tqvbox.h>
-#include <tqtimer.h>
-
-#include <kjanuswidget.h>
-#include <kurl.h>
-#include <kmessagebox.h>
-#include <kstatusbar.h>
-#include <kconfig.h>
-#include <kwin.h>
-#include <kcombobox.h>
-#include <kmenubar.h>
-#include <kstandarddirs.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kiconloader.h>
-#include <kdebug.h>
-#include <kaction.h>
-#include <kactionclasses.h>
-#include <kstdaction.h>
-#include <kuniqueapplication.h>
-#include <kkeydialog.h>
-#include <kedittoolbar.h>
-#include <kcmultidialog.h>
-#include <kprogress.h>
-#include <klibloader.h>
-
-
-#include "kpilotConfigDialog.h"
-#include "kpilotConfig.h"
-#include "kpilotConfigWizard.h"
-
-#include "pilotComponent.h"
-#include "pilotDatabase.h"
-
-#include "addressWidget.h"
-#include "memoWidget.h"
-#include "fileInstallWidget.h"
-#include "logWidget.h"
-#include "dbviewerWidget.h"
-#include "datebookWidget.h"
-#include "todoWidget.h"
-
-#include "conduitConfigDialog.h"
-
-#include "pilotDaemonDCOP.h"
-#include "pilotDaemonDCOP_stub.h"
-
-#include "kpilot.moc"
-
-class KPilotInstaller::KPilotPrivate
-{
-public:
-	typedef TQPtrList<PilotComponent> ComponentList;
-
-private:
-	ComponentList  fPilotComponentList;
-
-public:
-	ComponentList &list() { return fPilotComponentList; } ;
-} ;
-
-KPilotInstaller::KPilotInstaller() :
-	DCOPObject("KPilotIface"),
-	KMainWindow(0),
-	fDaemonStub(new PilotDaemonDCOP_stub("kpilotDaemon",
-		"KPilotDaemonIface")),
-	fP(new KPilotPrivate),
-	fQuitAfterCopyComplete(false),
-	fManagingWidget(0L),
-	fDaemonWasRunning(true),
-	fAppStatus(Startup),
-	fFileInstallWidget(0L),
-	fLogWidget(0L)
-{
-	FUNCTIONSETUP;
-
-	readConfig();
-	setupWidget();
-
-	PilotRecord::allocationInfo();
-	fConfigureKPilotDialogInUse = false;
-}
-
-KPilotInstaller::~KPilotInstaller()
-{
-	FUNCTIONSETUP;
-	killDaemonIfNeeded();
-	delete fDaemonStub;
-	PilotRecord::allocationInfo();
-	(void) PilotDatabase::instanceCount();
-}
-
-void KPilotInstaller::killDaemonIfNeeded()
-{
-	FUNCTIONSETUP;
-	if (KPilotSettings::killDaemonAtExit())
-	{
-		if (!fDaemonWasRunning)
-		{
-			DEBUGKPILOT << fname << ": Killing daemon." << endl;
-			getDaemon().quitNow();
-		}
-	}
-}
-
-void KPilotInstaller::startDaemonIfNeeded()
-{
-	FUNCTIONSETUP;
-
-	fAppStatus=WaitingForDaemon;
-
-	TQString daemonError;
-	TQCString daemonDCOP;
-	int daemonPID;
-
-	TQString s = getDaemon().statusString();
-
-	DEBUGKPILOT << fname << ": Daemon status is "
-		<< ( s.isEmpty() ? CSL1("<none>") : s ) << endl;
-
-	if ((s.isEmpty()) || (!getDaemon().ok()))
-	{
-		DEBUGKPILOT << fname
-			<< ": Daemon not responding, trying to start it."
-			<< endl;
-		fLogWidget->addMessage(i18n("Starting the KPilot daemon ..."));
-		fDaemonWasRunning = false;
-	}
-	else
-	{
-		fDaemonWasRunning = true;
-	}
-
-	if (!fDaemonWasRunning && KApplication::startServiceByDesktopName(
-		CSL1("kpilotdaemon"),
-		TQString::null, &daemonError, &daemonDCOP, &daemonPID
-			, "0" /* no notify */
-		))
-	{
-		WARNINGKPILOT << ": Can't start daemon : " << daemonError << endl;
-		if (fLogWidget)
-		{
-			fLogWidget->addMessage(i18n("Could not start the "
-				"KPilot daemon. The system error message "
-				"was: &quot;%1&quot;").arg(daemonError));
-		}
-		fAppStatus=Error;
-	}
-	else
-	{
-		DEBUGKPILOT << fname << ": Daemon status is " << s << endl;
-		if (fLogWidget)
-		{
-			int wordoffset;
-			s.remove(0,12);
-			wordoffset=s.find(';');
-			if (wordoffset>0) s.truncate(wordoffset);
-
-			fLogWidget->addMessage(
-				i18n("Daemon status is `%1'")
-				.arg(s.isEmpty() ? i18n("not running") : s ));
-		}
-		fAppStatus=Normal;
-	}
-}
-
-void KPilotInstaller::readConfig()
-{
-	FUNCTIONSETUP;
-
-	KPilotSettings::self()->readConfig();
-
-	(void) Pilot::setupPilotCodec(KPilotSettings::encoding());
-	(void) Pilot::setupPilotCodec(KPilotSettings::encoding());
-
-	if (fLogWidget)
-	{
-		fLogWidget->addMessage(i18n("Using character set %1 on "
-			"the handheld.")
-			.arg(Pilot::codecName()));
-	}
-}
-
-
-void KPilotInstaller::setupWidget()
-{
-	FUNCTIONSETUP;
-
-	setCaption(CSL1("KPilot"));
-	setMinimumSize(500, 405);
-
-
-	fManagingWidget = new KJanusWidget(this,"mainWidget",
-		KJanusWidget::IconList);
-	fManagingWidget->setMinimumSize(fManagingWidget->sizeHint());
-	fManagingWidget->show();
-	setCentralWidget(fManagingWidget);
-	connect( fManagingWidget, TQT_SIGNAL( aboutToShowPage ( TQWidget* ) ),
-			this, TQT_SLOT( slotAboutToShowComponent( TQWidget* ) ) );
-
-	initIcons();
-	initMenu();
-	initComponents();
-
-	setMinimumSize(sizeHint() + TQSize(10,60));
-
-	createGUI(CSL1("kpilotui.rc"), false);
-	setAutoSaveSettings();
-}
-
-void KPilotInstaller::initComponents()
-{
-	FUNCTIONSETUP;
-
-	TQString defaultDBPath = KPilotConfig::getDefaultDBPath();
-
-	TQPixmap pixmap;
-	TQString pixfile;
-	TQWidget *w;
-
-#define ADDICONPAGE(a,b) \
-	pixmap = KGlobal::iconLoader()->loadIcon(b, KIcon::Desktop, 64); \
-	w = getManagingWidget()->addVBoxPage(a,TQString::null, pixmap) ;
-
-	ADDICONPAGE(i18n("HotSync"),CSL1("kpilotbhotsync"));
-	fLogWidget = new LogWidget(w);
-	addComponentPage(fLogWidget, i18n("HotSync"));
-	fLogWidget->setShowTime(true);
-
-	ADDICONPAGE(i18n("To-do Viewer"),CSL1("kpilottodo"));
-	addComponentPage(new TodoWidget(w,defaultDBPath),
-		i18n("To-do Viewer"));
-
-	ADDICONPAGE(i18n("Address Viewer"),CSL1("kpilotaddress"));
-	addComponentPage(new AddressWidget(w,defaultDBPath),
-		i18n("Address Viewer"));
-
-	ADDICONPAGE(i18n("Memo Viewer"),CSL1("kpilotknotes"));
-	addComponentPage(new MemoWidget(w, defaultDBPath),
-		i18n("Memo Viewer"));
-
-	ADDICONPAGE(i18n("File Installer"),CSL1("kpilotfileinstaller"));
-	fFileInstallWidget = new FileInstallWidget(
-		w,defaultDBPath);
-	addComponentPage(fFileInstallWidget, i18n("File Installer"));
-
-	ADDICONPAGE(i18n("Generic DB Viewer"),CSL1("kpilotdb"));
-	addComponentPage(new GenericDBWidget(w,defaultDBPath),
-		i18n("Generic DB Viewer"));
-
-#undef ADDICONPAGE
-
-	TQTimer::singleShot(500,this,TQT_SLOT(initializeComponents()));
-}
-
-
-
-void KPilotInstaller::initIcons()
-{
-	FUNCTIONSETUP;
-
-}
-
-
-
-void KPilotInstaller::slotAboutToShowComponent( TQWidget *c )
-{
-	FUNCTIONSETUP;
-	int ix = fManagingWidget->pageIndex( c );
-	PilotComponent*compToShow = fP->list().at(ix);
-	for ( PilotComponent *comp = fP->list().first(); comp; comp = fP->list().next() )
-	{
-		// Load/Unload the data needed
-		comp->showKPilotComponent( comp == compToShow );
-	}
-}
-
-void KPilotInstaller::slotSelectComponent(PilotComponent *c)
-{
-	FUNCTIONSETUP;
-	if (!c)
-	{
-		WARNINGKPILOT << "Not a widget." << endl;
-		return;
-	}
-
-	TQObject *o = c->parent();
-	if (!o)
-	{
-		WARNINGKPILOT << "Widget has no parent." << endl;
-		return;
-	}
-
-	TQWidget *parent = dynamic_cast<TQWidget *>(o);
-	if (!parent)
-	{
-		WARNINGKPILOT << "Widget's parent is not a widget." << endl;
-		return;
-	}
-
-	int index = fManagingWidget->pageIndex(parent);
-
-	if (index < 0)
-	{
-		WARNINGKPILOT << "Bogus index " << index << endl;
-		return;
-	}
-
-	for ( PilotComponent *comp = fP->list().first(); comp; comp = fP->list().next() )
-	{
-		// Load/Unload the data needed
-		comp->showKPilotComponent( comp == c );
-	}
-	fManagingWidget->showPage(index);
-}
-
-
-
-
-void KPilotInstaller::slotBackupRequested()
-{
-	FUNCTIONSETUP;
-	setupSync(SyncAction::SyncMode::eBackup,
-		i18n("Next sync will be a backup. ") +
-		i18n("Please press the HotSync button."));
-}
-
-void KPilotInstaller::slotRestoreRequested()
-{
-	FUNCTIONSETUP;
-	setupSync(SyncAction::SyncMode::eRestore,
-		i18n("Next sync will restore the Pilot from backup. ") +
-		i18n("Please press the HotSync button."));
-}
-
-void KPilotInstaller::slotHotSyncRequested()
-{
-	FUNCTIONSETUP;
-	setupSync(SyncAction::SyncMode::eHotSync,
-		i18n("Next sync will be a regular HotSync. ") +
-		i18n("Please press the HotSync button."));
-}
-
-void KPilotInstaller::slotFullSyncRequested()
-{
-	FUNCTIONSETUP;
-	setupSync(SyncAction::SyncMode::eFullSync,
-		i18n("Next sync will be a Full Sync. ") +
-		i18n("Please press the HotSync button."));
-}
-
-void KPilotInstaller::slotHHtoPCRequested()
-{
-	FUNCTIONSETUP;
-	setupSync(SyncAction::SyncMode::eCopyHHToPC,
-		i18n("Next sync will copy Handheld data to PC. ") +
-		i18n("Please press the HotSync button."));
-}
-
-void KPilotInstaller::slotPCtoHHRequested()
-{
-	FUNCTIONSETUP;
-	setupSync(SyncAction::SyncMode::eCopyPCToHH,
-		i18n("Next sync will copy PC data to Handheld. ") +
-		i18n("Please press the HotSync button."));
-}
-
-/* virtual DCOP */ ASYNC KPilotInstaller::daemonStatus(int i)
-{
-	FUNCTIONSETUP;
-	DEBUGKPILOT << fname << ": Received daemon message " << i << endl;
-
-	switch(i)
-	{
-	case KPilotDCOP::StartOfHotSync :
-		if (fAppStatus==Normal)
-		{
-			fAppStatus=WaitingForDaemon;
-			componentPreSync();
-		}
-		break;
-	case KPilotDCOP::EndOfHotSync :
-		if (fAppStatus==WaitingForDaemon)
-		{
-			componentPostSync();
-			fAppStatus=Normal;
-		}
-		break;
-	case KPilotDCOP::DaemonQuit :
-		if (fLogWidget)
-		{
-			fLogWidget->logMessage(i18n("The daemon has exited."));
-			fLogWidget->logMessage(i18n("No further HotSyncs are possible."));
-			fLogWidget->logMessage(i18n("Restart the daemon to HotSync again."));
-		}
-		fAppStatus=WaitingForDaemon;
-		break;
-	case KPilotDCOP::None :
-		WARNINGKPILOT << "Unhandled status message " << i << endl;
-		break;
-	}
-}
-
-/* virtual DCOP*/ int KPilotInstaller::kpilotStatus()
-{
-	return status();
-}
-
-bool KPilotInstaller::componentPreSync()
-{
-	FUNCTIONSETUP;
-
-	TQString reason;
-	TQString rprefix(i18n("Cannot start a Sync now. %1"));
-
-	for (fP->list().first();
-		fP->list().current(); fP->list().next())
-	{
-		if (!fP->list().current()->preHotSync(reason))
-			break;
-	}
-
-	if (!reason.isNull())
-	{
-		KMessageBox::sorry(this,
-			rprefix.arg(reason),
-			i18n("Cannot start Sync"));
-		return false;
-	}
-	return true;
-}
-
-void KPilotInstaller::componentPostSync()
-{
-	FUNCTIONSETUP;
-
-	for (fP->list().first();
-		fP->list().current(); fP->list().next())
-	{
-		fP->list().current()->postHotSync();
-	}
-}
-
-void KPilotInstaller::setupSync(int kind, const TQString & message)
-{
-	FUNCTIONSETUP;
-
-	if (!componentPreSync())
-	{
-		return;
-	}
-	if (!message.isEmpty())
-	{
-		TQString m(message);
-		if (fLogWidget)
-		{
-			fLogWidget->logMessage(m);
-		}
-	}
-	getDaemon().requestSync(kind);
-}
-
-void KPilotInstaller::closeEvent(TQCloseEvent * e)
-{
-	FUNCTIONSETUP;
-
-	quit();
-	e->accept();
-}
-
-void KPilotInstaller::initMenu()
-{
-	FUNCTIONSETUP;
-
-	KAction *a;
-
-	KActionMenu *syncPopup;
-
-	syncPopup = new KActionMenu(i18n("HotSync"), CSL1("kpilot"),
-		actionCollection(), "popup_hotsync");
-	syncPopup->setToolTip(i18n("Select the kind of HotSync to perform next."));
-	syncPopup->setWhatsThis(i18n("Select the kind of HotSync to perform next. "
-		"This applies only to the next HotSync; to change the default, use "
-		"the configuration dialog."));
-	connect(syncPopup, TQT_SIGNAL(activated()),
-		this, TQT_SLOT(slotHotSyncRequested()));
-
-	// File actions, keep this list synced with kpilotui.rc and pilotDaemon.cc
-	a = new KAction(i18n("&HotSync"), CSL1("hotsync"), 0,
-		this, TQT_SLOT(slotHotSyncRequested()),
-		actionCollection(), "file_hotsync");
-	a->setToolTip(i18n("Next HotSync will be normal HotSync."));
-	a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
-		"should be a normal HotSync."));
-	syncPopup->insert(a);
-
-	a = new KAction(i18n("Full&Sync"), CSL1("fullsync"), 0,
-		this, TQT_SLOT(slotFullSyncRequested()),
-		actionCollection(), "file_fullsync");
-	a->setToolTip(i18n("Next HotSync will be a FullSync."));
-	a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
-		"should be a FullSync (check data on both sides)."));
-	syncPopup->insert(a);
-
-	a = new KAction(i18n("&Backup"), CSL1("backup"), 0,
-		this, TQT_SLOT(slotBackupRequested()),
-		actionCollection(), "file_backup");
-	a->setToolTip(i18n("Next HotSync will be backup."));
-	a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
-		"should back up the Handheld to the PC."));
-	syncPopup->insert(a);
-
-	a = new KAction(i18n("&Restore"), CSL1("restore"), 0,
-		this, TQT_SLOT(slotRestoreRequested()),
-		actionCollection(), "file_restore");
-	a->setToolTip(i18n("Next HotSync will be restore."));
-	a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
-		"should restore the Handheld from data on the PC."));
-	syncPopup->insert(a);
-
-	a = new KAction(i18n("Copy Handheld to PC"), TQString::null, 0,
-		this, TQT_SLOT(slotHHtoPCRequested()),
-		actionCollection(), "file_HHtoPC");
-	a->setToolTip(i18n("Next HotSync will be backup."));
-	a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
-		"should copy all data from the Handheld to the PC, "
-		"overwriting entries on the PC."));
-	syncPopup->insert(a);
-
-	a = new KAction(i18n("Copy PC to Handheld"), TQString::null, 0,
-		this, TQT_SLOT(slotPCtoHHRequested()),
-		actionCollection(), "file_PCtoHH");
-	a->setToolTip(i18n("Next HotSync will copy PC to Handheld."));
-	a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
-		"should copy all data from the PC to the Handheld, "
-		"overwriting entries on the Handheld."));
-	syncPopup->insert(a);
-
-
-#if 0
-	a = new KAction(i18n("&List Only"),CSL1("listsync"),0,
-		this,TQT_SLOT(slotTestSyncRequested()),
-		actionCollection(), "file_list");
-	a->setToolTip(i18n("Next HotSync will list databases."));
-	a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
-		"should just list the files on the Handheld and do nothing "
-		"else."));
-	syncPopup->insert(a);
-#endif
-
-
-	a = new KAction(i18n("Rese&t Link"),CSL1("reload"), 0,
-		this, TQT_SLOT(slotResetLink()),
-		actionCollection(),"file_reload");
-	a->setToolTip(i18n("Reset the device connection."));
-	a->setWhatsThis(i18n("Try to reset the daemon and its connection "
-		"to the Handheld."));
-
-
-	a = KStdAction::quit(this, TQT_SLOT(quit()), actionCollection());
-	a->setWhatsThis(i18n("Quit KPilot, (and stop the daemon "
-		"if configured that way)."));
-
-	// View actions
-
-	// Options actions
-	createStandardStatusBarAction();
-	setStandardToolBarMenuEnabled(true);
-
-	(void) KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()),
-		actionCollection());
-	(void) KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()),
-		actionCollection());
-	(void) KStdAction::preferences(this, TQT_SLOT(configure()),
-		actionCollection());
-
-	a = new KAction(i18n("Configuration &Wizard..."), CSL1("wizard"), 0,
-		this, TQT_SLOT(configureWizard()),
-		actionCollection(), "options_configure_wizard");
-	a->setWhatsThis(i18n("Configure KPilot using the configuration wizard."));
-
-}
-
-void KPilotInstaller::fileInstalled(int)
-{
-	FUNCTIONSETUP;
-}
-
-void KPilotInstaller::quit()
-{
-	FUNCTIONSETUP;
-
-	for (fP->list().first();
-		fP->list().current(); fP->list().next())
-	{
-		TQString reason;
-		if (!fP->list().current()->preHotSync(reason))
-		{
-			WARNINGKPILOT
-				<< "Couldn't save "
-				<< fP->list().current()->name()
-				<< endl;
-		}
-	}
-
-	killDaemonIfNeeded();
-	kapp->quit();
-}
-
-void KPilotInstaller::addComponentPage(PilotComponent * p,
-	const TQString & name)
-{
-	FUNCTIONSETUP;
-
-	if (!p)
-	{
-		WARNINGKPILOT << "Adding NULL component?" << endl;
-		return;
-	}
-
-	fP->list().append(p);
-
-	// The first component added gets id 1, while the title
-	// screen -- added elsewhere -- has id 0.
-	//
-	// fManagingWidget->addWidget(p, fP->list().count());
-
-
-	const char *componentname = p->name("(none)");
-	char *actionname = 0L;
-	int actionnameLength = 0;
-
-	if (strncmp(componentname, "component_", 10) == 0)
-	{
-		actionnameLength = strlen(componentname) - 10 + 8;
-		actionname = new char[actionnameLength];
-
-		strlcpy(actionname, "view_", actionnameLength);
-		strlcat(actionname, componentname + 10, actionnameLength);
-	}
-	else
-	{
-		actionnameLength = strlen(componentname) + 8;
-		actionname = new char[actionnameLength];
-
-		strlcpy(actionname, "view_", actionnameLength);
-		strlcat(actionname, componentname, actionnameLength);
-	}
-
-	KToggleAction *pt =
-		new KToggleAction(name, /* "kpilot" -- component icon, */ 0,
-		p, TQT_SLOT(slotShowComponent()),
-		actionCollection(), actionname);
-
-	pt->setExclusiveGroup(CSL1("view_menu"));
-
-	connect(p, TQT_SIGNAL(showComponent(PilotComponent *)),
-		this, TQT_SLOT(slotSelectComponent(PilotComponent *)));
-}
-
-/* slot */ void KPilotInstaller::initializeComponents()
-{
-	FUNCTIONSETUP;
-
-/*	for (PilotComponent *p = fP->list().first();
-		p ; p = fP->list().next())
-	{
-		p->initialize();
-	}*/
-}
-
-
-void KPilotInstaller::optionsConfigureKeys()
-{
-	FUNCTIONSETUP;
-	KKeyDialog::configure( actionCollection() );
-}
-
-void KPilotInstaller::optionsConfigureToolbars()
-{
-	FUNCTIONSETUP;
-	// use the standard toolbar editor
-	// This was added in KDE 3.1
-	saveMainWindowSettings( KGlobal::config(), autoSaveGroup() );
-	KEditToolbar dlg(actionCollection());
-	connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig()));
-	dlg.exec();
-}
-
-
-void KPilotInstaller::slotNewToolbarConfig()
-{
-	FUNCTIONSETUP;
-	// recreate our GUI
-	createGUI();
-	applyMainWindowSettings( KGlobal::config(), autoSaveGroup() );
-}
-
-void KPilotInstaller::slotResetLink()
-{
-	FUNCTIONSETUP;
-	getDaemon().reloadSettings();
-}
-
-/*
-** Can't be a member function because it needs to be called even with no KPilotInstaller.
-*/
-static bool runConfigure(PilotDaemonDCOP_stub &daemon,TQWidget *parent)
-{
-	FUNCTIONSETUP;
-	bool ret = false;
-
-	// Display the (modal) options page.
-	//
-	//
-	int rememberedSync = daemon.nextSyncType();
-	daemon.requestSync(0);
-
-	KPilotSettings::self()->readConfig();
-
-	KCMultiDialog *options = new KCMultiDialog( KDialogBase::Plain, i18n("Configuration"), parent, "KPilotPreferences", true );
-	options->addModule( CSL1("kpilot_config.desktop") );
-
-	if (!options)
-	{
-		WARNINGKPILOT << "Can't allocate KPilotOptions object" << endl;
-		daemon.requestSync(rememberedSync);
-		return false;
-	}
-
-	int r = options->exec();
-
-	if ( r && options->result() )
-	{
-		DEBUGKPILOT << fname << ": Updating settings." << endl;
-
-		// The settings are changed in the external module!!!
-		KPilotSettings::self()->config()->sync();
-		KPilotSettings::self()->readConfig();
-
-		// Update the daemon to reflect new settings.
-		// @TODO: This should also be done when pressing apply without
-		// closing the dialog.
-		//
-		daemon.reloadSettings();
-		ret = true;
-	}
-
-	KPILOT_DELETE(options);
-	daemon.requestSync(rememberedSync);
-
-	KPilotConfig::sync();
-	return ret;
-}
-
-/*
- * Run the config wizard -- this takes a little library magic, and
- * it might fail entirely; returns false if no wizard could be run,
- * or true if the wizard runs (says nothing about it being OK'ed or
- * canceled, though).
- */
-typedef enum { Failed, OK, Cancel } WizardResult;
-static WizardResult runWizard(PilotDaemonDCOP_stub &daemon,TQWidget *parent)
-{
-	FUNCTIONSETUP;
-	WizardResult ret = Failed ;
-	int rememberedSync = daemon.nextSyncType();
-	daemon.requestSync(0);
-
-	KPilotSettings::self()->readConfig();
-	// Declarations at top because of goto's in this function
-	ConfigWizard *(* f) (TQWidget *, int) = 0L ;
-	ConfigWizard *w = 0L;
-	KLibrary *l = KLibLoader::self()->library("kcm_kpilot");
-
-	if (!l)
-	{
-		WARNINGKPILOT << "Couldn't load library!" << endl;
-		goto sorry;
-	}
-
-	if (l->hasSymbol("create_wizard"))
-	{
-		f = ( ConfigWizard * (*) (TQWidget *, int) ) (l->symbol("create_wizard")) ;
-	}
-
-	if (!f)
-	{
-		WARNINGKPILOT << "No create_wizard() in library." << endl;
-		goto sorry;
-	}
-
-	w = f(parent,ConfigWizard::Standalone);
-	if (!w)
-	{
-		WARNINGKPILOT << "Can't create wizard." << endl;
-		goto sorry;
-	}
-
-	if (w->exec())
-	{
-		KPilotSettings::self()->readConfig();
-		ret = OK;
-	}
-	else
-	{
-		ret = Cancel;
-	}
-	KPILOT_DELETE(w);
-
-sorry:
-	if (Failed == ret)
-	{
-		KMessageBox::sorry(parent,
-			i18n("The library containing the configuration wizard for KPilot "
-				"could not be loaded, and the wizard is not available. "
-				"Please try to use the regular configuration dialog."),
-				i18n("Wizard Not Available"));
-	}
-
-	if (OK == ret)
-	{
-		KPilotConfig::updateConfigVersion();
-		KPilotSettings::writeConfig();
-		KPilotConfig::sync();
-	}
-
-	daemon.requestSync(rememberedSync);
-	return ret;
-}
-
-void KPilotInstaller::componentUpdate()
-{
-	FUNCTIONSETUP;
-
-	TQString defaultDBPath = KPilotConfig::getDefaultDBPath();
-	bool dbPathChanged = false;
-
-	for (fP->list().first();
-		fP->list().current();
-		fP->list().next())
-	{
-// TODO_RK: update the current component to use the new settings
-//			fP->list().current()->initialize();
-		PilotComponent *p = fP->list().current();
-		if (p && (p->dbPath() != defaultDBPath))
-		{
-			dbPathChanged = true;
-			p->setDBPath(defaultDBPath);
-		}
-	}
-
-	if (!dbPathChanged) // done if the username didn't change
-	{
-		return;
-	}
-
-	// Otherwise, need to re-load the databases
-	//
-	if (fLogWidget)
-	{
-		fLogWidget->logMessage(i18n("Changed username to `%1'.")
-			.arg(KPilotSettings::userName()));
-		fManagingWidget->showPage(0);
-		slotAboutToShowComponent(fLogWidget);
-	}
-	else
-	{
-		int ix = fManagingWidget->activePageIndex();
-		PilotComponent *component = 0L;
-		if (ix>=0)
-		{
-			component = fP->list().at(ix);
-		}
-		if (component)
-		{
-			component->hideComponent(); // Throw away current data
-			component->showComponent(); // Reload
-		}
-	}
-}
-
-/* virtual DCOP */ ASYNC KPilotInstaller::configureWizard()
-{
-	FUNCTIONSETUP;
-
-	if ( fAppStatus!=Normal || fConfigureKPilotDialogInUse )
-	{
-		if (fLogWidget)
-		{
-			fLogWidget->addMessage(i18n("Cannot run KPilot's configuration wizard right now (KPilot's UI is already busy)."));
-		}
-		return;
-	}
-	fAppStatus=UIBusy;
-	fConfigureKPilotDialogInUse = true;
-
-	if (runWizard(getDaemon(),this) == OK)
-	{
-		componentUpdate();
-	}
-
-	fConfigureKPilotDialogInUse = false;
-	fAppStatus=Normal;
-}
-
-/* virtual DCOP */ ASYNC KPilotInstaller::configure()
-{
-	FUNCTIONSETUP;
-
-	if ( fAppStatus!=Normal || fConfigureKPilotDialogInUse )
-	{
-		if (fLogWidget)
-		{
-			fLogWidget->addMessage(i18n("Cannot configure KPilot right now (KPilot's UI is already busy)."));
-		}
-		return;
-	}
-	fAppStatus=UIBusy;
-	fConfigureKPilotDialogInUse = true;
-	if (runConfigure(getDaemon(),this))
-	{
-		componentUpdate();
-	}
-
-	fConfigureKPilotDialogInUse = false;
-	fAppStatus=Normal;
-}
-
-
-/* static */ const char *KPilotInstaller::version(int kind)
-{
-	FUNCTIONSETUP;
-	// I don't think the program title needs to be translated. (ADE)
-	//
-	//
-	if (kind)
-	{
-		return "kpilot.cc";
-	}
-	else
-	{
-		return "KPilot v" KPILOT_VERSION;
-	}
-}
-
-// Command line options descriptions.
-//
-//
-//
-//
-static KCmdLineOptions kpilotoptions[] = {
-	{"s", 0, 0},
-	{"setup",
-		I18N_NOOP("Setup the Pilot device, conduits and other parameters"),
-		0L},
-	{"debug <level>", I18N_NOOP("Set debugging level"), "0"},
-	KCmdLineLastOption
-};
-
-
-
-
-// "Regular" mode == 0
-// setup mode == 's'
-//
-// This is only changed by the --setup flag --
-// kpilot still does a setup the first time it is run.
-//
-//
-KPilotConfig::RunMode run_mode = KPilotConfig::Normal;
-
-
-
-int main(int argc, char **argv)
-{
-	FUNCTIONSETUP;
-
-	KAboutData about("kpilot", I18N_NOOP("KPilot"),
-		KPILOT_VERSION,
-		"KPilot - HotSync software for KDE\n\n",
-		KAboutData::License_GPL,
-		"(c) 1998-2000,2001, Dan Pilone (c) 2000-2006, Adriaan de Groot",
-		0L,
-		"http://www.kpilot.org/"
-		);
-	about.addAuthor("Dan Pilone",
-		I18N_NOOP("Project Leader"),
-		"pilone@slac.com" );
-	about.addAuthor("Adriaan de Groot",
-		I18N_NOOP("Maintainer"),
-		"groot@kde.org", "http://www.kpilot.org/");
-	about.addAuthor("Reinhold Kainhofer",
-		I18N_NOOP("Core and conduits developer"), "reinhold@kainhofer.com", "http://reinhold.kainhofer.com/Linux/");
-	about.addAuthor("Jason 'vanRijn' Kasper",
-		I18N_NOOP("Core and conduits developer"),
-		"vR@movingparts.net", "http://movingparts.net/");
-	about.addCredit("Preston Brown", I18N_NOOP("VCal conduit"));
-	about.addCredit("Greg Stern", I18N_NOOP("Abbrowser conduit"));
-	about.addCredit("Chris Molnar", I18N_NOOP("Expenses conduit"));
-	about.addCredit("Jörn Ahrens", I18N_NOOP("Notepad conduit, Bugfixer"));
-	about.addCredit("Heiko Purnhagen", I18N_NOOP("Bugfixer"));
-	about.addCredit("Jörg Habenicht", I18N_NOOP("Bugfixer"));
-	about.addCredit("Martin Junius",
-		I18N_NOOP("XML GUI"),
-		"mj@m-j-s.net", "http://www.m-j-s.net/kde/");
-	about.addCredit("David Bishop",
-		I18N_NOOP(".ui files"));
-	about.addCredit("Aaron J. Seigo",
-		I18N_NOOP("Bugfixer, coolness"));
-	about.addCredit("Bertjan Broeksema",
-		I18N_NOOP("VCalconduit state machine, CMake"));
-
-	KCmdLineArgs::init(argc, argv, &about);
-	KCmdLineArgs::addCmdLineOptions(kpilotoptions, "kpilot");
-	KUniqueApplication::addCmdLineOptions();
-	KCmdLineArgs *p = KCmdLineArgs::parsedArgs();
-
-#ifdef DEBUG
-	KPilotConfig::getDebugLevel(p);
-#endif
-
-
-	if (!KUniqueApplication::start())
-	{
-		return 0;
-	}
-	KUniqueApplication a(true, true);
-
-
-	if (p->isSet("setup"))
-	{
-		run_mode = KPilotConfig::ConfigureKPilot;
-	}
-	else if (KPilotSettings::configVersion() < KPilotConfig::ConfigurationVersion)
-	{
-		WARNINGKPILOT << "KPilot configuration version "
-			<< KPilotConfig::ConfigurationVersion
-			<< " newer than stored version "
-			<< KPilotSettings::configVersion() << endl;
-		// Only force a reconfigure and continue if the
-		// user is expecting normal startup. Otherwise,
-		// do the configuration they're explicitly asking for.
-		run_mode = KPilotConfig::interactiveUpdate();
-		if (run_mode == KPilotConfig::Cancel) return 1;
-	}
-
-
-	if ( (run_mode == KPilotConfig::ConfigureKPilot) ||
-		(run_mode == KPilotConfig::ConfigureAndContinue) ||
-		(run_mode == KPilotConfig::WizardAndContinue) )
-	{
-		DEBUGKPILOT << fname
-			<< ": Running setup first."
-			<< " (mode " << run_mode << ")" << endl;
-		PilotDaemonDCOP_stub *daemon = new PilotDaemonDCOP_stub("kpilotDaemon","KPilotDaemonIface");
-		bool r = false;
-		if (run_mode == KPilotConfig::WizardAndContinue)
-		{
-			r = ( runWizard(*daemon,0L) == OK );
-		}
-		else
-		{
-			r = runConfigure(*daemon,0L);
-		}
-		delete daemon;
-		if (!r) return 1;
-		// User expected configure only.
-		if (run_mode == KPilotConfig::ConfigureKPilot)
-		{
-			return 0;
-		}
-	}
-
-	if (KPilotSettings::configVersion() < KPilotConfig::ConfigurationVersion)
-	{
-		WARNINGKPILOT << "Still not configured for use." << endl;
-		KPilotConfig::sorryVersionOutdated( KPilotSettings::configVersion());
-		return 1;
-	}
-
-
-	KPilotInstaller *tp = new KPilotInstaller();
-
-	if (tp->status() == KPilotInstaller::Error)
-	{
-		KPILOT_DELETE(tp);
-		return 1;
-	}
-
-	TQTimer::singleShot(0,tp,TQT_SLOT(startDaemonIfNeeded()));
-
-	KGlobal::dirs()->addResourceType("pilotdbs",
-		CSL1("share/apps/kpilot/DBBackup"));
-	tp->show();
-	a.setMainWidget(tp);
-	return a.exec();
-}
-
-
diff --git a/kpilot/kpilot/kpilot.desktop b/kpilot/kpilot/kpilot.desktop
deleted file mode 100644
index 8d1a0ea9..00000000
--- a/kpilot/kpilot/kpilot.desktop
+++ /dev/null
@@ -1,86 +0,0 @@
-# KDE Config File
-[Desktop Entry]
-Name=KPilot
-Name[af]=Kpilot
-Name[eo]=Palm-Piloto
-Name[fr]=Palm Pilot
-Name[hi]=के-पायलट
-Name[lv]=KPilots
-Name[mk]=КПилот
-Name[ne]=केडीई पाइलट
-Name[pt_BR]=Ferramenta para PalmPilot
-Name[sv]=Kpilot
-Name[ta]=கேபைலட�
-Name[ven]=Mufhufhisi wa K
-Name[zu]=KUmshayeli webhanoyi
-GenericName=PalmPilot Tool
-GenericName[af]=Palmpilot Program
-GenericName[be]=Ін�трум�нт Palm Pilot
-GenericName[bg]=Връзка � PalmPilot
-GenericName[br]=Ostilh PalmPilot
-GenericName[bs]=Alati za PalmPilot
-GenericName[ca]=Eina PalmPilot
-GenericName[cs]=Nástroj pro PalmPilot
-GenericName[cy]=Erfyn PalmPilot
-GenericName[da]=Palm Pilot-værktøj
-GenericName[de]=Palm Pilot-Dienstprogramm
-GenericName[el]=Ε�γαλείο PalmPilot
-GenericName[eo]=Ilo por Palmpiloto
-GenericName[es]=Herramienta para Palm Pilot
-GenericName[et]=PalmPiloti rakendus
-GenericName[eu]=PalmPilot tresna
-GenericName[fa]=ابزار PalmPilot
-GenericName[fi]=Palm Pilot -työkalu
-GenericName[fr]=Outil pour le Palm Pilot
-GenericName[fy]=Palm Pilot-syngronisaasje
-GenericName[ga]=Uirlis PalmPilot
-GenericName[gl]=Ferramenta de PalmPilot
-GenericName[he]=כלי פ�ל�-פיילוט
-GenericName[hi]=पाम-पायलट औज़ार
-GenericName[hr]=Alat za Palm Pilota
-GenericName[hu]=PalmPilot-kezelő
-GenericName[is]=PalmPilot tól
-GenericName[it]=Strumento per PalmPilot
-GenericName[ja]=PalmPilot ツール
-GenericName[kk]=PalmPilot құрылғы�ы
-GenericName[km]=ឧបករណ� PalmPilot
-GenericName[lt]=PalmPilot įrankis
-GenericName[lv]=PalmPilota RÄ«ks
-GenericName[mk]=�латка за PalmPilot
-GenericName[ms]=Alat PalmPilot 
-GenericName[mt]=Għodda għall-Palm Pilot
-GenericName[nb]=PalmPilot-verktøy
-GenericName[nds]=PalmPilot-Warktüüch
-GenericName[ne]=पाल�म पाइलट उपकरण
-GenericName[nl]=Palm Pilot-synchronisatie
-GenericName[nn]=Palm Pilot-verktøy
-GenericName[nso]=Sebereka sa PalmPilot
-GenericName[pl]=Palm Pilot
-GenericName[pt]=Ferramenta para o PalmPilot
-GenericName[pt_BR]=Ferramenta para o Palm Pilot
-GenericName[ro]=Utilitar PalmPilot
-GenericName[ru]=Синхронизаци� данных � Palm Pilot
-GenericName[sk]=Nástroj pre PalmPilot
-GenericName[sl]=Orodje za Palm Pilot
-GenericName[sr]=�лат за PalmPilot
-GenericName[sr@Latn]=Alat za PalmPilot
-GenericName[sv]=Verktyg för Palm Pilot
-GenericName[ta]=பாம� பைலட� கர�வி
-GenericName[tg]=Синхронизат�и�и маълумот аз PalmPilot
-GenericName[th]=เครื่องมือของเครื่องปาล์มไพล็อต
-GenericName[tr]=Palm Pilot Aracı
-GenericName[uk]=За�іб дл� PalmPilot
-GenericName[ven]=Tshishimuswa tsha mureili wa palm
-GenericName[vi]=Công cụ PalmPilot
-GenericName[xh]=Isixhobo se PalmPilot
-GenericName[zh_CN]=PalmPilot 工具
-GenericName[zh_TW]=PalmPilot 工具
-GenericName[zu]=Ithuluzi lesandla soMshayeli webhanoyi
-Exec=kpilot
-Icon=kpilot
-Type=Application
-DocPath=kpilot/index.html
-Terminal=false
-X-KDE-StartupNotify=true
-X-DCOP-ServiceType=Unique
-Categories=Qt;KDE;Utility;X-KDE-Utilities-Peripherals;Office;PDA;
diff --git a/kpilot/kpilot/kpilot.gif b/kpilot/kpilot/kpilot.gif
deleted file mode 100644
index 9cfe04ce..00000000
--- a/kpilot/kpilot/kpilot.gif
+++ /dev/null
diff --git a/kpilot/kpilot/kpilot.h b/kpilot/kpilot/kpilot.h
deleted file mode 100644
index c0a0dca6..00000000
--- a/kpilot/kpilot/kpilot.h
+++ /dev/null
@@ -1,214 +0,0 @@
-#ifndef _KPILOT_KPILOT_H
-#define _KPILOT_KPILOT_H
-/* kpilot.h			KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This is the main program in KPilot.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <kmainwindow.h>
-
-
-class TQPopupMenu;
-class TQComboBox;
-class KAction;
-class KProgress;
-class KJanusWidget;
-
-class PilotDaemonDCOP_stub;
-class PilotComponent;
-class FileInstallWidget;
-class LogWidget;
-
-
-#include "kpilotDCOP.h"
-
-
-
-class KPilotInstaller : public KMainWindow, public KPilotDCOP
-{
-Q_OBJECT
-
-public:
-	KPilotInstaller();
-	KPilotInstaller(TQStrList& fileList);
-	~KPilotInstaller();
-
-	/**
-	* Return a string with the version identifier (ie.
-	* "KPilot v3.1b11") if kind == 0; otherwise return
-	* a "long" string about KPilot -- currently the
-	* id of kpilot.o
-	*/
-	static const char *version(int kind);
-
-
-	// Adds 'name' to the pull down menu of components
-	void addComponentPage(PilotComponent *, const TQString &name);
-
-
-	KPilotStatus status() const { return fAppStatus; } ;
-
-
-protected:
-	void closeEvent(TQCloseEvent *e);
-	KJanusWidget *getManagingWidget() { return fManagingWidget; }
-
-	/**
-	* Provide access to the daemon's DCOP interface
-	* through an object of the stub class.
-	*/
-protected:
-	PilotDaemonDCOP_stub &getDaemon() { return *fDaemonStub; } ;
-private:
-	PilotDaemonDCOP_stub *fDaemonStub;
-
-	/**
-	* Handle the functionality of kill-daemon-on-exit and
-	* kill-daemon-if-started-by-my by killing it in those
-	* cases.
-	*/
-protected:
-	void killDaemonIfNeeded();
-
-public slots:
-	/**
-	* These are slots for the menu actions for each kind of
-	* sync that can be requested.
-	*/
-	void slotRestoreRequested();
-	void slotBackupRequested();
-	void slotHotSyncRequested();
-	void slotFullSyncRequested();
-	void slotHHtoPCRequested();
-	void slotPCtoHHRequested();
-
-	void startDaemonIfNeeded();
-
-	/**
-	* These are slots for the standard Configure ...
-	* actions and not interesting. The show toolbar
-	* functionality is in kdelibs starting with KDE 3.1,
-	* but we need to remain backwards compatible.
-	*/
-	void optionsConfigureKeys();
-	void optionsConfigureToolbars();
-
-
-public:
-	/**
-	* This is the DCOP interface from the daemon to KPilot.
-	*/
-	virtual ASYNC daemonStatus(int);
-	virtual int kpilotStatus();
-
-public slots:
-	/**
-	* This is the DCOP interface from the daemon to KPilot
-	* to configure KPilot.
-	*/
-	virtual ASYNC configure();
-	virtual ASYNC configureWizard();
-
-protected:
-	void readConfig();
-
-
-	/**
-	* Run all the internal conduits' presync functions.
-	*/
-	bool componentPreSync();
-	void setupSync(int kind,const TQString& msg);
-	void componentPostSync();
-	/**
-	* Run after a configuration change to force
-	* the viewers to re-load data.
-	*/
-	void componentUpdate();
-
-	void initIcons();
-	void initMenu();
-	void setupWidget();
-	void initComponents();
-
-	/**
-	* This is the private-d-pointer, KPilot style. Not everything
-	* has moved there yet.
-	*/
-	class KPilotPrivate;
-	KPilotPrivate *fP;
-
-private:
-	bool            fQuitAfterCopyComplete; // Used for GUI-less interface
-	KJanusWidget    *fManagingWidget;
-	bool fDaemonWasRunning;
-
-	KPilotStatus fAppStatus;
-
-	FileInstallWidget *fFileInstallWidget;
-	LogWidget *fLogWidget;
-
-	// Used to track if dialog is visible - needed for new DCOP calls
-	bool fConfigureKPilotDialogInUse;
-
-
-protected slots:
-	void quit();
-	void fileInstalled(int which);
-	void slotNewToolbarConfig();
-
-	/**
-	 * Get the daemon to reset the link. This uses reloadSettings()
-	 * to achieve this result - the daemon calls reset() in there.
-	 */
-	void slotResetLink();
-
-	/**
-	 * Indicate that a particular component has been selected (through
-	 * whatever mechanism). This will make that component visible and
-	 * adjust any other user-visible state to indicate that that component
-	 * is now active.
-	 *
-	 * This should be called (possibly by the component itself!)
-	 * or activated through the signal mechanism.
-	 * */
-	void slotSelectComponent( PilotComponent *c );
-	void slotAboutToShowComponent( TQWidget *c );
-
-	/**
-	* Delayed initialization of the components.
-	* This improves perceived startup time.
-	*/
-	void initializeComponents();
-
-signals:
-	void modeSelected(int selected);
-};
-
-
-
-
-#endif
diff --git a/kpilot/kpilot/kpilot.kcfg b/kpilot/kpilot/kpilot.kcfg
deleted file mode 100644
index 6b5ba723..00000000
--- a/kpilot/kpilot/kpilot.kcfg
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
-      http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <include>kstandarddirs.h</include>
-  <kcfgfile name="kpilotrc"/>
-  <group name="General">
-    <entry name="Debug" type="UInt">
-        <label>
-        </label>
-        <default>0</default>
-    </entry>
-    <entry name="ConfigVersion" key="Configured" type="UInt">
-        <label>
-        </label>
-        <default>0</default>
-    </entry>
-    <entry name="LastSyncTime" type="DateTime">
-        <label>
-        </label>
-        <default>QDateTime()</default>
-    </entry>
-
-    <entry name="PilotDevice" type="String">
-        <label>
-        </label>
-        <default>/dev/pilot</default>
-    </entry>
-    <entry name="PilotSpeed" type="UInt">
-        <label>
-        </label>
-        <default>0</default>
-    </entry>
-    <entry name="Encoding" type="String">
-        <label>
-        </label>
-        <default></default>
-    </entry>
-    <entry name="UserName" type="String">
-        <label>
-        </label>
-        <default></default>
-    </entry>
-    <entry name="Workarounds" type="Enum">
-        <choices>
-          <choice name="eWorkaroundNone"/>
-          <choice name="eWorkaroundUSB"/>
-        </choices>
-        <label></label>
-        <default>eWorkaroundNone</default>
-    </entry>
-    
-    <entry name="LogFileName" type="String">
-        <label>
-        </label>
-        <default code="true">KGlobal::dirs()->saveLocation("data", "kpilot/").append("lastsync.log")</default>
-    </entry>
-    <entry name="StartDaemonAtLogin" type="Bool">
-        <label>
-        </label>
-        <default>false</default>
-    </entry>
-    <entry name="KillDaemonAtExit" type="Bool">
-        <label>
-        </label>
-        <default>false</default>
-    </entry>
-    <entry name="DockDaemon" type="Bool">
-        <label>
-        </label>
-        <default>true</default>
-    </entry>
-    <entry name="QuitAfterSync" type="Bool">
-        <label>
-        </label>
-        <default>false</default>
-    </entry>
-
-
-    <entry name="SyncType" type="UInt">
-        <label>
-        </label>
-        <default>6</default>
-    </entry>
-    <entry name="FullSyncOnPCChange" type="Bool">
-        <label>
-        </label>
-        <default>true</default>
-    </entry>
-    <entry name="ConflictResolution" type="UInt">
-        <label>
-        </label>
-        <default>0</default>
-    </entry>
-
-
-
-    <entry name="InternalEditors" key="InternalEditorsWritable"  type="Bool">
-        <label>
-        </label>
-        <default>true</default>
-    </entry>
-    <entry name="ShowSecrets" type="Bool">
-        <label>
-        </label>
-        <default>false</default>
-    </entry>
-    <entry name="SkipBackupDB" type="StringList">
-        <label>Which databases not to backup.</label>
-        <default>[Arng],[PmDB],[lnch],[a86k],FATFS,ImgFile-Foto,Jpeg-Foto,WifiCoreLib</default>
-    </entry>
-    <entry name="SkipRestoreDB" type="StringList">
-        <label>
-        </label>
-        <default>[AvGo]</default>
-    </entry>
-    <entry name="BackupFrequency" type="UInt">
-        <label></label>
-        <default>0</default>
-    </entry>
-    <entry name="RunConduitsWithBackup" type="Bool">
-        <label></label>
-        <default>false</default>
-    </entry>
-    <entry name="DeviceDBs" type="StringList">
-        <label>
-        </label>
-        <default></default>
-    </entry>
-    <entry name="AddedDBs" type="StringList">
-        <label>
-        </label>
-        <default></default>
-    </entry>
-    <entry name="ScreenlockSecure" type="Bool">
-        <label>Prevent HotSync when screen locked</label>
-        <whatsthis>Turning this option on prevents syncing
-	when the screen is locked. This is a security measure
-	to prevent people from stealing your data through physical
-	access to a Pilot device link to your machine.
-	It doesn't work with screensavers other than KDE, though,
-	so you will need to turn it off for other environments.</whatsthis>
-	<default>true</default>
-    </entry>
-  </group>
-
-  <group name="Conduit Names">
-    <entry name="InstalledConduits" type="StringList">
-        <label>
-        </label>
-        <default>abbrowser_conduit,internal_fileinstall,knotes-conduit,vcal-conduit,todo-conduit,mal_conduit,sysinfo_conduit</default>
-    </entry>
-  </group>
-
-  <group name="Internal Editors">
-    <entry name="AppBlockChangedDatabases" key="AppBlock Changed" type="StringList">
-        <label>
-        </label>
-    </entry>
-    <entry name="DirtyDatabases" key="Changed Databases" type="StringList">
-        <label>
-        </label>
-    </entry>
-    <entry name="FlagsChangedDatabases" key="Flags Changed" type="StringList">
-        <label>
-        </label>
-    </entry>
-  </group>
-
-
-  <group name="Address Widget">
-    <entry name="AddressDisplayMode" key="AddressDisplay" type="UInt">
-        <label>
-        </label>
-        <default>0</default>
-    </entry>
-    <entry name="UseKeyField" type="Bool">
-        <label>
-        </label>
-        <default>false</default>
-    </entry>
-  </group>
-
-
-</kcfg>
diff --git a/kpilot/kpilot/kpilot.magic b/kpilot/kpilot/kpilot.magic
deleted file mode 100644
index 4871f0f2..00000000
--- a/kpilot/kpilot/kpilot.magic
+++ /dev/null
@@ -1,12 +0,0 @@
-# start kpilot.magic
-# This must go at the end of $(kde_mimedir)/magic
-# PalmPilot Files
-0       string           >\0
->0x20   beshort&0xffe7   0              palmpilot/database
->0x20   beshort&0xffe7   1
->>0x3c  string           appl           palmpilot/application
->>0x3c  string           HACK           palmpilot/hack
->>0x3c  string           libr           palmpilot/library
->>0x3c  string           >\0            palmpilot/database
-# stop kpilot.magic
-
diff --git a/kpilot/kpilot/kpilot.upd b/kpilot/kpilot/kpilot.upd
deleted file mode 100644
index 1fbc36a6..00000000
--- a/kpilot/kpilot/kpilot.upd
+++ /dev/null
@@ -1,34 +0,0 @@
-Id=kdepim_3.3
-File=kpilotrc
-Group=<default>,General
-AllKeys
-# split up the kpilotrc into several config files, so the different processes
-# don't step on each other's toes
-Id=kdepim_3.3_SplitConfig
-File=kpilotrc,kpilot_addressconduitrc
-Group=Abbrowser-conduit,General
-AllKeys
-File=kpilotrc,kpilot_docconduitrc
-Group=DOC-conduit,General
-AllKeys
-File=kpilotrc,kpilot_notesconduitrc
-Group=KNotes-conduit,General
-AllKeys
-File=kpilotrc,kpilot_malconduitrc
-Group=MAL-conduit,General
-AllKeys
-File=kpilotDaemonrc,kpilot_malconduitrc
-Group=MAL-conduit,General
-AllKeys
-File=kpilotrc,kpilot_mailconduitrc
-Group=Popmail-conduit,General
-AllKeys
-File=kpilotrc,kpilot_sysinfoconduitrc
-Group=SysInfo-conduit,General
-AllKeys
-File=kpilotrc,kpilot_vcalconduitsrc
-Group=todoOptions,ToDo-Conduit
-AllKeys
-Group=vcalOptions,Calendar-Conduit
-AllKeys
-RemoveGroup=YAPS-conduit
diff --git a/kpilot/kpilot/kpilotConfig.cc b/kpilot/kpilot/kpilotConfig.cc
deleted file mode 100644
index 28589026..00000000
--- a/kpilot/kpilot/kpilotConfig.cc
+++ /dev/null
@@ -1,346 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This is all of KPilot's config-handling stuff.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <stdlib.h>
-
-#include <tqlineedit.h>
-#include <tqcombobox.h>
-#include <tqcheckbox.h>
-
-#include <kstandarddirs.h>
-#include <kconfig.h>
-#include <ksimpleconfig.h>
-#include <kcmdlineargs.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
-
-#include "kpilotSettings.h"
-#include "kpilotConfig.h"
-
-
-// This is a number indicating what configuration version
-// we're dealing with. Whenever new configuration options are
-// added that make it imperative for the user to take a
-// look at the configuration of KPilot (for example the
-// skipDB setting really needs user attention) we can change
-// (increase) this number.
-//
-//
-/* static */ const uint KPilotConfig::ConfigurationVersion = 443;
-
-/* static */ int KPilotConfig::getConfigVersion()
-{
-	FUNCTIONSETUP;
-
-	uint version = KPilotSettings::configVersion();
-
-	if (version < ConfigurationVersion)
-	{
-		WARNINGKPILOT << "Config file has old version " << version << endl;
-	}
-	else
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname
-			<< ": Config file has version " << version << endl;
-#endif
-	}
-
-	return version;
-}
-
-/* static */ void KPilotConfig::updateConfigVersion()
-{
-	FUNCTIONSETUP;
-	KPilotSettings::setConfigVersion( ConfigurationVersion );
-}
-
-/* static */ TQString KPilotConfig::getDefaultDBPath()
-{
-	FUNCTIONSETUP;
-	TQString lastUser = KPilotSettings::userName();
-	TQString dbsubpath = CSL1("kpilot/DBBackup/");
-	TQString defaultDBPath = KGlobal::dirs()->
-		saveLocation("data", dbsubpath + lastUser + CSL1("/"));
-	return defaultDBPath;
-}
-
-/* static */ int KPilotConfig::getDebugLevel(KCmdLineArgs *p)
-{
-	FUNCTIONSETUP;
-
-	if (p)
-	{
-		if (p->isSet("debug"))
-		{
-			debug_level = p->getOption("debug").toInt();
-		}
-	}
-
-	return debug_level;
-}
-
-static TQFont *thefont = 0L;
-
-/* static */ const TQFont & KPilotConfig::fixed()
-{
-	FUNCTIONSETUP;
-
-	if (!thefont)
-		thefont = new TQFont(KGlobalSettings::fixedFont());
-
-	return *thefont;
-}
-
-
-void KPilotConfig::addDirtyDatabase(TQString db)
-{
-	FUNCTIONSETUP;
-	TQStringList l(KPilotSettings::dirtyDatabases());
-	if (!l.contains(db))
-	{
-		l.append(db);
-		KPilotSettings::setDirtyDatabases(l);
-	}
-}
-
-
-void KPilotConfig::addAppBlockChangedDatabase(TQString db)
-{
-	TQStringList l(KPilotSettings::appBlockChangedDatabases());
-	if (!l.contains(db))
-	{
-		l.append(db);
-		KPilotSettings::setAppBlockChangedDatabases(l);
-	}
-}
-
-void KPilotConfig::addFlagsChangedDatabase(TQString db)
-{
-	TQStringList l(KPilotSettings::flagsChangedDatabases());
-	if (!l.contains(db))
-	{
-		l.append(db);
-		KPilotSettings::setFlagsChangedDatabases(l);
-	}
-}
-
-
-
-
-/* static */ TQString KPilotConfig::versionDetails(int fileversion, bool run)
-{
-	FUNCTIONSETUP;
-	TQString s = CSL1("<qt><p>");
-	s += i18n("The configuration file is outdated.");
-	s += ' ';
-	s += i18n("The configuration file has version %1, while KPilot "
-		"needs version %2.").arg(fileversion).arg(ConfigurationVersion);
-	if (run)
-	{
-		s += ' ';
-		s += i18n("Please run KPilot and check the configuration carefully "
-			"to update the file.");
-	}
-	s += CSL1("</p><p>");
-	s += i18n("Important changes to watch for are:");
-	s += ' ';
-	if (fileversion < 440)
-	{
-		s += i18n("Renamed conduits, Kroupware and file installer have "
-			"been made conduits as well.");
-		s += ' ';
-		s += i18n("Conflict resolution is now a global setting.");
-		s += ' ';
-	}
-	if (fileversion < 443)
-	{
-		s += i18n("Changed format of no-backup databases.");
-		s += ' ';
-	}
-	// Insert more recent additions here
-
-
-	return s;
-}
-
-/* static */ void KPilotConfig::sorryVersionOutdated(int fileversion)
-{
-	FUNCTIONSETUP;
-	KMessageBox::detailedSorry(0L,
-		i18n("The configuration file for KPilot is out-of "
-			"date. Please run KPilot to update it."),
-		KPilotConfig::versionDetails(fileversion,true),
-		i18n("Configuration File Out-of Date"));
-}
-
-static void update440()
-{
-	// Try to update conduit list
-	{
-	TQStringList conduits( KPilotSettings::installedConduits() );
-	KConfig*c = KPilotSettings::self()->config();
-///	c->resetGroup();
-	c->setGroup( TQString::null );
-	bool installFiles = c->readBoolEntry("SyncFiles",true);
-	if (installFiles) conduits.append( CSL1("internal_fileinstall") );
-	c->deleteEntry("SyncFiles");
-	KPilotSettings::setInstalledConduits(conduits);
-	c->sync();
-	if (installFiles)
-		KMessageBox::information(0L,
-			i18n("The settings for the file installer have been moved to the "
-				"conduits configuration. Check the installed "
-				"conduits list."),
-			i18n("Settings Updated"));
-
-	}
-
-	// Check if individual conduits have conflict settings?
-
-	// Search for old conduit libraries.
-	{
-	TQStringList foundlibs ;
-	static const char *oldconduits[] = { "null", "address", "doc",
-		"knotes", "sysinfo", "time", "todo", "vcal", 0L } ;
-	const char **s = oldconduits;
-	while (*s)
-	{
-		TQString libname = CSL1("kde3/lib%1conduit.so").arg(TQString::fromLatin1(*s));
-		TQString foundlib = ::locate("lib",libname);
-		if (!foundlib.isEmpty())
-		{
-			foundlibs.append(foundlib);
-		}
-		s++;
-	}
-
-	if (!foundlibs.isEmpty())
-		KMessageBox::informationList(0L,
-			i18n("<qt>The following old conduits were found on "
-				"your system. It is a good idea to remove "
-				"them and the associated <tt>.la</tt> "
-				"and <tt>.so.0</tt> files.</qt>"),
-			foundlibs,
-			i18n("Old Conduits Found"));
-	}
-}
-
-static void update443()
-{
-	FUNCTIONSETUP;
-
-	TQStringList skip = KPilotSettings::skipBackupDB();
-	TQStringList fixSkip;
-	bool fixedSome = false;
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Skip databases are: "
-		<< skip.join(CSL1(",")) << endl;
-#endif
-
-	for (TQStringList::const_iterator i = skip.begin(); i!=skip.end(); ++i)
-	{
-		if ((*i).length()==4)
-		{
-			fixSkip.append(CSL1("[%1]").arg(*i));
-			fixedSome = true;
-		}
-		else
-		{
-			fixSkip.append(*i);
-		}
-	}
-
-	if (fixedSome)
-	{
-		KMessageBox::informationList(0L,
-			i18n("<qt>The no backup databases listed in your configuration file "
-				"have been adjusted to the new format. Database creator IDs "
-				"have been changed to use square brackets []."),
-			fixSkip,
-			i18n("No Backup Databases Updated"));
-	}
-}
-
-/* static */ KPilotConfig::RunMode KPilotConfig::interactiveUpdate()
-{
-	FUNCTIONSETUP;
-
-	int res = 0;
-	unsigned int fileVersion = KPilotSettings::configVersion();
-	// FIXME better config handling -> Move the config entries using kconf_update
-
-	// It's OK if we're already at the required level.
-	if (fileVersion >= KPilotConfig::ConfigurationVersion)
-	{
-		return Normal;
-	}
-
-	if (0 == fileVersion) // No config file at all
-	{
-		res = KMessageBox::questionYesNoCancel(0L,
-			i18n("KPilot is not configured for use. You may use "
-				"the configuration wizard or the normal configure dialog "
-				"to configure KPilot."),
-			i18n("Not Configured"),
-			i18n("Use &Wizard"),
-			i18n("Use &Dialog"));
-		if (res == KMessageBox::Yes) return WizardAndContinue;
-		if (res == KMessageBox::No) return ConfigureAndContinue;
-
-		return Cancel;
-	}
-
-	res = KMessageBox::warningContinueCancel(0L,
-		i18n("The configuration file for KPilot is out-of "
-			"date. KPilot can update some parts of the "
-			"configuration automatically. Do you wish to "
-			"continue?"),
-		i18n("Configuration File Out-of Date"));
-	if (res!=KMessageBox::Continue) return Cancel;
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Updating from "
-		<< fileVersion << " to " << ConfigurationVersion << endl;
-#endif
-
-	if (fileVersion < 440) update440();
-	if (fileVersion < 443) update443();
-
-	KPilotConfig::updateConfigVersion();
-	KPilotSettings::writeConfig();
-	return ConfigureAndContinue;
-}
-
-void KPilotConfig::sync()
-{
-	KPilotSettings::self()->config()->sync();
-}
diff --git a/kpilot/kpilot/kpilotConfig.h b/kpilot/kpilot/kpilotConfig.h
deleted file mode 100644
index bc15c0ac..00000000
--- a/kpilot/kpilot/kpilotConfig.h
+++ /dev/null
@@ -1,126 +0,0 @@
-#ifndef _KPILOT_KPILOTCONFIG_H
-#define _KPILOT_KPILOTCONFIG_H
-/* kpilotConfig.h			KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This class concentrates all the configuration
-** information for the various parts of KPilot.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include "kpilotSettings.h"
-
-class KCmdLineArgs;
-
-
-class KPilotConfig
-{
-public:
-	typedef enum
-	{
-		Cancel=0,
-		Normal,
-		ConfigureKPilot,
-		ConfigureConduits,
-		ConfigureAndContinue,
-		WizardAndContinue
-	} RunMode;
-
-	/**
-	 * @return TQString of default path for the BackupDB files
-	 * are located
-	 */
-	static TQString getDefaultDBPath();
-
-
-	// Conduit configuration information
-	static void addDirtyDatabase(TQString db);
-	static void addAppBlockChangedDatabase(TQString db);
-	static void addFlagsChangedDatabase(TQString db);
-
-	/**
-	* This number can be changed every time a new
-	* KPilot version is released that absolutely requires
-	* the user to take a look at the configuration of
-	* KPilot.
-	*/
-	static const uint ConfigurationVersion;
-
-	/**
-	* Reads the configuration version from a configuration file.
-	* TODO: Make this use the *standard* location.
-	*/
-	static int getConfigVersion();
-
-	/**
-	* Write the current configuration version to the standard
-	* location. @em Only call this after the KApplication object
-	* is created, or crashes will result.
-	*/
-	static void updateConfigVersion();
-
-	/**
-	* Warn the user that the config file is outdated.
-	* versionDetails() returns a descriptive string. Pass in the
-	*     actual version of the config file. Set @p run to true to add an
-	*     admonition to run kpilot in config mode to fix this.
-	* sorryVersionOutdated() uses KMessageBox to display it.
-	*/
-	static TQString versionDetails(int fileversion, bool run);
-	static void sorryVersionOutdated(int fileversion);
-	/**
-	* Update the config file as best we can, and inform the user.
-	* Returns a suggested run mode if it's ok (ie. update finished, or
-	* file was already up-to-date) and Cancel if the user cancels.
-	* If the user cancels, it's probably best to _not_ continue with
-	* anything, since the config is bogus.
-	*
-	* The suggested run mode might be anything - usually normal,
-	* but might return ConfigureAndContinue as well.
-	*
-	* This function can call functions to update from different versions
-	* to current; these are static in kpilotConfig.cc.
-	*/
-	static RunMode interactiveUpdate();
-
-	/**
-	* Deal with --debug options.
-	* @ret resulting debug level
-	*/
-	static int getDebugLevel(KCmdLineArgs *p);
-
-	/**
-	* Returns the user's preference for the system-wide
-	* fixed font.
-	*/
-	static const TQFont& fixed() ;
-
-	static void sync();
-} ;
-
-
-
-#endif
diff --git a/kpilot/kpilot/kpilotConfigDialog.cc b/kpilot/kpilot/kpilotConfigDialog.cc
deleted file mode 100644
index 34cf8247..00000000
--- a/kpilot/kpilot/kpilotConfigDialog.cc
+++ /dev/null
@@ -1,528 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2001 by Dan Pilone
-** Copyright (C) 2002-2004 by Adriaan de Groot
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This file defines a specialization of KPilotDeviceLink
-** that can actually handle some HotSync tasks, like backup
-** and restore. It does NOT do conduit stuff.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <pi-version.h>
-
-#include <tqcombobox.h>
-#include <tqcheckbox.h>
-#include <tqradiobutton.h>
-#include <tqpushbutton.h>
-#include <tqbuttongroup.h>
-#include <tqlineedit.h>
-#include <tqtabwidget.h>
-#include <tqspinbox.h>
-#include <tqfile.h>
-
-#include <kmessagebox.h>
-#include <kcharsets.h>
-#include <kstandarddirs.h>
-#include <kglobal.h>
-#include <kurl.h>
-#include <kio/netaccess.h>
-
-#include "kpilotConfig.h"
-#include "kpilotSettings.h"
-
-#include "kpilotConfigDialog_device.h"
-#include "kpilotConfigDialog_sync.h"
-#include "kpilotConfigDialog_startup.h"
-#include "kpilotConfigDialog_viewers.h"
-#include "kpilotConfigDialog_backup.h"
-#include "kpilotConfigDialog.moc"
-#include "syncAction.h"
-#include "dbSelectionDialog.h"
-
-/* virtual */ TQString ConfigPage::maybeSaveText() const
-{
-	return i18n("<qt>The settings for configuration page <i>%1</i> have been changed. Do you "
-		"want to save the changes before continuing?</qt>").arg(this->conduitName());
-}
-
-DeviceConfigPage::DeviceConfigPage(TQWidget * w, const char *n ) : ConfigPage( w, n )
-{
-	FUNCTIONSETUP;
-
-	fConfigWidget = new DeviceConfigWidget( w );
-	// Fill the encodings list
-	{
-		TQStringList l = KGlobal::charsets()->descriptiveEncodingNames();
-		for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it )
-		{
-			fConfigWidget->fPilotEncoding->insertItem(*it);
-		}
-	}
-
-	fConfigWidget->resize(fConfigWidget->size());
-	fWidget = fConfigWidget;
-
-#if PILOT_LINK_NUMBER < PILOT_LINK_0_10_0
-	fConfigWidget->fPilotDevice->setMaxLength(13);
-#endif
-
-
-#define CM(a,b) connect(fConfigWidget->a,b,this,TQT_SLOT(modified()));
-	CM(fPilotDevice, TQT_SIGNAL(textChanged(const TQString &)));
-	CM(fPilotSpeed, TQT_SIGNAL(activated(int)));
-	CM(fPilotEncoding, TQT_SIGNAL(textChanged(const TQString &)));
-	CM(fUserName, TQT_SIGNAL(textChanged(const TQString &)));
-	CM(fWorkaround, TQT_SIGNAL(activated(int)));
-#undef CM
-
-	fConduitName = i18n("Device");
-}
-
-void DeviceConfigPage::load()
-{
-	FUNCTIONSETUP;
-	KPilotSettings::self()->readConfig();
-
-	/* General tab in the setup dialog */
-	fConfigWidget->fPilotDevice->setText(KPilotSettings::pilotDevice());
-	fConfigWidget->fPilotSpeed->setCurrentItem(KPilotSettings::pilotSpeed());
-	getEncoding();
-	fConfigWidget->fUserName->setText(KPilotSettings::userName());
-
-	switch(KPilotSettings::workarounds())
-	{
-	case KPilotSettings::eWorkaroundNone :
-		fConfigWidget->fWorkaround->setCurrentItem(0);
-		break;
-	case KPilotSettings::eWorkaroundUSB :
-		fConfigWidget->fWorkaround->setCurrentItem(1);
-		break;
-	default:
-		WARNINGKPILOT << "Unknown workaround number "
-			<< (int) KPilotSettings::workarounds()
-			<< endl;
-		KPilotSettings::setWorkarounds(KPilotSettings::eWorkaroundNone);
-		fConfigWidget->fWorkaround->setCurrentItem(0);
-	}
-	unmodified();
-}
-
-/* virtual */ bool DeviceConfigPage::validate()
-{
-	int r = KMessageBox::Yes;
-
-#if PILOT_LINK_NUMBER < PILOT_LINK_0_10_0
-	TQString d = fConfigWidget->fPilotDevice->text();
-
-	if (d.length() > 13)
-	{
-	r = KMessageBox::questionYesNo(
-		fConfigWidget,
-		i18n("<qt>The device name you entered (<i>%1</i>) "
-			"is longer than 13 characters. This is "
-			"probably unsupported and can cause problems. "
-			"Are you sure you want to use this device name?</qt>")
-			.arg(d),
-		i18n("Device Name too Long"), i18n("Use"), i18n("Do Not Use")
-		) ;
-	}
-#endif
-
-	return KMessageBox::Yes == r;
-}
-
-/* virtual */ void DeviceConfigPage::commit()
-{
-	FUNCTIONSETUP;
-
-	// General page
-	KPilotSettings::setPilotDevice(fConfigWidget->fPilotDevice->text());
-	KPilotSettings::setPilotSpeed(fConfigWidget->fPilotSpeed->currentItem());
-	setEncoding();
-	KPilotSettings::setUserName(fConfigWidget->fUserName->text());
-
-	switch(fConfigWidget->fWorkaround->currentItem())
-	{
-	case 0 : KPilotSettings::setWorkarounds(KPilotSettings::eWorkaroundNone); break;
-	case 1 : KPilotSettings::setWorkarounds(KPilotSettings::eWorkaroundUSB); break;
-	default :
-		WARNINGKPILOT << "Unknown workaround number "
-			<< fConfigWidget->fWorkaround->currentItem()
-			<< endl;
-		KPilotSettings::setWorkarounds(KPilotSettings::eWorkaroundNone);
-
-	}
-	KPilotConfig::updateConfigVersion();
-	KPilotSettings::self()->writeConfig();
-	unmodified();
-}
-
-/* slot */ void DeviceConfigPage::changePortType(int i)
-{
-	FUNCTIONSETUP;
-
-	switch (i)
-	{
-	case 0:
-		fConfigWidget->fPilotSpeed->setEnabled(true);
-		break;
-	case 1:
-	case 2:
-		fConfigWidget->fPilotSpeed->setEnabled(false);
-		break;
-	default:
-		WARNINGKPILOT << "Unknown port type " << i << endl;
-	}
-}
-
-void DeviceConfigPage::getEncoding()
-{
-	FUNCTIONSETUP;
-	TQString e = KPilotSettings::encoding();
-	if (e.isEmpty())
-		fConfigWidget->fPilotEncoding->setCurrentText(CSL1("ISO8859-15"));
-	else
-		fConfigWidget->fPilotEncoding->setCurrentText(e);
-}
-
-void DeviceConfigPage::setEncoding()
-{
-	FUNCTIONSETUP;
-
-	TQString enc = fConfigWidget->fPilotEncoding->currentText();
-	if (enc.isEmpty())
-	{
-		WARNINGKPILOT << "Empty encoding. Will ignore it." << endl;
-	}
-	else
-	{
-		KPilotSettings::setEncoding(enc);
-	}
-}
-
-SyncConfigPage::SyncConfigPage(TQWidget * w, const char *n ) : ConfigPage( w, n )
-{
-	FUNCTIONSETUP;
-
-	fConfigWidget = new SyncConfigWidget( w );
-	fConfigWidget->resize(fConfigWidget->size());
-	fWidget = fConfigWidget;
-
-#define CM(a,b) connect(fConfigWidget->a,b,this,TQT_SLOT(modified()));
-	CM(fSpecialSync, TQT_SIGNAL(activated(int)));
-	CM(fFullSyncCheck, TQT_SIGNAL(toggled(bool)));
-	CM(fScreenlockSecure, TQT_SIGNAL(toggled(bool)));
-	CM(fConflictResolution, TQT_SIGNAL(activated(int)));
-#undef CM
-
-	fConduitName = i18n("HotSync");
-}
-
-#define MENU_ITEM_COUNT (4)
-static SyncAction::SyncMode::Mode syncTypeMap[MENU_ITEM_COUNT] = {
-	SyncAction::SyncMode::eHotSync,
-	SyncAction::SyncMode::eFullSync,
-	SyncAction::SyncMode::eCopyPCToHH,
-	SyncAction::SyncMode::eCopyHHToPC
-	} ;
-
-void SyncConfigPage::load()
-{
-	FUNCTIONSETUP;
-	KPilotSettings::self()->readConfig();
-
-	/* Sync tab */
-	int synctype=KPilotSettings::syncType();
-	if (synctype<0) synctype=(int) SyncAction::SyncMode::eHotSync;
-	for (unsigned int i=0; i<MENU_ITEM_COUNT; ++i)
-	{
-		if (syncTypeMap[i] == synctype)
-		{
-			fConfigWidget->fSpecialSync->setCurrentItem(i);
-			synctype=-1;
-			break;
-		}
-	}
-	if (synctype != -1)
-	{
-		fConfigWidget->fSpecialSync->setCurrentItem(0); /* HotSync */
-	}
-
-	fConfigWidget->fFullSyncCheck->setChecked(KPilotSettings::fullSyncOnPCChange());
-	fConfigWidget->fConflictResolution->setCurrentItem(KPilotSettings::conflictResolution());
-	fConfigWidget->fScreenlockSecure->setChecked(KPilotSettings::screenlockSecure());
-
-	unmodified();
-}
-
-/* virtual */ void SyncConfigPage::commit()
-{
-	FUNCTIONSETUP;
-
-	/* Sync tab */
-	int synctype = -1;
-	unsigned int selectedsync = fConfigWidget->fSpecialSync->currentItem();
-	if (selectedsync < MENU_ITEM_COUNT)
-	{
-		synctype = syncTypeMap[selectedsync];
-	}
-	if (synctype < 0)
-	{
-		synctype = SyncAction::SyncMode::eHotSync;
-	}
-
-	KPilotSettings::setSyncType(synctype);
-	KPilotSettings::setFullSyncOnPCChange(fConfigWidget->fFullSyncCheck->isChecked());
-	KPilotSettings::setConflictResolution(fConfigWidget->fConflictResolution->currentItem());
-	KPilotSettings::setScreenlockSecure(fConfigWidget->fScreenlockSecure->isChecked());
-
-	KPilotConfig::updateConfigVersion();
-	KPilotSettings::self()->writeConfig();
-	unmodified();
-}
-
-
-BackupConfigPage::BackupConfigPage(TQWidget * w, const char *n ) : ConfigPage( w, n )
-{
-	FUNCTIONSETUP;
-
-	fConfigWidget = new BackupConfigWidget( w );
-	fConfigWidget->resize(fConfigWidget->size());
-	fWidget = fConfigWidget;
-
-	connect(fConfigWidget->fBackupOnlyChooser, TQT_SIGNAL( clicked() ),
-		TQT_SLOT( slotSelectNoBackupDBs() ) );
-	connect(fConfigWidget->fSkipDBChooser, TQT_SIGNAL(clicked()),
-		TQT_SLOT(slotSelectNoRestoreDBs()));
-
-#define CM(a,b) connect(fConfigWidget->a,b,this,TQT_SLOT(modified()));
-	CM(fBackupOnly, TQT_SIGNAL(textChanged(const TQString &)));
-	CM(fSkipDB, TQT_SIGNAL(textChanged(const TQString &)));
-	CM(fBackupFrequency, TQT_SIGNAL(activated(int)));
-#undef CM
-
-	fConduitName = i18n("Backup");
-}
-
-void BackupConfigPage::load()
-{
-	FUNCTIONSETUP;
-	KPilotSettings::self()->readConfig();
-
-	/* Backup tab */
-	fConfigWidget->fBackupOnly->setText(KPilotSettings::skipBackupDB().join(CSL1(",")));
-	fConfigWidget->fSkipDB->setText(KPilotSettings::skipRestoreDB().join(CSL1(",")));
-	fConfigWidget->fRunConduitsWithBackup->setChecked(KPilotSettings::runConduitsWithBackup());
-
-	int backupfreq=KPilotSettings::backupFrequency();
-
-	fConfigWidget->fBackupFrequency->setCurrentItem(backupfreq);
-
-	unmodified();
-}
-
-/* virtual */ void BackupConfigPage::commit()
-{
-	FUNCTIONSETUP;
-
-	/* Backup tab */
-	KPilotSettings::setSkipBackupDB(
-		TQStringList::split(CSL1(","),fConfigWidget->fBackupOnly->text()));
-	KPilotSettings::setSkipRestoreDB(
-		TQStringList::split(CSL1(","),fConfigWidget->fSkipDB->text()));
-	KPilotSettings::setRunConduitsWithBackup(fConfigWidget->fRunConduitsWithBackup->isChecked());
-	KPilotSettings::setBackupFrequency(fConfigWidget->fBackupFrequency->currentItem());
-
-	KPilotConfig::updateConfigVersion();
-	KPilotSettings::self()->writeConfig();
-	unmodified();
-}
-
-void BackupConfigPage::slotSelectNoBackupDBs()
-{
-	FUNCTIONSETUP;
-
-	TQStringList selectedDBs(TQStringList::split(',', fConfigWidget->fBackupOnly->text() ));
-
-	TQStringList deviceDBs=KPilotSettings::deviceDBs();
-	TQStringList addedDBs=KPilotSettings::addedDBs();
-	KPilotDBSelectionDialog*dlg=new KPilotDBSelectionDialog(selectedDBs, deviceDBs, addedDBs, 0, "NoBackupDBs");
-	if (dlg && (dlg->exec()==TQDialog::Accepted) )
-	{
-		fConfigWidget->fBackupOnly->setText(
-			dlg->getSelectedDBs().join(CSL1(",")));
-		KPilotSettings::setAddedDBs( dlg->getAddedDBs() );
-	}
-	KPILOT_DELETE(dlg);
-}
-
-void BackupConfigPage::slotSelectNoRestoreDBs()
-{
-	FUNCTIONSETUP;
-
-	TQStringList selectedDBs(TQStringList::split(',', fConfigWidget->fSkipDB->text() ));
-
-	TQStringList deviceDBs=KPilotSettings::deviceDBs();
-	TQStringList addedDBs=KPilotSettings::addedDBs();
-	KPilotDBSelectionDialog*dlg=new KPilotDBSelectionDialog(selectedDBs, deviceDBs, addedDBs, 0, "NoRestoreDBs");
-	if (dlg && (dlg->exec()==TQDialog::Accepted) )
-	{
-		fConfigWidget->fSkipDB->setText(
-			dlg->getSelectedDBs().join(CSL1(",")));
-		KPilotSettings::setAddedDBs( dlg->getAddedDBs() );
-	}
-	KPILOT_DELETE(dlg);
-}
-
-
-
-ViewersConfigPage::ViewersConfigPage(TQWidget * w, const char *n ) : ConfigPage( w, n )
-{
-	FUNCTIONSETUP;
-
-	fConfigWidget = new ViewersConfigWidget( w );
-	fConfigWidget->resize(fConfigWidget->size());
-	fWidget = fConfigWidget;
-
-#define CM(a,b) connect(fConfigWidget->a,b,this,TQT_SLOT(modified()));
-	CM(fInternalEditors, TQT_SIGNAL(toggled(bool)));
-	CM(fUseSecret, TQT_SIGNAL(toggled(bool)));
-	CM(fAddressGroup, TQT_SIGNAL(clicked(int)));
-	CM(fUseKeyField, TQT_SIGNAL(toggled(bool)));
-#undef CM
-
-	fConduitName = i18n("Viewers");
-}
-
-void ViewersConfigPage::load()
-{
-	FUNCTIONSETUP;
-	KPilotSettings::self()->readConfig();
-
-	fConfigWidget->fInternalEditors->setChecked( false /* KPilotSettings::internalEditors() */ );
-	fConfigWidget->fUseSecret->setChecked(KPilotSettings::showSecrets());
-	fConfigWidget->fAddressGroup->setButton(KPilotSettings::addressDisplayMode());
-	fConfigWidget->fUseKeyField->setChecked(KPilotSettings::useKeyField());
-	unmodified();
-}
-
-/* virtual */ void ViewersConfigPage::commit()
-{
-	FUNCTIONSETUP;
-
-	KPilotSettings::setInternalEditors( fConfigWidget->fInternalEditors->isChecked());
-	KPilotSettings::setShowSecrets(fConfigWidget->fUseSecret->isChecked());
-	KPilotSettings::setAddressDisplayMode(fConfigWidget->fAddressGroup->id(
-		fConfigWidget->fAddressGroup->selected()));
-	KPilotSettings::setUseKeyField(fConfigWidget->fUseKeyField->isChecked());
-	KPilotConfig::updateConfigVersion();
-	KPilotSettings::self()->writeConfig();
-	unmodified();
-}
-
-
-
-
-
-
-
-
-
-StartExitConfigPage::StartExitConfigPage(TQWidget * w, const char *n ) : ConfigPage( w, n )
-{
-	FUNCTIONSETUP;
-
-	fConfigWidget = new StartExitConfigWidget( w );
-	fConfigWidget->resize(fConfigWidget->size());
-	fWidget = fConfigWidget;
-
-#define CM(a,b) connect(fConfigWidget->a,b,this,TQT_SLOT(modified()));
-	CM(fStartDaemonAtLogin, TQT_SIGNAL(toggled(bool)));
-	CM(fKillDaemonOnExit, TQT_SIGNAL(toggled(bool)));
-	CM(fDockDaemon, TQT_SIGNAL(toggled(bool)));
-	CM(fQuitAfterSync, TQT_SIGNAL(toggled(bool)));
-#undef CM
-
-	fConduitName = i18n("Startup and Exit");
-}
-
-void StartExitConfigPage::load()
-{
-	FUNCTIONSETUP;
-	KPilotSettings::self()->readConfig();
-
-	fConfigWidget->fStartDaemonAtLogin->setChecked(KPilotSettings::startDaemonAtLogin());
-	fConfigWidget->fDockDaemon->setChecked(KPilotSettings::dockDaemon());
-	fConfigWidget->fKillDaemonOnExit->setChecked(KPilotSettings::killDaemonAtExit());
-	fConfigWidget->fQuitAfterSync->setChecked(KPilotSettings::quitAfterSync());
-	unmodified();
-}
-
-
-/* virtual */ void StartExitConfigPage::commit()
-{
-	FUNCTIONSETUP;
-
-	TQString autostart = KGlobalSettings::autostartPath();
-	TQString desktopfile = CSL1("kpilotdaemon.desktop");
-	TQString desktopcategory = CSL1("kde/");
-	TQString location = KGlobal::dirs()->findResource("xdgdata-apps",desktopcategory + desktopfile);
-	if (location.isEmpty()) // Fallback to KDE 3.0?
-	{
-		location = KGlobal::dirs()->findResource("apps",desktopfile);
-	}
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Autostart=" << autostart << endl;
-	DEBUGKPILOT << fname << ": desktop=" << desktopfile << endl;
-	DEBUGKPILOT << fname << ": location=" << location << endl;
-#endif
-
-	KPilotSettings::setStartDaemonAtLogin(fConfigWidget->fStartDaemonAtLogin->isChecked());
-	if (KPilotSettings::startDaemonAtLogin())
-	{
-		if (!location.isEmpty())
-		{
-			KURL src;
-			src.setPath(location);
-			KURL dst;
-			dst.setPath(autostart+desktopfile);
-			KIO::NetAccess::file_copy(src,dst,-1 /* 0666? */,true /* overwrite */);
-		}
-	}
-	else
-	{
-		TQFile::remove(autostart+desktopfile);
-	}
-	KPilotSettings::setDockDaemon(fConfigWidget->fDockDaemon->isChecked());
-	KPilotSettings::setKillDaemonAtExit(fConfigWidget->fKillDaemonOnExit->isChecked());
-	KPilotSettings::setQuitAfterSync(fConfigWidget->fQuitAfterSync->isChecked());
-	KPilotConfig::updateConfigVersion();
-	KPilotSettings::self()->writeConfig();
-	unmodified();
-}
-
diff --git a/kpilot/kpilot/kpilotConfigDialog.h b/kpilot/kpilot/kpilotConfigDialog.h
deleted file mode 100644
index 11960f8d..00000000
--- a/kpilot/kpilot/kpilotConfigDialog.h
+++ /dev/null
@@ -1,134 +0,0 @@
-#ifndef _KPILOT_KPILOTCONFIGDIALOG_H
-#define _KPILOT_KPILOTCONFIGDIALOG_H
-/* kpilotConfigDialog.h                 KPilot
-**
-** Copyright (C) 2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This file defines a specialization of KPilotDeviceLink
-** that can actually handle some HotSync tasks, like backup
-** and restore. It does NOT do conduit stuff.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "plugin.h"
-
-
-// class KPilotConfigWidget;
-class StartExitConfigWidget;
-class SyncConfigWidget;
-class DeviceConfigWidget;
-class ViewersConfigWidget;
-class BackupConfigWidget;
-
-class ConfigPage : public ConduitConfigBase
-{
-public:
-	ConfigPage( TQWidget *w, const char *n ) : ConduitConfigBase(w,n) { } ;
-protected:
-	// Override base class virtual function.
-	virtual TQString maybeSaveText() const;
-} ;
-
-class DeviceConfigPage : public ConfigPage
-{
-Q_OBJECT
-public:
-	DeviceConfigPage( TQWidget *, const char * );
-
-protected:
-	virtual bool validate();
-	virtual void load();
-	virtual void commit();
-
-protected slots:
-	void changePortType(int);
-
-private:
-	DeviceConfigWidget *fConfigWidget;
-
-	// Read and write the values of Encoding
-	// and EncodingDD.
-	void getEncoding();
-	void setEncoding();
-} ;
-
-
-class KDE_EXPORT SyncConfigPage : public ConfigPage
-{
-public:
-	SyncConfigPage( TQWidget *, const char * );
-
-protected:
-	virtual void load();
-	virtual void commit();
-
-private:
-	SyncConfigWidget *fConfigWidget;
-} ;
-
-class BackupConfigPage : public ConfigPage
-{
-Q_OBJECT
-public:
-	BackupConfigPage( TQWidget *, const char * );
-
-protected:
-	virtual void load();
-	virtual void commit();
-
-protected slots:
-	void slotSelectNoBackupDBs();
-	void slotSelectNoRestoreDBs();
-
-private:
-	BackupConfigWidget *fConfigWidget;
-} ;
-
-class StartExitConfigPage : public ConfigPage
-{
-public:
-	StartExitConfigPage( TQWidget *, const char * );
-
-protected:
-	virtual void load();
-	virtual void commit();
-
-private:
-	StartExitConfigWidget *fConfigWidget;
-} ;
-
-class ViewersConfigPage : public ConfigPage
-{
-public:
-	ViewersConfigPage( TQWidget *, const char * );
-
-protected:
-	virtual void load();
-	virtual void commit();
-
-private:
-	ViewersConfigWidget *fConfigWidget;
-} ;
-
-#endif
diff --git a/kpilot/kpilot/kpilotConfigDialog_backup.ui b/kpilot/kpilot/kpilotConfigDialog_backup.ui
deleted file mode 100644
index 9591c6c5..00000000
--- a/kpilot/kpilot/kpilotConfigDialog_backup.ui
+++ /dev/null
@@ -1,207 +0,0 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>BackupConfigWidget</class>
-<comment>A widget for editing HotSync-specific settings.</comment>
-<author>David Bishop</author>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>BackupConfigForm</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>549</width>
-            <height>424</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>KPilot Options</string>
-    </property>
-    <vbox>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <widget class="QGroupBox">
-            <property name="name">
-                <cstring>GroupBox23_2</cstring>
-            </property>
-            <property name="title">
-                <string>Backup Frequency</string>
-            </property>
-            <hbox>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="QLabel">
-                    <property name="name">
-                        <cstring>TextLabel5_2</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>5</hsizetype>
-                            <vsizetype>5</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <property name="minimumSize">
-                        <size>
-                            <width>100</width>
-                            <height>0</height>
-                        </size>
-                    </property>
-                    <property name="text">
-                        <string>Do &amp;backup:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>fBackupFrequency</cstring>
-                    </property>
-                </widget>
-                <widget class="QComboBox">
-                    <item>
-                        <property name="text">
-                            <string>On every HotSync</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property name="text">
-                            <string>On request only</string>
-                        </property>
-                    </item>
-                    <property name="name">
-                        <cstring>fBackupFrequency</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                </widget>
-            </hbox>
-        </widget>
-        <widget class="QGroupBox">
-            <property name="name">
-                <cstring>GroupBox23</cstring>
-            </property>
-            <property name="title">
-                <string>Databases</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="QLabel" row="0" column="0">
-                    <property name="name">
-                        <cstring>TextLabel5</cstring>
-                    </property>
-                    <property name="minimumSize">
-                        <size>
-                            <width>100</width>
-                            <height>0</height>
-                        </size>
-                    </property>
-                    <property name="text">
-                        <string>&amp;No backup:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>fBackupOnly</cstring>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;&lt;p&gt;Enter the databases types you wish to exclude from the backup operation here. Use this setting if backing up some databases crashes the handheld, or if you do not want a backup of some databases (like AvantGo pages).&lt;/p&gt;&lt;p&gt;Entries with square brackets [] are &lt;i&gt;creator codes&lt;/i&gt; like &lt;tt&gt;[lnch]&lt;/tt&gt; and can exclude a whole range of databases. Entries without the brackets list database names, and may include shell-style wildcards, like &lt;tt&gt;*_a68k&lt;/tt&gt;.&lt;/p&gt;&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="1" column="0">
-                    <property name="name">
-                        <cstring>TextLabel6</cstring>
-                    </property>
-                    <property name="minimumSize">
-                        <size>
-                            <width>100</width>
-                            <height>0</height>
-                        </size>
-                    </property>
-                    <property name="text">
-                        <string>Not &amp;restored:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>fSkipDB</cstring>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;&lt;p&gt;Enter the databases types you wish to exclude from the restore operation here (like AvantGo databases). They will be skipped even if they exist in the set of backup databases on the handheld. If you still want to install an ignored database to the handheld, you can always manually install it to the handheld.&lt;/p&gt;&lt;p&gt;Entries with square brackets [] are &lt;i&gt;creator codes&lt;/i&gt; like &lt;tt&gt;[lnch]&lt;/tt&gt; and can exclude a whole range of databases. Entries without the brackets list database names, and may include shell-style wildcards, like &lt;tt&gt;*_a68k&lt;/tt&gt;.&lt;/p&gt;&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QLineEdit" row="0" column="1">
-                    <property name="name">
-                        <cstring>fBackupOnly</cstring>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;&lt;p&gt;Enter the databases types you wish to exclude from the backup operation here. Use this setting if backing up some databases crashes the handheld, or if you do not want a backup of some databases (like AvantGo pages).&lt;/p&gt;&lt;p&gt;Entries with square brackets [] are &lt;i&gt;creator codes&lt;/i&gt; like &lt;tt&gt;[lnch]&lt;/tt&gt; and can exclude a whole range of databases. Entries without the brackets list database names, and may include shell-style wildcards, like &lt;tt&gt;*_a68k&lt;/tt&gt;.&lt;/p&gt;&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QLineEdit" row="1" column="1">
-                    <property name="name">
-                        <cstring>fSkipDB</cstring>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;&lt;p&gt;Enter the databases types you wish to exclude from the restore operation here (like AvantGo databases). They will be skipped even if they exist in the set of backup databases on the handheld. If you still want to install an ignored database to the handheld, you can always manually install it to the handheld.&lt;/p&gt;&lt;p&gt;Entries with square brackets [] are &lt;i&gt;creator codes&lt;/i&gt; like &lt;tt&gt;[lnch]&lt;/tt&gt; and can exclude a whole range of databases. Entries without the brackets list database names, and may include shell-style wildcards, like &lt;tt&gt;*_a68k&lt;/tt&gt;.&lt;/p&gt;&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="0" column="2">
-                    <property name="name">
-                        <cstring>fBackupOnlyChooser</cstring>
-                    </property>
-                    <property name="text">
-                        <string>...</string>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Click here to open the database selection dialog. This dialog allows you to check the databases you want to exclude from the backup from a list.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="1" column="2">
-                    <property name="name">
-                        <cstring>fSkipDBChooser</cstring>
-                    </property>
-                    <property name="text">
-                        <string>...</string>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Click here to open the database selection dialog. This dialog allows you to select the databases you want to exclude from the restore operation from a list.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-            </grid>
-        </widget>
-        <widget class="QCheckBox">
-            <property name="name">
-                <cstring>fRunConduitsWithBackup</cstring>
-            </property>
-            <property name="text">
-                <string>Run conduits durin&amp;g a backup sync</string>
-            </property>
-            <property name="whatsThis" stdset="0">
-                <string>&lt;qt&gt;Check this box to run the selected conduits before every backup. This makes sure the backup is up to date with the last changes from your PC.&lt;/qt&gt;</string>
-            </property>
-        </widget>
-        <spacer>
-            <property name="name">
-                <cstring>spacer8</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Vertical</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>20</width>
-                    <height>41</height>
-                </size>
-            </property>
-        </spacer>
-    </vbox>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/kpilot/kpilot/kpilotConfigDialog_device.ui b/kpilot/kpilot/kpilotConfigDialog_device.ui
deleted file mode 100644
index 20f840e8..00000000
--- a/kpilot/kpilot/kpilotConfigDialog_device.ui
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
-<class>DeviceConfigWidget</class>
-<comment>A widget for configuring the hardware device.</comment>
-<author>David Bishop</author>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>DeviceForm</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>383</width>
-            <height>334</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>KPilot Options</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <widget class="QLabel" row="0" column="0">
-            <property name="name">
-                <cstring>TextLabel1</cstring>
-            </property>
-            <property name="text">
-                <string>Pilot &amp;device:</string>
-            </property>
-            <property name="buddy" stdset="0">
-                <cstring>fPilotDevice</cstring>
-            </property>
-            <property name="whatsThis" stdset="0">
-                <string>&lt;qt&gt;Enter the device the Pilot is attached to (for instance a serial or USB port) here. You can also use &lt;i&gt;/dev/pilot&lt;/i&gt;, and make that a symlink to the correct device. You need write permission to successfully synchronize with the handheld.&lt;/qt&gt;</string>
-            </property>
-        </widget>
-        <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>fPilotDevice</cstring>
-            </property>
-            <property name="whatsThis" stdset="0">
-                <string>&lt;qt&gt;Enter the device the Pilot is attached to (for instance a serial or USB port) here. You can also use &lt;i&gt;/dev/pilot&lt;/i&gt;, and make that a symlink to the correct device. You need write permission to successfully synchronize with the handheld.&lt;/qt&gt;</string>
-            </property>
-        </widget>
-        <widget class="QLabel" row="1" column="0">
-            <property name="name">
-                <cstring>TextLabel4</cstring>
-            </property>
-            <property name="text">
-                <string>&amp;Speed:</string>
-            </property>
-            <property name="buddy" stdset="0">
-                <cstring>fPilotSpeed</cstring>
-            </property>
-            <property name="whatsThis" stdset="0">
-                <string>&lt;qt&gt;Select the speed of the serial connection to your handheld here. This has no meaning for USB devices. For an older model, choose 9600. Newer models may be able to handle speeds up to the maximum listed, 115200. You can experiment with the connection speed: the manual suggests starting at a speed of 19200 and trying faster speeds to see if they work.&lt;/qt&gt;</string>
-            </property>
-        </widget>
-        <widget class="QLineEdit" row="4" column="1" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>fUserName</cstring>
-            </property>
-            <property name="whatsThis" stdset="0">
-                <string>&lt;qt&gt;Enter your name here, as it appears in the Pilot's &amp;quot;Owner&amp;quot; setting.&lt;/qt&gt;</string>
-            </property>
-        </widget>
-        <spacer row="5" column="2">
-            <property name="name">
-                <cstring>spacer1</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Vertical</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>20</width>
-                    <height>90</height>
-                </size>
-            </property>
-        </spacer>
-        <widget class="QComboBox" row="1" column="1">
-            <item>
-                <property name="text">
-                    <string>9600</string>
-                </property>
-            </item>
-            <item>
-                <property name="text">
-                    <string>19200</string>
-                </property>
-            </item>
-            <item>
-                <property name="text">
-                    <string>38400</string>
-                </property>
-            </item>
-            <item>
-                <property name="text">
-                    <string>57600</string>
-                </property>
-            </item>
-            <item>
-                <property name="text">
-                    <string>115200</string>
-                </property>
-            </item>
-            <property name="name">
-                <cstring>fPilotSpeed</cstring>
-            </property>
-            <property name="whatsThis" stdset="0">
-                <string>&lt;qt&gt;Select the speed of the serial connection to your handheld here. This has no meaning for USB devices. For an older model, choose 9600. Newer models may be able to handle speeds up to the maximum listed, 115200. You can experiment with the connection speed: the manual suggests starting at a speed of 19200 and trying faster speeds to see if they work.&lt;/qt&gt;</string>
-            </property>
-        </widget>
-        <widget class="QLabel" row="3" column="0">
-            <property name="name">
-                <cstring>textLabel1</cstring>
-            </property>
-            <property name="text">
-                <string>En&amp;coding:</string>
-            </property>
-            <property name="buddy" stdset="0">
-                <cstring>fPilotEncoding</cstring>
-            </property>
-            <property name="whatsThis" stdset="0">
-                <string>&lt;qt&gt;PalmOS devices are available in many different languages. If your device uses a different encoding than ISO-latin1 (ISO8859-1), select the correct encoding here, in order to display special characters correctly.&lt;/qt&gt;</string>
-            </property>
-        </widget>
-        <widget class="QLabel" row="4" column="0">
-            <property name="name">
-                <cstring>TextLabel2</cstring>
-            </property>
-            <property name="text">
-                <string>Pilot &amp;user:</string>
-            </property>
-            <property name="buddy" stdset="0">
-                <cstring>fUserName</cstring>
-            </property>
-            <property name="whatsThis" stdset="0">
-                <string>&lt;qt&gt;Enter your name here, as it appears in the Pilot's &amp;quot;Owner&amp;quot; setting.&lt;/qt&gt;</string>
-            </property>
-        </widget>
-        <widget class="QComboBox" row="3" column="1" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>fPilotEncoding</cstring>
-            </property>
-            <property name="editable">
-                <bool>true</bool>
-            </property>
-            <property name="whatsThis" stdset="0">
-                <string>&lt;qt&gt;PalmOS devices are available in many different languages. If your device uses a different encoding than ISO-latin1 (ISO8859-1), select the correct encoding here, in order to display special characters correctly.&lt;/qt&gt;</string>
-            </property>
-        </widget>
-        <widget class="QLabel" row="2" column="0">
-            <property name="name">
-                <cstring>textLabel1_2</cstring>
-            </property>
-            <property name="text">
-                <string>&amp;Workarounds:</string>
-            </property>
-            <property name="buddy" stdset="0">
-                <cstring>fWorkaround</cstring>
-            </property>
-        </widget>
-        <widget class="QComboBox" row="2" column="1" rowspan="1" colspan="2">
-            <item>
-                <property name="text">
-                    <string>None</string>
-                </property>
-            </item>
-            <item>
-                <property name="text">
-                    <string>Zire 31, 72, Tungsten T5</string>
-                </property>
-            </item>
-            <property name="name">
-                <cstring>fWorkaround</cstring>
-            </property>
-            <property name="whatsThis" stdset="0">
-                <string>&lt;qt&gt;Workarounds enable special handling for specific devices. Most devices do not need special handling. However, the Zire&tm; 31, Zire 72 and Tungsten T5 &lt;i&gt;do&lt;/i&gt; have special needs, so if you are connecting such a device, please select the workaround for them.&lt;/qt&gt;</string>
-            </property>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="0"/>
-</UI>
diff --git a/kpilot/kpilot/kpilotConfigDialog_startup.ui b/kpilot/kpilot/kpilotConfigDialog_startup.ui
deleted file mode 100644
index 6445e6ea..00000000
--- a/kpilot/kpilot/kpilotConfigDialog_startup.ui
+++ /dev/null
@@ -1,118 +0,0 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
-<class>StartExitConfigWidget</class>
-<comment>A tabWidget for configuring
-KPilot's settings.</comment>
-<author>David Bishop</author>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>StartExitForm</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>593</width>
-            <height>323</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>KPilot Options</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <widget class="QGroupBox" row="1" column="0">
-            <property name="name">
-                <cstring>groupBox4</cstring>
-            </property>
-            <property name="title">
-                <string>Exit Options</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="QCheckBox" row="1" column="0">
-                    <property name="name">
-                        <cstring>fKillDaemonOnExit</cstring>
-                    </property>
-                    <property name="text">
-                        <string>S&amp;top KPilot's system tray application on exit</string>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Check this box to stop the KPilot daemon when you quit KPilot (only if KPilot started the daemon itself).&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QCheckBox" row="0" column="0">
-                    <property name="name">
-                        <cstring>fQuitAfterSync</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Quit &amp;after HotSync</string>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Check this box to stop both KPilot and the KPilot daemon after the HotSync finishes. This may be useful for systems where KPilot is started by the USB daemon.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-            </grid>
-        </widget>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1_2</cstring>
-            </property>
-            <property name="title">
-                <string>Startup Options</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="QCheckBox" row="0" column="0">
-                    <property name="name">
-                        <cstring>fStartDaemonAtLogin</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Start KPilot at login</string>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Check this box to start up the KPilot daemon every time you log in to KDE.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QCheckBox" row="1" column="0">
-                    <property name="name">
-                        <cstring>fDockDaemon</cstring>
-                    </property>
-                    <property name="text">
-                        <string>S&amp;how KPilot in system tray</string>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Check this box to place a Kpilot icon in the system tray, which shows the daemon's status, and allows you to select the next sync type and to configure KPilot.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-            </grid>
-        </widget>
-        <spacer row="2" column="0">
-            <property name="name">
-                <cstring>spacer3</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Vertical</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>20</width>
-                    <height>31</height>
-                </size>
-            </property>
-        </spacer>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/kpilot/kpilot/kpilotConfigDialog_sync.ui b/kpilot/kpilot/kpilotConfigDialog_sync.ui
deleted file mode 100644
index 7571b197..00000000
--- a/kpilot/kpilot/kpilotConfigDialog_sync.ui
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>SyncConfigWidget</class>
-<comment>A widget for editing HotSync-specific settings.</comment>
-<author>David Bishop</author>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>SyncConfigForm</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>593</width>
-            <height>332</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>KPilot Options</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <widget class="QCheckBox" row="1" column="1">
-            <property name="name">
-                <cstring>fFullSyncCheck</cstring>
-            </property>
-            <property name="text">
-                <string>Do full sync when chan&amp;ging PCs</string>
-            </property>
-            <property name="checked">
-                <bool>true</bool>
-            </property>
-            <property name="whatsThis" stdset="0">
-                <string>&lt;qt&gt;Check this box to perform a full sync when your last sync was performed with another PC or system, to guarantee the completeness of your data.&lt;/qt&gt;</string>
-            </property>
-        </widget>
-        <widget class="QComboBox" row="0" column="1">
-            <item>
-                <property name="text">
-                    <string>HotSync (sync all changes)</string>
-                </property>
-            </item>
-            <item>
-                <property name="text">
-                    <string>FullSync (sync also unchanged records)</string>
-                </property>
-            </item>
-            <item>
-                <property name="text">
-                    <string>Copy PC to Handheld</string>
-                </property>
-            </item>
-            <item>
-                <property name="text">
-                    <string>Copy Handheld to PC</string>
-                </property>
-            </item>
-            <property name="name">
-                <cstring>fSpecialSync</cstring>
-            </property>
-            <property name="whatsThis" stdset="0">
-                <string>&lt;qt&gt;Select in this list the synchronization type that KPilot will use as default. Possible values are:&lt;br&gt;"HotSync", to run all selected conduits, and sync the databases with a modified flag set, updating the modified records only;&lt;br&gt;"FullSync" to run all selected conduits, and sync all databases, reading all records, and performing a full backup;&lt;br&gt;"Copy PC to handheld" to run all conduits and sync all databases, but instead of merging the information from both sources, copy the PC data to the handheld;&lt;br&gt;"Copy handheld to PC" to run all conduits and sync all databases, but instead of merging the information from both sources, copy the handheld data to the PC.&lt;/qt&gt;</string>
-            </property>
-        </widget>
-        <widget class="QLabel" row="0" column="0">
-            <property name="name">
-                <cstring>textLabel1_2</cstring>
-            </property>
-            <property name="text">
-                <string>&amp;Default sync:</string>
-            </property>
-            <property name="buddy" stdset="0">
-                <cstring>fSpecialSync</cstring>
-            </property>
-        </widget>
-        <spacer row="4" column="1">
-            <property name="name">
-                <cstring>spacer3</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Vertical</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>20</width>
-                    <height>170</height>
-                </size>
-            </property>
-        </spacer>
-        <widget class="QComboBox" row="3" column="1">
-            <item>
-                <property name="text">
-                    <string>Ask User</string>
-                </property>
-            </item>
-            <item>
-                <property name="text">
-                    <string>Do Nothing</string>
-                </property>
-            </item>
-            <item>
-                <property name="text">
-                    <string>Handheld Overrides</string>
-                </property>
-            </item>
-            <item>
-                <property name="text">
-                    <string>PC Overrides</string>
-                </property>
-            </item>
-            <item>
-                <property name="text">
-                    <string>Values From Last Sync (if possible)</string>
-                </property>
-            </item>
-            <item>
-                <property name="text">
-                    <string>Use Both Entries</string>
-                </property>
-            </item>
-            <property name="name">
-                <cstring>fConflictResolution</cstring>
-            </property>
-            <property name="whatsThis" stdset="0">
-                <string>&lt;qt&gt;Select in this list how conflicting entries (entries which were edited both on your handheld and on the PC) are resolved. Possibly values are  "Ask User" to let you decide case by case, "Do Nothing" to allow the entries to be different, "PC overrides", "Handheld overrides", "Use values from last sync" and "Use both entries" to create a new entry on both the PC and handheld. Note that the conflict resolution option selected here can be overridden by conduits that have their own conflict resolution configuration.&lt;/qt&gt;</string>
-            </property>
-        </widget>
-        <widget class="QLabel" row="3" column="0">
-            <property name="name">
-                <cstring>textLabel1</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>4</hsizetype>
-                    <vsizetype>5</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="text">
-                <string>Conflict &amp;resolution:</string>
-            </property>
-            <property name="buddy" stdset="0">
-                <cstring>fConflictResolution</cstring>
-            </property>
-        </widget>
-        <widget class="QCheckBox" row="2" column="1">
-            <property name="name">
-                <cstring>fScreenlockSecure</cstring>
-            </property>
-            <property name="text">
-                <string>Do not sync when screensaver is active</string>
-            </property>
-            <property name="checked">
-                <bool>true</bool>
-            </property>
-            <property name="whatsThis" stdset="0">
-                <string>&lt;qt&gt;Check this box to prevent KPilot from syncing your handheld while the screensaver is active: this is a security measure to prevent others from syncing &lt;i&gt;their&lt;/i&gt; handhelds with your data.  This option must be disabled when you use a different desktop, since KPilot is not aware of screensavers other than KDE's.&lt;/qt&gt;</string>
-            </property>
-        </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/kpilot/kpilot/kpilotConfigDialog_viewers.ui b/kpilot/kpilot/kpilotConfigDialog_viewers.ui
deleted file mode 100644
index 1be8b408..00000000
--- a/kpilot/kpilot/kpilotConfigDialog_viewers.ui
+++ /dev/null
@@ -1,149 +0,0 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
-<class>ViewersConfigWidget</class>
-<comment>A tabWidget for configuring
-KPilot's settings.</comment>
-<author>David Bishop</author>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>ViewersForm</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>610</width>
-            <height>325</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>KPilot Options</string>
-    </property>
-    <vbox>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <widget class="QGroupBox">
-            <property name="name">
-                <cstring>groupBox2</cstring>
-            </property>
-            <property name="title">
-                <string>Viewers</string>
-            </property>
-            <vbox>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="QCheckBox">
-                    <property name="name">
-                        <cstring>fInternalEditors</cstring>
-                    </property>
-                    <property name="enabled">
-                        <bool>false</bool>
-                    </property>
-                    <property name="text">
-                        <string>Make internal viewers &amp;editable</string>
-                    </property>
-                    <property name="checked">
-                        <bool>false</bool>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;The internal viewers can be read only or editable. The editable mode allows you to add new records, delete or edit the existing records and sync your modifications back to the handheld. Check this box to set the internal viewers to editable mode, uncheck to set them to read only mode.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QCheckBox">
-                    <property name="name">
-                        <cstring>fUseSecret</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Show private records</string>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Check this box to display in the internal viewers records that are marked &amp;quot;Private&amp;quot; in the Pilot.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-            </vbox>
-        </widget>
-        <widget class="QButtonGroup">
-            <property name="name">
-                <cstring>fAddressGroup</cstring>
-            </property>
-            <property name="title">
-                <string>Address Viewer</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="QRadioButton" row="0" column="0">
-                    <property name="name">
-                        <cstring>fNormalDisplay</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Show as "&amp;Last, first"</string>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Select this option to display addresses in the internal address viewer sorted by last name, first name.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QRadioButton" row="1" column="0">
-                    <property name="name">
-                        <cstring>fCompanyDisplay</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Show as "&amp;Company, last"</string>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Select this option to display addresses in the internal address viewer sorted by company name, last name.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <widget class="Line" row="2" column="0">
-                    <property name="name">
-                        <cstring>line1</cstring>
-                    </property>
-                    <property name="frameShape">
-                        <enum>HLine</enum>
-                    </property>
-                    <property name="frameShadow">
-                        <enum>Sunken</enum>
-                    </property>
-                    <property name="orientation">
-                        <enum>Horizontal</enum>
-                    </property>
-                </widget>
-                <widget class="QCheckBox" row="3" column="0">
-                    <property name="name">
-                        <cstring>fUseKeyField</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Use key field</string>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Check this box to combine all entries with the same last name in the internal address viewer.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-            </grid>
-        </widget>
-        <spacer>
-            <property name="name">
-                <cstring>spacer1</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Vertical</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>20</width>
-                    <height>41</height>
-                </size>
-            </property>
-        </spacer>
-    </vbox>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/kpilot/kpilot/kpilotConfigWizard.cc b/kpilot/kpilot/kpilotConfigWizard.cc
deleted file mode 100644
index 9df81b41..00000000
--- a/kpilot/kpilot/kpilotConfigWizard.cc
+++ /dev/null
@@ -1,233 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2004 by Reinhold Kainhofer
-**
-** A simple configuration wizard.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-//#include "options.h"
-
-#include <tqpushbutton.h>
-#include <tqbuttongroup.h>
-#include <tqcheckbox.h>
-#include <tqlineedit.h>
-
-#include <kmessagebox.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kconfigskeleton.h>
-
-#include "kpilotConfig.h"
-#include "options.h"
-
-#include "kpilotConfigWizard_app.h"
-#include "kpilotConfigWizard_user.h"
-#include "kpilotConfigWizard_address.h"
-#include "kpilotConfigWizard_notes.h"
-#include "kpilotConfigWizard_vcal.h"
-
-
-#include "kpilotConfigWizard.moc"
-#include "kpilotProbeDialog.h"
-
-
-ConfigWizard::ConfigWizard(TQWidget *parent, const char *n, int m) :
-	KWizard(parent, n),
-	fMode((Mode)m)
-{
-//	page1=new ConfigWizard_base1(this);
-//	addPage( page1, i18n("Select Connection Type") );
-	page2=new ConfigWizard_base2(this);
-	addPage( page2, i18n("Pilot Info") );
-	page3=new ConfigWizard_base3(this);
-	addPage( page3, i18n("Application to Sync With") );
-	setFinishEnabled( page3, true );
-	
-	setHelpEnabled( page2, false );
-	setHelpEnabled( page3, false );
-
-	connect( page2->fProbeButton, TQT_SIGNAL( pressed() ),
-		this, TQT_SLOT( probeHandheld() ) );
-
-	KPilotSettings::self()->readConfig();
-	page2->fUserName->setText( KPilotSettings::userName() );
-	page2->fDeviceName->setText( KPilotSettings::pilotDevice() );
-	page2->fPilotRunningPermanently->setChecked( KPilotSettings::startDaemonAtLogin() );
-
-}
-
-ConfigWizard::~ConfigWizard()
-{
-}
-
-void ConfigWizard::accept()
-{
-	FUNCTIONSETUP;
-	TQString username( page2->fUserName->text() );
-	TQString devicename( page2->fDeviceName->text() );
-//	int devicetype( page1->fConnectionType->selectedId() );
-	enum eSyncApp {
-		eAppKDE=0,
-		//eAppKontact,
-		eAppEvolution,
-		eAppNone
-	} app;
-	app=(eSyncApp)( page3->fAppType->selectedId() );
-	bool keepPermanently( page2->fPilotRunningPermanently->isChecked() );
-#ifdef DEBUG
-	DEBUGKPILOT<<fname<<"Keep permanently: "<<keepPermanently<<endl;
-#endif
-
-	KPilotSettings::setPilotDevice( devicename );
-	KPilotSettings::setUserName(username);
-//	KPilotSettings::setEncoding("iso 8859-15");
-	KPilotSettings::setDockDaemon( true );
-	KPilotSettings::setKillDaemonAtExit( !keepPermanently);
-	KPilotSettings::setQuitAfterSync( !keepPermanently );
-	KPilotSettings::setStartDaemonAtLogin( keepPermanently );
-	KPilotSettings::setSyncType(0);
-	KPilotSettings::setFullSyncOnPCChange( true );
-	KPilotSettings::setConflictResolution(0);
-	if ( !mDBs.isEmpty() ) 
-		KPilotSettings::setDeviceDBs( mDBs );
-
-	KPilotWizard_vcalConfig*calendarConfig = new KPilotWizard_vcalConfig("Calendar");
-	KPilotWizard_vcalConfig*todoConfig = new KPilotWizard_vcalConfig("ToDo");
-	KPilotWizard_addressConfig*addressConfig = new KPilotWizard_addressConfig();
-	KPilotWizard_notesConfig*notesConfig = new KPilotWizard_notesConfig();
-	addressConfig->readConfig();
-	notesConfig->readConfig();
-	todoConfig->readConfig();
-	calendarConfig->readConfig();
-
-	TQStringList conduits = KPilotSettings::installedConduits();
-	int version(0);
-#define APPEND_CONDUIT(a) if (!conduits.contains(a)) conduits.append(a)
-	TQString applicationName(i18n("general KDE-PIM"));
-	APPEND_CONDUIT("internal_fileinstall");
-	APPEND_CONDUIT("todo-conduit");
-	APPEND_CONDUIT("vcal-conduit");
-	switch (app) {
-		case eAppEvolution:
-			applicationName=i18n("Gnome's PIM suite", "Evolution");
-
-			// TODO: Once the Evolution abook resource is finished, enable it...
-			conduits.remove("abbrowser_conduit");
-			// addressConfig->setDefaults();
-			// addressConfig->setAddressbookType( KPilotWizard_addressConfig::eAbookResource );
-			//// addressConfig->revertToDefault("ArchiveDeleted");
-			//// addressConfig->revertToDefault("ConflictResolution");
-
-			// nothing to do for knotes conduit yet (evolution doesn't have notes)
-			conduits.remove("knotes-conduit");
-
-			// the vcalconduits use the same config file, so set the correct groups
-			version = calendarConfig->conduitVersion();
-			calendarConfig->setDefaults();
-			calendarConfig->setCalendarType( KPilotWizard_vcalConfig::eCalendarLocal );
-			calendarConfig->setCalendarFile( "$HOME/evolution/local/Calendar/calendar.ics" );
-			calendarConfig->setConduitVersion( version );
-			version = todoConfig->conduitVersion();
-			todoConfig->setDefaults();
-			todoConfig->setCalendarType( KPilotWizard_vcalConfig::eCalendarLocal );
-			todoConfig->setCalendarFile( "$HOME/evolution/local/Tasks/tasks.ics" );
-			todoConfig->setConduitVersion( version );
-
-			KMessageBox::information(this, i18n("KPilot cannot yet synchronize the addressbook with Evolution, so the addressbook conduit was disabled.\nWhen syncing the calendar or to-do list using KPilot please quit Evolution before the sync, otherwise you will lose data."), i18n("Restrictions with Evolution"));
-			break;
-		case eAppNone:
-			conduits.clear();
-			APPEND_CONDUIT("internal_fileinstall");
-			applicationName=i18n("Kpilot will sync with nothing","nothing (it will backup only)");
-			break;
-//		case eAppKontact:
-		case eAppKDE:
-			applicationName=i18n("KDE's PIM suite", "Kontact");
-		default:
-			APPEND_CONDUIT("knotes-conduit");
-			APPEND_CONDUIT("abbrowser_conduit");
-			// Set to the stdaddressbook, reset others to defaults
-			addressConfig->setAddressbookType( KPilotWizard_addressConfig::eAbookResource );
-			addressConfig->setArchiveDeleted( true );
-			addressConfig->setConflictResolution( -1 );
-			// nothing to do for knotes conduit yet
-			// notesConfig->set...
-			// the vcalconduits use the same config file, so set the correct groups
-			int version = calendarConfig->conduitVersion();
-			calendarConfig->setDefaults();
-			calendarConfig->setCalendarType( KPilotWizard_vcalConfig::eCalendarResource );
-			calendarConfig->setConduitVersion( version );
-			version = todoConfig->conduitVersion();
-			todoConfig->setDefaults();
-			todoConfig->setCalendarType( KPilotWizard_vcalConfig::eCalendarResource );
-			todoConfig->setConduitVersion( version );
-			break;
-	}
-	addressConfig->writeConfig();
-	notesConfig->writeConfig();
-	todoConfig->writeConfig();
-	calendarConfig->writeConfig();
-
-	KPILOT_DELETE(addressConfig);
-	KPILOT_DELETE(notesConfig);
-	KPILOT_DELETE(todoConfig);
-	KPILOT_DELETE(calendarConfig);
-
-	KPilotSettings::setInstalledConduits( conduits );
-#undef APPEND_CONDUIT
-
-	TQString finishMessage = i18n("KPilot is now configured to sync with %1.").arg(applicationName);
-	if (fMode == InDialog)
-	{
-		finishMessage.append(CSL1("\n"));
-		finishMessage.append(i18n(
-			"The remaining options in the config dialog are advanced options and can "
-			"be used to fine-tune KPilot."));
-	}
-
-	KMessageBox::information(this, finishMessage,
-		i18n("Automatic Configuration Finished"));
-	KPilotSettings::self()->writeConfig();
-	TQDialog::accept();
-}
-
-void ConfigWizard::probeHandheld()
-{
-	if ( KMessageBox::warningContinueCancel( this, i18n("Please put the handheld "
-			"in the cradle, press the hotsync button and click on \"Continue\".\n\nSome "
-			"kernel versions (Linux 2.6.x) have problems with the visor kernel module "
-			"(for Sony Clie devices). Running an autodetection in that case might block "
-			"the computer from doing hotsyncs until it is rebooted. In that case it might "
-			"be advisable not to continue."), 
-			i18n("Handheld Detection") ) == KMessageBox::Continue ) {
-		ProbeDialog *probeDialog = new ProbeDialog( this );
-		if ( probeDialog->exec() && probeDialog->detected() ) {
-			page2->fUserName->setText( probeDialog->userName() );
-			page2->fDeviceName->setText( probeDialog->device() );
-			mDBs = probeDialog->dbs();
-		}
-		KPILOT_DELETE(probeDialog);
-	}
-}
-
diff --git a/kpilot/kpilot/kpilotConfigWizard.h b/kpilot/kpilot/kpilotConfigWizard.h
deleted file mode 100644
index 742df392..00000000
--- a/kpilot/kpilot/kpilotConfigWizard.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef _KPILOT_CONFIGWIZARD_H
-#define _KPILOT_CONFIGWIZARD_H
-/* kpilotConfigWizard.h                 KPilot
-**
-** Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This file defines kpilot's configuration wizard
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "kwizard.h"
-
-class ConfigWizard_base1;
-class ConfigWizard_base2;
-class ConfigWizard_base3;
-
-class ConfigWizard : public KWizard
-{
-Q_OBJECT
-public:
-	enum Mode { InDialog=0, Standalone=1 } ;
-
-	ConfigWizard(TQWidget *p=0L,const char *n=0L, int mode=(int)InDialog);
-	~ConfigWizard();
-
-protected slots:
-	void probeHandheld();
-protected:
-	void accept();
-//	ConfigWizard_base1 *page1;
-	ConfigWizard_base2 *page2;
-	ConfigWizard_base3 *page3;
-
-	Mode fMode;
-	TQStringList mDBs;
-} ;
-
-#endif
diff --git a/kpilot/kpilot/kpilotConfigWizard_address.kcfgc b/kpilot/kpilot/kpilotConfigWizard_address.kcfgc
deleted file mode 100644
index 884fd3af..00000000
--- a/kpilot/kpilot/kpilotConfigWizard_address.kcfgc
+++ /dev/null
@@ -1,7 +0,0 @@
-File=../conduits/abbrowserconduit/abbrowserconduit.kcfg
-ClassName=KPilotWizard_addressConfig
-Singleton=False
-ItemAccessors=true
-Mutators=true
-GlobalEnums=true
-SetUserTexts=true
diff --git a/kpilot/kpilot/kpilotConfigWizard_app.ui b/kpilot/kpilot/kpilotConfigWizard_app.ui
deleted file mode 100644
index 7a690f86..00000000
--- a/kpilot/kpilot/kpilotConfigWizard_app.ui
+++ /dev/null
@@ -1,112 +0,0 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>ConfigWizard_base3</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>ConfigWizard_base3</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>462</width>
-            <height>404</height>
-        </rect>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <widget class="QLabel" row="0" column="0">
-            <property name="name">
-                <cstring>textLabel6</cstring>
-            </property>
-            <property name="text">
-                <string>Finally, you can configure KPilot specifically for some PIM applications, like Kontact (KDE's integrated PIM application) or Evolution (GNOME's integrated PIM application).
-
-Press "Finish" to setup KPilot according to the settings in this configuration Wizard.</string>
-            </property>
-            <property name="alignment">
-                <set>WordBreak|AlignVCenter</set>
-            </property>
-        </widget>
-        <widget class="QButtonGroup" row="2" column="0">
-            <property name="name">
-                <cstring>fAppType</cstring>
-            </property>
-            <property name="title">
-                <string>Set Default Values for Syncing With</string>
-            </property>
-            <vbox>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="QRadioButton">
-                    <property name="name">
-                        <cstring>radioButton6</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;KDE-PIM suite (Kontact)</string>
-                    </property>
-                    <property name="checked">
-                        <bool>true</bool>
-                    </property>
-                </widget>
-                <widget class="QRadioButton">
-                    <property name="name">
-                        <cstring>radioButton8</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;GNOME-PIM (Evolution)</string>
-                    </property>
-                </widget>
-                <widget class="QRadioButton">
-                    <property name="name">
-                        <cstring>radioButton4</cstring>
-                    </property>
-                    <property name="text">
-                        <string>No sync, just backup</string>
-                    </property>
-                </widget>
-            </vbox>
-        </widget>
-        <spacer row="3" column="0">
-            <property name="name">
-                <cstring>spacer5</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Vertical</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>20</width>
-                    <height>120</height>
-                </size>
-            </property>
-        </spacer>
-        <spacer row="1" column="0">
-            <property name="name">
-                <cstring>spacer5_2</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Vertical</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Minimum</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>20</width>
-                    <height>12</height>
-                </size>
-            </property>
-        </spacer>
-    </grid>
-</widget>
-<tabstops>
-    <tabstop>radioButton6</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/kpilot/kpilot/kpilotConfigWizard_notes.kcfgc b/kpilot/kpilot/kpilotConfigWizard_notes.kcfgc
deleted file mode 100644
index c343514f..00000000
--- a/kpilot/kpilot/kpilotConfigWizard_notes.kcfgc
+++ /dev/null
@@ -1,7 +0,0 @@
-File=../conduits/knotes/knotesconduit.kcfg
-ClassName=KPilotWizard_notesConfig
-Singleton=false
-ItemAccessors=true
-Mutators=true
-GlobalEnums=true
-SetUserTexts=true
diff --git a/kpilot/kpilot/kpilotConfigWizard_user.ui b/kpilot/kpilot/kpilotConfigWizard_user.ui
deleted file mode 100644
index b894cbba..00000000
--- a/kpilot/kpilot/kpilotConfigWizard_user.ui
+++ /dev/null
@@ -1,168 +0,0 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
-<class>ConfigWizard_base2</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>ConfigWizard_base2</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>512</width>
-            <height>298</height>
-        </rect>
-    </property>
-    <vbox>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <widget class="QLabel">
-            <property name="name">
-                <cstring>textLabel1</cstring>
-            </property>
-            <property name="text">
-                <string>This wizard will help you configure KPilot.</string>
-            </property>
-            <property name="alignment">
-                <set>WordBreak|AlignVCenter</set>
-            </property>
-        </widget>
-        <widget class="QLabel">
-            <property name="name">
-                <cstring>textLabel5</cstring>
-            </property>
-            <property name="text">
-                <string>As a first step, we need to determine the user name and how the handheld is connected to the computer.</string>
-            </property>
-            <property name="alignment">
-                <set>WordBreak|AlignVCenter</set>
-            </property>
-        </widget>
-        <widget class="QGroupBox">
-            <property name="name">
-                <cstring>groupBox2</cstring>
-            </property>
-            <property name="title">
-                <string>Handheld &amp;&amp; User Name</string>
-            </property>
-            <property name="whatsThis" stdset="0">
-                <string>&lt;p&gt;You can either let KPilot detect these values automatically (for this you need your handheld ready and connected to the PC)  or enter them manually.&lt;/p&gt;
-&lt;p&gt;Please enter the username exactly as set on the handheld. &lt;/p&gt;
-&lt;p&gt;If setting the device type manually (i.e., if automatic detection did not work for you), please look below for tips on choosing the right device name.  {0...n} means a number from 0 up to a very large number, though usually just 255.
-&lt;p&gt;
-Serial Port: an old method of connection, used primarily by the original line of Palm Pilots, and various Palm-based cellphones.  Device name will look like /dev/ttyS{0...n} (Linux) or /dev/cuaa{0...n} (FreeBSD).&lt;/p&gt;
-&lt;p&gt;
-USB Port: A newer style of connection, used by most newer Palms, Handsprings, and Sony Clies.  Device name will look like /dev/ttyUSB{0...n} or /dev/usb/tts/{0...n} (Linux) or /dev/ucom{0...n} (FreeBSD).  On Linux, definitely check both 0 and 1: newer devices tend to use 1; older devices tend to use 0.&lt;/p&gt;
-&lt;p&gt;
-Infrared: (pronounced infra-red) is a relatively slow connection type used solely as a last resort.  Device name will be /dev/ircomm0 or /dev/ttyS{0...n} (Linux), or /dev/sio{0...n} (FreeBSD).&lt;/p&gt;
-&lt;p&gt;
-Bluetooth: A new connection method, this is used almost exclusively on new, high-end devices, like the Tungsten T3 or the Zire 72.  Device name will be /dev/usb/ttub/{0...n} or /dev/ttyUB{0...n} (Linux), or /dev/ttyp{0...n} (FreeBSD).&lt;/p&gt;
-&lt;p&gt;
-Network: This has not been tested by any of the KPilot developers themselves (hardware donations always accepted!), but it has been reported that setting the device to "net:any" will work for network-enabled devices.  However, this has also been known to lock KPilot up when doing anything other than just syncing. Use it with caution.
-&lt;/p&gt;</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="QLabel" row="1" column="0">
-                    <property name="name">
-                        <cstring>textLabel3_2</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Device:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>fDeviceName</cstring>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Enter the device the Pilot is attached to (for instance a serial or USB port) here. You can also use &lt;i&gt;/dev/pilot&lt;/i&gt;, and make that a symlink to the correct device. Use the button below to automatically detect the device. You need write permission to successfully synchronize with the handheld.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="2" column="0" rowspan="1" colspan="2">
-                    <property name="name">
-                        <cstring>fProbeButton</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Automatically Detect Handheld &amp;&amp; User Name</string>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Click this button to open the detection dialog. The wizard will try to automatically find and display the correct device and username for your handheld. If the wizard cannot retrieve this information, check if you have write permission for the device.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QLineEdit" row="1" column="1">
-                    <property name="name">
-                        <cstring>fDeviceName</cstring>
-                    </property>
-                    <property name="text">
-                        <string>/dev/pilot</string>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Enter the device the Pilot is attached to (for instance a serial or USB port) here. You can also use &lt;i&gt;/dev/pilot&lt;/i&gt;, and make that a symlink to the correct device. Use the button below to automatically detect the device. You need write permission to successfully synchronize with the handheld.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QLineEdit" row="0" column="1">
-                    <property name="name">
-                        <cstring>fUserName</cstring>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Enter your username here, as it appears in the Pilot's &amp;quot;Owner&amp;quot; setting, or use the button below to automatically detect it.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QLabel" row="0" column="0">
-                    <property name="name">
-                        <cstring>textLabel2_2</cstring>
-                    </property>
-                    <property name="text">
-                        <string>User na&amp;me:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>fUserName</cstring>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>&lt;qt&gt;Enter your username here, as it appears in the Pilot's &amp;quot;Owner&amp;quot; setting, or use the button below to automatically detect it.&lt;/qt&gt;</string>
-                    </property>
-                </widget>
-            </grid>
-        </widget>
-        <widget class="QCheckBox">
-            <property name="name">
-                <cstring>fPilotRunningPermanently</cstring>
-            </property>
-            <property name="text">
-                <string>&amp;Start KPilot at login</string>
-            </property>
-            <property name="checked">
-                <bool>true</bool>
-            </property>
-            <property name="whatsThis" stdset="0">
-                <string>&lt;qt&gt;Check this box to make the kpilot daemon load when you first log in until you log out.  That means (in theory), that you should not have to do anything other than connect your handheld and push "sync", and kpilot will appear and magically do your bidding. &lt;/qt&gt;</string>
-            </property>
-        </widget>
-        <spacer>
-            <property name="name">
-                <cstring>spacer4</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Vertical</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>20</width>
-                    <height>70</height>
-                </size>
-            </property>
-        </spacer>
-    </vbox>
-</widget>
-<tabstops>
-    <tabstop>fUserName</tabstop>
-    <tabstop>fDeviceName</tabstop>
-    <tabstop>fProbeButton</tabstop>
-    <tabstop>fPilotRunningPermanently</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/kpilot/kpilot/kpilotConfigWizard_vcal.kcfgc b/kpilot/kpilot/kpilotConfigWizard_vcal.kcfgc
deleted file mode 100644
index 36141b8a..00000000
--- a/kpilot/kpilot/kpilotConfigWizard_vcal.kcfgc
+++ /dev/null
@@ -1,7 +0,0 @@
-File=../conduits/vcalconduit/vcalconduitbase.kcfg
-ClassName=KPilotWizard_vcalConfig
-Singleton=false
-ItemAccessors=true
-Mutators=true
-GlobalEnums=true
-SetUserTexts=true
diff --git a/kpilot/kpilot/kpilotDCOP.h b/kpilot/kpilot/kpilotDCOP.h
deleted file mode 100644
index a17e8a29..00000000
--- a/kpilot/kpilot/kpilotDCOP.h
+++ /dev/null
@@ -1,75 +0,0 @@
-#ifndef _KPILOT_KPILOTDCOP_H
-#define _KPILOT_KPILOTDCOP_H
-/* kpilotDCOP.h			KPilotDaemon
-**
-** Copyright (C) 2000 by Adriaan de Groot
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This file defines the DCOP interface for KPilot.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include <dcopobject.h>
-
-
-class KPilotDCOP : virtual public DCOPObject
-{
-	K_DCOP
-
-public:
-	enum DaemonMessages {
-		None=0,
-		StartOfHotSync=1,
-		EndOfHotSync=2,
-		DaemonQuit=4 } ;
-	enum KPilotStatus {
-		Startup=1,
-		WaitingForDaemon=2,
-		Normal=10,
-		UIBusy=100,
-		Error=101 } ;
-
-k_dcop:
-	/**
-	* This is the method the daemon uses to report
-	* changes in its state.
-	*/
-	virtual ASYNC daemonStatus(int) = 0;
-
-	/**
-	* This is the method the daemon uses to popup
-	* the configure dialog.
-	*/
-	virtual ASYNC configure() = 0;
-	virtual ASYNC configureWizard() = 0;
-
-	/**
-	* Report KPilot's state back to the daemon.
-	*/
-	virtual int kpilotStatus() = 0;
-} ;
-
-
-
-#endif
diff --git a/kpilot/kpilot/kpilotProbeDialog.cc b/kpilot/kpilot/kpilotProbeDialog.cc
deleted file mode 100644
index fd7fcb3c..00000000
--- a/kpilot/kpilot/kpilotProbeDialog.cc
+++ /dev/null
@@ -1,363 +0,0 @@
-/* conduitConfigDialog.cc                KPilot
-**
-** Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This file defines a .ui-based configuration dialog for conduits.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <tqlayout.h>
-#include <tqgroupbox.h>
-#include <tqlabel.h>
-#include <tqvbox.h>
-#include <tqtimer.h>
-#include <tqptrlist.h>
-#include <tqmap.h>
-#include <tqvaluelist.h>
-
-#include <kmessagebox.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kconfigskeleton.h>
-#include <kapplication.h>
-#include <kprogress.h>
-
-#include "kpilotConfig.h"
-#include "pilotUser.h"
-#include "pilotSysInfo.h"
-#include "options.h"
-#include "kpilotdevicelink.h"
-
-#include "kpilotProbeDialog.moc"
-#include "pilotDaemonDCOP_stub.h"
-
-/*
-We can't connect to /dev/ttyUSB0 and /dev/ttyUSB1 at the same time, because that
-will lock up kpilot completely. In particular, it gets a connection on /dev/ttyUSB0,
-which it processes, and while processing, a connection on USB1 is also detected.
-However, when kpilot gets 'round to process it, the link is already closed, and
-pi_connect hangs forever.
-
-Now, I split up the list of devices to probe into three list, one holding /dev/pilot,
-the second holding all /dev/xxx0 and /dev/xxx2 (e.g. /dev/ttyUSB0 and /dev/ttyUSB2),
-and finally a third holding the remaining /dev/xxx1 and /dev/xxx3 devices. Each of
-these three sets of devices is activated for a few seconds, and then the next set is
-probed. This way, I ensure that kpilot never listens on /dev/ttyUSB0 and /dev/ttyUSB1
-at the same time.
-
-Now the first detection works fine. However, it seems the Linux kernel has another
-problem with /dev/ttyUSB0. I have a Clie, which uses ttyUSB0, and as soon as the
-wizard tries to listen on ttyUSB1 (after it detected the handheld on ttyUSB0 already),
-the kernel writes a warning message to the syslog:
-visor ttyUSB1: Device lied about number of ports, please use a lower one.
-
-If I continue autodetection once again afterwards, the visor module kind of crashes.
-lsmod shows an impossible usage count for the module:
-
-reinhold@einstein:/kde/builddir$ lsmod
-Module                  Size  Used by
-visor                  17164  4294967294
-usbserial              30704  1 visor
-
-After that, the kernel doesn't detect the device ever again (until the computer is rebooted),
-and the module can't be unloaded.
-*/
-
-
-ProbeDialog::ProbeDialog(TQWidget *parent, const char *n) :
-	KDialogBase(parent, n, true, i18n("Autodetecting Your Handheld"), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::User1, KDialogBase::Cancel, true, i18n("Restart Detection")),
-	mDetected(false), mUserName(), mDevice()
-{
-	FUNCTIONSETUP;
-
-	TQVBox *mainWidget = makeVBoxMainWidget();
-
-	fInfoText = new TQLabel( i18n( "KPilot is now trying to automatically detect the device of your handheld. Please press the hotsync button if you have not done so already." ), mainWidget, "fInfoText" );
-	fInfoText->setAlignment( TQLabel::WordBreak );
-
-	fStatusGroup = new TQGroupBox( i18n("Status"), mainWidget, "fStatusGroup" );
-	fStatusGroup->setColumnLayout(0, Qt::Vertical );
-	fStatusGroupLayout = new TQGridLayout( fStatusGroup->layout() );
-
-	fStatus = new TQLabel( i18n("Autodetection not yet started..."), fStatusGroup, "fStatus" );
-	fStatus->setAlignment( TQLabel::WordBreak );
-	fStatusGroupLayout->addWidget( fStatus, 0, 0 );
-
-	fProgress = new KProgress( 100, fStatusGroup, "fProgress" );
-	fStatusGroupLayout->addWidget( fProgress, 1, 0 );
-
-
-
-	fResultsGroup = new TQGroupBox( i18n( "Detected Values" ), mainWidget, "fResultsGroup" );
-	fResultsGroup->setEnabled( FALSE );
-	fResultsGroup->setColumnLayout(0, Qt::Vertical );
-	fResultsGroupLayout = new TQGridLayout( fResultsGroup->layout() );
-	fResultsGroupLayout->setAlignment( Qt::AlignTop );
-
-	fUserLabel = new TQLabel( i18n( "Handheld user:" ), fResultsGroup, "fUserLabel" );
-	fUserLabel->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)5, 0, 0, fUserLabel->sizePolicy().hasHeightForWidth() ) );
-	fResultsGroupLayout->addWidget( fUserLabel, 0, 0 );
-
-	fDeviceLabel = new TQLabel( i18n( "Device:" ), fResultsGroup, "fDeviceLabel" );
-	fResultsGroupLayout->addWidget( fDeviceLabel, 1, 0 );
-
-	fUser = new TQLabel( i18n("[Not yet known]"), fResultsGroup, "fUser" );
-	fResultsGroupLayout->addWidget( fUser, 0, 1 );
-
-	fDevice = new TQLabel( i18n("[Not yet known]"), fResultsGroup, "fDevice" );
-	fResultsGroupLayout->addWidget( fDevice, 1, 1 );
-
-
-	resize( TQSize(459, 298).expandedTo(minimumSizeHint()) );
-	clearWState( WState_Polished );
-	enableButtonOK(false);
-
-	mDevicesToProbe[0] << "/dev/pilot";
-	mDevicesToProbe[1] <<"/dev/ttyS0"<<"/dev/ttyS2"
-	                <<"/dev/tts/0"<<"/dev/tts/2"
-	                <<"/dev/ttyUSB0"<<"/dev/ttyUSB2"
-	                <<"/dev/usb/tts/0"<<"/dev/usb/tts/2"
-	                <<"/dev/cuaa0"<<"/dev/cuaa2"
-			<<"/dev/cuad0"<<"/dev/cuad2"
-	                <<"/dev/ucom0"<<"/dev/ucom2";
-	mDevicesToProbe[2] <<"/dev/ttyS1"<<"/dev/ttyS3"
-	                <<"/dev/tts/1"<<"/dev/tts/3"
-	                <<"/dev/ttyUSB1"<<"/dev/ttyUSB3"
-	                <<"/dev/usb/tts/1"<<"/dev/usb/tts/3"
-	                <<"/dev/cuaa1"<<"/dev/cuaa3"
-			<<"/dev/cuad1"<<"/dev/cuad3"
-	                <<"/dev/ucom1"<<"/dev/ucom3";
-
-	fProcessEventsTimer = new TQTimer( this );
-	fTimeoutTimer = new TQTimer( this );
-	fProgressTimer = new TQTimer( this );
-	fRotateLinksTimer = new TQTimer( this );
-	connect( fProcessEventsTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(processEvents()) );
-	connect( fTimeoutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()) );
-	connect( fProgressTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT( progress()) );
-	connect( fRotateLinksTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT( detect()) );
-	connect( this, TQT_SIGNAL(finished()), this, TQT_SLOT(disconnectDevices()) );
-}
-
-ProbeDialog::~ProbeDialog()
-{
-	FUNCTIONSETUP;
-}
-
-void ProbeDialog::processEvents()
-{
-	FUNCTIONSETUP;
-	KApplication::kApplication()->processEvents();
-}
-
-void ProbeDialog::progress()
-{
-	fProgress->advance(1);
-}
-
-int ProbeDialog::exec()
-{
-	mDetected = false;
-	mUserName = TQString();
-	mDevice = TQString();
-	TQTimer::singleShot( 0, this, TQT_SLOT( startDetection() ) );
-	return KDialogBase::exec();
-}
-
-void ProbeDialog::startDetection()
-{
-	FUNCTIONSETUP;
-
-	disconnectDevices();
-	fProgress->setProgress(0);
-	fStatus->setText( i18n("Starting detection...") );
-	TQTimer::singleShot(0, this, TQT_SLOT(processEvents()) );
-	processEvents();
-	PilotDaemonDCOP_stub *daemonStub = new PilotDaemonDCOP_stub("kpilotDaemon", "KPilotDaemonIface");
-	if (daemonStub) {
-		daemonStub->stopListening();
-	}
-	KPILOT_DELETE(daemonStub);
-	processEvents();
-	if (!fTimeoutTimer->start( 30000, true ) )
-	{
-		WARNINGKPILOT << "Could not start fTimeoutTimer" << endl;
-	}
-	if (!fProcessEventsTimer->start( 100, false ) )
-	{
-		WARNINGKPILOT << "Could not start fProcessEventsTimer" << endl;
-	}
-	if (!fProgressTimer->start( 300, false) )
-	{
-		WARNINGKPILOT << "Could not start Progress timer" << endl;
-	}
-
-	KPilotDeviceLink*link;
-	for (int i=0; i<3; i++)
-	{
-		TQStringList::iterator end(mDevicesToProbe[i].end());
-		for (TQStringList::iterator it=mDevicesToProbe[i].begin(); it!=end; ++it)
-		{
-			link = new KPilotDeviceLink();
-			link->setDevice((*it));
-#ifdef DEBUG
-			DEBUGKPILOT<<"new kpilotDeviceLink for "<<(*it)<<endl;
-#endif
-			mDeviceLinks[i].append( link );
-			connect( link, TQT_SIGNAL(deviceReady(KPilotDeviceLink*)), this, TQT_SLOT(connection(KPilotDeviceLink*)) );
-			processEvents();
-		}
-	}
-	fStatus->setText( i18n("Waiting for handheld to connect...") );
-	mProbeDevicesIndex=0;
-
-	detect();
-	if (!fRotateLinksTimer->start( 3000, false) )
-	{
-		WARNINGKPILOT << "Could not start Device link rotation timer" << endl;
-	}
-}
-
-
-void ProbeDialog::detect(int i)
-{
-	FUNCTIONSETUP;
-
-	mProbeDevicesIndex = i;
-	PilotLinkList::iterator end(mDeviceLinks[mProbeDevicesIndex].end());
-
-	for (PilotLinkList::iterator it=mDeviceLinks[mProbeDevicesIndex].begin(); it!=end; ++it)
-	{
-		if (*it) (*it)->reset();
-	}
-}
-
-void ProbeDialog::detect()
-{
-	detect( (mProbeDevicesIndex+1)%3 );
-}
-
-void ProbeDialog::timeout()
-{
-	disconnectDevices();
-	if (!mDetected) {
-		fStatus->setText( i18n("Timeout reached, could not detect a handheld.") );
-		KMessageBox::information ( this, i18n("<qt>A handheld could not be detected. Possible check the following things:</p>"
-			"<ul><li> Have you pressed the hotsync button on the handheld?\n"
-			"<li> Make sure the device sits in the cradle correctly.\n"
-			"<li> Make sure the cradle is correctly plugged in to the computer.\n"
-			"<li> Have you checked that your device is actually supported by kpilot (see http://www.kpilot.org).\n"
-			"</ul>"
-			), i18n("Automatic Detection Failed"), "AutoDetectionFailed");
-	}
-}
-
-void ProbeDialog::connection( KPilotDeviceLink*lnk)
-{
-	FUNCTIONSETUP;
-
-	mActiveLink = lnk;
-	if ( !mActiveLink ) return;
-	const KPilotUser &usr( mActiveLink->getPilotUser() );
-
-	mUserName = usr.name();
-	mDevice = mActiveLink->pilotPath();
-
-	fStatus->setText( i18n("Found a connected device on %1").arg(mDevice) );
-	fUser->setText( mUserName );
-	fDevice->setText( mDevice );
-	mDetected = true;
-
-	fResultsGroup->setEnabled( true );
-	enableButtonOK(true);
-
-	TQTimer::singleShot(0, this, TQT_SLOT(retrieveDBList()));
-}
-
-void ProbeDialog::retrieveDBList()
-{
-	KPilotLink::DBInfoList dbs = mActiveLink->getDBList();
-	mDBs.clear();
-	char buff[7];
-	buff[0] = '[';
-
-	for ( KPilotLink::DBInfoList::ConstIterator i = dbs.begin();
-		i != dbs.end(); ++i )
-	{
-		set_long( &buff[1], (*i).creator );
-		buff[5] = ']';
-		buff[6] = '\0';
-		TQString cr( buff );
-		mDBs << cr;
-		mDBs << TQString( (*i).name );
-	}
-	mDBs.sort();
-
-	TQString old( TQString::null );
-	TQStringList::Iterator itr = mDBs.begin();
-	while ( itr != mDBs.end() ) {
-		if ( old == *itr ) {
-			itr = mDBs.remove( itr );
-		} else {
-			old = *itr;
-			++itr;
-		}
-	}
-
-	// End sync gracefully, but don't change settings on the handheld.
-	mActiveLink->endSync( KPilotLink::NoUpdate );
-
-	TQTimer::singleShot(0, this, TQT_SLOT(disconnectDevices()));
-}
-void ProbeDialog::disconnectDevices()
-{
-	FUNCTIONSETUP;
-
-	if (!mDetected) fStatus->setText( i18n("Disconnected from all devices") );
-	fProcessEventsTimer->stop( );
-	fTimeoutTimer->stop();
-	fProgressTimer->stop();
-	fRotateLinksTimer->stop();
-	fProgress->setProgress(fProgress->totalSteps());
-	for (int i=0; i<3; ++i)
-	{
-		PilotLinkList::iterator end(mDeviceLinks[i].end());
-		for (PilotLinkList::iterator it=mDeviceLinks[i].begin(); it!=end; ++it)
-		{
-			(*it)->close();
-			KPILOT_DELETE(*it);
-		}
-		mDeviceLinks[i].clear();
-	}
-
-
-	PilotDaemonDCOP_stub *daemonStub = new PilotDaemonDCOP_stub("kpilotDaemon", "KPilotDaemonIface");
-	if (daemonStub)
-	{
-		daemonStub->startListening();
-	}
-	KPILOT_DELETE(daemonStub);
-}
-
diff --git a/kpilot/kpilot/kpilotProbeDialog.h b/kpilot/kpilot/kpilotProbeDialog.h
deleted file mode 100644
index d6fb1cbe..00000000
--- a/kpilot/kpilot/kpilotProbeDialog.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#ifndef _KPILOT_PROBEDIALOG_H
-#define _KPILOT_PROBEDIALOG_H
-/* kpilotConfigWizard.h                 KPilot
-**
-** Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This file defines kpilot's configuration wizard
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "kdialogbase.h"
-
-class KPilotDeviceLink;
-class TQLabel;
-class TQGroupBox;
-class KProgress;
-class TQTimer;
-class TQGridLayout;
-template <class T> class TQValueList;
-template<class Key, class T> class TQMap;
-
-typedef TQValueList<KPilotDeviceLink*> PilotLinkList;
-
-typedef TQMap<TQString, KPilotDeviceLink*> PilotLinkMap;
-
-class ProbeDialog : public KDialogBase
-{
-Q_OBJECT
-public:
-	ProbeDialog(TQWidget *p=0L,const char *n=0L);
-	~ProbeDialog();
-
-	bool detected() const { return mDetected; }
-	TQString userName() const { return mUserName; }
-	TQString device() const { return mDevice; }
-	TQStringList dbs()  const { return mDBs; }
-
-
-protected slots:
-	void startDetection();
-	void timeout();
-	void connection(KPilotDeviceLink*lnk);
-	void retrieveDBList();
-	void disconnectDevices();
-	void processEvents();
-	void progress();
-	void detect();
-	void detect(int i);
-public slots:
-	int exec();
-	void slotUser1 () { startDetection(); }
-protected:
-	TQLabel* fInfoText;
-	TQGroupBox* fResultsGroup;
-	TQLabel* fUserLabel;
-	TQLabel* fDeviceLabel;
-	TQLabel* fUser;
-	TQLabel* fDevice;
-	TQGroupBox* fStatusGroup;
-	TQLabel* fStatus;
-	KProgress* fProgress;
-
-	TQTimer* fProcessEventsTimer;
-	TQTimer* fTimeoutTimer;
-	TQTimer* fProgressTimer;
-	TQTimer* fRotateLinksTimer;
-protected:
-	TQGridLayout* fResultsGroupLayout;
-	TQGridLayout* fStatusGroupLayout;
-
-	TQStringList mDevicesToProbe[3];
-	PilotLinkList mDeviceLinks[3];
-	int mProbeDevicesIndex;
-	KPilotDeviceLink *mActiveLink;
-
-	bool mDetected;
-	TQString mUserName;
-	TQString mDevice;
-	TQStringList mDBs;
-} ;
-
-#endif
diff --git a/kpilot/kpilot/kpilotSettings.kcfgc b/kpilot/kpilot/kpilotSettings.kcfgc
deleted file mode 100644
index 5ee06e63..00000000
--- a/kpilot/kpilot/kpilotSettings.kcfgc
+++ /dev/null
@@ -1,7 +0,0 @@
-File=kpilot.kcfg
-ClassName=KPilotSettings
-Singleton=true
-ItemAccessors=true
-Mutators=true
-GlobalEnums=true
-SetUserTexts=true
diff --git a/kpilot/kpilot/kpilot_config.desktop b/kpilot/kpilot/kpilot_config.desktop
deleted file mode 100644
index 075e31cd..00000000
--- a/kpilot/kpilot/kpilot_config.desktop
+++ /dev/null
@@ -1,156 +0,0 @@
-[Desktop Entry]
-Icon=kpilot
-Type=Service
-ServiceTypes=KCModule
-
-X-KDE-ModuleType=Library
-X-KDE-Library=kpilot
-X-KDE-FactoryName=kpilotconfig
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=kpilot
-X-KDE-ParentComponents=kpilot,kpilotDaemon,kontact_kpilotplugin
-
-Name=KPilot Configuration
-Name[af]=KPilot opstelling
-Name[ar]=إعداد KPilot
-Name[be]=Канфігурацы� KPilot
-Name[bg]=�а�тройване на KPilot
-Name[br]=Kefluniadur KPilot
-Name[bs]=KPilot podešavanje
-Name[ca]=Configuració de KPilot
-Name[cs]=Nastavení KPilotu
-Name[da]=KPilot indstilling
-Name[de]=KPilot-Einrichtung
-Name[el]=Ρ�θμιση KPilot
-Name[eo]=KPilot-Agordo
-Name[es]=Configuración de KPilot
-Name[et]=KPiloti seadistamine
-Name[eu]=KPilot-en konfigurazioa
-Name[fa]=پیکربندی KPilot
-Name[fi]=KPilot-asetukset
-Name[fr]=Configuration de KPilot
-Name[fy]=KPilot ynstellings
-Name[ga]=Cumraíocht KPilot
-Name[gl]=Configuración de KPilot
-Name[hu]=A KPilot beállításai
-Name[is]=KPilot stillingar
-Name[it]=Configurazione KPilot
-Name[ja]=KPilot �設定
-Name[kk]=KPilot параметрлері
-Name[km]=ការ​កំណ�់​រចនាសម្ព�ន្ធ KPilot
-Name[lt]=Kpilot konfigūracija
-Name[mk]=Конфигурација на КПилот
-Name[ms]=Konfigurasi KPilot
-Name[nb]=KPilot oppsett
-Name[nds]=KPilot instellen
-Name[ne]=केडीई पाइलट कन�फिगरेसन
-Name[nl]=KPilot instellingen
-Name[nn]=KPilot-oppsett
-Name[pl]=konfiguracja KPilota
-Name[pt]=Configuração do KPilot
-Name[pt_BR]=Configuração do KPilot
-Name[ru]=Синхронизаци� � КПК
-Name[se]=KPilot-heivehus
-Name[sk]=Nastavenie KPilot
-Name[sl]=Nastavitve KPilota
-Name[sr]=KPilot подешавање
-Name[sr@Latn]=KPilot podešavanje
-Name[sv]=Inställning av Kpilot
-Name[ta]=Kபைலட� கட�டமைப�ப�
-Name[tg]=Танзимоти KPilot
-Name[tr]=KPilot Yapılandırması
-Name[uk]=�алаштуванн� KPilot
-Name[zh_CN]=KPilot �置
-Name[zh_TW]=KPilot 設定
-Comment=KPilot Main Configuration
-Comment[af]=KPilot hoof opstelling
-Comment[bg]=Общи на�тройки на KPilot
-Comment[br]=Kefluniadur kentañ KPilot
-Comment[bs]=KPilot glavno podešavanje
-Comment[ca]=Configuració principal de KPilot
-Comment[cs]=Hlavní nastavení KPilotu
-Comment[da]=KPilot hovedindstilling
-Comment[de]=Grundeinrichtung für KPilot
-Comment[el]=Κ��ια ��θμιση του KPilot
-Comment[eo]=KPilot-Ĉefagordo
-Comment[es]=Configuración principal de KPilot
-Comment[et]=KPiloti põhiseadistused
-Comment[eu]=KPilot-en konfigurazio nagusia
-Comment[fa]=پیکربندی اصلی KPilot
-Comment[fi]=KPilotin pääasetukset
-Comment[fr]=Configuration principale de KPilot
-Comment[fy]=KPilot algemiene ynstellings
-Comment[ga]=Príomhchumraíocht KPilot
-Comment[gl]=Configuración Principal de KPilot 
-Comment[hu]=A KPilot legfontosabb beállításai
-Comment[is]=Aðalstillingar KPilot
-Comment[it]=Configurazione principale di KPilot
-Comment[ja]=KPilot 主�設定
-Comment[kk]=KPilot негізгі параметрлері
-Comment[km]=ការ​កំណ�់​រចនាសម្ព�ន្ធ​សំ�ាន់ៗ​របស់ KPilot
-Comment[lt]=KPilot bendrasis konfigūravimas
-Comment[mk]=Главна конфигурација
-Comment[ms]=Konfigurasi Utama KPilot 
-Comment[nb]=KPilot hovedoppsett
-Comment[nds]=Hööftinstellen för KPilot
-Comment[ne]=केडीई पाइलट म�ख�य कन�फिगरेसन
-Comment[nl]=KPilot algemene instellingen
-Comment[nn]=KPilot hovudoppsett
-Comment[pl]=Główna konfiguracja KPilota
-Comment[pt]=Configuração Principal do KPilot
-Comment[pt_BR]=Configuração Principal do KPilot
-Comment[ru]=Общие параметры KPilot
-Comment[sk]=Hlavné nastavenie KPilot
-Comment[sl]=Glavne nastavitve KPilota
-Comment[sr]=Главна подешавања у KPilot-у
-Comment[sr@Latn]=Glavna podešavanja u KPilot-u
-Comment[sv]=Kpilots huvudinställning
-Comment[ta]=கேபைலட� ம�க�கிய கட�டமைப�ப�
-Comment[tg]=Параметрҳои умумии KPilot
-Comment[tr]=KPilot Ana Yapılandırması
-Comment[uk]=Загальні параметри KPilot
-Comment[zh_CN]=KPilot 主��置
-Comment[zh_TW]=KPilot 主設定
-Keywords=kpilot,main
-Keywords[bg]=общи, на�тройки, мобилен, мобилни, у�трой�тво, у�трой�тва, kpilot, main
-Keywords[ca]=kpilot,principal
-Keywords[cs]=kpilot,hlavní
-Keywords[da]=kpilot,hoved
-Keywords[de]=KPilot
-Keywords[el]=kpilot,κ��ια
-Keywords[eo]=reto,dosieroj,dosierujoj
-Keywords[es]=kpilot,principal
-Keywords[et]=kpilot,peamine
-Keywords[eu]=kpilot,nagusia
-Keywords[fa]=kpilot ،اصلی
-Keywords[fi]=kpilot
-Keywords[fr]=kpilot,principal
-Keywords[fy]=kpilot,algemien
-Keywords[ga]=kpilot,príomh
-Keywords[gl]=kpilot,principal
-Keywords[hu]=kpilot,alap
-Keywords[is]=kpilot,aðal
-Keywords[it]=kpilot,principale
-Keywords[ja]=kpilot,主�
-Keywords[km]=kpilot,សំ�ាន់
-Keywords[lt]=kpilot,main,pagrindinis
-Keywords[mk]=kpilot,main.кпилот,главно
-Keywords[ms]=kpilot,utama
-Keywords[nb]=kpilot,hoved
-Keywords[nds]=KPilot,Hööft,Hööftinstellen,instellen
-Keywords[ne]=केडीई पाइलट, म�ख�य
-Keywords[nl]=kpilot,algemeen
-Keywords[nn]=kpilot,hovud
-Keywords[pl]=kpilot,główna,konfiguracja
-Keywords[pt]=kpilot,principal
-Keywords[pt_BR]=kpilot,principal
-Keywords[ru]=kpilot,main,общие,на�тройки
-Keywords[sk]=kpilot,hlavné
-Keywords[sl]=kpilot,glavne
-Keywords[sr]=kpilot,главно
-Keywords[sr@Latn]=kpilot,glavno
-Keywords[sv]=kpilot, huvudinställning
-Keywords[ta]=கேபைலட�,ம�க�கிய
-Keywords[tg]=kpilot,main,умумӣ,танзимот
-Keywords[tr]=kpilot,ana
-Keywords[zh_CN]=kpilot,main,主�
diff --git a/kpilot/kpilot/kpilotconduit.desktop b/kpilot/kpilot/kpilotconduit.desktop
deleted file mode 100644
index 21214231..00000000
--- a/kpilot/kpilot/kpilotconduit.desktop
+++ /dev/null
@@ -1,59 +0,0 @@
-[Desktop Entry]
-Type=ServiceType
-X-KDE-ServiceType=KPilotConduit
-Comment=KPilot Conduit
-Comment[af]=Kpilot Pad
-Comment[az]=KPilot
-Comment[be]=Канал KPilot
-Comment[bg]=При�тавка на KPilot
-Comment[ca]=Conducte KPilot
-Comment[cs]=Propojení Palm Pilota
-Comment[cy]=Cwndid KPilot
-Comment[da]=KPilot-kanal
-Comment[de]=KPilot-Abgleich (Conduit)
-Comment[el]=Σ�νδεσμος KPilot
-Comment[eo]=KPiloto - kanalo
-Comment[es]=Conducto KPilot
-Comment[et]=KPiloti kanal
-Comment[eu]=KPilot kanala
-Comment[fa]=لولۀ KPilot
-Comment[fi]=KPilot-yhdyskäytävä
-Comment[fr]=Canal de KPilot
-Comment[ga]=Seoladán KPilot
-Comment[gl]=Conducto de KPilot
-Comment[he]=ממשק של KPilot
-Comment[hi]=के-पायलट कन�ड�यूइट
-Comment[hr]=KPilot veza
-Comment[hu]=KPilot-csatoló
-Comment[is]=KPilot rásir
-Comment[it]=Conduit KPilot
-Comment[ja]=KPilot コンジット
-Comment[kk]=KPilot арна�ы
-Comment[km]=បំពង់ KPilot
-Comment[lt]=KPilot kanalas
-Comment[lv]=KPilot Ķēde
-Comment[mk]=Канал за КПилот
-Comment[ms]=Saluran KPilot 
-Comment[nb]=KPilot-kanal
-Comment[nds]=KPilot-Kanaal (Synkroniseren)
-Comment[ne]=केडीई पाइलट कन�ड�य�ट
-Comment[nn]=KPilot-kopling
-Comment[nso]=Conduit ya KPilot
-Comment[pl]=�ącznik KPilota
-Comment[pt]=Conduta do KPilot
-Comment[pt_BR]=Conduíte do KPilot
-Comment[ro]=Conductă KPilot
-Comment[ru]=Канал KPilot
-Comment[sk]=KPilot rúra
-Comment[sl]=Veznik za KPilot
-Comment[sr]=KPilot провод
-Comment[sr@Latn]=KPilot provod
-Comment[sv]=Kpilot-kanal
-Comment[ta]=கேபைலட� காப�ப�க�க�ழாய�
-Comment[tg]=Канали KPilot
-Comment[tr]=KPilot Kanalı
-Comment[uk]=�кведук KPilot
-Comment[ven]=Conduit ya mureili wa K
-Comment[vi]=Truy�n dẫn KPilot 
-Comment[zh_CN]=KPilot 管�
-Comment[zu]=KUmshayeli webhanoyi Conduit
diff --git a/kpilot/kpilot/kpilotdaemon.desktop b/kpilot/kpilot/kpilotdaemon.desktop
deleted file mode 100644
index 917beab6..00000000
--- a/kpilot/kpilot/kpilotdaemon.desktop
+++ /dev/null
@@ -1,42 +0,0 @@
-# KDE Config File
-[Desktop Entry]
-Name=KPilotDaemon
-Name[af]=Kpilotdaemon
-Name[ar]=مراقب KPilot
-Name[az]=KPilotProgramı
-Name[da]=KPilotDæmon
-Name[de]=KPilot-Dienst
-Name[el]=Δαίμονας KPilot
-Name[eo]=KPiloto-demono
-Name[es]=Demonio de KPilot
-Name[et]=KPiloti deemon
-Name[he]=תהליך הרקע של KPilot
-Name[hi]=के-पायलट-डेमन
-Name[is]=KPilot þjónn
-Name[it]=Demone KPilot
-Name[ja]=KPilot デーモン
-Name[lt]=KPilot tarnyba
-Name[lv]=KPilotDÄ“mons
-Name[ms]=Daemon KPilot
-Name[nds]=KPilot-Dämoon
-Name[ne]=केडीई पाइलट डेइमन
-Name[nso]=Daemon ya KPilot
-Name[pl]=demon KPilota
-Name[pt_BR]=Servidor do KPilot
-Name[ro]=Demon KPilot
-Name[ru]=Служба �инхронизации КПК
-Name[sk]=KPilotDémon
-Name[sr]=KPilot демон
-Name[sr@Latn]=KPilot demon
-Name[sv]=Kpilotdemon
-Name[ta]=கேபைலட� டெமன�
-Name[tg]=Демони KPilot
-Name[ven]=Daemon ya Mureili wa K
-Name[zu]=KUmshayeli webhanoyi Daemon
-Exec=kpilotDaemon
-NoDisplay=true
-Icon=kpilot.xpm
-Type=Application
-Terminal=false
-X-DCOP-ServiceType=Unique
-Categories=Qt;KDE;Utility;Office;PDA;
diff --git a/kpilot/kpilot/kpilotui.rc b/kpilot/kpilot/kpilotui.rc
deleted file mode 100644
index d5e6ac42..00000000
--- a/kpilot/kpilot/kpilotui.rc
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-
-<kpartgui name="kpilot" version="5">
-<MenuBar>
-  <Menu name="file" noMerge="1"><text>&amp;File</text>
-    <!-- Keep this list synchronized with pilotDaemon.cc and kpilot.cc -->
-    <Action name="file_hotsync" />
-    <Action name="file_fullsync" />
-    <Action name="file_backup" />
-    <Action name="file_restore" />
-    <Action name="file_HHtoPC" />
-    <Action name="file_PCtoHH" />
-    <Separator />
-    <Action name="file_quit" />
-  </Menu>
-  <Menu name="settings" noMerge="1"><text>&amp;Settings</text>
-    <Action name="options_show_statusbar" />
-    <Action name="options_show_toolbar" />
-    <Merge name="StandardToolBarMenuHandler" />
-    <Separator />
-    <Action name="options_configure_keybinding" />
-    <Action name="options_configure_toolbars" />
-    <Action name="options_configure" />
-    <Action name="options_configure_wizard" />
-  </Menu>
-</MenuBar>
-
-<Menu name="rb_popup">
-  <Action name="file_hotsync" />
-  <Action name="file_backup" />
-  <Action name="file_restore" />
-  <Separator />
-</Menu>
-
-<ToolBar name="mainToolBar"><text>Main Toolbar</text>
-  <Action name="popup_hotsync" />
-  <Action name="file_backup" />
-  <Action name="file_reload" />
-  <Separator />
-</ToolBar>
-
-</kpartgui>
-
-
-<!--
-Local Variables:
-mode: xml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-general-insert-case: lower
-End:
--->
-
diff --git a/kpilot/kpilot/kroupware.cc b/kpilot/kpilot/kroupware.cc
deleted file mode 100644
index 212df17d..00000000
--- a/kpilot/kpilot/kroupware.cc
+++ /dev/null
@@ -1,311 +0,0 @@
-/* KPilot
-**
-** Copyright still to be determined.
-**
-** This file defines the actions taken when KPilot
-** is Kroupware-enabled. Basically it just does a
-** little communication with the local Kroupware agent (KMail).
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <tqfile.h>
-
-#include <dcopclient.h>
-#include <ktempfile.h>
-
-
-#include <kapplication.h>
-#include "kroupware.h"
-#include "kpilotConfig.h"
-
-KroupwareSync::KroupwareSync(bool pre,int parts,KPilotDeviceLink *p) :
-	SyncAction(p,pre ? "KroupwarePreSync" : "KroupwarePostSync"),
-	fPre(pre),
-	fParts(parts)
-{
-
-}
-
-/* virtual */ bool KroupwareSync::exec()
-{
-	FUNCTIONSETUP;
-	if (fPre)
-	{
-		preSync();
-	}
-	else
-	{
-		postSync();
-	}
-	// delayDone();
-	emit syncDone(this);
-	return true;
-}
-
-void KroupwareSync::cleanupConfig()
-{
-  // tempfile check in case app has terminated during sync
-  // TODO!!! Use sensitive groups/keys for the kroupware branch...
-  KConfig* c = KPilotSettings::self()->config();
-  c->setGroup("todoOptions");
-  if ( c->hasKey( "CalFileBackup") ) {
-    TQString fn = c->readPathEntry( "CalFileBackup" );
-    if ( fn != CSL1("empty") ) {
-      c->writePathEntry( "CalFile" ,fn );
-      c->writeEntry( "CalFileBackup" , "empty" );
-    }
-  }
-  c->setGroup("vcalOptions");
-  if ( c->hasKey( "CalFileBackup") ) {
-    TQString fn = c->readPathEntry( "CalFileBackup" );
-    if ( fn != CSL1("empty") ) {
-      c->writePathEntry( "CalFile" ,fn );
-      c->writeEntry( "CalFileBackup" , "empty" );
-    }
-  }
-  c->setGroup("Abbrowser-conduit");
-  c->writeEntry( "KMailTempFile" , "empty" );
-  KPilotSettings::writeConfig();
-}
-
-// For the log messages, I've added i18n to the
-// ones I consider relevant for the user. The rest is
-// really debug info, and shouldn't go to the normal
-// sync log for the user.
-//
-// TODO!!! better way to read the config options!
-void KroupwareSync::start_syncCal_TodosWithKMail( bool cal, bool todos )
-{
-  if ( !cal && ! todos )
-    return;
-  KConfig*c = KPilotSettings::self()->config();
-  DCOPClient *client = kapp->dcopClient();
-  KTempFile  tempfile;
-  TQString filename = tempfile.name();
-  TQByteArray  data, reply_data;
-  TQCString reply_type;
-  TQDataStream arg(data, IO_WriteOnly);
-  arg << filename;
-  if (!client->call( "kmail" ,
-		     "KOrganizerSyncIface",
-		     "pullSyncData(TQString)",
-		     data,
-		     reply_type,
-		     reply_data)) {
-    logMessage( CSL1("Calling KMail over DCOP failed!" ));
-    logMessage(CSL1("Not syncing calendars with KMail"));
-    logMessage(CSL1("Not syncing to-dos with KMail"));
-  }
-  else {
-    logMessage(CSL1("Calling Cal/Todo over DCOP succeeded"));
-    // now prepare for syncing
-    _syncWithKMail = true;
-    if ( todos ) {
-      logMessage( i18n("Syncing to-dos with KMail" ));
-      c->setGroup("todoOptions");
-      TQString fn = c->readPathEntry( "CalFile" );
-      c->writePathEntry( "CalFileBackup" ,fn );
-      c->writePathEntry( "CalFile" ,filename );
-    }
-    else
-      logMessage( CSL1("Not syncing todos with KMail" ));
-    if ( cal ) {
-      logMessage( i18n("Syncing calendar with KMail" ));
-      c->setGroup("vcalOptions");
-      TQString fn = c->readPathEntry( "CalFile" );
-      c->writePathEntry( "CalFileBackup" ,fn );
-      c->writePathEntry( "CalFile" ,filename );
-    }
-    else
-      logMessage( CSL1("Not syncing calendar with KMail" ));
-  }
-  KPilotSettings::self()->writeConfig();
-}
-
-void KroupwareSync::start_syncAddWithKMail()
-{
-  logMessage( CSL1("Syncing Addresses with KMail" ));
-  DCOPClient *client = kapp->dcopClient();
-  KTempFile  tempfile;
-  TQString filename = tempfile.name();
-  TQByteArray  data, reply_data;
-  TQCString reply_type;
-  TQDataStream arg(data, IO_WriteOnly);
-  arg << filename;
-  if (!client->call( "kmail" ,
-		     "KMailIface",
-		     "requestAddresses(TQString)",
-		     data,
-		     reply_type,
-		     reply_data)) {
-    logMessage(CSL1("Calling KMail over DCOP failed!" ));
-    logMessage(CSL1("Not syncing Addresses with KMail"));
-  }
-  else {
-    // TODO!!! better config handling!
-    KConfig*c = KPilotSettings::self()->config();
-    logMessage(CSL1("Calling addresses over DCOP succeeded"));
-    c->setGroup("Abbrowser-conduit");
-    c->writePathEntry( "KMailTempFile" , filename );
-    KPilotSettings::self()->writeConfig();
-  }
-}
-void KroupwareSync::start_syncNotesWithKMail()
-{
-  logMessage( i18n("Syncing Notes with Mail" ));
-  logMessage( CSL1("Syncing Notes-sorry not implemented" ));
-}
-
-void KroupwareSync::end_syncCal_TodosWithKMail( bool cal, bool todos)
-{
- if ( !cal && ! todos )
-    return;
- TQString filename;
- KConfig*c=KPilotSettings::self()->config();
- if ( todos ) {
-   logMessage( i18n("Rewriting to-dos to KMail..." ));
-   c->setGroup("todoOptions");
-   filename = c->readPathEntry( "CalFile" );
-   c->writePathEntry( "CalFile", c->readPathEntry( "CalFileBackup" ) );
-   c->writeEntry( "CalFileBackup", "empty");
- }
- if ( cal ) {
-   logMessage( i18n("Rewriting Calendar to KMail" ));
-   c->setGroup("vcalOptions");
-   filename = c->readPathEntry( "CalFile" );
-   TQString tf = c->readPathEntry( "CalFileBackup" ) ;
-   c->writePathEntry( "CalFile" , tf  );
-   c->writeEntry( "CalFileBackup" ,"empty");
- }
- KPilotSettings::writeConfig();
- if ( !filename.isEmpty() ) {
-   logMessage(CSL1("Try to call KMail via DCOP to finish sync..."));
-   // try DCOP connection to KMail
-   DCOPClient *client = kapp->dcopClient();
-   TQByteArray  data, reply_data;
-   TQCString reply_type;
-   TQDataStream arg(data, IO_WriteOnly);
-   arg << filename;
-   if (!client->call( "kmail" /*"korganizer" kmdcop */,
-		      "KOrganizerSyncIface",
-		      "pushSyncData(TQString)",
-		      data,
-		      reply_type,
-		      reply_data)) {
-     logMessage( CSL1("Calling KMail over DCOP failed!" ));
-     logMessage( CSL1("Sync is not complete"));
-     logMessage( CSL1("Data from Palm stored in file:"));
-     logMessage(filename);
-   } else {
-     logMessage(CSL1("Calling over DCOP succeeded"));
-     logMessage(CSL1("Sync to KMail has finished successfully"));
-   }
-   TQFile::remove( filename );
- }
-}
-void KroupwareSync::end_syncAddWithKMail()
-{
-  logMessage( i18n("Syncing KMail with Addresses " ));
-  DCOPClient *client = kapp->dcopClient();
-  // TODO!! better config handling (KConfig XT)
-  KConfig*c = KPilotSettings::self()->config();
-  c->setGroup("Abbrowser-conduit");
-  TQString filename = c->readPathEntry( "KMailTempFile" );
-  c->writeEntry( "KMailTempFile" , "empty" );
-  KPilotSettings::writeConfig();
-  TQByteArray  data, reply_data;
-  TQCString reply_type;
-  TQDataStream arg(data, IO_WriteOnly);
-  arg << filename;
-  arg << TQStringList();
-  if (!client->call( "kmail" ,
-		     "KMailIface",
-		     "storeAddresses(TQString, TQStringList)",
-		     data,
-		     reply_type,
-		     reply_data)) {
-    logMessage(CSL1("Calling KMail over DCOP failed!" ));
-    logMessage(CSL1("Not syncing Addresses with KMail"));
-  }
-  else {
-    logMessage(CSL1("Calling  store addresses over DCOP succeeded"));
-  }
-  //TQFile::remove( filename );
-}
-void KroupwareSync::end_syncNotesWithKMail()
-{
-  logMessage( i18n("Syncing KMail with Notes" ));
-  logMessage( CSL1("Syncing Notes-sorry not implemented" ));
-}
-
-
-
-/* static */ bool KroupwareSync::startKMail(TQString *error)
-{
-	FUNCTIONSETUP;
-
-	TQCString kmdcop;
-	TQString mess;
-	int pid;
-
-	return KApplication::startServiceByDesktopName(CSL1("kmail"),
-						      TQString::null,
-						      error,
-						      &kmdcop,
-						      &pid
-						      )==0;
-}
-
-
-void KroupwareSync::preSync()
-{
-	cleanupConfig();
-	start_syncCal_TodosWithKMail( fParts & Cal, fParts & Todo );
-	if (fParts & Notes)
-	{
-		start_syncNotesWithKMail();
-	}
-	if (fParts & Address)
-	{
-		start_syncAddWithKMail();
-	}
-}
-
-void KroupwareSync::postSync()
-{
-	cleanupConfig();
-	end_syncCal_TodosWithKMail( fParts & Cal, fParts & Todo );
-	if (fParts & Notes)
-	{
-		end_syncNotesWithKMail();
-	}
-	if (fParts & Address)
-	{
-		end_syncAddWithKMail();
-	}
-}
-
-
-
diff --git a/kpilot/kpilot/kroupware.h b/kpilot/kpilot/kroupware.h
deleted file mode 100644
index 1bec93ab..00000000
--- a/kpilot/kpilot/kroupware.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef _KPILOT_KROUPWARE_H
-#define _KPILOT_KROUPWARE_H
-/* kroupware.h			KPilot
-** 
-** Copyright still to be determined.
-**
-** This file defines the actions taken when KPilot
-** is Kroupware-enabled. Basically it just does a
-** little communication with the local Kroupware agent (KMail).
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "syncAction.h"
-
-class TQString;
-
-class KroupwareSync : public SyncAction
-{
-public:
-	// Creates a pre- or post-sync action
-	// depending on @p pre (pre==true makes
-	// it a pre-sync action, pre==false makes
-	// it a post-sync action).
-	//
-	// Which things it syncs is based on
-	// @p parts, which is a bitwise OR of
-	// values from the KroupwareParts enum.
-	//
-	KroupwareSync(bool pre,int parts,KPilotDeviceLink *p);
-	
-	enum KroupwareParts 
-	{
-		Cal=1,
-		Todo=2,
-		Notes=4,
-		Address=8
-	} ;
-	
-protected:
-	virtual bool exec();
-	
-	void preSync();   // Functions to collect all the actions
-	void postSync();  //   together. Call {start,end}*().
-	
-protected:
-	bool fPre;
-	int fParts;
-	
-private:
-	bool _syncWithKMail;
-
-	void cleanupConfig();
-	void start_syncCal_TodosWithKMail( bool cal, bool todos);
-	void start_syncAddWithKMail();
-	void start_syncNotesWithKMail();
-	void end_syncCal_TodosWithKMail( bool cal, bool todos);
-	void end_syncAddWithKMail();
-	void end_syncNotesWithKMail();
-
-	
-public:
-	/* Try to start KMail. Returns true on success. */
-	static bool startKMail(TQString *errormessage);
-} ;
-
-#endif
-
diff --git a/kpilot/kpilot/listCat.cc b/kpilot/kpilot/listCat.cc
deleted file mode 100644
index 6faa3efa..00000000
--- a/kpilot/kpilot/listCat.cc
+++ /dev/null
@@ -1,272 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2000-2001 by Adriaan de Groot
-**
-** This file defines a specialization of KListView that can
-** be used to sort some fixed set of object into some fixed
-** set of categories.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <tqpainter.h>
-#include <klocale.h>
-
-#include "listCat.moc"
-
-
-ListCategorizer::ListCategorizer(TQWidget * parent,
-	const char *name) :
-	KListView(parent, name), 
-	fStartOpen(false)
-{
-	FUNCTIONSETUP;
-	setupWidget();
-}
-
-ListCategorizer::ListCategorizer(const TQStringList & i,
-	bool startOpen,
-	TQWidget * parent,
-	const char *name) :
-	KListView(parent, name), 
-	fStartOpen(startOpen)
-{
-	FUNCTIONSETUP;
-	addCategories(i);
-}
-
-void ListCategorizer::addCategories(const TQStringList & l)
-{
-	FUNCTIONSETUP;
-	TQStringList::ConstIterator i;
-
-	for (i = l.begin(); i != l.end(); ++i)
-	{
-		(void) addCategory(*i);
-	}
-}
-
-TQListViewItem *ListCategorizer::addCategory(const TQString & name,
-	const TQString & desc)
-{
-	FUNCTIONSETUP;
-	TQListViewItem *m = new TQListViewItem(this, name, desc);
-
-	m->setSelectable(false);
-	m->setOpen(fStartOpen);
-	return m;
-}
-
-void ListCategorizer::setupWidget()
-{
-	FUNCTIONSETUP;
-	addColumn(i18n("Category"));
-	addColumn(i18n("Description"));
-	setItemsMovable(false);
-	setDragEnabled(true);
-	setAcceptDrops(true);
-	setDropVisualizer(true);
-	setRootIsDecorated(true);
-}
-
-/* virtual */ bool ListCategorizer::acceptDrag(TQDropEvent * event) const
-{
-	FUNCTIONSETUP;
-	if (!(event->source()))
-		return false;
-	TQListViewItem *p = itemAt(event->pos());
-
-	if (!p)
-		return false;
-
-	return true;
-}
-
-/* virtual */ void ListCategorizer::contentsDropEvent(TQDropEvent * e)
-{
-	FUNCTIONSETUP;
-	cleanDropVisualizer();
-
-	if (!acceptDrag(e))
-		return;
-	e->accept();
-
-	TQListViewItem *p = itemAt(e->pos());
-	TQListViewItem *selection = currentItem();
-
-	if (!p)
-	{
-		WARNINGKPILOT << "Drop without a category!" << endl;
-		return;
-	}
-
-	TQListViewItem *category = p->parent();
-
-	if (!category)
-	{
-		category = p;
-	}
-
-	moveItem(selection, category, 0L);
-}
-
-/* virtual */ void ListCategorizer::startDrag()
-{
-	FUNCTIONSETUP;
-	TQListViewItem *p = currentItem();
-
-	if (!p || !p->parent())
-		return;
-
-	KListView::startDrag();
-}
-
-TQStringList ListCategorizer::listSiblings(const TQListViewItem * p, int column) const
-{
-	FUNCTIONSETUP;
-	TQStringList l;
-
-	while (p)
-	{
-		l.append(p->text(column));
-		p = p->nextSibling();
-	}
-
-	return l;
-}
-
-TQListViewItem *ListCategorizer::findCategory(const TQString & category) const
-{
-	FUNCTIONSETUP;
-	TQListViewItem *p = firstChild();
-
-	while (p)
-	{
-		if (p->text(0) == category)
-			return p;
-		p = p->nextSibling();
-	}
-
-	return 0L;
-}
-
-TQListViewItem *ListCategorizer::addItem(const TQString & category,
-	const TQString & name, const TQString & description)
-{
-	FUNCTIONSETUP;
-	TQListViewItem *p = findCategory(category);
-
-	if (!p)
-		return 0L;
-
-	return new TQListViewItem(p, name, description);
-}
-
-#define RVPAD	(4)
-
-RichListViewItem::RichListViewItem(TQListViewItem *p,
-	TQString l,
-	int c) :
-	TQListViewItem(p,l)
-{
-	FUNCTIONSETUP;
-
-	fColumns=c;
-	fIsRich = new bool[c];
-	fRect = new QRect[c];
-
-	for (int i=0; i<c; i++)
-	{
-		fIsRich[i]=false;
-	}
-}
-
-RichListViewItem::~RichListViewItem()
-{
-	FUNCTIONSETUP;
-
-	delete[] fIsRich;
-	delete[] fRect;
-}
-
-void RichListViewItem::computeHeight(int c)
-{
-	FUNCTIONSETUP;
-
-	if (!fIsRich[c]) return;
-
-	TQListView *v = listView();
-	
-	fRect[c] = v->fontMetrics().boundingRect(v->itemMargin()+RVPAD,0+RVPAD,
-		v->columnWidth(c)-v->itemMargin()-RVPAD,300,
-		AlignLeft | AlignTop | WordBreak,
-		text(c));
-}
-
-
-/* virtual */ void RichListViewItem::setup()
-{
-	FUNCTIONSETUP;
-
-	TQListViewItem::setup();
-
-	int h = height();
-
-	for (int i=0; i<fColumns; i++)
-	{
-		computeHeight(i);
-		h = kMax(h,fRect[i].height()+2*RVPAD);
-	}
-
-	setHeight(h);
-}
-
-
-/* virtual */ void RichListViewItem::paintCell(TQPainter *p,
-	const TQColorGroup &gc,
-	int column,
-	int width,
-	int alignment)
-{
-	FUNCTIONSETUP;
-
-	if ((!column) || (!fIsRich[column]))
-	{
-		TQListViewItem::paintCell(p,gc,column,width,alignment);
-		return;
-	}
-
-	TQListView *v = listView();
-
-	p->eraseRect(0,0,width,height());
-	p->setBackgroundColor(gc.background());
-	p->eraseRect(RVPAD,RVPAD,width-RVPAD,height()-RVPAD);
-	p->setPen(gc.text());
-	p->drawText(v->itemMargin()+RVPAD,0+RVPAD,
-		width-v->itemMargin()-RVPAD,height()-RVPAD,
-		AlignTop | AlignLeft | WordBreak,
-		text(column),
-		-1,
-		&fRect[column]);
-}
diff --git a/kpilot/kpilot/listCat.h b/kpilot/kpilot/listCat.h
deleted file mode 100644
index 8ccaf0d4..00000000
--- a/kpilot/kpilot/listCat.h
+++ /dev/null
@@ -1,229 +0,0 @@
-#ifndef LISTCAT_H
-#define LISTCAT_H
-/* listCat.h			KPilot
-**
-** Copyright (C) 2000-2001 by Adriaan de Groot
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-*/
-
-/** @file
-** This is a specialization of KListView to allow the user to
-** DnD a fixed set of objects into a fixed set of categories
-** (categories set at construction time). @em Deprecated, do not use.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <klistview.h>
-class TQStringList;
-
-/**
- * This Widget extends KListView for a particular purpose:
- * sorting some items into some bins. This can be useful
- * for putting items in an enabled / disabled state, or
- * into categories, or configuring toolbars (putting
- * icons onto toolbars).
- *
- * You can use all of the standard KListView signals and
- * slots. You may in particular want to change the names
- * of the columns, for example:
- * @code
- * ListCategorizer *lc = new ListCategorizer(this,colors);
- * lc->setColumnText(0,i18n("Color"));
- * lc->setColumnText(1,i18n("HTML"));
- * TQListViewItem *stdKDE = lc->addCategory(i18n("Standard KDE"));
- * (void) new TQListViewItem(stdKDE,i18n("red"),"#FF0000");
- * @endcode
- * to set sensible column headers for a list of colors
- * and their HTML equivalents (although why you would want
- * to categorize colors is beyond me).
- *
- * @version $Id$
- */
-
-class ListCategorizer : public KListView
-{
-	Q_OBJECT
-
-public:
-	/**
-	 * Constructor.
-	 *
-	 * This creates a new empty ListCategorizer with
-	 * startOpen set to false. The parameters
-	 * @p parent and @p name are the usual Qt ones.
-	 */
-	ListCategorizer(TQWidget *parent,
-		const char *name = 0);
-	/**
-	 * Constructor.
-	 *
-	 * This creates a ListCategorizer with the given @p categories
-	 * already inserted. In addition, this constructor lets you
-	 * specify whether or not startOpen is set.
-	 */
-	ListCategorizer(const TQStringList& categories,
-		bool startOpen,
-		TQWidget *parent,
-		const char *name = 0);
-
-	/**
-	 * Add a list of categories to the ListCategorizer.
-	 * All the categories are added without descriptions;
-	 * use addCategory on a per-category basis for that.
-	 */
-	void addCategories(const TQStringList&);
-	/**
-	 * Add a category with name @p name and optional
-	 * @p description. This can be useful if you want
-	 * either a description for the category or want to
-	 * refer to this category in the future without
-	 * using findCategory().
-	 *
-	 * @return the TQListViewItem created for the category
-	 */
-	TQListViewItem *addCategory(const TQString& name,
-		const TQString& description = TQString::null);
-	/**
-	 * Returns the list of names of the categories in
-	 * the ListCategorizer.
-	 */
-	TQStringList categories() const
-	{
-		return listSiblings(firstChild());
-	} ;
-
-	/**
-	 * Add a single item to the category named @p category,
-	 * with name @p name and description set to @p description.
-	 * This might be a convenience function, but it's probably
-	 * more convenient to just use QListViewItem's
-	 * constructor. That way you can also hide more data in
-	 * the remaining columns.
-	 */
-	TQListViewItem *addItem(const TQString& category,
-		const TQString& name,
-		const TQString& description = TQString::null);
-	/**
-	 * Returns the list of strings in column @p column under
-	 * category @p category. You can do this to get, for example
-	 * the names of all the items categorized under a given
-	 * category, or, more usefully, set @p column to something
-	 * other that 0 (name) or 1 (description) to return the
-	 * TQStringList hidden in the non-visible columns.
-	 */
-	TQStringList items(const TQString& category,int column=0) const
-	{
-		return listSiblings(findCategory(category),column);
-	}
-
-	/**
-	 * Given a category categoryName return the QListViewItem
-	 * that represents that category. Probably a useless function,
-	 * since just remembering the pointer addCategory gives
-	 * you is faster and uses hardly any memory.
-	 */
-	TQListViewItem *findCategory(const TQString& categoryName) const;
-	/**
-	 * Return the list of strings in column @p column of all siblings
-	 * of the given item @p p. If you remembered a pointer to a
-	 * category, you can use
-	 * @code
-	 * TQStringList l = lc->listSiblings(stdKDE->firstChild(),2);
-	 * @endcode
-	 * to get the list of strings in hidden column 2 under
-	 * the category you remembered.
-	 */
-	TQStringList listSiblings(const TQListViewItem *p,int column=0) const;
-
-	/**
-	 * @return whether new categories are inserted in an
-	 * open state or not.
-	 *
-	 * @see setStartOpen
-	 */
-	bool startOpen() const { return fStartOpen; } ;
-	/**
-	 * Enable categories being inserted in an open state.
-	 * It is disabled by default but may be set from the
-	 * constructor.
-	 */
-	void setStartOpen(bool b) { fStartOpen=b; } ;
-
-protected:
-	/**
-	 * Reimplemented to prevent categories from being dragged.
-	 */
-	virtual bool acceptDrag (TQDropEvent* event) const;
-	/**
-	 * Reimplemented to prevent categories from being dragged.
-	 */
-	virtual void startDrag();
-	/**
-	 * Reimplemented to prevent categories from being dragged.
-	 */
-	virtual void contentsDropEvent (TQDropEvent*);
-
-
-
-private:
-	/**
-	 * Call several KListView functions to set up useful
-	 * behavior for this particular class.
-	 */
-	void setupWidget();
-
-	bool fStartOpen:1;
-} ;
-
-
-class RichListViewItem : public QListViewItem
-{
-public:
-	RichListViewItem(TQListViewItem *parent,
-		TQString,
-		int);
-	virtual ~RichListViewItem();
-
-	virtual void paintCell(TQPainter *,
-		const TQColorGroup &,
-		int column,
-		int width,
-		int alignment);
-
-	virtual void setup();
-
-	bool isRich(int c) const { return fIsRich[c]; } ;
-	void setRich(int c,bool b) { fIsRich[c]=b; } ;
-
-protected:
-	void computeHeight(int c);
-
-protected:
-	bool *fIsRich;
-	TQRect *fRect;
-	int fColumns;
-
-} ;
-
-#endif
diff --git a/kpilot/kpilot/listItems.cc b/kpilot/kpilot/listItems.cc
deleted file mode 100644
index 9984f004..00000000
--- a/kpilot/kpilot/listItems.cc
+++ /dev/null
@@ -1,242 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003 by Reinhold Kainhofer
-**
-** Program description
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-
-#include <tqstring.h>
-#include <tqlistbox.h>
-#include <tqlistview.h>
-
-
-#ifndef _KPILOT_LISTITEMS_H
-#include "listItems.h"
-#endif
-
-#ifdef DEBUG
-/* static */ int PilotListItem::crt = 0;
-/* static */ int PilotListItem::del = 0;
-/* static */ int PilotListItem::count = 0;
-
-/* static */ void PilotListItem::counts()
-{
-	FUNCTIONSETUP;
-	DEBUGKPILOT << fname
-		<< ": created=" << crt << " deletions=" << del << endl;
-}
-#endif
-
-PilotListItem::PilotListItem(const TQString & text,
-	recordid_t pilotid, void *r) :
-	TQListBoxText(text),
-	fid(pilotid),
-	fr(r)
-{
-	// FUNCTIONSETUP;
-#ifdef DEBUG
-	crt++;
-	count++;
-	if (!(count & 0xff))
-		counts();
-#endif
-}
-
-PilotListItem::~PilotListItem()
-{
-	// FUNCTIONSETUP;
-#ifdef DEBUG
-	del++;
-	count++;
-	if (!(count & 0xff))
-		counts();
-#endif
-}
-
-
-
-
-#ifdef DEBUG
-/* static */ int PilotCheckListItem::crt = 0;
-/* static */ int PilotCheckListItem::del = 0;
-/* static */ int PilotCheckListItem::count = 0;
-
-/* static */ void PilotCheckListItem::counts()
-{
-	FUNCTIONSETUP;
-	DEBUGKPILOT << fname
-		<< ": created=" << crt << " deletions=" << del << endl;
-}
-#endif
-
-PilotCheckListItem::PilotCheckListItem(TQListView * parent, const TQString & text, recordid_t pilotid, void *r) :
-	TQCheckListItem(parent, text, TQCheckListItem::CheckBox),
-	fid(pilotid),
-	fr(r)
-{
-	// FUNCTIONSETUP;
-#ifdef DEBUG
-	crt++;
-	count++;
-	if (!(count & 0xff))
-		counts();
-#endif
-}
-
-PilotCheckListItem::~PilotCheckListItem()
-{
-	// FUNCTIONSETUP;
-#ifdef DEBUG
-	del++;
-	count++;
-	if (!(count & 0xff))
-		counts();
-#endif
-}
-
-void PilotCheckListItem::stateChange ( bool on)
-{
-	// FUNCTIONSETUP;
-	TQCheckListItem::stateChange(on);
-
-}
-
-
-
-
-#ifdef DEBUG
-/* static */ int PilotListViewItem::crt = 0;
-/* static */ int PilotListViewItem::del = 0;
-/* static */ int PilotListViewItem::count = 0;
-
-/* static */ void PilotListViewItem::counts()
-{
-	FUNCTIONSETUP;
-	DEBUGKPILOT << fname
-		<< ": created=" << crt << " deletions=" << del << endl;
-}
-#endif
-
-PilotListViewItem::PilotListViewItem( TQListView * parent,
-	TQString label1, TQString label2, TQString label3, TQString label4,
-	recordid_t pilotid, void *r):
-	TQListViewItem(parent, label1, label2, label3, label4,
-		TQString::null, TQString::null, TQString::null, TQString::null),
-	fid(pilotid),
-	fr(r),
-	d(new PilotListViewItemData)
-{
-	// FUNCTIONSETUP;
-	if (d) d->valCol=-1;
-#ifdef DEBUG
-	crt++;
-	count++;
-	if (!(count & 0xff))
-		counts();
-#endif
-}
-
-PilotListViewItem::~PilotListViewItem()
-{
-	// FUNCTIONSETUP;
-#ifdef DEBUG
-	del++;
-	count++;
-	if (!(count & 0xff))
-		counts();
-#endif
-}
-void PilotListViewItem::setNumericCol(int col, bool numeric)
-{
-	// FUNCTIONSETUP;
-	if (numeric)
-	{
-		if (!numericCols.contains(col))
-			numericCols.append(col);
-	}
-	else
-	{
-		if (numericCols.contains(col))
-			numericCols.remove(col);
-	}
-}
-
-unsigned long PilotListViewItem::colValue(int col, bool *ok) const
-{
-//	FUNCTIONSETUP;
-/*	if (!d)
-	{
-		d=new PilotListViewItemData;
-		d->valCol=-1;
-	}*/
-	if (d->valCol!=col)
-	{
-		// Use true for ascending for now...
-		d->val=key(col, true).toULong(&d->valOk);
-		d->valCol=col;
-	}
-	if (ok) (*ok)=d->valOk;
-	return d->val;
-}
-
-int PilotListViewItem::compare( TQListViewItem *i, int col, bool ascending ) const
-{
-// 	FUNCTIONSETUP;
-	PilotListViewItem*item=dynamic_cast<PilotListViewItem*>(i);
-/*#ifdef DEBUG
-	DEBUGKPILOT<<"Item of dyn cast: "<<item<<endl;
-#endif*/
-	if (item && numericCols.contains(col))
-	{
-/*#ifdef DEBUG
-	DEBUGKPILOT<<"Comparing: col "<<col<<", Ascending: "<<ascending<<endl;
-#endif*/
-		bool ok1, ok2;
-		/// Do the toULong call just once if the sorting column changed:
-		unsigned long l1=colValue(col, &ok1);
-		unsigned long l2=item->colValue(col, &ok2);
-/*#ifdef DEBUG
-	DEBUGKPILOT<<"l1="<<l1<<"(ok: "<<ok1<<"), l2="<<l2<<"(ok: "<<ok2<<")"<<endl;
-#endif*/
-		if (ok1 && ok2)
-		{
-			// Returns -1 if this item is less than i, 0 if they are
-			// equal and 1 if this item is greater than i.
-			int res=0;
-			if (l1<l2) res=-1;
-			else if (l1>l2) res=1;
-			//else res=0;
-/*#ifdef DEBUG
-	DEBUGKPILOT<<"RESULT="<<res<<endl;
-#endif*/
-			return res;
-		}
-	}
-	return TQListViewItem::compare(i, col, ascending);
-}
-
diff --git a/kpilot/kpilot/listItems.h b/kpilot/kpilot/listItems.h
deleted file mode 100644
index 4987219f..00000000
--- a/kpilot/kpilot/listItems.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* listItems.h			KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This file defines a subclasse of TQListBoxText that carries
-** additional information useful for Pilot records. In particular it
-** carries an int (for the pilot's uid?) and a void * (for pilotrecord?)
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#ifndef _KPILOT_LISTITEMS_H
-#define _KPILOT_LISTITEMS_H
-
-#include <tqlistview.h>
-#include <pi-dlp.h>
-
-class PilotListItem : public QListBoxText
-{
-public:
-	PilotListItem(const TQString &text, recordid_t pilotid=0, void *r=0);
-	virtual ~PilotListItem();
-	recordid_t id() const {return fid;};
-	const void *rec() const {return fr;};
-
-
-protected:
-	recordid_t fid;
-	void *fr;
-
-#ifdef DEBUG
-public:
-	static void counts();
-private:
-	static int crt,del,bal,count;
-#endif
-};
-
-class PilotCheckListItem : public QCheckListItem
-{
-public:
-	PilotCheckListItem( TQListView * parent, const TQString & text, recordid_t pilotid=0, void *r=0);
-	virtual ~PilotCheckListItem();
-	recordid_t id() const {return fid;};
-	const void  *rec() const {return fr;};
-protected:
-	virtual void stateChange ( bool );
-	recordid_t fid;
-	void *fr;
-#ifdef DEBUG
-public:
-	static void counts();
-private:
-	static int crt, del, bal, count;
-#endif
-};
-
-struct PilotListViewItemData
-{
-	int valCol;
-	bool valOk;
-	unsigned long val;
-};
-
-class PilotListViewItem : public QListViewItem
-{
-public:
-	PilotListViewItem( TQListView * parent,
-		TQString label1, TQString label2 = TQString::null,
-		TQString label3 = TQString::null, TQString label4 = TQString::null,
-		recordid_t pilotid=0, void *r=0);
-	virtual ~PilotListViewItem();
-	recordid_t id() const {return fid;};
-	const void  *rec() const {return fr;};
-public:
-	void setNumericCol(int col, bool numeric);
-	int compare( TQListViewItem *i, int col, bool ascending ) const;
-protected:
-	TQValueList<int> numericCols;
-	recordid_t fid;
-	void *fr;
-	// Caching to make sorting faster:
-	PilotListViewItemData*d;
-	unsigned long colValue(int col, bool *ok) const;
-#ifdef DEBUG
-public:
-	static void counts();
-private:
-	static int crt, del, bal, count;
-#endif
-};
-
-
-#endif
diff --git a/kpilot/kpilot/logFile.cc b/kpilot/kpilot/logFile.cc
deleted file mode 100644
index b7868bfd..00000000
--- a/kpilot/kpilot/logFile.cc
+++ /dev/null
@@ -1,128 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2001 by Dan Pilone
-** Copyright (C) 2004 by Reinhold Kainhofer
-**
-** This file defines the log file class, which logs
-** sync-messages during a HotSync to a file.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org.
-*/
-
-#include "options.h"
-
-#include <tqfile.h>
-#include <tqtextstream.h>
-#include <tqdatetime.h>
-
-#include <pi-version.h>
-
-#ifndef PILOT_LINK_PATCH
-#define PILOT_LINK_PATCH "unknown"
-#endif
-#include "logFile.h"
-#include "kpilotConfig.h"
-
-#include "logFile.moc"
-
-
-LogFile::LogFile() : DCOPObject("LogIface"), TQObject(), fOutfile(0L), fSyncing(false)
-{
-	FUNCTIONSETUP;
-}
-
-
-/* DCOP */ ASYNC LogFile::logStartSync()
-{
-	FUNCTIONSETUP;
-	// If a sync is already running (something went wrong then!), close that old log
-	if (fSyncing) logEndSync();
-	
-	fOutfile = new TQFile(KPilotSettings::logFileName());
-	
-	if (!fOutfile || !fOutfile->open(IO_WriteOnly)) 
-	{
-		WARNINGKPILOT << "Unable to open log file " << KPilotSettings::logFileName() << endl;
-		KPILOT_DELETE( fOutfile );
-		fSyncing = false;
-		return;
-	}
-	
-	fSyncing = true;
-	fLogStream.setDevice(fOutfile);
-
-	fLogStream<<(CSL1("KPilot HotSync log, %1").arg(TQDateTime::currentDateTime().toString()))<<endl<<endl<<endl;
-	fLogStream<<(CSL1("Version: KPilot %1").arg(TQString::fromLatin1(KPILOT_VERSION)))<<endl;
-	fLogStream<<(CSL1("Version: pilot-link %1.%2.%3%4" )
-		.arg(PILOT_LINK_VERSION).arg(PILOT_LINK_MAJOR).arg(PILOT_LINK_MINOR)
-#ifdef PILOT_LINK_PATCH
-		.arg(TQString::fromLatin1(PILOT_LINK_PATCH))
-#else
-		.arg(TQString())
-#endif
-		)<<endl;
-#ifdef KDE_VERSION_STRING
-	fLogStream<<(CSL1("Version: KDE %1" ).arg(TQString::fromLatin1(KDE_VERSION_STRING)) )<<endl;
-#endif
-#ifdef QT_VERSION_STR
-	fLogStream<<(CSL1("Version: Qt %1" ).arg(TQString::fromLatin1(QT_VERSION_STR)) )<<endl;
-#endif
-	fLogStream<<endl<<endl;
-		
-}
-
-/* DCOP */ ASYNC LogFile::logEndSync()
-{
-	if (fSyncing) 
-	{
-		logMessage(i18n("HotSync finished."));
-		fLogStream.unsetDevice();
-		if (fOutfile) fOutfile->close();
-		KPILOT_DELETE(fOutfile)
-		fSyncing=false;
-	}
-}
-
-/* DCOP */ ASYNC LogFile::logMessage(TQString s)
-{
-	addMessage(s);
-}
-
-/* DCOP */ ASYNC LogFile::logError(TQString s)
-{
-	addMessage(s);
-}
-
-/* DCOP */ ASYNC LogFile::logProgress(TQString, int)
-{
-}
-
-
-void LogFile::addMessage(const TQString & s)
-{
-	FUNCTIONSETUP;
-	if ( fSyncing && !s.isEmpty() ) 
-	{
-		fLogStream<<TQTime::currentTime().toString()<<"  "<<s<<endl;
-	}
-}
-
diff --git a/kpilot/kpilot/logFile.h b/kpilot/kpilot/logFile.h
deleted file mode 100644
index 93614c5b..00000000
--- a/kpilot/kpilot/logFile.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef _KPILOT_LOGFILE_H
-#define _KPILOT_LOGFILE_H
-/* logFile.h                          KPilot
-**
-** Copyright (C) 2001 by Dan Pilone
-** Copyright (C) 2004 by Reinhold Kainhofer
-**
-** This file defines the log window widget, which logs
-** sync-messages during a HotSync.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org.
-*/
-
-#include "loggerDCOP.h"
-#include "tqobject.h"
-
-class TQFile;
-class TQTextStream;
-
-class LogFile : public TQObject, public LoggerDCOP
-{
-Q_OBJECT
-
-public:
-	LogFile();
-	~LogFile() { } ;
-
-	/**
-	* DCOP interface.
-	*/
-	virtual ASYNC logStartSync();
-	virtual ASYNC logEndSync();
-	virtual ASYNC logError(TQString);
-	virtual ASYNC logMessage(TQString);
-	virtual ASYNC logProgress(TQString,int);
-
-	void addMessage(const TQString &);
-
-private:
-	TQFile*fOutfile;
-	bool fSyncing;
-	TQTextStream fLogStream;
-} ;
-
-#endif
diff --git a/kpilot/kpilot/logWidget.cc b/kpilot/kpilot/logWidget.cc
deleted file mode 100644
index c7bddb61..00000000
--- a/kpilot/kpilot/logWidget.cc
+++ /dev/null
@@ -1,396 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2001 by Dan Pilone
-**
-** This file defines the log window widget, which logs
-** sync-messages during a HotSync.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org.
-*/
-
-#include "options.h"
-
-#include <tqfile.h>
-#include <tqlayout.h>
-#include <tqtextedit.h>
-#include <tqwhatsthis.h>
-#include <tqdatetime.h>
-#include <tqlabel.h>
-#include <tqpixmap.h>
-#include <tqtimer.h>
-#include <tqpushbutton.h>
-#include <tqhbox.h>
-#include <tqtextstream.h>
-#include <tqpainter.h>
-
-#include <kglobal.h>
-#include <kstandarddirs.h>
-#include <kprogress.h>
-#include <kfiledialog.h>
-#include <kmessagebox.h>
-
-#include <pi-version.h>
-
-#ifndef PILOT_LINK_PATCH
-#define PILOT_LINK_PATCH "unknown"
-#endif
-
-#include "logWidget.moc"
-
-#if QT_VERSION < 0x030100
-#define TE_EOL "<br/>"
-#else
-#define TE_EOL "\n"
-#endif
-
-
-LogWidget::LogWidget(TQWidget * parent) :
-	DCOPObject("LogIface"),
-	PilotComponent(parent, "component_log", TQString::null),
-	fLog(0L),
-	fShowTime(false),
-	fSplash(0L),
-	fLabel(0L),
-	fProgress(0L),
-	fButtonBox(0L)
-{
-	FUNCTIONSETUP;
-	TQGridLayout *grid = new TQGridLayout(this, 4, 4, SPACING);
-
-	grid->addRowSpacing(0, SPACING);
-	grid->addRowSpacing(1, 100);
-	grid->addColSpacing(2, 100);
-	grid->addRowSpacing(3, SPACING);
-	grid->addColSpacing(0, SPACING);
-	grid->addColSpacing(3, SPACING);
-	grid->setRowStretch(1, 50);
-	grid->setColStretch(2, 50);
-
-	fLog = new TQTextEdit(this);
-	fLog->setReadOnly(true);
-	fLog->setWordWrap(TQTextEdit::WidgetWidth);
-	fLog->setWrapPolicy(TQTextEdit::AtWordOrDocumentBoundary);
-#if QT_VERSION < 0x030100
-	/* nothing, use AutoText */
-#else
-	fLog->setTextFormat(Qt::LogText);
-#endif
-
-	TQWhatsThis::add(fLog, i18n("<qt>This lists all the messages received "
-			"during the current HotSync</qt>"));
-	grid->addMultiCellWidget(fLog, 1, 1,1,2);
-
-
-	TQString initialText ;
-
-	initialText.append(CSL1("<b>Version:</b> KPilot %1" TE_EOL)
-		.arg(TQString::fromLatin1(KPILOT_VERSION)));
-	initialText.append(CSL1("<b>Version:</b> pilot-link %1.%2.%3%4" TE_EOL)
-		.arg(PILOT_LINK_VERSION)
-		.arg(PILOT_LINK_MAJOR)
-		.arg(PILOT_LINK_MINOR)
-#ifdef PILOT_LINK_PATCH
-		.arg(TQString::fromLatin1(PILOT_LINK_PATCH))
-#else
-		.arg(TQString())
-#endif
-		);
-#ifdef KDE_VERSION_STRING
-	initialText.append(CSL1("<b>Version:</b> KDE %1" TE_EOL)
-		.arg(TQString::fromLatin1(KDE_VERSION_STRING)));
-#endif
-#ifdef QT_VERSION_STR
-	initialText.append(CSL1("<b>Version:</b> Qt %1" TE_EOL)
-		.arg(TQString::fromLatin1(QT_VERSION_STR)));
-#endif
-
-	initialText.append(CSL1(TE_EOL));
-	initialText.append(i18n("<qt><b>HotSync Log</b></qt>"));
-	initialText.append(CSL1(TE_EOL));
-
-#if KDE_IS_VERSION(3,3,0)
-#else
-	initialText.append(CSL1(TE_EOL "<qt><b>KDE 3.2 is no longer supported. Please update to KDE 3.3 or later.</b></qt>" TE_EOL));
-	initialText.append(CSL1(TE_EOL "<qt><b>You may be unable to do conflict resolution.</b></qt>" TE_EOL));
-#endif
-
-	fLog->setText(initialText);
-	fLog->scrollToBottom();
-
-	TQHBox *h = new TQHBox(this);
-	h->setSpacing(SPACING);
-	TQPushButton *b = new TQPushButton(
-		i18n("Clear the text of HotSync messages","Clear Log"),
-		h);
-	TQWhatsThis::add(b,i18n("<qt>Clears the list of messages from the "
-		"current HotSync.</qt>"));
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(clearLog()));
-
-	b = new TQPushButton(i18n("Save Log..."),h);
-	TQWhatsThis::add(b,i18n("<qt>You can save the list of messages received "
-		"during this HotSync to a file (for example for use in a "
-		"bug report) by clicking here.</qt>"));
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(saveLog()));
-
-	fButtonBox = h;
-
-	grid->addMultiCellWidget(h,2,2,1,2);
-
-	fLabel = new TQLabel(i18n("Sync progress:"),this);
-	grid->addWidget(fLabel,3,1);
-	fProgress = new KProgress(this);
-	TQWhatsThis::add(fProgress,i18n("<qt>The (estimated) percentage "
-		"completed in the current HotSync.</qt>"));
-	grid->addWidget(fProgress,3,2);
-
-
-	TQString splashPath =
-		KGlobal::dirs()->findResource("data",
-			CSL1("kpilot/kpilot-splash.png"));
-
-	if (!splashPath.isEmpty() && TQFile::exists(splashPath))
-	{
-		fLog->hide();
-		fLabel->hide();
-		fProgress->hide();
-
-		TQPixmap splash(splashPath);
-		TQPainter painter(&splash);
-		painter.setPen(TQColor(0, 255, 0));
-
-		// This latin1() is ok; KPILOT_VERSION is a #define
-		// of a constant string.
-		int textWidth =fontMetrics().width(
-			TQString::fromLatin1(KPILOT_VERSION)) ;
-		int textHeight = fontMetrics().height();
-
-#ifdef DEBUG
-		DEBUGKPILOT << fname
-			<< ": Using text size "
-			<< textWidth << "x" << textHeight
-			<< endl;
-#endif
-
-		painter.fillRect(splash.width() -  28 - textWidth,
-			splash.height() - 6 - textHeight,
-			textWidth + 6,
-			textHeight + 4,
-			black);
-		painter.drawText(splash.width() -  25 - textWidth,
-			splash.height() - 8,
-			TQString::fromLatin1(KPILOT_VERSION));
-		fSplash = new TQLabel(this);
-		fSplash->setPixmap(splash);
-		fSplash->setAlignment(AlignCenter);
-		TQTimer::singleShot(3000,this,TQT_SLOT(hideSplash()));
-		grid->addMultiCellWidget(fSplash,1,3,1,2);
-		grid->addColSpacing(0,10);
-		grid->setColStretch(1,50);
-		grid->setColStretch(2,50);
-		grid->addColSpacing(3,10);
-	}
-
-}
-
-void LogWidget::addMessage(const TQString & s)
-{
-	FUNCTIONSETUP;
-
-	if (s.isEmpty()) return;
-	if (!fLog) return;
-	TQString t;
-
-	if (fShowTime)
-	{
-		t.append(CSL1("<b>"));
-		t.append(TQTime::currentTime().toString());
-		t.append(CSL1("</b> "));
-	}
-
-	t.append(s);
-
-#if QT_VERSION < 0x030100
-	t.append(TE_EOL);
-	fLog->setText(fLog->text() + t);
-#else
-	fLog->append(t);
-#endif
-	fLog->scrollToBottom();
-}
-
-void LogWidget::addError(const TQString & s)
-{
-	FUNCTIONSETUP;
-
-	if (s.isEmpty()) return;
-
-	WARNINGKPILOT << "KPilot error: " << s << endl;
-
-	if (!fLog) return;
-
-	TQString t;
-
-	t.append(CSL1("<i>"));
-	t.append(s);
-	t.append(CSL1("</i>"));
-
-	addMessage(t);
-}
-
-void LogWidget::addProgress(const TQString &s,int i)
-{
-	FUNCTIONSETUP;
-
-	if (!s.isEmpty()) logMessage(s);
-
-	if ((i >= 0) && (i <= 100))
-	{
-		// setValue seems to be in both KDE2 and
-		// KDE3, but is marked deprecated in KDE3.
-		//
-		//
-#ifdef KDE2
-		fProgress->setValue(i);
-#else
-		fProgress->setProgress(i);
-#endif
-	}
-}
-
-void LogWidget::syncDone()
-{
-	FUNCTIONSETUP;
-
-	addMessage(i18n("<b>HotSync Finished.</b>"));
-}
-
-void LogWidget::hideSplash()
-{
-	FUNCTIONSETUP;
-
-	if (fSplash)
-	{
-		fSplash->hide();
-		KPILOT_DELETE(fSplash);
-	}
-
-	fLog->show();
-	fLabel->show();
-	fProgress->show();
-}
-
-
-/* DCOP */ ASYNC LogWidget::logMessage(TQString s)
-{
-	addMessage(s);
-}
-
-/* DCOP */ ASYNC LogWidget::logError(TQString s)
-{
-	addError(s);
-}
-
-/* DCOP */ ASYNC LogWidget::logProgress(TQString s, int i)
-{
-	addProgress(s,i);
-}
-
-/* DCOP */ ASYNC LogWidget::logStartSync()
-{
-}
-
-/* DCOP */ ASYNC LogWidget::logEndSync()
-{
-}
-
-/* slot */ void LogWidget::clearLog()
-{
-	FUNCTIONSETUP;
-
-	if (fLog)
-	{
-		fLog->setText(TQString::null);
-	}
-}
-
-/* slot */ void LogWidget::saveLog()
-{
-	FUNCTIONSETUP;
-
-	bool finished = false;
-
-	while (!finished)
-	{
-		TQString saveFileName = KFileDialog::getSaveFileName(
-			TQString::null,     /* default */
-			CSL1("*.log"),     /* show log files by default */
-			this,
-			i18n("Save Log"));
-
-		if (saveFileName.isEmpty()) return;
-		if (TQFile::exists(saveFileName))
-		{
-			int r = KMessageBox::warningYesNoCancel(
-				this,
-				i18n("The file exists. Do you want to "
-					"overwrite it?"),
-				i18n("File Exists"), i18n("Overwrite"), i18n("Do Not Overwrite"));
-			if (r==KMessageBox::Yes)
-			{
-				finished=saveFile(saveFileName);
-			}
-
-			if (r==KMessageBox::Cancel) return;
-		}
-		else
-		{
-			finished=saveFile(saveFileName);
-		}
-	}
-}
-
-
-bool LogWidget::saveFile(const TQString &saveFileName)
-{
-	FUNCTIONSETUP;
-
-	TQFile f(saveFileName);
-	if (!f.open(IO_WriteOnly))
-	{
-		int r = KMessageBox::questionYesNo(this,
-			i18n("<qt>Cannot open the file &quot;%1&quot; "
-				"for writing; try again?</qt>"),
-			i18n("Cannot Save"), i18n("Try Again"), i18n("Do Not Try"));
-
-		if (r==KMessageBox::Yes) return false;
-		return true;
-	}
-	else
-	{
-		TQTextStream t(&f);
-		t << fLog->text();
-	}
-
-	f.close();
-	return true;
-}
-
diff --git a/kpilot/kpilot/logWidget.h b/kpilot/kpilot/logWidget.h
deleted file mode 100644
index 2f6be95b..00000000
--- a/kpilot/kpilot/logWidget.h
+++ /dev/null
@@ -1,90 +0,0 @@
-#ifndef _KPILOT_LOGWIDGET_H
-#define _KPILOT_LOGWIDGET_H
-/* logWidget.h                          KPilot
-**
-** Copyright (C) 2001 by Dan Pilone
-**
-** This file defines the log window widget, which logs
-** sync-messages during a HotSync.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org.
-*/
-
-#include "loggerDCOP.h"
-#include "pilotComponent.h"
-
-class TQLabel;
-class TQTextEdit;
-class TQHBox;
-class KProgress;
-
-class LogWidget : public PilotComponent , public LoggerDCOP
-{
-Q_OBJECT
-
-public:
-	LogWidget(TQWidget *);
-	~LogWidget() { } ;
-
-	// Pilot Component Methods:
-	//
-	bool showTime() const { return fShowTime; } ;
-	void setShowTime(bool b) { fShowTime=b; } ;
-
-	/**
-	* DCOP interface.
-	*/
-	virtual ASYNC logError(TQString);
-	virtual ASYNC logMessage(TQString);
-	virtual ASYNC logProgress(TQString,int);
-	virtual ASYNC logStartSync();
-	virtual ASYNC logEndSync();
-
-	// GUI customization hooks
-	//
-	//
-	TQHBox *buttonBox() const { return fButtonBox; } ;
-
-public slots:
-	void addMessage(const TQString &);
-	void addError(const TQString &);
-	void addProgress(const TQString &,int);
-	void syncDone();
-
-private slots:
-	void hideSplash();
-	void clearLog();
-	void saveLog();
-
-private:
-	bool saveFile(const TQString &);
-
-private:
-	TQTextEdit *fLog;
-	bool fShowTime;
-	TQLabel *fSplash;
-	TQLabel *fLabel;
-	KProgress *fProgress;
-	TQHBox *fButtonBox;
-} ;
-
-#endif
diff --git a/kpilot/kpilot/loggerDCOP.h b/kpilot/kpilot/loggerDCOP.h
deleted file mode 100644
index 3ea3101d..00000000
--- a/kpilot/kpilot/loggerDCOP.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef _KPILOT_LOGWIDGETDCOP_H
-#define _KPILOT_LOGWIDGETDCOP_H
-/* logWidgetDCOP.h			KPilotDaemon
-**
-** Copyright (C) 2000 by Adriaan de Groot
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This file defines the DCOP interface for the generalized log widget.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include <dcopobject.h>
-
-
-class LoggerDCOP : virtual public DCOPObject
-{
-	K_DCOP
-
-k_dcop:
-	// Indicates the start of a sync process
-	virtual ASYNC logStartSync() = 0 ;
-	// Indicates the end of a sync process
-	virtual ASYNC logEndSync() = 0 ;
-	// Adds a single message to the log, with formatting 
-	// showing it's an error message.
-	virtual ASYNC logError(TQString) = 0 ;
-	// Adds a regular message.
-	virtual ASYNC logMessage(TQString) = 0 ;
-	// Adds a message if the string is non-null, and
-	// sets the progress bar to @p n%. Limit @p n
-	// to the range 0 .. 100.
-	virtual ASYNC logProgress(TQString,int n) = 0 ;
-} ;
-
-
-
-#endif
diff --git a/kpilot/kpilot/main-config.cc b/kpilot/kpilot/main-config.cc
deleted file mode 100644
index e69de29b..00000000
--- a/kpilot/kpilot/main-config.cc
+++ /dev/null
diff --git a/kpilot/kpilot/main-test.cc b/kpilot/kpilot/main-test.cc
deleted file mode 100644
index f9c9fe80..00000000
--- a/kpilot/kpilot/main-test.cc
+++ /dev/null
@@ -1,437 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2001 by Dan Pilone
-** Copyright (C) 2001,2002,2003,2004 by Adriaan de Groot
-**
-** This is the main program for kpilotTest, which shows a SyncLog and
-** exercises the KPilotDeviceLink class. It's intended to test if the
-** Palm hardware and the KPilot software are functioning correctly to
-** some extent.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org.
-*/
-
-#include "options.h"
-
-#include <stdlib.h>
-#include <time.h>
-#include <iostream>
-
-#include <tqpushbutton.h>
-#include <tqhbox.h>
-#include <tqtimer.h>
-
-#include <kapplication.h>
-#include <klocale.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kservice.h>
-#include <kservicetype.h>
-#include <kuserprofile.h>
-
-#include <pi-version.h>
-
-#include "actionQueue.h"
-#include "actions.h"
-#include "kpilotdevicelink.h"
-#include "kpilotlocallink.h"
-#include "pilot.h"
-
-#include "kpilotConfig.h"
-#include "hotSync.h"
-
-
-static KCmdLineOptions generalOptions[] = {
-	{"p",0,0},
-	{"port <device>",
-		I18N_NOOP("Path to Pilot device node"),
-		"/dev/pilot"},
-	{"l",0,0},
-	{"list", I18N_NOOP("List DBs"), 0},
-	{"b",0,0},
-	{"backup <dest dir>", I18N_NOOP("Backup Pilot to <dest dir>"), 0},
-	{"r",0,0},
-	{"restore <src dir>", I18N_NOOP("Restore Pilot from backup"), 0},
-	{"e",0,0},
-	{ "exec <filename>",
-		I18N_NOOP("Run conduit from desktop file <filename>"),
-		0 },
-	{"c",0,0},
-	{ "check <what>",
-		I18N_NOOP("Run a specific check (with the device)"), "help"},
-	{"s",0,0},
-	{ "show <what>",
-		I18N_NOOP("Show KPilot configuration information"), "help"},
-#ifdef DEBUG
-	{ "debug <level>",
-		I18N_NOOP("Set the debug level"), "1" },
-#endif
-	KCmdLineLastOption
-} ;
-
-static KCmdLineOptions conduitOptions[] = {
-	{ "T",0,0},
-	{ "notest",
-		I18N_NOOP("*Really* run the conduit, not in test mode."),
-		0 } ,
-	{ "F",0,0},
-	{ "local",
-		I18N_NOOP("Run the conduit in file-test mode."),
-		0 } ,
-	{ "HHtoPC",
-		I18N_NOOP("Copy Pilot to Desktop."),
-		0 } ,
-	{ "PCtoHH",
-		I18N_NOOP("Copy Desktop to Pilot."),
-		0 } ,
-	{ "loop",
-		I18N_NOOP("Repeated perform action - only useful for --list"),
-		0 } ,
-	KCmdLineLastOption
-} ;
-
-/**
-*** Conduits - sync actions - for testing specific scenarios.
-**/
-
-
-
-KPilotLink *createLink( bool local )
-{
-	FUNCTIONSETUP;
-	if (!local)
-	{
-		return new KPilotDeviceLink(0, "deviceLink");
-	}
-	else
-	{
-		return new KPilotLocalLink(0, "localLink");
-	}
-}
-
-/** If @p loop is true, then instead of quitting at end of
-*   sync, wait for a new sync just like the real daemon does.
-*/
-void connectStack( KPilotLink *l, ActionQueue *a, bool loop = false )
-{
-	FUNCTIONSETUP;
-
-	if (l && a)
-	{
-		TQObject::connect(a, TQT_SIGNAL(syncDone(SyncAction *)),
-			l, TQT_SLOT(close()));
-		if (!loop)
-		{
-			TQObject::connect(a, TQT_SIGNAL(syncDone(SyncAction *)),
-				kapp, TQT_SLOT(quit()));
-		}
-		else
-		{
-			TQObject::connect(a, TQT_SIGNAL(syncDone(SyncAction *)),
-				l, TQT_SLOT(reset()));
-		}
-		TQObject::connect(l, TQT_SIGNAL(deviceReady(KPilotLink*)),
-			a, TQT_SLOT(execConduit()));
-	}
-}
-
-
-
-int exec(const TQString &device, const TQString &what, KCmdLineArgs *p)
-{
-	FUNCTIONSETUP;
-
-	// get --exec-conduit value
-	if (what.isEmpty()) return 1;
-	TQStringList l;
-	l.append(what);
-
-	SyncAction::SyncMode::Mode syncMode = SyncAction::SyncMode::eHotSync;
-	if (p->isSet("HHtoPC")) syncMode = SyncAction::SyncMode::eCopyHHToPC;
-	if (p->isSet("PCtoHH")) syncMode = SyncAction::SyncMode::eCopyPCToHH;
-	SyncAction::SyncMode mode(syncMode,p->isSet("test"),p->isSet("local"));
-
-	KPilotLink *link = createLink( p->isSet("local") );
-	ActionQueue *syncStack = new ActionQueue( link );
-	syncStack->queueInit();
-	syncStack->addAction(new CheckUser( link ));
-	syncStack->queueConduits(l,mode);
-	syncStack->queueCleanup();
-	connectStack(link,syncStack);
-	link->reset(device);
-	return kapp->exec();
-}
-
-int backup(const TQString &device, const TQString &what, KCmdLineArgs *p)
-{
-	FUNCTIONSETUP;
-	KPilotLink *link = createLink( p->isSet("local") );
-	ActionQueue *syncStack = new ActionQueue( link );
-	syncStack->queueInit();
-	BackupAction *ba = new BackupAction( link, true /* full backup */ );
-	ba->setDirectory( what );
-	syncStack->addAction( ba );
-	syncStack->queueCleanup();
-	connectStack(link,syncStack);
-	link->reset(device);
-	return kapp->exec();
-}
-
-int restore(const TQString &device, const TQString &what, KCmdLineArgs *p)
-{
-	FUNCTIONSETUP;
-	KPilotLink *link = createLink( p->isSet("local") );
-	ActionQueue *syncStack = new ActionQueue( link );
-	syncStack->queueInit();
-	RestoreAction *ra = new RestoreAction( link );
-	ra->setDirectory( what );
-	syncStack->addAction( ra );
-	syncStack->queueCleanup();
-	connectStack(link,syncStack);
-	link->reset(device);
-	return kapp->exec();
-}
-
-int listDB(const TQString &device, KCmdLineArgs *p)
-{
-	FUNCTIONSETUP;
-	KPilotLink *link = createLink( p->isSet("local") );
-	ActionQueue *syncStack = new ActionQueue( link );
-	syncStack->queueInit();
-	syncStack->addAction( new TestLink( link ) );
-	syncStack->queueCleanup();
-	connectStack(link,syncStack, p->isSet("loop") );
-	link->reset(device);
-	return kapp->exec();
-}
-
-int check( const TQString &device, const TQString &what, KCmdLineArgs *p )
-{
-	FUNCTIONSETUP;
-
-	if ( "help" == what )
-	{
-		std::cout <<
-"You can use the --check option to kpilotTest to run various\n"
-"small checks that require the use of the device. These are:\n"
-"\thelp - show this help\n"
-"\tuser - check the user name on the handheld\n"
-		<< std::endl;
-		return 0;
-	}
-
-	if ( "user" == what )
-	{
-		KPilotLink *link = createLink( p->isSet("local") );
-		ActionQueue *syncStack = new ActionQueue( link );
-		syncStack->queueInit();
-		syncStack->addAction( new CheckUser( link ) );
-		syncStack->queueCleanup();
-		connectStack(link,syncStack);
-		link->reset(device);
-		return kapp->exec();
-	}
-
-	return 0;
-}
-
-void listConduits()
-{
-	FUNCTIONSETUP;
-
-	KServiceTypeProfile::OfferList offers =
-		KServiceTypeProfile::offers(CSL1("KPilotConduit"));
-
-	// Now actually fill the two list boxes, just make
-	// sure that nothing gets listed in both.
-	//
-	//
-	TQValueListIterator < KServiceOffer > availList(offers.begin());
-	while (availList != offers.end())
-	{
-		KSharedPtr < KService > o = (*availList).service();
-
-		std::cout << "File:   " << o->desktopEntryName() << std::endl;
-		std::cout << "  Desc: " << o->name()  << std::endl;
-		if (!o->library().isEmpty())
-		{
-			std::cout << "  Lib : "
-				<< o->library()
-				<< std::endl;
-		}
-
-		++availList;
-	}
-}
-
-int show( const TQString &what )
-{
-	FUNCTIONSETUP;
-
-	if ( "help" == what )
-	{
-		std::cout <<
-"Displays various bits of KPilot's internal settings. This\n"
-"does not require a device connection or a running KDE desktop.\n"
-"No change to data takes place. The following options are available\n"
-"for display:\n"
-"\thelp     - displays this help\n"
-"\tconduits - displays the list of available conduits\n"
-"\tuser     - displays the user name KPilot expects\n"
-"\tdevice   - displays the device settings in KPilot\n"
-"\tdebug    - displays internal numbers\n"
-		<< std::endl;
-		return 0;
-	}
-
-	if ( "conduits" == what )
-	{
-		listConduits();
-		return 0;
-	}
-
-	if ( "user" == what )
-	{
-		std::cout << "User: " << KPilotSettings::userName() << std::endl;
-		return 0;
-	}
-
-	if ( "device" == what )
-	{
-		std::cout << "Device:   " << KPilotSettings::pilotDevice()
-			<< "\nSpeed:    " << KPilotSettings::pilotSpeed()
-			<< "\nEncoding: " << KPilotSettings::encoding()
-			<< "\nQuirks:   " << KPilotSettings::workarounds()
-			<< std::endl;
-		return 0;
-	}
-
-	if ( "debug" == what )
-	{
-		std::cout << "Debug:  " << KPilotSettings::debug()
-			<< "\nConfig: " << KPilotSettings::configVersion()
-			<< std::endl;
-		return 0;
-	}
-
-	std::cerr << "Unknown --show argument, use --show help for help.\n";
-	return 1;
-}
-
-int main(int argc, char **argv)
-{
-#ifdef DEBUG
-	debug_level = 1;
-#endif
-	FUNCTIONSETUP;
-	KAboutData about("kpilotTest",
-		I18N_NOOP("KPilotTest"),
-		KPILOT_VERSION,
-		"KPilot Tester",
-		KAboutData::License_GPL, "(C) 2001-2004, Adriaan de Groot");
-	about.addAuthor("Adriaan de Groot",
-		I18N_NOOP("KPilot Maintainer"),
-		"groot@kde.org", "http://www.kpilot.org/");
-
-	KCmdLineArgs::init(argc, argv, &about);
-	KCmdLineArgs::addCmdLineOptions(generalOptions,
-		I18N_NOOP("General"));
-	KCmdLineArgs::addCmdLineOptions(conduitOptions,
-		I18N_NOOP("Conduit Actions"),"conduit");
-
-	KApplication::addCmdLineOptions();
-
-	KCmdLineArgs *p = KCmdLineArgs::parsedArgs();
-
-	bool needGUI = false;
-
-	// Some versions need a GUI
-	needGUI |= (p->isSet("check"));
-	needGUI |= (p->isSet("exec")); // assume worst wrt. conduits
-	needGUI |= (p->isSet("restore"));
-
-	KApplication a(needGUI,needGUI);
-#ifdef DEBUG
-	KPilotConfig::getDebugLevel(p);
-	DEBUGKPILOT  << fname << "Created KApplication." << endl;
-#endif
-
-	Pilot::setupPilotCodec(KPilotSettings::encoding());
-
-	TQString device( "/dev/pilot" );
-
-	if ( p->isSet("port") )
-	{
-		device = p->getOption("port");
-	}
-
-	if ( p->isSet("check") )
-	{
-		return check( device, p->getOption("check"),
-			KCmdLineArgs::parsedArgs("conduit") );
-	}
-
-	if ( p->isSet("show") )
-	{
-		return show( p->getOption("show") );
-	}
-
-	if ( p->isSet("exec") )
-	{
-		return exec( device, p->getOption("exec"),
-			KCmdLineArgs::parsedArgs("conduit") );
-	}
-
-	if ( p->isSet("list") )
-	{
-		return listDB( device,
-			KCmdLineArgs::parsedArgs("conduit") );
-	}
-
-	if ( p->isSet("backup") )
-	{
-		return backup( device, p->getOption("backup"),
-			KCmdLineArgs::parsedArgs("conduit") );
-	}
-
-	if ( p->isSet("restore") )
-	{
-		return restore( device, p->getOption("restore"),
-			KCmdLineArgs::parsedArgs("conduit") );
-	}
-
-
-
-	std::cout <<
-"Usage: kpilotTest [--port devicename] action\n\n"
-"Where action can be one of:\n"
-"\t--list - list the databases on the handheld\n"
-"\t--show (help | conduits | ...) - show configuration\n"
-"\t--check (help | user | ...) - check device\n"
-"\t--exec conduit - run a single conduit\n"
-"\t--backup - backup the device\n"
-"\t--restore - restore the device from backup\n"
-	<< std::endl;
-	return 1;
-}
-
-
diff --git a/kpilot/kpilot/memoWidget.cc b/kpilot/kpilot/memoWidget.cc
deleted file mode 100644
index 143167ae..00000000
--- a/kpilot/kpilot/memoWidget.cc
+++ /dev/null
@@ -1,803 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2001 by David Bishop (XML stuff)
-** Copyright (C) 2004 by Adriaan de Groot
-**
-** This is the memo-viewing widget (internal conduit) used by KPilot.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <time.h>
-
-#include <pi-macros.h>
-#include <pi-dlp.h>
-
-#include <tqdir.h>
-#include <tqptrlist.h>
-#include <tqlistbox.h>
-#include <tqfile.h>
-#include <tqpushbutton.h>
-#include <tqlayout.h>
-#include <tqdom.h>
-#include <tqtextstream.h>
-#include <tqwhatsthis.h>
-#include <tqlabel.h>
-#include <tqdatetime.h>
-#include <tqptrlist.h>
-
-#include <kapplication.h>
-#include <kmessagebox.h>
-#include <kfiledialog.h>
-#include <kdeversion.h>
-#include <ktextedit.h>
-
-#include "kpilot.h"
-#include "kpilotConfig.h"
-#include "listItems.h"
-#include "pilotLocalDatabase.h"
-#include "pilotMemo.h"
-
-#include "memoWidget.moc"
-
-
-class MemoWidget::Private
-{
-public:
-	Private() : fMemoAppInfo(0L) { } ;
-	~Private() { KPILOT_DELETE(fMemoAppInfo); } ;
-
-	PilotMemoInfo	*fMemoAppInfo;
-	TQPtrList<PilotMemo>	fMemoList;
-} ;
-
-
-MemoWidget::MemoWidget(TQWidget * parent,
-	const TQString & path) :
-	PilotComponent(parent, "component_memo", path),
-	fTextWidget(0L),
-	d(new Private()),
-	lastSelectedMemo(-1)
-{
-	FUNCTIONSETUP;
-
-	setGeometry(0, 0,
-		parent->geometry().width(), parent->geometry().height());
-	setupWidget();
-	d->fMemoList.setAutoDelete(true);
-	slotUpdateButtons();
-}
-
-MemoWidget::~MemoWidget()
-{
-	FUNCTIONSETUP;
-	saveChangedMemo();
-	KPILOT_DELETE(d);
-}
-
-
-// void MemoWidget::initializeMemos(PilotDatabase *memoDB)
-//
-// Reads all the memos from the local database and places them
-// in the selection screen.
-//
-
-void MemoWidget::initializeMemos(PilotDatabase * memoDB)
-{
-	FUNCTIONSETUP;
-
-
-	// ShowSecrets tells us to also list memos with an attribute of "Secret"
-	// or "Private"
-	//
-	bool showSecrets = KPilotSettings::showSecrets();
-
-	d->fMemoList.clear();
-
-
-	int currentRecord = 0;
-	PilotRecord *pilotRec;
-	PilotMemo *memo;
-
-	while ((pilotRec = memoDB->readRecordByIndex(currentRecord)) != NULL)
-	{
-		if (!pilotRec->isDeleted())
-		{
-			if ((!pilotRec->isSecret()) || showSecrets)
-			{
-				memo = new PilotMemo(pilotRec);
-				d->fMemoList.append(memo);
-
-#ifdef DEBUG
-				DEBUGKPILOT << fname <<
-					": Added memo "
-					<< currentRecord << endl;
-#endif
-			}
-			else
-			{
-#ifdef DEBUG
-				DEBUGKPILOT << fname <<
-					": Skipped secret record " <<
-					currentRecord << endl;
-#endif
-			}
-		}
-		else
-		{
-#ifdef DEBUG
-			DEBUGKPILOT << fname <<
-				": Skipped deleted record " <<
-				currentRecord << endl;
-#endif
-		}
-
-		delete pilotRec;
-
-		currentRecord++;
-	}
-}
-
-
-void MemoWidget::showComponent()
-{
-	FUNCTIONSETUP;
-	if (!shown) return;
-
-	// Get the local database - assume the call may fail and return
-	// NULL, or the database object may be returned but unopened.
-	//
-	//
-	PilotLocalDatabase *memoDB =
-		new PilotLocalDatabase(dbPath(), CSL1("MemoDB"));
-	if (memoDB == NULL || !memoDB->isOpen())
-	{
-		WARNINGKPILOT << "Can't open local database MemoDB\n";
-
-		populateCategories(fCatList, 0L);
-		updateWidget();
-		return;
-	}
-
-	KPILOT_DELETE(d->fMemoAppInfo);
-	d->fMemoAppInfo = new PilotMemoInfo(memoDB);
-
-	d->fMemoAppInfo->dump();
-	populateCategories(fCatList, d->fMemoAppInfo->categoryInfo());
-	initializeMemos(memoDB);
-
-	KPILOT_DELETE( memoDB );
-
-	updateWidget();
-}
-
-void MemoWidget::hideComponent()
-{
-	FUNCTIONSETUP;
-	saveChangedMemo();
-	fCatList->clear();
-	fTextWidget->clear();
-	d->fMemoList.clear();
-	fListBox->clear();
-	lastSelectedMemo = -1;
-}
-
-void MemoWidget::postHotSync()
-{
-	FUNCTIONSETUP;
-	d->fMemoList.clear();
-	showComponent();
-}
-
-
-// void MemoWidget::setupWidget()
-//
-// Setup all the GUI components by allocating them.
-//
-//
-void MemoWidget::setupWidget()
-{
-	FUNCTIONSETUP;
-
-	TQLabel *label = NULL;
-	TQPushButton *button = NULL;
-	TQGridLayout *grid = new TQGridLayout(this, 5, 4, SPACING);
-	TQString wt;
-
-	fCatList = new TQComboBox(this);
-	grid->addWidget(fCatList, 0, 1);
-	connect(fCatList, TQT_SIGNAL(activated(int)),
-		this, TQT_SLOT(slotSetCategory(int)));
-	TQWhatsThis::add(fCatList,
-		i18n("Select the category of addresses\n"
-			"to display here."));
-
-	(void) i18n("Memos:");
-	label = new TQLabel(i18n("Category:"), this);
-	label->setBuddy(fCatList);
-	grid->addWidget(label, 0, 0);
-
-	fListBox = new TQListBox(this);
-	grid->addMultiCellWidget(fListBox, 1, 1, 0, 1);
-	connect(fListBox, TQT_SIGNAL(highlighted(int)),
-		this, TQT_SLOT(slotShowMemo(int)));
-	connect(fListBox, TQT_SIGNAL(selectionChanged()),
-		this,TQT_SLOT(slotUpdateButtons()));
-	TQWhatsThis::add(fListBox,
-		i18n("This list displays all the memos\n"
-			"in the selected category. Click on\n"
-			"one to display it to the right."));
-
-	label = new TQLabel(i18n("Memo text:"), this);
-	grid->addWidget(label, 0, 2);
-
-	fTextWidget = new KTextEdit(this, "textArea");
-	fTextWidget->setWordWrap(KTextEdit::WidgetWidth);
-	fTextWidget->setTextFormat(Qt::PlainText);
-	grid->addMultiCellWidget(fTextWidget, 1, 4, 2, 2);
-	TQWhatsThis::add(fTextWidget,
-		i18n("The text of the selected memo appears here."));
-	fTextWidget->setReadOnly(!KPilotSettings::internalEditors());
-
-	button = new TQPushButton(i18n("Import Memo..."), this);
-	grid->addWidget(button, 2, 0);
-	connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotImportMemo()));
-	wt = KPilotSettings::internalEditors() ?
-		i18n	("Read a text file and add it to the Pilot's memo database.") :
-		i18n("<qt><i>Import is disabled by the 'internal editors' setting.</i></qt>");
-	TQWhatsThis::add(button,wt);
-
-	fExportButton = new TQPushButton(i18n("Export Memo..."), this);
-	grid->addWidget(fExportButton, 2, 1);
-	connect(fExportButton, TQT_SIGNAL(clicked()), this,
-		TQT_SLOT(slotExportMemo()));
-	TQWhatsThis::add(fExportButton,
-		i18n("Write the selected memo to a file."));
-
-	fDeleteButton = new TQPushButton(i18n("Delete Memo"), this);
-	grid->addWidget(fDeleteButton, 3, 1);
-	connect(fDeleteButton, TQT_SIGNAL(clicked()), this,
-		TQT_SLOT(slotDeleteMemo()));
-	wt = KPilotSettings::internalEditors() ?
-		i18n("Delete the selected memo.") :
-		i18n("<qt><i>Deleting is disabled by the 'internal editors' setting.</i></qt>") ;
-	TQWhatsThis::add(fDeleteButton, wt);
-
-	button = new TQPushButton(i18n("Add Memo"), this);
-	grid->addWidget(button, 3, 0);
-	connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddMemo()));
-	TQWhatsThis::add(button,i18n("Add a new memo to the database."));
-}
-
-void MemoWidget::slotUpdateButtons()
-{
-	FUNCTIONSETUP;
-
-	bool highlight = false;
-
-	if ((fListBox->currentItem() != -1) &&
-		(fListBox->isSelected(fListBox->currentItem())))
-			highlight=true;
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Selected items " << highlight << endl;
-#endif
-
-	if (fExportButton)
-	{
-		fExportButton->setEnabled(highlight);
-	}
-
-	//  The remaining buttons are relevant only if the
-	// internal editors are editable.
-	highlight &= KPilotSettings::internalEditors() ;
-	if (fDeleteButton)
-	{
-		fDeleteButton->setEnabled(highlight);
-	}
-}
-
-void MemoWidget::slotSetCategory(int)
-{
-	FUNCTIONSETUP;
-	updateWidget();
-}
-
-void MemoWidget::slotDeleteMemo()
-{
-	FUNCTIONSETUP;
-	if (!shown) return;
-
-	int item = fListBox->currentItem();
-
-	if (item == -1)
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": No current item selected\n";
-#endif
-		return;
-	}
-	if (KMessageBox::questionYesNo(this,
-			i18n("Delete currently selected memo?"),
-			i18n("Delete Memo?"), KStdGuiItem::del(), KStdGuiItem::cancel()) != KMessageBox::Yes)
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname <<
-			": User decided not to delete memo.\n";
-#endif
-		return;
-	}
-
-	PilotListItem *p = (PilotListItem *) fListBox->item(item);
-	PilotMemo *selectedMemo = (PilotMemo *) p->rec();
-
-	if (selectedMemo->id() == 0x0)
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": Searching for record to delete (it's fresh)" << endl;
-#endif
-		PilotLocalDatabase *memoDB = new PilotLocalDatabase(dbPath(), CSL1("MemoDB"));
-		if (!memoDB || (!memoDB->isOpen()))
-		{
-			// Err.. peculiar.
-			WARNINGKPILOT << "Can't open MemoDB" << endl;
-			KMessageBox::sorry(this,
-				i18n("Cannot open MemoDB to delete record."),
-				i18n("Cannot Delete Memo"));
-			return;
-		}
-		memoDB->resetDBIndex();
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": Searching for new record." << endl;
-#endif
-		const PilotRecord *r = 0L;
-		while ((r = memoDB->findNextNewRecord()))
-		{
-#ifdef DEBUG
-			DEBUGKPILOT << fname << ": got record " << (void *) r << endl;
-#endif
-			PilotMemo m(r);
-			if (m.text() == selectedMemo->text())
-			{
-#ifdef DEBUG
-				DEBUGKPILOT << fname << ": I think I found the memo." << endl;
-#endif
-				(const_cast<PilotRecord *>(r))->setDeleted(true);
-				break;
-			}
-		}
-		delete memoDB;
-	}
-	else
-	{
-		selectedMemo->setDeleted(true);
-		writeMemo(selectedMemo);
-	}
-	d->fMemoList.remove(selectedMemo);
-	delete p;
-}
-
-
-void MemoWidget::updateWidget()
-{
-	FUNCTIONSETUP;
-	if (!shown || !d->fMemoAppInfo ) return;
-
-	if (fCatList->currentItem() == -1)
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": No category selected.\n";
-#endif
-		return;
-	}
-
-	int listIndex = 0;
-	int currentCatID = findSelectedCategory(fCatList,
-		d->fMemoAppInfo->categoryInfo(), false);
-
-
-	fListBox->clear();
-	d->fMemoList.first();
-
-
-	// Iterate through all the memos and insert each memo
-	// only if the category of the memo matches the selected category
-	// (using -1 to mean "All")
-	//
-	//
-	while (d->fMemoList.current())
-	{
-		PilotMemo *curr = d->fMemoList.current();
-		if ((curr->category() == currentCatID) ||
-			(currentCatID == -1))
-		{
-			PilotListItem *p =
-				new PilotListItem(curr->shortTitle(),
-				listIndex,
-				curr);
-
-			// List will delete the title of the memo,
-			// so there's no memory leak here.
-			//
-			//
-			fListBox->insertItem(p);
-
-#ifdef DEBUG
-			DEBUGKPILOT << fname << ": Added memo "
-				<< curr->getTitle() << endl;
-#endif
-		}
-		else
-		{
-#ifdef DEBUG
-			DEBUGKPILOT << fname << ": Skipped memo "
-				<< curr->getTitle() << endl;
-#endif
-		}
-
-		listIndex++;
-		d->fMemoList.next();
-	}
-
-	fTextWidget->clear();
-
-	slotUpdateButtons();
-
-	lastSelectedMemo=-1;
-}
-
-void MemoWidget::showMemo(const PilotMemo *m)
-{
-	FUNCTIONSETUP;
-
-	int index = fListBox->count();
-	for (int x = 0; x < index; x++)
-	{
-		PilotMemo *p = (PilotMemo *) ((PilotListItem *)fListBox->item(x))->rec();
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": Memo @" << (void *) p <<endl;
-		DEBUGKPILOT << fname << "       :" << fListBox->item(x)->text() << endl;
-#endif
-		if (m==p)
-		{
-			fListBox->setSelected(x,true);
-			slotShowMemo(x);
-			break;
-		}
-	}
-
-}
-
-void MemoWidget::slotShowMemo(int which)
-{
-	FUNCTIONSETUP;
-	if ( which == -1 ) return;
-	if (!shown) return;
-
-	slotUpdateButtons();
-	if ( !fListBox->isSelected(which) )
-	{
-		// Handle unselecting a memo. This is easy.
-		fTextWidget->blockSignals(true);
-		fTextWidget->clear();
-		fTextWidget->blockSignals(false);
-		return;
-	}
-
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Displaying memo " << which << endl;
-#endif
-	fTextWidget->blockSignals(true);
-	PilotListItem *p = (PilotListItem *) fListBox->item(which);
-	PilotMemo *theMemo = (PilotMemo *) p->rec();
-	fTextWidget->setText(theMemo->text());
-	fTextWidget->blockSignals(false);
-}
-
-
-void MemoWidget::writeMemo(PilotMemo * which)
-{
-	FUNCTIONSETUP;
-	if (!shown) return;
-	PilotRecord *pilotRec = which->pack();
-	PilotDatabase *memoDB = new PilotLocalDatabase(dbPath(), CSL1("MemoDB"));
-	memoDB->writeRecord(pilotRec);
-	markDBDirty(CSL1("MemoDB"));
-	KPILOT_DELETE( memoDB );
-	KPILOT_DELETE( pilotRec );
-}
-
-void MemoWidget::saveChangedMemo()
-{
-	FUNCTIONSETUP;
-	if (!shown) return;
-
-	if (-1 == lastSelectedMemo) return;
-	if (!fTextWidget->isModified()) return;
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Saving changed memo " << lastSelectedMemo << endl;
-#endif
-
-	PilotListItem *p =
-		(PilotListItem *) fListBox->item(lastSelectedMemo);
-	PilotMemo *currentMemo = (PilotMemo *) p->rec();
-
-// TODO: overload setText in PilotMemo
-	currentMemo->setText(Pilot::toPilot(fTextWidget->text()));
-	writeMemo(currentMemo);
-}
-
-/* virtual */ bool MemoWidget::preHotSync(TQString &)
-{
-	FUNCTIONSETUP;
-	saveChangedMemo();
-	return true;
-}
-
-bool MemoWidget::addMemo(const TQString &s, int category)
-{
-	FUNCTIONSETUP;
-
-	if (s.length() >= MemoWidget::MAX_MEMO_LEN)
-	{
-		return false;
-	}
-	if ((category<0) || (category>=(int)Pilot::CATEGORY_COUNT))
-	{
-		category=Pilot::Unfiled;
-	}
-
-	PilotMemo *aMemo = new PilotMemo();
-	aMemo->setCategory(category);
-	aMemo->setText(s);
-
-	d->fMemoList.append(aMemo);
-	writeMemo(aMemo);
-	updateWidget();
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": New memo @" << (void *)aMemo << endl;
-#endif
-	showMemo(aMemo);
-	return true;
-}
-
-void MemoWidget::slotAddMemo()
-{
-	FUNCTIONSETUP;
-	int currentCatID = findSelectedCategory(fCatList,
-		d->fMemoAppInfo->categoryInfo(), true);
-	addMemo(TQDateTime::currentDateTime().toString(), currentCatID);
-}
-
-void MemoWidget::slotImportMemo()
-{
-	FUNCTIONSETUP;
-	if (!shown || !d->fMemoAppInfo ) return;
-
-	int currentCatID = findSelectedCategory(fCatList,
-		d->fMemoAppInfo->categoryInfo(), true);
-
-	TQString fileName = KFileDialog::getOpenFileName();
-
-	if (!fileName.isEmpty())
-	{
-		TQFile importFile(fileName);
-
-		if (importFile.open(IO_ReadOnly) == FALSE)
-		{
-			// show error!
-			return;
-		}
-
-		if (importFile.size() > MemoWidget::MAX_MEMO_LEN)
-		{
-			// Perhaps read first 64k?
-			return;
-		}
-
-		TQTextStream stream(&importFile);
-		TQString memoText = stream.read();
-		addMemo(memoText, currentCatID);
-	}
-}
-
-void MemoWidget::slotExportMemo()
-{
-	FUNCTIONSETUP;
-	if (!shown) return;
-
-	int index = fListBox->numRows();
-	if (index == 0)
-		return;
-
-	TQString data;
-
-	const TQString filter = CSL1("*|Plain text output\n*.xml|XML output");
-	TQString fileName;
-
-	KFileDialog kfile( TQString::null , filter, fExportButton , "memoSave" , true );
-	kfile.setOperationMode( KFileDialog::Saving );
-
-	if ( kfile.exec() == TQDialog::Accepted ) {
-		fileName = kfile.selectedFile();
-	}
-
-	if (fileName.isEmpty())
-		return;
-
-	TQPtrList<PilotListItem> menu_items;
-
-	for (int x = 0; x < index; x++){
-		if (fListBox->item(x)->isSelected()){
-			menu_items.append((PilotListItem *) fListBox->item(x));
-		}
-	}
-
-	if (kfile.currentFilter() == CSL1("*.xml") )
-	{
-		MemoWidget::saveAsXML( fileName , menu_items );
-	}
-	else
-	{
-		MemoWidget::saveAsText( fileName , menu_items );
-	}
-
-
-	return;
-}
-
-bool MemoWidget::saveAsText(const TQString &fileName,const TQPtrList<PilotListItem> &memo_list)
-{
-	TQFile f( fileName );
-	TQTextStream stream(&f);
-
-	if ( TQFile::exists( fileName ) )
-	{
-		if( !f.open(IO_ReadWrite | IO_Append) )
-		{
-			return false;
-		}
-	}
-	else
-	{
-		if( !f.open(IO_WriteOnly) )
-		{
-			return false;
-		}
-	}
-
-	TQPtrListIterator<PilotListItem> it(memo_list);
-	for ( ; it.current(); ++it )
-	{
-		PilotListItem *p = it.current();
-		PilotMemo *theMemo = (PilotMemo *) p->rec();
-		stream << theMemo->text() << endl;
-	}
-
-
-	return true;
-}
-
-bool MemoWidget::saveAsXML(const TQString &fileName,const TQPtrList<PilotListItem> &memo_list)
-{
-	TQDomDocument doc( CSL1("kpilotmemos") );
-	TQFile f( fileName );
-	TQTextStream stream( &f );
-	TQDomElement memos;
-	int append = 0;
-
-
-	if ( f.exists() )
-	{
-		if ( !f.open(IO_ReadOnly ) ) return false;
-
-		if ( doc.setContent( &f ) )
-		{
-		//
-		//
-		//Only if QDom can read the .xml file and set the doc object to be populated with it's contents
-			memos = doc.documentElement();
-			if ( memos.tagName()!= CSL1("memos") )
-			{
-				return false;
-			}
-				//
-				//
-				//This is an XML Document but it isn't a valid KPilot-Memo xml document
-			else
-			{
-				append = 1;
-			}
-				//
-				//
-				//This is a valid KPilot memo, and we will append the current memo to the xml
-		}
-		else
-		{
-		//
-		//
-		//We *couldn't* understand the xml.  Return false!
-			return false;
-		}
-	}
-	else
-	{
-		if ( !f.open(IO_ReadWrite ) ) return false;
-		//
-		//
-		//If there's no such file, we are not appending, just opening the file to read/write.
-	}
-
-	f.close();
-    // These are temporary, and should be retrieved from the pilot stuff
-    TQString mpilotid;
-    mpilotid = "1";
-    //  End of temp variables
-
-	if (append == 1)
-	{
-		memos = doc.documentElement();
-	}
-	else
-	{
-		memos = doc.createElement( CSL1("memos") );
-		doc.appendChild ( memos );
-	}
-
-	TQPtrListIterator<PilotListItem> it(memo_list);
-	for ( ; it.current(); ++it )
-	{
-		PilotListItem *p = it.current();
-		PilotMemo *theMemo = (PilotMemo *) p->rec();
-
-
-    	TQDomElement memo = doc.createElement( CSL1("memo") );
-	    memo.setAttribute ( CSL1("pilotid") , mpilotid );
-	    memos.appendChild ( memo );
-
-	    //TQDomElement category = doc.createElement( "category" );
-	    //head.appendChild ( category );
-		//
-	 	//TQDomText categorytext = doc.createTextNode( memo->category() );
-		//category.appendChild ( categorytext );
-		//FIXME
-
-		TQDomElement title = doc.createElement(CSL1("title" ));
-		memo.appendChild ( title );
-
-		TQDomText titletext = doc.createTextNode( theMemo->shortTitle() );
-		title.appendChild ( titletext );
-
-		TQDomText body = doc.createTextNode( theMemo->text() );
-		memo.appendChild ( body );
-	}
-	if ( !f.open(IO_WriteOnly ) ) return false;
-	stream << doc.toString();
-	return true;
-}
-
diff --git a/kpilot/kpilot/memoWidget.h b/kpilot/kpilot/memoWidget.h
deleted file mode 100644
index 87038347..00000000
--- a/kpilot/kpilot/memoWidget.h
+++ /dev/null
@@ -1,112 +0,0 @@
-#ifndef _KPILOT_MEMOWIDGET_H
-#define _KPILOT_MEMOWIDGET_H
-/* memoWidget.h			KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-**
-** This is the memo viewer widget.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "pilotComponent.h"
-
-class KPilotInstaller;
-class TQListBox;
-class TQComboBox;
-class TQPushButton;
-class KTextEdit;
-
-class PilotMemo;
-class PilotListItem;
-
-class MemoWidget : public PilotComponent
-{
-Q_OBJECT
-
-public:
-	MemoWidget(TQWidget* parent, const TQString& dbpath);
-	virtual ~MemoWidget();
-
-	// Pilot Component Methods:
-	/* virtual */ void showComponent();
-	/* virtual */ void hideComponent();
-	/* virtual */ bool preHotSync(TQString &);
-	/* virtual */ void postHotSync();
-
-	// Added by David Bishop, please move to correct location!
-	bool saveAsXML(const TQString &fileName,const TQPtrList<PilotListItem> &menu_item );
-	bool saveAsText(const TQString &fileName,const TQPtrList<PilotListItem> &menu_item );
-
-	typedef enum {
-		MAX_MEMO_LEN = 8192
-		} Constants ;
-
-protected:
-	void initializeCategories(PilotDatabase *);
-	void initializeMemos(PilotDatabase *);
-
-	void saveChangedMemo();
-
-	bool addMemo(const TQString &text, int category);
-
-public slots:
-	/**
-	* Called whenever the selected memo changes in order to:
-	*   - display it if necessary
-	*   - update which buttons are active, to prevent the delete
-	*     button from being active when it can't do anything.
-	*
-	*/
-	void slotShowMemo(int);
-	void slotUpdateButtons();
-
-	void slotImportMemo();
-	void slotExportMemo();
-	void slotDeleteMemo();
-	void slotAddMemo();
-	void slotSetCategory(int);
-
-protected:
-	void showMemo(const PilotMemo *);
-
-
-private:
-	void setupWidget();
-	void updateWidget(); // Called with the lists have changed..
-	void writeMemo(PilotMemo* which);
-
-	class Private;
-
-	TQComboBox* fCatList;
-
-	KTextEdit*		fTextWidget;
-	Private *d;
-	TQListBox*		fListBox;
-
-	TQPushButton *fExportButton,*fDeleteButton;
-
-	int lastSelectedMemo;
-};
-
-
-#endif
diff --git a/kpilot/kpilot/pilot-addresses.c b/kpilot/kpilot/pilot-addresses.c
deleted file mode 100644
index 823a6825..00000000
--- a/kpilot/kpilot/pilot-addresses.c
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
- * pilot-addresses.c:  Palm address transfer utility
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <errno.h>
-#include <unistd.h>
-
-#include "pi-socket.h"
-#include "pi-dlp.h"
-#include "pi-address.h"
-#include "pi-header.h"
-
-/* These are indexes in the tabledelims array */
-enum terminators { term_newline=0,
-	term_comma=1,
-	term_semi=2,
-	term_tab=3 } ;
-terminators tabledelim = term_comma;
-char 	tabledelims[4] = { '\n', ',', ';', '\t' };
-
-
-
-int realentry[21] =
-    { 0, 1, 13, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14, 15, 16, 17, 18, 19, 20 };
-
-const char *tableheads[21] = {
-	"Last name",	/* 0 	*/
-	"First name", 	/* 1	*/
-	"Title", 	/* 2	(real entry 13)*/
-	"Company", 	/* 3	*/
-	"Phone1", 	/* 4	*/
-	"Phone2",	/* 5	*/
-	"Phone3", 	/* 6	*/
-	"Phone4", 	/* 7	*/
-	"Phone5", 	/* 8	*/
-	"Address", 	/* 9	*/
-	"City", 	/* 10	*/
-	"State",	/* 11	*/
-	"Zip Code",	/* 12	*/
-	"Country", 	/* 13	*/
-	"Custom 1", 	/* 14	*/
-	"Custom 2", 	/* 15	*/
-	"Custom 3", 	/* 16	*/
-	"Custom 4", 	/* 17	*/
-	"Note",		/* 18	*/
-	"Private", 	/* 19	*/
-	"Category"	/* 20	*/
-};
-
-int
-	augment 	= 0,
-	defaultcategory = 0;
-
-
-
-/***********************************************************************
- *
- * Function:    inchar
- *
- * Summary:     Turn the protected name back into the "original"
- *		characters
- *
- * Parameters:
- *
- * Returns:     Modified character, 'c'
- *
- ***********************************************************************/
-int inchar(FILE * in)
-{
-	int 	c;	/* switch */
-
-	c = getc(in);
-	if (c == '\\') {
-		c = getc(in);
-		switch (c) {
-		case 'b':
-			c = '\b';
-			break;
-		case 'f':
-			c = '\f';
-			break;
-		case 'n':
-			c = '\n';
-			break;
-		case 't':
-			c = '\t';
-			break;
-		case 'r':
-			c = '\r';
-			break;
-		case 'v':
-			c = '\v';
-			break;
-		case '\\':
-			c = '\\';
-			break;
-		default:
-			ungetc(c, in);
-			c = '\\';
-			break;
-		}
-	}
-	return c;
-}
-
-
-/***********************************************************************
- *
- * Function:    read_field
- *
- * Summary:     Reach each field of the CSV during read_file
- *
- * Parameters:  dest    <-> Buffer for storing field contents
- *              in      --> Inbound filehandle
- *              length  --> Size of buffer
- *
- * Returns:     0 for end of line
- *              1 for , termination
- *              2 for ; termination
- *              3 for \t termination
- *             -1 on end of file
- *
- *              Note that these correspond to indexes in the tabledelims
- *              array, and should be preserved.
- *
- ***********************************************************************/
-int read_field(char *dest, FILE *in, size_t length)
-{
-	int 	c;
-
-	if (length<=1) return -1;
-	/* reserve space for trailing NUL */
-	length--;
-
-	do {	/* Absorb whitespace */
-		c = getc(in);
-		if(c == '\n') {
-			*dest = 0;
-			return term_newline;
-		}
-
-	} while ((c != EOF) && ((c == ' ') || (c == '\t') || (c == '\r')));
-
-	if (c == '"') {
-		c = inchar(in);
-
-		while (c != EOF) {
-			if (c == '"') {
-				c = inchar(in);
-				if (c != '"')
-					break;
-			}
-			*dest++ = c;
-			if (!(--length))
-				break;
-			c = inchar(in);
-		}
-	} else {
-		while (c != EOF) {
-			if ((c == '\n') || (c == tabledelims[tabledelim])) {
-				break;
-			}
-			*dest++ = c;
-			if (!(--length))
-				break;
-			c = inchar(in);
-		}
-	}
-	*dest++ = '\0';
-
-	/* Absorb whitespace */
-	while ((c != EOF) && ((c == ' ') || (c == '\t')))
-		c = getc(in);
-
-	if (c == ',')
-		return term_comma;
-
-	else if (c == ';')
-		return term_semi;
-
-	else if (c == '\t')
-		return term_tab;
-
-	else if (c == EOF)
-		return -1;	/* No more */
-	else
-		return term_newline;
-}
-
-
-/***********************************************************************
- *
- * Function:    outchar
- *
- * Summary:     Protect each of the 'illegal' characters in the output
- *
- * Parameters:  filehandle
- *
- * Returns:     Nothing
- *
- ***********************************************************************/
-void outchar(char c, FILE * out)
-{
-		switch (c) {
-		case '"':
-			putc('"', out);
-			putc('"', out);
-			break;
-		case '\b':
-			putc('\\', out);
-			putc('b', out);
-			break;
-		case '\f':
-			putc('\\', out);
-			putc('f', out);
-			break;
-		case '\n':
-			putc('\\', out);
-			putc('n', out);
-			break;
-		case '\t':
-			putc('\\', out);
-			putc('t', out);
-			break;
-		case '\r':
-			putc('\\', out);
-			putc('r', out);
-			break;
-		case '\v':
-			putc('\\', out);
-			putc('v', out);
-			break;
-		case '\\':
-			putc('\\', out);
-			putc('\\', out);
-			break;
-		default:
-			putc(c, out);
-			break;
-		}
-}
-
-
-/***********************************************************************
- *
- * Function:    write_field
- *
- * Summary:     Write out each field in the CSV
- *
- * Parameters:  out    --> output file handle
- *              source --> NUL-terminated data to output
- *              more   --> delimiter number
- *
- * Returns:
- *
- ***********************************************************************/
-int write_field(FILE * out, const char *source, enum terminators more)
-{
-	putc('"', out);
-
-	while (*source) {
-		outchar(*source, out);
-		source++;
-	}
-	putc('"', out);
-
-	putc(tabledelims[more], out);
-	return 0;
-}
-
-
-
-
-/***********************************************************************
- *
- * Function:    match_phone
- *
- * Summary:     Find and match the 'phone' entries in 'buf'
- *
- * Parameters:
- *
- * Returns:
- *
- ***********************************************************************/
-int match_phone(char *buf, struct AddressAppInfo *aai)
-{
-	int 	i;
-
-	for (i = 0; i < 8; i++)
-		if (strncasecmp(buf, aai->phoneLabels[i], sizeof(aai->phoneLabels[0])) == 0)
-			return i;
-	return atoi(buf);	/* 0 is default */
-}
-
-
-
-/***********************************************************************
- *
- * Function:    write_file
- *
- * Summary:     Writes Address records in CSV format to <file>
- *
- * Parameters:  filehandle
- *
- * Returns:     0
- *
- ***********************************************************************/
-
-void write_record_CSV(FILE *out, const struct AddressAppInfo *aai, const struct Address *addr, const int attribute, const int category, const int augment)
-{
-	int j;
-	char buffer[16];
-
-	if (augment && (category || addr->showPhone)) {
-		write_field(out,
-				aai->category.name[category],
-				term_semi);
-		write_field(out,
-				aai->phoneLabels[addr->phoneLabel[addr->showPhone]],
-				term_semi);
-	}
-
-	for (j = 0; j < 19; j++) {
-		if (addr->entry[realentry[j]]) {
-			if (augment && (j >= 4) && (j <= 8)) {
-				write_field(out,
-						aai->phoneLabels[addr->phoneLabel
-								[j - 4]], term_semi);
-			}
-			write_field(out, addr->entry[realentry[j]],
-					tabledelim);
-		} else {
-			write_field(out, "", tabledelim);
-		}
-	}
-
-	snprintf(buffer, sizeof(buffer), "%d", (attribute & dlpRecAttrSecret) ? 1 : 0);
-	write_field(out, buffer, tabledelim);
-
-	write_field(out,
-		aai->category.name[category],
-		term_newline);
-}
diff --git a/kpilot/kpilot/pilotComponent.cc b/kpilot/kpilot/pilotComponent.cc
deleted file mode 100644
index 0172a44e..00000000
--- a/kpilot/kpilot/pilotComponent.cc
+++ /dev/null
@@ -1,190 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This file defines a base class for components -- internal conduits --
-** in KPilot. This includes a number of general utility functions.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include "options.h"
-
-#include <time.h>
-
-#include <pi-appinfo.h>
-
-#include <tqwidget.h>
-#include <tqcombobox.h>
-
-#include <kdebug.h>
-
-#include "kpilotConfig.h"
-#include "pilotRecord.h"
-#include "pilot.h"
-
-#include "pilotComponent.moc"
-
-PilotComponent::PilotComponent(TQWidget * parent,
-	const char *id,
-	const TQString & path) :
-	TQWidget(parent, id),
-	fDBPath(path),
-	shown(false)
-{
-	FUNCTIONSETUP;
-
-	if (parent)
-	{
-		resize(parent->geometry().width(),
-			parent->geometry().height());
-	}
-
-}
-
-
-
-int PilotComponent::findSelectedCategory(TQComboBox * fCatList,
-	struct CategoryAppInfo *info, bool AllIsUnfiled)
-{
-	FUNCTIONSETUP;
-
-	// Semantics of currentCatID are:
-	//
-	// >=0          is a specific category based on the text ->
-	//              category number mapping defined by the Pilot,
-	// ==-1         means "All" category selected when
-	//              AllIsUnfiled is true.
-	// == 0         == Unfiled means "All" category selected when
-	//              AllIsUnfiled is false.
-	//
-	//
-	int currentCatID = 0;
-
-	// If a category is deleted after others have been added, none of the
-	// category numbers are changed.  So we need to find the category number
-	// for this category (this category is represented by the selected
-	// *text*).
-	//
-	//
-	// The top entry in the list is "All", so if the top item is
-	// selected we can indicate that we are using the "All" category.
-	//
-	//
-	if (fCatList->currentItem() == 0)
-	{
-		currentCatID = (-1);
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": Category 'All' selected.\n";
-#endif
-	}
-	else
-	{
-		TQString selectedCategory =
-			fCatList->text(fCatList->currentItem());
-		currentCatID = Pilot::findCategory(info, selectedCategory, AllIsUnfiled);
-	}
-
-	if ((currentCatID == -1) && AllIsUnfiled)
-		currentCatID = 0;
-	return currentCatID;
-}
-
-
-void PilotComponent::populateCategories(TQComboBox * c,
-	struct CategoryAppInfo *info)
-{
-	FUNCTIONSETUP;
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Combo box @"
-		<< (long) c << " and info @" << (long) info << endl;
-#endif
-
-	c->clear();
-
-	if (!info)
-		goto CategoryAll;
-
-	// Fill up the categories list box with
-	// the categories defined by the user.
-	// These presumably are in the language
-	// the user uses, so no translation is necessary.
-	//
-	//
-	for (unsigned int i = 0; i < Pilot::CATEGORY_COUNT; i++)
-	{
-		if (info->name[i][0])
-		{
-#ifdef DEBUG
-			DEBUGKPILOT << fname
-				<< ": Adding category: "
-				<< info->name[i]
-				<< " with ID: " << (int) info->ID[i] << endl;
-#endif
-
-			c->insertItem(Pilot::fromPilot(info->name[i]));
-		}
-	}
-
-CategoryAll:
-	c->insertItem(i18n("All"), 0);
-}
-
-
-void PilotComponent::slotShowComponent()
-{
-	FUNCTIONSETUP;
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Showing component @" << (long) this << endl;
-#endif
-
-	emit showComponent(this);
-}
-
-/* virtual */ bool PilotComponent::preHotSync(TQString &)
-{
-	FUNCTIONSETUP;
-
-	return true;
-}
-
-void PilotComponent::markDBDirty(const TQString db)
-{
-	FUNCTIONSETUP;
-	KPilotConfig::addDirtyDatabase(db);
-	KPilotConfig::sync();
-}
-
-void PilotComponent::showKPilotComponent( bool toShow )
-{
-	if ( toShow != shown )
-	{
-		shown = toShow;
-		if (shown) showComponent();
-		else hideComponent();
-	}
-}
diff --git a/kpilot/kpilot/pilotComponent.h b/kpilot/kpilot/pilotComponent.h
deleted file mode 100644
index 4517acc7..00000000
--- a/kpilot/kpilot/pilotComponent.h
+++ /dev/null
@@ -1,141 +0,0 @@
-#ifndef _KPILOT_PILOTCOMPONENT_H
-#define _KPILOT_PILOTCOMPONENT_H
-/* pilotComponent.h			KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** See the .cc file for an explanation of what this file is for.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-/**
-  * Base class for any module to KPilot
-  */
-#include <tqwidget.h>
-
-struct CategoryAppInfo;
-class TQComboBox;
-class TQString;
-
-class PilotComponent : public QWidget
-{
-Q_OBJECT
-friend class KPilotInstaller;
-
-public:
-	PilotComponent(TQWidget* parent,
-		const char *id,
-		const TQString& dbPath);
-
-	/**
-	* Called when the component is shown in kpilot. It should
-	* load the database and populate the widgets.
-	*/
-	virtual void showComponent() {}
-	/**
-	* Called when the component is hidden in kpilot. It should
-	* unload the databases and clean up to save memory. This method
-	* can be called even if the component is not visible.
-	* If there are some editing dlgs open, this needs to be deferred
-	* until they are all closed. Then, one can explicitly call hideComponent().
-	*/
-	virtual void hideComponent() {}
-
-	/**
-	* Set the shown variable to true or false, then call showComponent
-	* or hideComponent.
-	*/
-	void showKPilotComponent( bool toShow );
-
-
-	/**
-	* Get ready for a hotsync -- write any unflushed records
-	* to disk, close windows, whatever. Returns false if it
-	* is impossible to go into a sync now (due to open windows
-	* or strange state.).
-	*
-	* The default implementation returns true.
-	*
-	* If the function returns false, it can also put a string
-	* stating the reason why into @p s. This string will be
-	* displayed to the user:
-	*     "Can't start HotSync. %1"
-	* where %1 is replaced by s.
-	*/
-	virtual bool preHotSync(TQString &s) ;
-
-	/**
-	* Reload data (possibly changed by the hotsync) etc. etc.
-	*/
-	virtual void postHotSync() { } ;
-
-
-protected:
-	/**
-	* Look up the selected category from the combo box in the
-	* Pilot's register of categories. We need this functon because
-	* the combo box doesn't contain any reference to the category
-	* ID, and we need that ID to do anything with the Pilot.
-	*
-	* If AllIsUnfiled is true, then when the user selects the
-	* category "All" in the combo box (always the first category),
-	* Unfiled (0) is returned. Otherwise if the category "All"
-	* is selected -1 is returned. For all other categories
-	* selected, their ID is returned. If nothing is selected,
-	* behave as if "All" is selected.
-	*/
-	int findSelectedCategory(TQComboBox *,
-		CategoryAppInfo *,
-		bool AllIsUnfiled=false);
-
-	/**
-	* Populate the combo box with the categories found in
-	* the Pilot's application categories block. Erases
-	* combo box's contents first.
-	*
-	* Always includes the category "All" as the first
-	* entry in the combo box.
-	*
-	* If info is a NULL pointer, just put "All" in the combo box.
-	*/
-	void populateCategories(TQComboBox *,
-		CategoryAppInfo *info=0);
-
-	void setDBPath(const TQString &path) { fDBPath = path; } ;
-	const TQString& dbPath() const { return fDBPath; } ;
-	void markDBDirty(const TQString db);
-
-public slots:
-	void slotShowComponent();
-
-signals:
-	void showComponent(PilotComponent *);
-
-private:
-	TQString fDBPath;
-protected:
-	bool shown;
-} ;
-
-#endif
diff --git a/kpilot/kpilot/pilotDaemon.cc b/kpilot/kpilot/pilotDaemon.cc
deleted file mode 100644
index 6541365d..00000000
--- a/kpilot/kpilot/pilotDaemon.cc
+++ /dev/null
@@ -1,1404 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2001-2004 by Adriaan de Groot
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This is the KPilot Daemon, which does the actual communication with
-** the Pilot and with the conduits.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <stdlib.h>
-
-#include <tqtimer.h>
-#include <tqtooltip.h>
-#include <tqpixmap.h>
-
-#include <kuniqueapplication.h>
-#include <kaboutapplication.h>
-#include <kcmdlineargs.h>
-#include <kwin.h>
-#include <kurl.h>
-#include <kpopupmenu.h>
-#include <kiconloader.h>
-#include <kdebug.h>
-#include <kprocess.h>
-#include <dcopclient.h>
-#include <kurldrag.h>
-#include <kservice.h>
-#include <kapplication.h>
-#include <khelpmenu.h>
-
-#include "pilotRecord.h"
-
-#include "fileInstaller.h"
-#include "pilotUser.h"
-#include "pilotDatabase.h"
-#include "kpilotlink.h"
-#include "kpilotdevicelink.h"
-#include "actionQueue.h"
-#include "actions.h"
-
-#include "hotSync.h"
-#include "internalEditorAction.h"
-#include "logFile.h"
-
-#include "kpilotConfig.h"
-
-
-#include "kpilotDCOP_stub.h"
-#include "kpilotDCOP.h"
-#include "loggerDCOP_stub.h"
-
-#include "pilotDaemon.moc"
-
-static KAboutData *aboutData = 0L;
-
-PilotDaemonTray::PilotDaemonTray(PilotDaemon * p) :
-	KSystemTray(0, "pilotDaemon"),
-	fSyncTypeMenu(0L),
-	daemon(p),
-	kap(0L),
-	fBlinkTimer(0L)
-{
-	FUNCTIONSETUP;
-	setupWidget();
-	setAcceptDrops(true);
-}
-
-/* virtual */ void PilotDaemonTray::dragEnterEvent(TQDragEnterEvent * e)
-{
-	FUNCTIONSETUP;
-	e->accept(KURLDrag::canDecode(e));
-}
-
-/* virtual */ void PilotDaemonTray::dropEvent(TQDropEvent * e)
-{
-	FUNCTIONSETUP;
-
-	KURL::List list;
-
-	KURLDrag::decode(e, list);
-
-	TQStringList files;
-	for(KURL::List::ConstIterator it = list.begin(); it != list.end(); ++it)
-	{
-	   if ((*it).isLocalFile())
-	      files << (*it).path();
-	}
-
-	daemon->addInstallFiles(files);
-}
-
-/* virtual */ void PilotDaemonTray::mousePressEvent(TQMouseEvent * e)
-{
-	FUNCTIONSETUP;
-
-	switch (e->button())
-	{
-		case RightButton:
-			{
-				KPopupMenu *menu = contextMenu();
-				contextMenuAboutToShow(menu);
-				menu->popup(e->globalPos());
-			}
-			break;
-		case LeftButton:
-			if (daemon) daemon->slotRunKPilot();
-			break;
-		default:
-			KSystemTray::mousePressEvent(e);
-	}
-}
-
-/* virtual */ void PilotDaemonTray::closeEvent(TQCloseEvent *)
-{
-	FUNCTIONSETUP;
-	daemon->quitNow();
-}
-
-void PilotDaemonTray::setupWidget()
-{
-	FUNCTIONSETUP;
-
-	KGlobal::iconLoader()->addAppDir( CSL1("kpilot") );
-	icons[Normal] = loadIcon( CSL1("kpilotDaemon") );
-	icons[Busy] = loadIcon( CSL1("busysync") );
-	icons[NotListening] = loadIcon( CSL1("nosync") );
-
-	slotShowNotListening();
-	TQTimer::singleShot(2000,this,TQT_SLOT(slotShowNormal()));
-
-	KPopupMenu *menu = contextMenu();
-
-	menuKPilotItem = menu->insertItem(i18n("Start &KPilot"), daemon,
-		TQT_SLOT(slotRunKPilot()));
-	menuConfigureConduitsItem = menu->insertItem(i18n("&Configure KPilot..."),
-		daemon, TQT_SLOT(slotRunConfig()));
-	menu->insertSeparator();
-
-	fSyncTypeMenu = new KPopupMenu(menu,"sync_type_menu");
-	TQString once = i18n("Appended to names of sync types to indicate the sync will happen just one time"," (once)");
-#define MI(a) fSyncTypeMenu->insertItem( \
-		SyncAction::SyncMode::name(SyncAction::SyncMode::a) + once, \
-		(int)(SyncAction::SyncMode::a));
-	fSyncTypeMenu->insertItem(i18n("Default (%1)")
-		.arg(SyncAction::SyncMode::name((SyncAction::SyncMode::Mode)KPilotSettings::syncType())),
-		0);
-	fSyncTypeMenu->insertSeparator();
-
-        // Keep this synchronized with kpilotui.rc and kpilot.cc if at all possible.
-	MI(eHotSync);
-	MI(eFullSync);
-	MI(eBackup);
-	MI(eRestore);
-	MI(eCopyHHToPC);
-	MI(eCopyPCToHH);
-
-	fSyncTypeMenu->setCheckable(true);
-	fSyncTypeMenu->setItemChecked(0,true);
-#undef MI
-	connect(fSyncTypeMenu,TQT_SIGNAL(activated(int)),daemon,TQT_SLOT(requestSync(int)));
-	menu->insertItem(i18n("Next &Sync"),fSyncTypeMenu);
-
-	KHelpMenu *help = new KHelpMenu(menu,aboutData);
-	menu->insertItem(
-		KGlobal::iconLoader()->loadIconSet(CSL1("help"),KIcon::Small,0,true),
-		i18n("&Help"),help->menu(),false /* no whatsthis */);
-
-
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Finished getting icons" << endl;
-#endif
-}
-
-void PilotDaemonTray::slotShowAbout()
-{
-	FUNCTIONSETUP;
-
-	if (!kap)
-	{
-		kap = new KAboutApplication(0, "kpdab", false);
-	}
-
-	kap->show();
-}
-
-
-void PilotDaemonTray::enableRunKPilot(bool b)
-{
-	FUNCTIONSETUP;
-	contextMenu()->setItemEnabled(menuKPilotItem, b);
-	contextMenu()->setItemEnabled(menuConfigureConduitsItem, b);
-}
-
-
-void PilotDaemonTray::changeIcon(IconShape i)
-{
-	FUNCTIONSETUP;
-	if (icons[i].isNull())
-	{
-		WARNINGKPILOT << "Icon #"<<i<<" is NULL!" << endl;
-	}
-	setPixmap(icons[i]);
-	fCurrentIcon = i;
-}
-
-void PilotDaemonTray::slotShowNormal()
-{
-	FUNCTIONSETUP;
-	changeIcon(Normal);
-}
-
-void PilotDaemonTray::slotShowBusy()
-{
-	FUNCTIONSETUP;
-	changeIcon(Busy);
-}
-
-void PilotDaemonTray::slotShowNotListening()
-{
-	FUNCTIONSETUP;
-	changeIcon( NotListening );
-}
-
-void PilotDaemonTray::slotBusyTimer()
-{
-	if (fCurrentIcon == Busy) changeIcon(Normal);
-	else if (fCurrentIcon == Normal) changeIcon(Busy);
-}
-
-void PilotDaemonTray::startHotSync()
-{
-	changeIcon(Busy);
-	if (!fBlinkTimer)
-	{
-		fBlinkTimer = new TQTimer(this,"blink timer");
-	}
-	if (fBlinkTimer)
-	{
-		connect(fBlinkTimer,TQT_SIGNAL(timeout()),
-			this,TQT_SLOT(slotBusyTimer()));
-		fBlinkTimer->start(750,false);
-	}
-}
-
-void PilotDaemonTray::endHotSync()
-{
-	changeIcon(Normal);
-	if (fBlinkTimer)
-	{
-		fBlinkTimer->stop();
-	}
-}
-
-
-PilotDaemon::PilotDaemon() :
-	DCOPObject("KPilotDaemonIface"),
-	fDaemonStatus(INIT),
-	fPostSyncAction(None),
-	fPilotLink(0L),
-	fNextSyncType(SyncAction::SyncMode::eHotSync,true),
-	fSyncStack(0L),
-	fTray(0L),
-	fInstaller(0L),
-	fLogFile(0L),
-	fLogStub(new LoggerDCOP_stub("kpilot", "LogIface")),
-	fLogFileStub(new LoggerDCOP_stub("kpilotDaemon", "LogIface")),
-	fKPilotStub(new KPilotDCOP_stub("kpilot", "KPilotIface")),
-	fTempDevice(TQString::null)
-{
-	FUNCTIONSETUP;
-
-	setupPilotLink();
-	reloadSettings();
-
-	if (fDaemonStatus == ERROR)
-	{
-		WARNINGKPILOT << "Connecting to device failed." << endl;
-		return;
-	}
-
-	fInstaller = new FileInstaller;
-	fLogFile = new LogFile;
-	connect(fInstaller, TQT_SIGNAL(filesChanged()),
-		this, TQT_SLOT(slotFilesChanged()));
-
-	fNextSyncType.setMode( KPilotSettings::syncType() );
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": The daemon is ready with status "
-		<< statusString() << " (" << (int) fDaemonStatus << ")" << endl;
-#endif
-}
-
-PilotDaemon::~PilotDaemon()
-{
-	FUNCTIONSETUP;
-
-	KPILOT_DELETE(fPilotLink);
-	KPILOT_DELETE(fSyncStack);
-	KPILOT_DELETE(fInstaller);
-
-	(void) PilotDatabase::instanceCount();
-}
-
-void PilotDaemon::addInstallFiles(const TQStringList &l)
-{
-	FUNCTIONSETUP;
-
-	fInstaller->addFiles( l, fTray );
-}
-
-int PilotDaemon::getPilotSpeed()
-{
-	FUNCTIONSETUP;
-
-	int speed = KPilotSettings::pilotSpeed();
-
-	// Translate the speed entry in the
-	// config file to something we can
-	// put in the environment (for who?)
-	//
-	//
-	const char *speedname = 0L;
-
-	switch (speed)
-	{
-	case 0:
-		speedname = "PILOTRATE=9600";
-		break;
-	case 1:
-		speedname = "PILOTRATE=19200";
-		break;
-	case 2:
-		speedname = "PILOTRATE=38400";
-		break;
-	case 3:
-		speedname = "PILOTRATE=57600";
-		break;
-	case 4:
-		speedname = "PILOTRATE=115200";
-		break;
-	default:
-		speedname = "PILOTRATE=9600";
-	}
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Speed set to "
-		<< speedname << " (" << speed << ")" << endl;
-#endif
-
-	putenv((char *) speedname);
-
-	return speed;
-}
-
-
-void PilotDaemon::showTray()
-{
-	FUNCTIONSETUP;
-
-	if (!fTray)
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": No tray icon to display!" << endl;
-#endif
-
-		return;
-	}
-
-	// Copied from Klipper
-	KWin::setSystemTrayWindowFor(fTray->winId(), 0);
-	fTray->setGeometry(-100, -100, 42, 42);
-	fTray->show();
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Tray icon displayed." << endl;
-#endif
-
-	updateTrayStatus();
-}
-
-/* DCOP ASYNC */ void PilotDaemon::setTempDevice(TQString d)
-{
-	if ( !d.isEmpty() ){
-		fTempDevice = d;
-		if (fPilotLink)
-			fPilotLink->setTempDevice( fTempDevice );
-		reloadSettings();
-	}
-}
-
-/* DCOP ASYNC */ void PilotDaemon::reloadSettings()
-{
-	FUNCTIONSETUP;
-
-	switch (fDaemonStatus)
-	{
-	case INIT:
-	case HOTSYNC_END:
-	case ERROR:
-	case READY:
-	case NOT_LISTENING:
-		// It's OK to reload settings in these states.
-		break;
-	case HOTSYNC_START:
-	case FILE_INSTALL_REQ:
-		// Postpone the reload till the sync finishes.
-		fPostSyncAction |= ReloadSettings;
-		return;
-		break;
-	}
-
-	// TODO: Is this bunch of calls really necessary to reload the settings???
-	delete KPilotSettings::self();
-	KPilotSettings::self()->config()->reparseConfiguration();
-	KPilotSettings::self()->readConfig();
-	getPilotSpeed();
-
-	(void) Pilot::setupPilotCodec(KPilotSettings::encoding());
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Got configuration "
-		<< KPilotSettings::pilotDevice()
-		<< endl;
-	DEBUGKPILOT << fname
-		<< ": Got conduit list "
-		<< (KPilotSettings::installedConduits().join(CSL1(",")))
-		<< endl;
-#endif
-
-	requestSync(0);
-
-
-	if (fPilotLink)
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname
-			<< ": Resetting with device "
-			<< KPilotSettings::pilotDevice()
-			<< endl;
-#endif
-
-		fPilotLink->reset( KPilotSettings::pilotDevice() );
-#ifdef DEBUG
-		DEBUGKPILOT << fname
-			<< ": Using workarounds "
-			<< KPilotSettings::workarounds()
-			<< endl;
-#endif
-		if ( KPilotSettings::workarounds() == KPilotSettings::eWorkaroundUSB )
-		{
-#ifdef DEBUG
-			DEBUGKPILOT << fname
-				<< ": Using Zire31 USB workaround." << endl;
-#endif
-			fPilotLink->setWorkarounds(true);
-		}
-	}
-
-	if (KPilotSettings::dockDaemon())
-	{
-		if (!fTray)
-		{
-			fTray = new PilotDaemonTray(this);
-			fTray->show();
-		}
-		else
-		{
-			fTray->show();
-		}
-	}
-	else
-	{
-		if (fTray)
-		{
-			fTray->hide();
-			delete fTray;
-
-			fTray = 0L;
-		}
-	}
-
-	updateTrayStatus();
-	logProgress(TQString::null,0);
-}
-
-/* DCOP */ void PilotDaemon::stopListening()
-{
-	fIsListening=false;
-	fTray->changeIcon(PilotDaemonTray::NotListening);
-	fDaemonStatus=NOT_LISTENING;
-	fPilotLink->close();
-}
-
-/* DCOP */ void PilotDaemon::startListening()
-{
-	fIsListening=true;
-	fTray->changeIcon(PilotDaemonTray::Normal);
-	fDaemonStatus=INIT;
-	fPilotLink->reset();
-}
-
-/* DCOP */ TQString PilotDaemon::statusString()
-{
-	FUNCTIONSETUP;
-
-	TQString s = CSL1("PilotDaemon=");
-	s.append(shortStatusString());
-
-	s.append(CSL1("; NextSync="));
-	s.append(fNextSyncType.name());
-
-	s.append(CSL1(" ("));
-	if (fPilotLink)
-	{
-		s.append(fPilotLink->statusString());
-	}
-	s.append(CSL1(");"));
-
-	return s;
-}
-
-/* DCOP */ TQString PilotDaemon::shortStatusString()
-{
-	TQString s;
-
-	switch (status())
-	{
-	case INIT:
-		s.append(CSL1("Waiting for sync"));
-		break;
-	case READY:
-		s.append(CSL1("Listening on device"));
-		break;
-	case ERROR:
-		s=CSL1("Error");
-		break;
-	case FILE_INSTALL_REQ:
-		s=CSL1("Installing File");
-		break;
-	case HOTSYNC_END:
-		s=CSL1("End of Hotsync");
-		break;
-	case HOTSYNC_START:
-		s=CSL1("Syncing");
-		break;
-	case NOT_LISTENING:
-		s.append(CSL1("Not Listening (stopped manually)"));
-		break;
-	}
-
-	return s;
-}
-
-
-
-bool PilotDaemon::setupPilotLink()
-{
-	FUNCTIONSETUP;
-
-	KPILOT_DELETE(fPilotLink);
-	fPilotLink = new KPilotDeviceLink( 0, 0, fTempDevice );
-	if (!fPilotLink)
-	{
-		WARNINGKPILOT << "Can't get pilot link." << endl;
-		return false;
-	}
-
-	TQObject::connect(fPilotLink, TQT_SIGNAL(deviceReady(KPilotLink*)),
-		this, TQT_SLOT(startHotSync(KPilotLink*)));
-	// connect the signals emitted by the pilotDeviceLink
-	TQObject::connect(fPilotLink, TQT_SIGNAL(logError(const TQString &)),
-		this, TQT_SLOT(logError(const TQString &)));
-	TQObject::connect(fPilotLink, TQT_SIGNAL(logMessage(const TQString &)),
-		this, TQT_SLOT(logMessage(const TQString &)));
-	TQObject::connect(fPilotLink,
-		TQT_SIGNAL(logProgress(const TQString &,int)),
-		this, TQT_SLOT(logProgress(const TQString &,int)));
-
-
-	return true;
-}
-
-
-/* DCOP ASYNC */ void PilotDaemon::quitNow()
-{
-	FUNCTIONSETUP;
-	// Using switch to make sure we cover all the cases.
-	//
-	//
-	switch (fDaemonStatus)
-	{
-	case INIT:
-	case HOTSYNC_END:
-	case ERROR:
-	case NOT_LISTENING:
-		getKPilot().daemonStatus(KPilotDCOP::DaemonQuit);
-		kapp->quit();
-		break;
-	case READY:
-	case HOTSYNC_START:
-	case FILE_INSTALL_REQ:
-		fPostSyncAction |= Quit;
-		break;
-	}
-	emitDCOPSignal( "kpilotDaemonStatusChanged()", TQByteArray() );
-}
-
-/* DCOP ASYNC */ void PilotDaemon::requestRegularSyncNext()
-{
-	requestSync(SyncAction::SyncMode::eHotSync);
-}
-
-
-/* DCOP ASYNC */ void PilotDaemon::requestSync(int mode)
-{
-	FUNCTIONSETUP;
-
-	if ( 0==mode )
-	{
-		mode = KPilotSettings::syncType();
-	}
-
-	if ( !fNextSyncType.setMode(mode) )
-	{
-		WARNINGKPILOT << "Ignored fake sync type " << mode << endl;
-		return;
-	}
-
-	updateTrayStatus();
-
-	if (fTray && (fTray->fSyncTypeMenu))
-	{
-		for (int i=((int)SyncAction::SyncMode::eHotSync);
-			i<=((int)SyncAction::SyncMode::eRestore) /* Restore */ ;
-			++i)
-		{
-			fTray->fSyncTypeMenu->setItemChecked(i,mode==i);
-		}
-	}
-
-	getLogger().logMessage(i18n("Next HotSync will be: %1. ").arg(fNextSyncType.name()) +
-		i18n("Please press the HotSync button."));
-}
-
-/* DCOP ASYNC */ void PilotDaemon::requestSyncType(TQString s)
-{
-	FUNCTIONSETUP;
-
-	// This checks unique prefixes of the names of the various sync types.
-	if (s.startsWith(CSL1("H"))) requestSync(SyncAction::SyncMode::eHotSync);
-	else if (s.startsWith(CSL1("Fu"))) requestSync(SyncAction::SyncMode::eFullSync);
-	else if (s.startsWith(CSL1("B"))) requestSync(SyncAction::SyncMode::eBackup);
-	else if (s.startsWith(CSL1("R"))) requestSync(SyncAction::SyncMode::eRestore);
-	else if (s.startsWith(CSL1("T"))) { fNextSyncType.setOptions(true,false); }
-	else if (s.startsWith(CSL1("CopyHHToPC"))) requestSync(SyncAction::SyncMode::eCopyHHToPC);
-	else if (s.startsWith(CSL1("CopyPCToHH"))) requestSync(SyncAction::SyncMode::eCopyPCToHH);
-	else if (s.startsWith(CSL1("D"))) requestSync(0);
-	else
-	{
-		WARNINGKPILOT << "Unknown sync type " << ( s.isEmpty() ? CSL1("<none>") : s )
-			<< endl;
-	}
-}
-
-/* DCOP ASYNC */ void PilotDaemon::requestSyncOptions(bool test, bool local)
-{
-	if ( !fNextSyncType.setOptions(test,local) )
-	{
-		WARNINGKPILOT << "Nonsensical request for "
-			<< (test ? "test" : "notest")
-			<< ' '
-			<< (local ? "local" : "nolocal")
-			<< " in mode "
-			<< fNextSyncType.name() << endl;
-	}
-}
-
-/* DCOP */ int PilotDaemon::nextSyncType() const
-{
-	return fNextSyncType.mode();
-}
-
-/**
-* DCOP Functions reporting some status data, e.g. for the kontact plugin.
-*/
-TQDateTime PilotDaemon::lastSyncDate()
-{
-	return KPilotSettings::lastSyncTime();
-}
-
-
-static TQDict<TQString> *conduitNameMap = 0L;
-
-static void fillConduitNameMap()
-{
-	if ( !conduitNameMap )
-	{
-		conduitNameMap = new TQDict<TQString>;
-		conduitNameMap->setAutoDelete(true);
-	}
-	conduitNameMap->clear();
-
-	TQStringList l = KPilotSettings::installedConduits();
-	// Fill with internal settings.
-	if ( l.find( CSL1("internal_fileinstall") ) != l.end() ) {
-		conduitNameMap->insert( CSL1("internal_fileinstall"),
-		                        new TQString(i18n("File Installer")) );
-	}
-
-	TQStringList::ConstIterator end = l.end();
-	for (TQStringList::ConstIterator i = l.begin(); i != end; ++i)
-	{
-		if (!conduitNameMap->find(*i))
-		{
-			TQString readableName = CSL1("<unknown>");
-			KSharedPtr < KService > o = KService::serviceByDesktopName(*i);
-			if (!o)
-			{
-				WARNINGKPILOT << "No service for " << *i << endl;
-			}
-			else
-			{
-				readableName = o->name();
-			}
-			conduitNameMap->insert( *i, new TQString(readableName) );
-		}
-	}
-}
-
-
-TQStringList PilotDaemon::configuredConduitList()
-{
-	fillConduitNameMap();
-
-	TQStringList keys;
-
-	TQDictIterator<TQString> it(*conduitNameMap);
-	for ( ; *it; ++it)
-	{
-		keys << it.currentKey();
-	}
-	keys.sort();
-
-	TQStringList::ConstIterator end = keys.end();
-	TQStringList result;
-	for (TQStringList::ConstIterator i = keys.begin(); i != end; ++i)
-	{
-		result << *(conduitNameMap->find(*i));
-	}
-
-	return result;
-}
-
-TQString PilotDaemon::logFileName()
-{
-	return KPilotSettings::logFileName();
-}
-
-TQString PilotDaemon::userName()
-{
-	return KPilotSettings::userName();
-}
-TQString PilotDaemon::pilotDevice()
-{
-	return KPilotSettings::pilotDevice();
-}
-
-bool PilotDaemon::killDaemonOnExit()
-{
-	return KPilotSettings::killDaemonAtExit();
-}
-
-typedef enum { NotLocked=0, Locked=1, DCOPError=2 } KDesktopLockStatus;
-static KDesktopLockStatus isKDesktopLockRunning()
-{
-	if (!KPilotSettings::screenlockSecure()) return NotLocked;
-
-	DCOPClient *dcopptr = KApplication::kApplication()->dcopClient();
-
-	// Can't tell, very weird, err on the side of safety.
-	if (!dcopptr || !dcopptr->isAttached())
-	{
-		WARNINGKPILOT << "Could not make DCOP connection. "
-			<< "Assuming screensaver is active." << endl;
-		return DCOPError;
-	}
-
-	TQByteArray data,returnValue;
-	TQCString returnType;
-
-	if (!dcopptr->call("kdesktop","KScreensaverIface","isBlanked()",
-		data,returnType,returnValue,true))
-	{
-		WARNINGKPILOT << "Check for screensaver failed."
-			<< "Assuming screensaver is active." << endl;
-		// Err on the side of safety again.
-		return DCOPError;
-	}
-
-	if (returnType == "bool")
-	{
-		bool b;
-		TQDataStream reply(returnValue,IO_ReadOnly);
-		reply >> b;
-		return (b ? Locked : NotLocked);
-	}
-	else
-	{
-		WARNINGKPILOT << "Strange return value from screensaver. "
-			<< "Assuming screensaver is active." << endl;
-		// Err on the side of safety.
-		return DCOPError;
-	}
-}
-
-
-static void informOthers(KPilotDCOP_stub &kpilot,
-	LoggerDCOP_stub &log,
-	LoggerDCOP_stub &filelog)
-{
-	kpilot.daemonStatus(KPilotDCOP::StartOfHotSync);
-	log.logStartSync();
-	filelog.logStartSync();
-}
-
-static bool isSyncPossible(ActionQueue *fSyncStack,
-	KPilotLink *pilotLink,
-	KPilotDCOP_stub &kpilot)
-{
-	FUNCTIONSETUP;
-
-	/**
-	* If KPilot is busy with something - like configuring
-	* conduit - then we shouldn't run a real sync, but
-	* just tell the user that the sync couldn't run because
-	* of that.
-	*/
-	int kpilotstatus = kpilot.kpilotStatus();
-	DCOPStub::Status callstatus = kpilot.status();
-
-#ifdef DEBUG
-	if (callstatus != DCOPStub::CallSucceeded)
-	{
-		DEBUGKPILOT << fname <<
-			": Could not call KPilot for status." << endl;
-	}
-	else
-	{
-		DEBUGKPILOT << fname << ": KPilot status " << kpilotstatus << endl;
-	}
-#endif
-	/**
-	* If the call fails, then KPilot is probably not running
-	* and we can behave normally.
-	*/
-	if ((callstatus == DCOPStub::CallSucceeded) &&
-		(kpilotstatus != KPilotDCOP::WaitingForDaemon))
-	{
-		WARNINGKPILOT << "KPilot returned status " << kpilotstatus << endl;
-
-		fSyncStack->queueInit();
-		fSyncStack->addAction(new SorryAction(pilotLink));
-		return false;
-	}
-
-	switch (isKDesktopLockRunning())
-	{
-	case NotLocked :
-		break; /* Fall through to return true below */
-	case Locked :
-		fSyncStack->queueInit();
-		fSyncStack->addAction(new SorryAction(pilotLink,
-			i18n("HotSync is disabled while the screen is locked.")));
-		return false;
-	case DCOPError :
-		fSyncStack->queueInit();
-		fSyncStack->addAction(new SorryAction(pilotLink,
-			i18n("HotSync is disabled because KPilot could not "
-			"determine the state of the screen saver. You "
-			"can disable this security feature by unchecking "
-			"the 'do not sync when screensaver is active' box "
-			"in the HotSync page of the configuration dialog.")));
-		return false;
-	}
-
-	return true;
-}
-
-static void queueInstaller(ActionQueue *fSyncStack,
-	KPilotLink *pilotLink,
-	FileInstaller *fInstaller,
-	const TQStringList &c)
-{
-	if (c.findIndex(CSL1("internal_fileinstall")) >= 0)
-	{
-		fSyncStack->addAction(new FileInstallAction(pilotLink,fInstaller->dir()));
-	}
-}
-
-static void queueEditors(ActionQueue *fSyncStack, KPilotLink *pilotLink)
-{
-	if (KPilotSettings::internalEditors())
-	{
-		fSyncStack->addAction(new InternalEditorAction(pilotLink));
-	}
-}
-
-static void queueConduits(ActionQueue *fSyncStack,
-	const TQStringList &conduits,
-	SyncAction::SyncMode e)
-{
-	if (conduits.count() > 0)
-	{
-		fSyncStack->queueConduits(conduits,e);
-		// TQString s = i18n("Conduit flags: ");
-		// s.append(ConduitProxy::flagsForMode(e).join(CSL1(" ")));
-		// logMessage(s);
-	}
-}
-
-bool PilotDaemon::shouldBackup()
-{
-
-	FUNCTIONSETUP;
-
-	bool ret = false;
-	int backupfreq = KPilotSettings::backupFrequency();
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Backup Frequency is: [" << backupfreq <<
-	"]. " << endl;
-#endif
-
-	if ( (fNextSyncType == SyncAction::SyncMode::eHotSync) ||
-		(fNextSyncType == SyncAction::SyncMode::eFullSync) )
-	{
-		/** If we're doing a Hot or Full sync, see if our user has
-		 * configured us to or to not always do a backup.
-		 */
-		if ( backupfreq == SyncAction::eOnRequestOnly )
-		{
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Should not do backup..." << endl;
-#endif
-			ret = false;
-		}
-		else if ( backupfreq == SyncAction::eEveryHotSync )
-		{
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Should do backup..." << endl;
-#endif
-			ret = true;
-		}
-	}
-
-	return ret;
-
-}
-
-
-/* slot */ void PilotDaemon::startHotSync(KPilotLink *pilotLink)
-{
-	FUNCTIONSETUP;
-
-	bool pcchanged=false; // If last PC to sync was a different one (implies full sync, normally)
-	TQStringList conduits ; // list of conduits to run
-	TQString s; // a generic string for stuff
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Starting Sync with type "
-		<< fNextSyncType.name() << endl;
-	DEBUGKPILOT << fname << ": Status is " << shortStatusString() << endl;
-	(void) PilotDatabase::instanceCount();
-#endif
-
-	fDaemonStatus = HOTSYNC_START ;
-	if (fTray)
-	{
-		fTray->startHotSync();
-	}
-	informOthers(getKPilot(),getLogger(),getFileLogger());
-
-
-	// Queue to add all the actions for this sync to.
-	fSyncStack = new ActionQueue(pilotLink);
-
-	// Check if the sync is possible at all.
-	if (!isSyncPossible(fSyncStack,pilotLink,getKPilot()))
-	{
-		// Sync is not possible now, sorry action was added to
-		// the queue, and we run that -- skipping all the rest of the sync stuff.
-		goto launch;
-	}
-
-	// Except when the user has requested a Restore, in which case she knows she doesn't
-	// want to sync with a blank palm and then back up the result over her stored backup files,
-	// do a Full Sync when changing the PC or using a different Palm Desktop app.
-	if (fNextSyncType.mode() != SyncAction::SyncMode::eRestore)
-	{ // Use gethostid to determine , since JPilot uses 1+(2000000000.0*random()/(RAND_MAX+1.0))
-		// as PC_ID, so using JPilot and KPilot is the same as using two different PCs
-		KPilotUser &usr = pilotLink->getPilotUser();
-		pcchanged = usr.getLastSyncPC() !=(unsigned long) gethostid();
-
-		if (pcchanged)
-		{
-#ifdef DEBUG
-			DEBUGKPILOT << fname << ": PC changed. Last sync PC: [" << usr.getLastSyncPC()
-				<< "], me: [" << (unsigned long) gethostid() << "]" << endl;
-#endif
- 			if ( KPilotSettings::fullSyncOnPCChange() )
-			{
-#ifdef DEBUG
-				DEBUGKPILOT << fname << ": Setting sync mode to full sync. " << endl;
-#endif
-				fNextSyncType = SyncAction::SyncMode::eFullSync;
-			}
-			else
-			{
-#ifdef DEBUG
-				DEBUGKPILOT << fname << ": Not changing sync mode because of settings. " << endl;
-#endif
-			}
-		}
-	}
-
-	// Normal case: regular sync.
-	fSyncStack->queueInit();
-	fSyncStack->addAction(new CheckUser(pilotLink));
-
-	conduits = KPilotSettings::installedConduits() ;
-
-	if (fNextSyncType.isTest())
-	{
-		fSyncStack->addAction(new TestLink(pilotLink));
-	}
-	else
-	{
-		switch (fNextSyncType.mode())
-		{
-		case SyncAction::SyncMode::eBackup:
-			if (KPilotSettings::runConduitsWithBackup() && (conduits.count() > 0))
-			{
-				queueConduits(fSyncStack,conduits,fNextSyncType);
-			}
-			fSyncStack->addAction(new BackupAction(pilotLink,true));
-			break;
-		case SyncAction::SyncMode::eRestore:
-			fSyncStack->addAction(new RestoreAction(pilotLink));
-			queueInstaller(fSyncStack,pilotLink,fInstaller,conduits);
-			break;
-		case SyncAction::SyncMode::eFullSync:
-		case SyncAction::SyncMode::eHotSync:
-			// first install the files, and only then do the conduits
-			// (conduits might want to sync a database that will be installed
-			queueInstaller(fSyncStack,pilotLink,fInstaller,conduits);
-			queueEditors(fSyncStack,pilotLink);
-			queueConduits(fSyncStack,conduits,fNextSyncType);
-			// After running the conduits, install new databases
-			queueInstaller(fSyncStack,pilotLink,fInstaller,conduits);
-			// And sync the remaining databases if needed.
-			if (shouldBackup())
-			{
-				fSyncStack->addAction(new BackupAction(pilotLink, (fNextSyncType == SyncAction::SyncMode::eFullSync)));
-			}
-			break;
-		case SyncAction::SyncMode::eCopyPCToHH:
-			queueConduits(fSyncStack,conduits,SyncAction::SyncMode::eCopyPCToHH);
-			break;
-		case SyncAction::SyncMode::eCopyHHToPC:
-			queueConduits(fSyncStack,conduits,SyncAction::SyncMode::eCopyHHToPC);
-			break;
-		}
-	}
-
-// Jump here to finalize the connections to the sync action
-// queue and start the actual sync.
-launch:
-	fSyncStack->queueCleanup();
-
-	TQObject::connect(fSyncStack, TQT_SIGNAL(logError(const TQString &)),
-		this, TQT_SLOT(logError(const TQString &)));
-	TQObject::connect(fSyncStack, TQT_SIGNAL(logMessage(const TQString &)),
-		this, TQT_SLOT(logMessage(const TQString &)));
-	TQObject::connect(fSyncStack,
-		TQT_SIGNAL(logProgress(const TQString &,int)),
-		this, TQT_SLOT(logProgress(const TQString &,int)));
-
-	TQObject::connect(fSyncStack, TQT_SIGNAL(syncDone(SyncAction *)),
-		this, TQT_SLOT(endHotSync()));
-
-	TQTimer::singleShot(0,fSyncStack,TQT_SLOT(execConduit()));
-
-	updateTrayStatus();
-}
-
-/* slot */ void PilotDaemon::logMessage(const TQString & s)
-{
-	FUNCTIONSETUPL(2);
-
-	getLogger().logMessage(s);
-	getFileLogger().logMessage(s);
-	updateTrayStatus(s);
-}
-
-/* slot */ void PilotDaemon::logError(const TQString & s)
-{
-	FUNCTIONSETUP;
-
-	getLogger().logError(s);
-	getFileLogger().logError(s);
-	updateTrayStatus(s);
-}
-
-/* slot */ void PilotDaemon::logProgress(const TQString & s, int i)
-{
-	FUNCTIONSETUPL(2);
-
-	getLogger().logProgress(s, i);
-	getFileLogger().logProgress(s, i);
-	if (!s.isEmpty()) updateTrayStatus(s);
-}
-
-/* slot */ void PilotDaemon::endHotSync()
-{
-	FUNCTIONSETUP;
-
-	if (fTray)
-	{
-		fTray->endHotSync();
-	}
-
-	KPILOT_DELETE(fSyncStack);
-	fPilotLink->close();
-
-	getLogger().logProgress(i18n("HotSync Completed.<br>"), 100);
-	getFileLogger().logProgress(i18n("HotSync Completed.<br>"), 100);
-	getLogger().logEndSync();
-	getFileLogger().logEndSync();
-	getKPilot().daemonStatus(KPilotDCOP::EndOfHotSync);
-	KPilotSettings::setLastSyncTime(TQDateTime::currentDateTime());
-	KPilotSettings::self()->writeConfig();
-
-	fDaemonStatus = HOTSYNC_END;
-
-	if (fPostSyncAction & Quit)
-	{
-		getKPilot().daemonStatus(KPilotDCOP::DaemonQuit);
-		kapp->quit();
-	}
-	if (fPostSyncAction & ReloadSettings)
-	{
-		reloadSettings();
-	}
-	else
-	{
-		TQTimer::singleShot(10000,fPilotLink,TQT_SLOT(reset()));
-	}
-
-	fPostSyncAction = None;
-	requestSync(0);
-
-	(void) PilotDatabase::instanceCount();
-
-	updateTrayStatus();
-}
-
-
-void PilotDaemon::slotFilesChanged()
-{
-	FUNCTIONSETUP;
-}
-
-void PilotDaemon::slotRunKPilot()
-{
-	FUNCTIONSETUP;
-
-	TQString kpilotError;
-	TQCString kpilotDCOP;
-	int kpilotPID;
-
-	if (KApplication::startServiceByDesktopName(CSL1("kpilot"),
-			TQString::null, &kpilotError, &kpilotDCOP, &kpilotPID
-#if (KDE_VERSION >= 220)
-			// Startup notification added in 2.2
-			, ""
-#endif
-		))
-	{
-		WARNINGKPILOT << "Couldn't start KPilot! " << kpilotError << endl;
-	}
-	else
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname
-			<< ": Started KPilot with DCOP name "
-			<< kpilotDCOP << " (pid " << kpilotPID << ")" << endl;
-#endif
-	}
-}
-
-void PilotDaemon::slotRunConfig()
-{
-	FUNCTIONSETUP;
-
-	// This function tries to send the raise() DCOP call to kpilot.
-	// If it succeeds, we can assume kpilot is running and then try
-	// to send the configure() DCOP call.
-	// If it fails (probably because kpilot isn't running) it tries
-	// to call kpilot via KProcess (using a command line switch to
-	// only bring up the configure dialog).
-	//
-	// Implementing the function this way catches all cases.
-	// ie 1 KPilot running with configure dialog open (raise())
-	//    2 KPilot running with dialog NOT open (configureConduits())
-	//    3 KPilot NOT running (KProcess)
-
-	DCOPClient *client = kapp->dcopClient();
-
-	// This DCOP call to kpilot's raise function solves the final case
-	// ie when kpilot already has the dialog open
-
-	if ( client->isApplicationRegistered( "kpilot" ) )
-	{
-		client->send("kpilot", "kpilot-mainwindow#1", "raise()",TQString::null);
-		client->send("kpilot", "KPilotIface", "configure()", TQString::null);
-	}
-	else
-	{
-		// KPilot not running
-		KProcess *p = new KProcess;
-		*p << "kpilot" << "-s";
-
-		p->start();
-	}
-}
-
-void PilotDaemon::updateTrayStatus(const TQString &s)
-{
-	if (!fTray) return;
-
-	TQString tipText = CSL1("<qt>");
-	tipText.append( s );
-	tipText.append( CSL1(" ") );
-	tipText.append( i18n("Next sync is %1.")
-		.arg( fNextSyncType.name() ) );
-	tipText.append( CSL1("</qt>") );
-
-	TQToolTip::remove(fTray);
-	TQToolTip::add(fTray,tipText);
-	emitDCOPSignal( "kpilotDaemonStatusChanged()", TQByteArray() );
-	// emit the same dcop signal but including the information needed by Kontact to update its kpilot summary widget
-	TQByteArray data;
-	TQDataStream arg(data, IO_WriteOnly);
-	arg << lastSyncDate();
-	arg << shortStatusString();
-	arg << configuredConduitList();
-	arg << logFileName();
-	arg << userName();
-	arg << pilotDevice();
-	arg << killDaemonOnExit();
-	emitDCOPSignal( "kpilotDaemonStatusDetails(TQDateTime,TQString,TQStringList,TQString,TQString,TQString,bool)", data );
-}
-
-static KCmdLineOptions daemonoptions[] = {
-#ifdef DEBUG
-	{"debug <level>", I18N_NOOP("Set debugging level"), "0"},
-#endif
-	{ "device <device>", I18N_NOOP("Device to try first"), ""},
-	{"fail-silently", I18N_NOOP("Exit instead of complaining about bad configuration files"), 0},
-	KCmdLineLastOption
-} ;
-
-
-int main(int argc, char **argv)
-{
-	FUNCTIONSETUP;
-
-	KLocale::setMainCatalogue("kpilot");
-
-	KAboutData about("kpilotDaemon",
-		I18N_NOOP("KPilot Daemon"),
-		KPILOT_VERSION,
-		"KPilot - HotSync software for KDE\n\n",
-		KAboutData::License_GPL,
-		"(c) 1998-2000,2001, Dan Pilone (c) 2000-2004, Adriaan de Groot",
-		0L,
-		"http://www.kpilot.org/"
-		);
-	about.addAuthor("Dan Pilone",
-		I18N_NOOP("Project Leader"),
-		"pilone@slac.com");
-	about.addAuthor("Adriaan de Groot",
-		I18N_NOOP("Maintainer"),
-		"groot@kde.org", "http://www.kpilot.org/");
-	about.addAuthor("Reinhold Kainhofer",
-		I18N_NOOP("Developer"),
-		"reinhold@kainhofer.com", "http://reinhold.kainhofer.com/Linux/");
-	aboutData = &about;
-
-
-	KCmdLineArgs::init(argc, argv, &about);
-	KCmdLineArgs::addCmdLineOptions(daemonoptions,"kpilotconfig");
-	KUniqueApplication::addCmdLineOptions();
-	KCmdLineArgs *p = KCmdLineArgs::parsedArgs();
-
-#ifdef DEBUG
-	KPilotConfig::getDebugLevel(p);
-#endif
-	if (!KUniqueApplication::start())
-	{
-		if (p->isSet("device")){
-			// tell the running kpilotDaemon to use
-			// this device now
-			DCOPClient d;
-			TQString dev(p->getOption("device"));
-			TQByteArray data;
-			TQDataStream arg(data, IO_WriteOnly);
-			arg << dev;
-			if (d.attach()){
-				d.send("kpilotDaemon", "KPilotDaemonIface", "setTempDevice(TQString)", data );
-				d.detach();
-			}
-		}
-		return 0;
-	}
-	KUniqueApplication a(true, true);
-
-	// A block just to keep variables local.
-	//
-	//
-	{
-//		KPilotSettings::self()->config()->setReadOnly(false);
-
-		if (KPilotSettings::configVersion() < KPilotConfig::ConfigurationVersion)
-		{
-			WARNINGKPILOT << "Is still not configured for use."
-				<< endl;
-			if (!p->isSet("fail-silently"))
-			{
-				KPilotConfig::sorryVersionOutdated(KPilotSettings::configVersion());
-			}
-			return 1;
-		}
-
-#ifdef DEBUG
-		DEBUGKPILOT << fname
-			<< ": Configuration version "
-			<< KPilotSettings::configVersion() << endl;
-#endif
-	}
-
-
-	PilotDaemon *gPilotDaemon = new PilotDaemon();
-
-	if (p->isSet("device"))
-		gPilotDaemon->setTempDevice(p->getOption("device"));
-
-	if (gPilotDaemon->status() == PilotDaemon::ERROR)
-	{
-		delete gPilotDaemon;
-
-		gPilotDaemon = 0;
-		WARNINGKPILOT << "Failed to start up daemon "
-			"due to errors constructing it." << endl;
-		return 2;
-	}
-
-	gPilotDaemon->showTray();
-
-	return a.exec();
-}
-
-
-
diff --git a/kpilot/kpilot/pilotDaemon.h b/kpilot/kpilot/pilotDaemon.h
deleted file mode 100644
index 8b386ee4..00000000
--- a/kpilot/kpilot/pilotDaemon.h
+++ /dev/null
@@ -1,279 +0,0 @@
-#ifndef _KPILOT_PILOTDAEMON_H
-#define _KPILOT_PILOTDAEMON_H
-/* pilotDaemon.h			KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** See the .cc file for an explanation of what this file is for.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include <ksystemtray.h>
-
-#include "kpilotlink.h"
-#include "syncAction.h"
-#include "pilotDaemonDCOP.h"
-
-class TQPixmap;
-class TQTimer;
-class KAboutApplication;
-class TQPopupMenu;
-
-class PilotDaemon;
-class ActionQueue;
-class FileInstaller;
-class LoggerDCOP_stub;
-class KPilotDCOP_stub;
-class LogFile;
-
-class KPilotLink;
-class KPilotDeviceLink;
-
-class PilotDaemonTray : public KSystemTray
-{
-	Q_OBJECT
-
-friend class PilotDaemon;
-
-public:
-	PilotDaemonTray(PilotDaemon *p);
-
-	typedef enum { Normal, Busy, NotListening } IconShape ;
-	void changeIcon(IconShape);
-
-	void enableRunKPilot(bool);
-
-	virtual void dragEnterEvent(TQDragEnterEvent *);
-	virtual void dropEvent(TQDropEvent *);
-
-
-protected:
-	void setupWidget();
-	/**
-	* Menu of sync types.
-	*/
-	TQPopupMenu *fSyncTypeMenu;
-
-protected slots:
-	void slotShowAbout();
-	void slotShowBusy();
-	void slotShowNormal();
-	void slotShowNotListening();
-	void slotBusyTimer();
-
-	// "Regular" QT actions
-	//
-	//
-	virtual void mousePressEvent(TQMouseEvent* e);
-	virtual void closeEvent(TQCloseEvent *e);
-
-protected:
-	void startHotSync();
-	void endHotSync();
-
-private:
-	TQPixmap icons[((int) NotListening) + 1];
-	IconShape fCurrentIcon;
-	PilotDaemon *daemon;
-
-	/**
-	* Remember which item in the context menu
-	* is "Run KPilot" so we can enable / disable
-	* it as necessary.
-	*/
-	int menuKPilotItem;
-
-	/**
-	* Remember which item in the context menu
-	* is "Configure Conduits" so we can enable / disable
-	* it as necessary.
-	*/
-	int menuConfigureConduitsItem;
-
-	/**
-	* Window for the "About KPilot" information.
-	*/
-	KAboutApplication *kap;
-
-	/**
-	* Timer for blinking.
-	*/
-	TQTimer *fBlinkTimer;
-
-} ;
-
-class PilotDaemon : public TQObject, virtual public PilotDaemonDCOP
-{
-Q_OBJECT
-
-// The tray must be our friend so that we can let it stop the daemon.
-friend class PilotDaemonTray;
-
-
-public:
-	PilotDaemon();
-	~PilotDaemon();
-
-	enum DaemonStatus
-  	{
-		HOTSYNC_START,    // Hotsync is running
-		HOTSYNC_END,      // Hotsync is cleaning up
-		FILE_INSTALL_REQ, // A file is being saved for installation
-		ERROR,
-		READY,            // Connected to device and ready for Sync
-		INIT,
-		NOT_LISTENING
-	};
-
-	DaemonStatus status() const { return fDaemonStatus; } ;
-	/* DCOP */ virtual TQString statusString();
-	/* DCOP */ virtual TQString shortStatusString();
-
-	/**
-	* Display the daemon's system tray icon
-	* (if there is one, depending on the DockDaemon
-	* setting in the config file)
-	*/
-	void showTray();
-	virtual void addInstallFiles(const TQStringList &);
-
-	// The next few functions are the DCOP interface.
-	// Some are also slots.
-	//
-public slots:
-	virtual ASYNC requestSync(int);
-public:
-	virtual ASYNC requestSyncType(TQString);
-	virtual ASYNC requestRegularSyncNext();
-	virtual int nextSyncType() const;
-	virtual ASYNC requestSyncOptions(bool,bool);
-
-	virtual ASYNC quitNow();
-	virtual ASYNC reloadSettings();
-	virtual ASYNC setTempDevice(TQString d);
-
-	virtual void stopListening();
-	virtual void startListening();
-	virtual bool isListening() { return fIsListening; }
-	/**
-	* Functions reporting same status data, e.g. for the kontact plugin.
-	*/
-	virtual TQDateTime lastSyncDate();
-	virtual TQStringList configuredConduitList();
-	virtual TQString logFileName();
-	virtual TQString userName();
-	virtual TQString pilotDevice();
-	virtual bool killDaemonOnExit();
-
-protected:
-	DaemonStatus fDaemonStatus;
-
-	enum postSyncActions {
-		None=0,
-		ReloadSettings = 1,
-		Quit = 2
-		} ;
-	int fPostSyncAction;
-
-protected slots:
-	void startHotSync( KPilotLink* lnk );
-	void endHotSync();
-
-	void logMessage(const TQString &);
-	void logError(const TQString &);
-	void logProgress(const TQString &,int);
-
-private:
-	int getPilotSpeed();
-
-	/**
-	* Check whether we should do a backup.  This is based on the
-	* KPilotSettings::backupFrequency and uses
-	* SyncAction::BackupFrequency.  This will be expanded, hopefully,
-	* to provide backup scheduling at some point.
-	*/
-	bool shouldBackup();
-
-	bool setupPilotLink();
-
-	KPilotDeviceLink &getPilotLink() { return *fPilotLink; }
-	KPilotDeviceLink *fPilotLink;
-
-	SyncAction::SyncMode fNextSyncType;
-
-	ActionQueue *fSyncStack;
-
-	/**
-	* This is a pointer to the (optional) docked
-	* system tray icon for the daemon.
-	*/
-	PilotDaemonTray *fTray;
-
-	/**
-	* Set or change the tooltip displayed by the tray icon.
-	*/
-	void updateTrayStatus(const TQString &s=TQString::null);
-
-	FileInstaller *fInstaller;
-
-protected slots:
-	/**
-	* Called after a file has been installed to notify any observers, like
-	* KPilot, that files have been installed. [Here that means: copied
-	* to the pending_install directory and thus *waiting* for
-	* installation on the Palm]
-	*/
-	void slotFilesChanged();
-
-	/**
-	* Start up KPilot.
-	*/
-	void slotRunKPilot();
-
-	/**
-	* Run conduit configuration using "kpilot -c"
-	*/
-	void slotRunConfig();
-
-	/**
-	* Provide access to KPilot's DCOP interface through a stub.
-	*/
-protected:
-	LoggerDCOP_stub &getLogger() { return *fLogStub; } ;
-	LoggerDCOP_stub &getFileLogger() { return *fLogFileStub; } ;
-	KPilotDCOP_stub &getKPilot() { return *fKPilotStub; } ;
-
-	LogFile *fLogFile;
-	bool fIsListening;
-
-private:
-	LoggerDCOP_stub *fLogStub;
-	LoggerDCOP_stub *fLogFileStub;
-	KPilotDCOP_stub *fKPilotStub;
-	TQString fTempDevice;
-};
-
-
-#endif
diff --git a/kpilot/kpilot/pilotDaemonDCOP.h b/kpilot/kpilot/pilotDaemonDCOP.h
deleted file mode 100644
index b56a245b..00000000
--- a/kpilot/kpilot/pilotDaemonDCOP.h
+++ /dev/null
@@ -1,103 +0,0 @@
-#ifndef PILOTDAEMONDCOP_H
-#define PILOTDAEMONDCOP_H
-/* pilotDaemonDCOP.h			KPilotDaemon
-**
-** Copyright (C) 2000 by Adriaan de Groot
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This file defines the DCOP interface for
-** the KPilotDaemon. The daemon has *two* interfaces:
-** one belonging with KUniqueApplication and this one.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include <dcopobject.h>
-#include <tqdatetime.h>
-#include <tqstringlist.h>
-
-class PilotDaemonDCOP : virtual public DCOPObject
-{
-	K_DCOP
-public:
-k_dcop:
-	/**
-	* Start a HotSync. What kind of HotSync is determined
-	* by the int parameter (use the enum in kpilot.kcfg, or
-	* better yet, use requestSyncType and pass the name).
-	* Using a value of 0 (zero, which isn't a legal mode for
-	* sync actions) uses the configuration file default.
-	*/
-	virtual ASYNC requestSync(int) = 0;
-	/**
-	* Request a particular kind of sync next; pass in the name
-	* of a sync type instead.
-	*/
-	virtual ASYNC requestSyncType(TQString) = 0;
-	/** Shortcut for using requestSync(1) */
-	virtual ASYNC requestRegularSyncNext() = 0;
-	/** Query what type is set most recently. */
-	virtual int nextSyncType() const = 0;
-	/** Set the mix-ins (see SyncAction::SyncMode for details). */
-	virtual ASYNC requestSyncOptions(bool test, bool local) = 0;
-
-	/**
-	* Functions for the KPilot UI, indicating what the daemon
-	* should do.
-	*/
-	virtual ASYNC quitNow() = 0;
-	virtual ASYNC reloadSettings() = 0; // Indicate changed config file.
-	virtual ASYNC setTempDevice(TQString d) =0; // use this device
-	virtual void stopListening() = 0;
-	virtual void startListening() = 0;
-	virtual bool isListening() =0 ;
-
-	/**
-	* Functions requesting the status of the daemon.
-	*/
-	virtual TQString statusString() = 0;
-	virtual TQString shortStatusString() = 0;
-
-	/**
-	* Functions reporting same status data, e.g. for the kontact plugin.
-	*/
-	virtual TQDateTime lastSyncDate() = 0;
-	virtual TQStringList configuredConduitList() = 0;
-	virtual TQString logFileName() = 0;
-	virtual TQString userName() = 0;
-	virtual TQString pilotDevice() = 0;
-	virtual bool killDaemonOnExit() = 0;
-
-	/**
-	* Some other useful functionality
-	*/
-	virtual void addInstallFiles(const TQStringList &) = 0;
-
-
-k_dcop_signals:
-	void kpilotDaemonStatusChanged();
-	// used to push status information
-	void kpilotDaemonStatusDetails( TQDateTime, TQString, TQStringList, TQString, TQString, TQString, bool );
-} ;
-
-#endif
diff --git a/kpilot/kpilot/stamp-h.in b/kpilot/kpilot/stamp-h.in
deleted file mode 100644
index e69de29b..00000000
--- a/kpilot/kpilot/stamp-h.in
+++ /dev/null
diff --git a/kpilot/kpilot/syncCalendar.cc b/kpilot/kpilot/syncCalendar.cc
deleted file mode 100644
index 802ee354..00000000
--- a/kpilot/kpilot/syncCalendar.cc
+++ /dev/null
@@ -1,87 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2005 by Adriaan de Groot <groot@kde.org>
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org.
-*/
-
-#include "options.h"
-
-#include <kpilotlink.h>
-#include <pilotDatabase.h>
-#include <pilotDateEntry.h>
-
-#include <libkcal/calendarlocal.h>
-#include <libkcal/event.h>
-
-
-typedef DatabaseInterpreter<KCal::Event,PilotDateEntry,PilotDateEntry::Mapper> DatebookDB;
-
-class CalendarDumper
-{
-public:
-	CalendarDumper() {}
-
-	KCal::CalendarLocal *retrieve(int fd);
-	KCal::CalendarLocal *retrieve(const TQString &filename);
-
-protected:
-	KCal::CalendarLocal *retrieve(DatebookDB *db);
-} ;
-
-
-
-KCal::CalendarLocal *CalendarDumper::retrieve(int fd)
-{
-	PilotSerialDatabase sdb( fd, CSL1("DatebookDB") );
-	DatebookDB db(&sdb);
-	return retrieve(db);
-}
-
-KCal::CalendarLocal *CalendarDumped::retrieve(const TQString &fn)
-{
-	PilotLocalDatabase ldb( fn );
-	DatebookDB db(&ldb);
-	return retrieve(db);
-}
-
-KCal::CalendarLocal *retrieve(DatebookDB *db)
-{
-	KCal::CalendarLocal *cal = new CalendarLocal( TQString::null );
-
-	int count = db->db()->recordCount();
-
-	if (count < 1)
-	{
-		return cal;
-	}
-
-	for (int i=0; i<count; i++)
-	{
-		KCal::Event *e = db->readRecordByIndex(i);
-		if (!e) continue;
-		cal->addEvent(e);
-	}
-
-	return cal;
-}
diff --git a/kpilot/kpilot/todoEditor.cc b/kpilot/kpilot/todoEditor.cc
deleted file mode 100644
index d7017bb9..00000000
--- a/kpilot/kpilot/todoEditor.cc
+++ /dev/null
@@ -1,173 +0,0 @@
-// -*- C++ -*-
-/* KPilot
-**
-** Copyright (C) 2000 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This is a dialog window that edits one single todo record.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include "options.h"
-
-#include <tqcombobox.h>
-#include <tqlayout.h>
-#include <tqlabel.h>
-#include <tqtextedit.h>
-#include <tqcheckbox.h>
-
-#include <kdatewidget.h>
-
-#include "pilotTodoEntry.h"
-#include "todoEditor_base.h"
-#include "todoEditor.moc"
-
-
-TodoEditor::TodoEditor(PilotTodoEntry * p, struct ToDoAppInfo *appInfo,
-	TQWidget * parent, const char *name) :
-	KDialogBase(parent, name, false, i18n("To-do Editor"), Ok|Cancel),
-	fDeleteOnCancel(p == 0L),
-	fTodo(p),
-	fAppInfo(appInfo)
-{
-	FUNCTIONSETUP;
-
-	fWidget=new TodoEditorBase(this);
-	setMainWidget(fWidget);
-	fillFields();
-
-	connect(parent, TQT_SIGNAL(recordChanged(PilotTodoEntry *)),
-		this, TQT_SLOT(updateRecord(PilotTodoEntry *)));
-
-}
-
-TodoEditor::~TodoEditor()
-{
-	FUNCTIONSETUP;
-
-	if (fDeleteOnCancel && fTodo)
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname
-			<< ": Deleting private todo record." << endl;
-#endif
-		delete fTodo;
-		fTodo = 0L;
-	}
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Help! I'm deleting!" << endl;
-#endif
-}
-
-
-
-void TodoEditor::fillFields()
-{
-	FUNCTIONSETUP;
-
-	if (fTodo == 0L)
-	{
-		fTodo = new PilotTodoEntry();
-		fDeleteOnCancel = true;
-	}
-
-	fWidget->fDescription->setText(fTodo->getDescription());
-	fWidget->fCompleted->setChecked(fTodo->getComplete());
-	if (fTodo->getIndefinite())
-	{
-		fWidget->fHasEndDate->setChecked(false);
-	}
-	else
-	{
-		fWidget->fHasEndDate->setChecked(true);
-		fWidget->fEndDate->setDate(readTm(fTodo->getDueDate()).date());
-	}
-	fWidget->fPriority->setCurrentItem(fTodo->getPriority());
-//	fCategory->setCurrentItem(fTodo->getCategory()));
-	fWidget->fNote->setText(fTodo->getNote());
-}
-
-
-
-/* slot */ void TodoEditor::slotCancel()
-{
-	FUNCTIONSETUP;
-
-	if (fDeleteOnCancel && fTodo)
-	{
-		delete fTodo;
-
-		fTodo = 0L;
-	}
-	KDialogBase::slotCancel();
-}
-
-/* slot */ void TodoEditor::slotOk()
-{
-	FUNCTIONSETUP;
-
-	// Commit changes here
-	fTodo->setDescription(fWidget->fDescription->text());
-	fTodo->setComplete(fWidget->fCompleted->isChecked());
-	if (fWidget->fHasEndDate->isChecked())
-	{
-		fTodo->setIndefinite(false);
-		struct tm duedate=writeTm(fWidget->fEndDate->date());
-		fTodo->setDueDate(duedate);
-	}
-	else
-	{
-		fTodo->setIndefinite(true);
-	}
-	fTodo->setPriority(fWidget->fPriority->currentItem());
-//	fTodo->setCategory(fWidget->fCategory->currentItem());
-	fTodo->setNote(fWidget->fNote->text());
-
-	emit(recordChangeComplete(fTodo));
-	KDialogBase::slotOk();
-}
-
-/* slot */ void TodoEditor::updateRecord(PilotTodoEntry * p)
-{
-	FUNCTIONSETUP;
-	if (p != fTodo)
-	{
-		// Not meant for me
-		//
-		//
-		return;
-	}
-
-	if (p->isDeleted())
-	{
-		delayedDestruct();
-		return;
-	}
-	else
-	{
-		fillFields();
-	}
-}
-
diff --git a/kpilot/kpilot/todoEditor.h b/kpilot/kpilot/todoEditor.h
deleted file mode 100644
index 53dbb33c..00000000
--- a/kpilot/kpilot/todoEditor.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// -*- C++ -*-
-/* todoEditor.h		KPilot
-**
-** Copyright (C) 1998-2000 by Dan Pilone
-**
-** This is a dialog window that is used to edit a single todo record.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#ifndef _KPILOT_TODOEDITOR_H
-#define _KPILOT_TODOEDITOR_H
-
-#include <kdialogbase.h>
-
-class PilotTodoEntry;
-struct ToDoAppInfo;
-
-class TQComboBox;
-class TQTextEdit;
-class TQCheckBox;
-class KDateWidget;
-class TodoEditorBase;
-
-class TodoEditor : public KDialogBase
-{
-	Q_OBJECT
-
-
-public:
-	TodoEditor(PilotTodoEntry *todo,
-		struct ToDoAppInfo *appInfo,
-		TQWidget *parent, const char *name=0L);
-	~TodoEditor();
-
-
-signals:
-	void recordChangeComplete ( PilotTodoEntry* );
-
-public slots:
-	void slotOk();
-	void slotCancel();
-	void updateRecord(PilotTodoEntry *);
-
-private:
-	TodoEditorBase*fWidget;
-	bool fDeleteOnCancel;
-
-	PilotTodoEntry* fTodo;
-	struct ToDoAppInfo *fAppInfo;
-
-	void fillFields();
-};
-#endif
-
diff --git a/kpilot/kpilot/todoEditor_base.ui b/kpilot/kpilot/todoEditor_base.ui
deleted file mode 100644
index 9ed2d569..00000000
--- a/kpilot/kpilot/todoEditor_base.ui
+++ /dev/null
@@ -1,180 +0,0 @@
-<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
-<class>TodoEditorBase</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>TodoEditorBase</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>399</width>
-            <height>263</height>
-        </rect>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <widget class="QLabel" row="0" column="0">
-            <property name="name">
-                <cstring>fDescriptionLabel</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>4</hsizetype>
-                    <vsizetype>5</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="text">
-                <string>&amp;Description:</string>
-            </property>
-            <property name="alignment">
-                <set>AlignTop</set>
-            </property>
-            <property name="buddy" stdset="0">
-                <cstring>fDescription</cstring>
-            </property>
-        </widget>
-        <widget class="QLabel" row="4" column="0">
-            <property name="name">
-                <cstring>fNoteLabel</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>4</hsizetype>
-                    <vsizetype>5</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="text">
-                <string>&amp;Note:</string>
-            </property>
-            <property name="alignment">
-                <set>AlignTop</set>
-            </property>
-            <property name="buddy" stdset="0">
-                <cstring>fNote</cstring>
-            </property>
-        </widget>
-        <widget class="QLabel" row="2" column="2">
-            <property name="name">
-                <cstring>fCategoryLabel</cstring>
-            </property>
-            <property name="enabled">
-                <bool>false</bool>
-            </property>
-            <property name="text">
-                <string>Ca&amp;tegory:</string>
-            </property>
-            <property name="buddy" stdset="0">
-                <cstring>fCategory</cstring>
-            </property>
-        </widget>
-        <widget class="QComboBox" row="2" column="3">
-            <property name="name">
-                <cstring>fCategory</cstring>
-            </property>
-            <property name="enabled">
-                <bool>false</bool>
-            </property>
-        </widget>
-        <widget class="QLabel" row="1" column="2">
-            <property name="name">
-                <cstring>fPriorityLabel</cstring>
-            </property>
-            <property name="text">
-                <string>&amp;Priority:</string>
-            </property>
-            <property name="buddy" stdset="0">
-                <cstring>fPriority</cstring>
-            </property>
-        </widget>
-        <widget class="QComboBox" row="1" column="3">
-            <item>
-                <property name="text">
-                    <string>1</string>
-                </property>
-            </item>
-            <item>
-                <property name="text">
-                    <string>2</string>
-                </property>
-            </item>
-            <item>
-                <property name="text">
-                    <string>3</string>
-                </property>
-            </item>
-            <item>
-                <property name="text">
-                    <string>4</string>
-                </property>
-            </item>
-            <item>
-                <property name="text">
-                    <string>5</string>
-                </property>
-            </item>
-            <property name="name">
-                <cstring>fPriority</cstring>
-            </property>
-        </widget>
-        <widget class="QTextEdit" row="0" column="1" rowspan="1" colspan="3">
-            <property name="name">
-                <cstring>fDescription</cstring>
-            </property>
-            <property name="maximumSize">
-                <size>
-                    <width>32767</width>
-                    <height>80</height>
-                </size>
-            </property>
-        </widget>
-        <widget class="QTextEdit" row="4" column="1" rowspan="1" colspan="3">
-            <property name="name">
-                <cstring>fNote</cstring>
-            </property>
-        </widget>
-        <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>fCompleted</cstring>
-            </property>
-            <property name="text">
-                <string>&amp;Completed</string>
-            </property>
-        </widget>
-        <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>fHasEndDate</cstring>
-            </property>
-            <property name="text">
-                <string>Has &amp;end date:</string>
-            </property>
-        </widget>
-        <widget class="KDateWidget" row="3" column="0" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>fEndDate</cstring>
-            </property>
-            <property name="enabled">
-                <bool>false</bool>
-            </property>
-        </widget>
-    </grid>
-</widget>
-<connections>
-    <connection>
-        <sender>fHasEndDate</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>fEndDate</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-</connections>
-<layoutdefaults spacing="6" margin="11"/>
-<includes>
-    <include location="system" impldecl="in implementation">kdatewidget.h</include>
-</includes>
-</UI>
diff --git a/kpilot/kpilot/todoWidget.cc b/kpilot/kpilot/todoWidget.cc
deleted file mode 100644
index 4e0e9394..00000000
--- a/kpilot/kpilot/todoWidget.cc
+++ /dev/null
@@ -1,608 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This file defines the todoWidget, that part of KPilot that
-** displays todo records from the Pilot.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <tqptrlist.h>
-#include <klistview.h>
-#include <tqpushbutton.h>
-#include <tqlayout.h>
-#include <tqlabel.h>
-#include <tqtextview.h>
-#include <tqcombobox.h>
-#include <tqwhatsthis.h>
-#include <tqtextcodec.h>
-
-#include <kmessagebox.h>
-
-#include "kpilotConfig.h"
-#include "todoEditor.h"
-#include "pilotLocalDatabase.h"
-#include "todoWidget.moc"
-
-
-
-
-TodoCheckListItem::TodoCheckListItem(TQListView*parent, const TQString&text,
-	recordid_t pilotid, void*r):PilotCheckListItem(parent, text, pilotid, r)
-{
-
-}
-
-void TodoCheckListItem::stateChange(bool state)
-{
-	TodoListView*par=dynamic_cast<TodoListView*>(listView());
-	if (par) par->itemWasChecked(this, state);
-}
-
-
-
-TodoWidget::TodoWidget(TQWidget * parent,
-	const TQString & path) :
-	PilotComponent(parent, "component_todo", path),
-	fTodoInfo(0L),
-	fTodoAppInfo(0L),
-	fTodoDB(0L),
-	fPendingTodos(0)
-{
-	FUNCTIONSETUP;
-
-	setupWidget();
-	fTodoList.setAutoDelete(true);
-
-}
-
-TodoWidget::~TodoWidget()
-{
-	FUNCTIONSETUP;
-	KPILOT_DELETE( fTodoDB );
-}
-
-int TodoWidget::getAllTodos(PilotDatabase * todoDB)
-{
-	FUNCTIONSETUP;
-
-	int currentRecord = 0;
-	PilotRecord *pilotRec;
-	PilotTodoEntry *todo;
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Reading ToDoDB..." << endl;
-#endif
-
-	while ((pilotRec = todoDB->readRecordByIndex(currentRecord)) != 0L)
-	{
-		if (!(pilotRec->isDeleted()) &&
-			(!(pilotRec->isSecret()) || KPilotSettings::showSecrets()))
-		{
-			todo = new PilotTodoEntry(pilotRec);
-			if (todo == 0L)
-			{
-				WARNINGKPILOT << "Couldn't allocate record "
-					<< currentRecord++
-					<< endl;
-				break;
-			}
-			fTodoList.append(todo);
-		}
-		KPILOT_DELETE( pilotRec );
-
-		currentRecord++;
-	}
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Total " << currentRecord << " records" << endl;
-#endif
-
-	return currentRecord;
-}
-
-void TodoWidget::showComponent()
-{
-	FUNCTIONSETUP;
-	if ( fPendingTodos>0 ) return;
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Reading from directory " << dbPath() << endl;
-#endif
-
-	fTodoDB = new PilotLocalDatabase(dbPath(), CSL1("ToDoDB"));
-
-	fTodoList.clear();
-
-	if (fTodoDB->isOpen())
-	{
-		KPILOT_DELETE(fTodoAppInfo);
-		fTodoAppInfo = new PilotToDoInfo(fTodoDB);
-		populateCategories(fCatList, fTodoAppInfo->categoryInfo());
-		getAllTodos(fTodoDB);
-
-	}
-	else
-	{
-		populateCategories(fCatList, 0L);
-		WARNINGKPILOT << "Could not open local TodoDB" << endl;
-	}
-
-	KPILOT_DELETE( fTodoDB );
-
-	updateWidget();
-}
-
-/* virtual */ bool TodoWidget::preHotSync(TQString &s)
-{
-	FUNCTIONSETUP;
-
-	if (fPendingTodos)
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname
-			<< ": fPendingTodo="
-			<< fPendingTodos
-			<< endl;
-#endif
-
-#if KDE_VERSION<220
-		s = i18n("There are still %1 to-do editing windows open.")
-			.arg(TQString::number(fPendingTodos));
-#else
-		s = i18n("There is still a to-do editing window open.",
-			"There are still %n to-do editing windows open.",
-			fPendingTodos);
-#endif
-		return false;
-	}
-
-	return true;
-}
-
-void TodoWidget::postHotSync()
-{
-	FUNCTIONSETUP;
-
-	fTodoList.clear();
-	showComponent();
-}
-
-void TodoWidget::hideComponent()
-{
-	FUNCTIONSETUP;
-	if ( fPendingTodos==0 )
-	{
-		fTodoList.clear();
-		fListBox->clear();
-		KPILOT_DELETE( fTodoDB );
-	}
-}
-
-void TodoWidget::setupWidget()
-{
-	FUNCTIONSETUP;
-
-	TQLabel *label;
-	TQGridLayout *grid = new TQGridLayout(this, 6, 4, SPACING);
-
-	fCatList = new TQComboBox(this);
-	grid->addWidget(fCatList, 0, 1);
-	connect(fCatList, TQT_SIGNAL(activated(int)),
-		this, TQT_SLOT(slotSetCategory(int)));
-	TQWhatsThis::add(fCatList,
-		i18n("<qt>Select the category of to-dos to display here.</qt>"));
-
-	label = new TQLabel(i18n("Category:"), this);
-	label->setBuddy(fCatList);
-	grid->addWidget(label, 0, 0);
-
-	fListBox = new TodoListView(this);
-	fListBox->addColumn( i18n( "To-do Item" ) );
-	fListBox->setAllColumnsShowFocus( TRUE );
-	fListBox->setResizeMode( KListView::LastColumn );
-	fListBox->setFullWidth( TRUE );
-	fListBox->setItemsMovable( FALSE );
-	fListBox->setItemsRenameable (TRUE);
-	grid->addMultiCellWidget(fListBox, 1, 1, 0, 1);
-	connect(fListBox, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-		this, TQT_SLOT(slotShowTodo(TQListViewItem*)));
-	connect(fListBox, TQT_SIGNAL(doubleClicked(TQListViewItem*)),
-		this, TQT_SLOT(slotEditRecord(TQListViewItem*)));
-	connect(fListBox, TQT_SIGNAL(returnPressed(TQListViewItem*)),
-		this, TQT_SLOT(slotEditRecord(TQListViewItem*)));
-	connect(fListBox, TQT_SIGNAL(itemChecked(TQCheckListItem*, bool)),
-		this, TQT_SLOT(slotItemChecked(TQCheckListItem*, bool)));
-	connect(fListBox, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)),
-		this, TQT_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int)));
-	TQWhatsThis::add(fListBox,
-		i18n("<qt>This list displays all the to-dos "
-			"in the selected category. Click on "
-			"one to display it to the right.</qt>"));
-
-	label = new TQLabel(i18n("To-do info:"), this);
-	grid->addWidget(label, 0, 2);
-
-	// todo info text view
-	fTodoInfo = new TQTextView(this);
-	grid->addMultiCellWidget(fTodoInfo, 1, 4, 2, 2);
-
-	TQPushButton *button;
-	TQString wt;
-
-	fEditButton = new TQPushButton(i18n("Edit Record..."), this);
-	grid->addWidget(fEditButton, 2, 0);
-	connect(fEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditRecord()));
-
-	wt = KPilotSettings::internalEditors() ?
-		i18n("<qt>You can edit a to-do when it is selected.</qt>") :
-		i18n("<qt><i>Editing is disabled by the 'internal editors' setting.</i></qt>");
-	TQWhatsThis::add(fEditButton,wt);
-
-	button = new TQPushButton(i18n("New Record..."), this);
-	grid->addWidget(button, 2, 1);
-	connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCreateNewRecord()));
-	wt = KPilotSettings::internalEditors() ?
-		i18n("<qt>Add a new to-do to the to-do list.</qt>") :
-		i18n("<qt><i>Adding new to-dos is disabled by the 'internal editors' setting.</i></qt>");
-	TQWhatsThis::add(button, wt);
-	button->setEnabled(KPilotSettings::internalEditors());
-
-	fDeleteButton = new TQPushButton(i18n("Delete Record"), this);
-	grid->addWidget(fDeleteButton, 3, 0);
-	connect(fDeleteButton, TQT_SIGNAL(clicked()),
-		this, TQT_SLOT(slotDeleteRecord()));
-	wt = KPilotSettings::internalEditors() ?
-		i18n("<qt>Delete the selected to-do from the to-do list.</qt>") :
-		i18n("<qt><i>Deleting is disabled by the 'internal editors' setting.</i></qt>") ;
-	TQWhatsThis::add(fDeleteButton,wt);
-}
-
-void TodoWidget::updateWidget()
-{
-	FUNCTIONSETUP;
-	if (!shown || !fTodoAppInfo ) return;
-
-	int listIndex = 0;
-
-	int currentCatID = findSelectedCategory(fCatList,
-		fTodoAppInfo->categoryInfo());
-
-	fListBox->clear();
-	fTodoList.first();
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Adding records..." << endl;
-#endif
-
-	PilotTodoEntry*todo;
-	while (fTodoList.current())
-	{
-		todo=fTodoList.current();
-		if ((currentCatID == -1) ||
-			(todo->category() == currentCatID))
-		{
-			TQString title = todo->getDescription();
-
-			TodoCheckListItem*item=new TodoCheckListItem(fListBox, title,
-				listIndex, todo);
-			item->setOn(todo->getComplete());
-		}
-		listIndex++;
-		fTodoList.next();
-	}
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": " << listIndex << " records" << endl;
-#endif
-
-	slotUpdateButtons();
-}
-
-
-
-/* slot */ void TodoWidget::slotUpdateButtons()
-{
-	FUNCTIONSETUP;
-
-	bool enabled = (fListBox->currentItem() != 0L);
-
-	enabled &= KPilotSettings::internalEditors() ;
-
-	fEditButton->setEnabled(enabled);
-	fDeleteButton->setEnabled(enabled);
-}
-
-void TodoWidget::slotSetCategory(int)
-{
-	FUNCTIONSETUP;
-
-	updateWidget();
-}
-
-void TodoWidget::slotEditRecord()
-{
-	slotEditRecord(fListBox->currentItem());
-}
-void TodoWidget::slotEditRecord(TQListViewItem*item)
-{
-	FUNCTIONSETUP;
-	if (!shown) return;
-
-	TodoCheckListItem*p = static_cast<TodoCheckListItem*>(item);
-	if (!p) return;
-	PilotTodoEntry *selectedRecord = (PilotTodoEntry *) p->rec();
-
-	if (selectedRecord->id() == 0)
-	{
-		KMessageBox::error(0L,
-			i18n("Cannot edit new records until "
-				"HotSynced with Pilot."),
-			i18n("HotSync Required"));
-		return;
-	}
-
-	TodoEditor *editor = new TodoEditor(selectedRecord,
-		fTodoAppInfo->info(), this);
-
-	connect(editor, TQT_SIGNAL(recordChangeComplete(PilotTodoEntry *)),
-		this, TQT_SLOT(slotUpdateRecord(PilotTodoEntry *)));
-	connect(editor, TQT_SIGNAL(cancelClicked()),
-		this, TQT_SLOT(slotEditCancelled()));
-	editor->show();
-
-	fPendingTodos++;
-}
-
-void TodoWidget::slotCreateNewRecord()
-{
-	FUNCTIONSETUP;
-	if (!shown) return;
-
-	// Response to bug 18072: Don't even try to
-	// add records to an empty or unopened database,
-	// since we don't have the DBInfo stuff to deal with it.
-	//
-	//
-	PilotDatabase *myDB = new PilotLocalDatabase(dbPath(), CSL1("ToDoDB"));
-
-	if (!myDB || !myDB->isOpen())
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname
-			<< ": Tried to open "
-			<< dbPath()
-			<< "/ToDoDB"
-			<< " and got pointer @"
-			<< (void *) myDB
-			<< " with status "
-			<< ( myDB ? myDB->isOpen() : false )
-			<< endl;
-#endif
-
-		KMessageBox::sorry(this,
-			i18n("You cannot add to-dos to the to-do list "
-				"until you have done a HotSync at least once "
-				"to retrieve the database layout from your Pilot."),
-			i18n("Cannot Add New To-do"));
-
-		if (myDB)
-			KPILOT_DELETE( myDB );
-
-		return;
-	}
-
-	TodoEditor *editor = new TodoEditor(0L,
-		fTodoAppInfo->info(), this);
-
-	connect(editor, TQT_SIGNAL(recordChangeComplete(PilotTodoEntry *)),
-		this, TQT_SLOT(slotAddRecord(PilotTodoEntry *)));
-	connect(editor, TQT_SIGNAL(cancelClicked()),
-		this, TQT_SLOT(slotEditCancelled()));
-	editor->show();
-
-	fPendingTodos++;
-}
-
-void TodoWidget::slotAddRecord(PilotTodoEntry * todo)
-{
-	FUNCTIONSETUP;
-	if ( !shown && fPendingTodos==0 ) return;
-
-	int currentCatID = findSelectedCategory(fCatList,
-		fTodoAppInfo->categoryInfo(), true);
-
-
-	todo->PilotRecordBase::setCategory(currentCatID);
-	fTodoList.append(todo);
-	writeTodo(todo);
-	// TODO: Just add the new record to the lists
-	updateWidget();
-
-	// k holds the item number of the todo just added.
-	//
-//	int k = fListBox->count() - 1;
-//
-//	fListBox->setCurrentItem(k);	// Show the newest one
-//	fListBox->setBottomItem(k);
-
-	fPendingTodos--;
-	if ( !shown && fPendingTodos==0 ) hideComponent();
-}
-
-void TodoWidget::slotUpdateRecord(PilotTodoEntry * todo)
-{
-	FUNCTIONSETUP;
-	if ( !shown && fPendingTodos==0 ) return;
-
-	writeTodo(todo);
-	TodoCheckListItem* currentRecord = static_cast<TodoCheckListItem*>(fListBox->currentItem());
-
-	// TODO: Just change the record
-	updateWidget();
-	fListBox->setCurrentItem(currentRecord);
-
-	emit(recordChanged(todo));
-
-	fPendingTodos--;
-	if ( !shown && fPendingTodos==0 ) hideComponent();
-}
-
-void TodoWidget::slotEditCancelled()
-{
-	FUNCTIONSETUP;
-
-	fPendingTodos--;
-	if ( !shown && fPendingTodos==0 ) hideComponent();
-}
-
-void TodoWidget::slotDeleteRecord()
-{
-	FUNCTIONSETUP;
-	if (!shown) return;
-
-	TodoCheckListItem* p = static_cast<TodoCheckListItem*>(fListBox->currentItem());
-	if (p == 0L) return;
-
-	PilotTodoEntry *selectedRecord = (PilotTodoEntry *) p->rec();
-
-	if (selectedRecord->id() == 0)
-	{
-		KMessageBox::error(this,
-			i18n("New records cannot be deleted until "
-				"HotSynced with pilot."),
-			i18n("HotSync Required"));
-		return;
-	}
-
-	if (KMessageBox::questionYesNo(this,
-			i18n("Delete currently selected record?"),
-			i18n("Delete Record?"), KStdGuiItem::del(), KStdGuiItem::cancel()) == KMessageBox::No)
-		return;
-
-	selectedRecord->setDeleted(true);
-	writeTodo(selectedRecord);
-	emit(recordChanged(selectedRecord));
-	showComponent();
-}
-
-
-
-void TodoWidget::slotShowTodo(TQListViewItem*item)
-{
-	FUNCTIONSETUP;
-	if (!shown) return;
-
-	TodoCheckListItem *p = dynamic_cast<TodoCheckListItem*>(item);
-	if (!p) return;
-	PilotTodoEntry *todo = (PilotTodoEntry *) p->rec();
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Showing "<< todo->getDescription()<<endl;
-#endif
-
-	TQString text(CSL1("<qt>"));
-	text += todo->getTextRepresentation(Qt::RichText);
-	text += CSL1("</qt>\n");
-	fTodoInfo->setText(text);
-
-	slotUpdateButtons();
-}
-
-
-
-void TodoWidget::writeTodo(PilotTodoEntry * which,
-	PilotDatabase * todoDB)
-{
-	FUNCTIONSETUP;
-
-	// Open a database (myDB) only if needed,
-	// i.e. only if the passed-in todoDB
-	// isn't valid.
-	//
-	//
-	PilotDatabase *myDB = todoDB;
-	bool usemyDB = false;
-
-	if (myDB == 0L || !myDB->isOpen())
-	{
-		myDB = new PilotLocalDatabase(dbPath(), CSL1("ToDoDB"));
-		usemyDB = true;
-	}
-
-	// Still no valid todo database...
-	//
-	//
-	if (!myDB->isOpen())
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": Todo database is not open" <<
-			endl;
-#endif
-		return;
-	}
-
-
-	// Do the actual work.
-	PilotRecord *pilotRec = which->pack();
-
-	myDB->writeRecord(pilotRec);
-	markDBDirty(CSL1("ToDoDB"));
-	KPILOT_DELETE(pilotRec);
-
-
-	// Clean up in the case that we allocated our own DB.
-	//
-	//
-	if (usemyDB)
-	{
-		KPILOT_DELETE(myDB);
-	}
-}
-
-void TodoWidget::slotItemChecked(TQCheckListItem*item, bool on)
-{
-	TodoCheckListItem*p = static_cast<TodoCheckListItem*>(item);
-	if (!p) return;
-	PilotTodoEntry *selectedRecord = (PilotTodoEntry *) p->rec();
-	if (!selectedRecord) return;
-	selectedRecord->setComplete(on);
-	slotShowTodo(item);
-}
-
-void TodoWidget::slotItemRenamed(TQListViewItem*item, const TQString &txt, int nr)
-{
-	TodoCheckListItem*p = static_cast<TodoCheckListItem*>(item);
-	if (!p) return;
-	PilotTodoEntry *selectedRecord = (PilotTodoEntry *) p->rec();
-	if (!selectedRecord) return;
-	if (nr==0)
-	{
-		selectedRecord->setDescription(txt);
-		slotShowTodo(item);
-	}
-}
diff --git a/kpilot/kpilot/todoWidget.h b/kpilot/kpilot/todoWidget.h
deleted file mode 100644
index 63ee3e86..00000000
--- a/kpilot/kpilot/todoWidget.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* todoWidget.h			KPilot
-**
-** Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-
-** This file defines the todo-viewing widget used in KPilot
-** to display the Pilot's todo records.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-#ifndef _KPILOT_TODOWIDGET_H
-#define _KPILOT_TODOWIDGET_H
-
-class TQComboBox;
-class TQPushButton;
-class TQTextView;
-
-#include "pilotComponent.h"
-#include "pilotTodoEntry.h"
-#include "listItems.h"
-
-class TodoListView : public KListView
-{
-Q_OBJECT
-public:
-	TodoListView(TQWidget * parent = 0, const char * name = 0 ):KListView(parent, name){};
-	~TodoListView() {};
-signals:
-	void itemChecked(TQCheckListItem*item);
-	void itemChecked(TQCheckListItem*item, bool on);
-//protected:
-public:
-	void itemWasChecked(TQCheckListItem*item, bool on) {
-		emit itemChecked(item);
-		emit itemChecked(item, on);
-	}
-};
-
-class TodoCheckListItem : public PilotCheckListItem
-{
-public:
-	TodoCheckListItem(TQListView*parent, const TQString&text, recordid_t pilotid, void*r);
-	~TodoCheckListItem()  {};
-	virtual void  stateChange(bool state);
-};
-
-class TodoWidget : public PilotComponent
-{
-Q_OBJECT
-
-public:
-	TodoWidget(TQWidget* parent,const TQString& dbpath);
-	~TodoWidget();
-
-	// Pilot Component Methods:
-	virtual bool preHotSync(TQString &);
-	virtual void postHotSync();
-	virtual void showComponent();
-	virtual void hideComponent();
-
-public slots:
-	/**
-	* Called when a particular todo is selected. This slot displays
-	* it in the viewer widget.
-	*/
-	void slotShowTodo(TQListViewItem*);
-	void slotEditRecord(TQListViewItem*item);
-	void slotEditRecord();
-	void slotCreateNewRecord();
-	void slotDeleteRecord();
-	void slotEditCancelled();
-
-	void slotUpdateButtons();	// Enable/disable buttons
-
-signals:
-	void recordChanged(PilotTodoEntry *);
-
-protected slots:
-	/**
-	* When an edit window is closed, the corresponding record
-	* is updated and possibly re-displayed.
-	*/
-	void slotUpdateRecord(PilotTodoEntry*);
-
-	/**
-	* Pop up an edit window for a new record.
-	*/
-	void slotAddRecord(PilotTodoEntry*);
-
-	/**
-	* Change category. This means that the display should be
-	* cleared and that the list should be repopulated.
-	*/
-	void slotSetCategory(int);
-
-
-	void slotItemChecked(TQCheckListItem*item, bool on);
-	void slotItemRenamed(TQListViewItem*item, const TQString &txt, int nr);
-private:
-	void setupWidget();
-	void updateWidget(); // Called with the lists have changed..
-	void writeTodo(PilotTodoEntry* which,PilotDatabase *db=0L);
-
-	/**
-	* getAllTodos reads the database and places all
-	* the todos from the database in the list
-	* in memory --- not the list on the screen.
-	* @see fTodoList
-	*/
-	int getAllTodos(PilotDatabase *todoDB);
-
-	/**
-	* Create a sensible "title" for an todo, composed
-	* of first + last name if possible.
-	*/
-	TQString createTitle(PilotTodoEntry *,int displayMode);
-
-	/**
-	* We use a TQComboBox fCatList to hold the user-visible names
-	* of all the categories. The TQTextView fTodoInfo is for
-	* displaying the currently selected todo, if any.
-	* The TQListView fListBox lists all the todoes in the
-	* currently selected category.
-	*
-	* The entire todo database is read into memory in the
-	* QList fTodoList. We need the appinfo block from the
-	* database to determine which categories there are; this
-	* is held in fTodoAppInfo.
-	*
-	* The two buttons should speak for themselves.
-	*/
-	QComboBox		*fCatList;
-	QTextView		*fTodoInfo;
-	PilotToDoInfo 		*fTodoAppInfo;
-	TQPtrList<PilotTodoEntry>	fTodoList;
-	TodoListView		*fListBox;
-	QPushButton		*fEditButton,*fDeleteButton;
-	PilotDatabase		*fTodoDB;
-protected:
-	/**
-	* Keep track of how many open todo editing windows there
-	* are. You can't sync when there are open windows.
-	*/
-	int fPendingTodos;
-
-};
-
-#endif
diff --git a/kpilot/lib/CMakeLists.txt b/kpilot/lib/CMakeLists.txt
deleted file mode 100644
index efc36ce5..00000000
--- a/kpilot/lib/CMakeLists.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-include(CheckIncludeFiles)
-include(CheckFunctionExists)
-
-check_include_files( stdint.h HAVE_STDINT_H )
-check_include_files( alloca.h HAVE_ALLOCA_H )
-check_include_files( "sys/time.h" HAVE_SYS_TIME_H )
-check_include_files( "sys/stat.h" HAVE_SYS_STAT_H )
-check_function_exists( cfsetspeed HAVE_CFSETSPEED )
-check_function_exists( strdup HAVE_STRDUP )
-check_function_exists( setenv HAVE_SETENV )
-check_function_exists( unsetenv HAVE_UNSETENV )
-check_function_exists( usleep HAVE_USLEEP )
-check_function_exists( random HAVE_RANDOM )
-check_function_exists( putenv HAVE_PUTENV )
-check_function_exists( seteuid HAVE_SETEUID )
-check_function_exists( mkstemps HAVE_MKSTEMPS )
-check_function_exists( mkstemp HAVE_MKSTEMP )
-check_function_exists( mkdtemp HAVE_MKDTEMP )
-check_function_exists( revoke HAVE_REVOKE )
-check_function_exists( strlcpy HAVE_STRLCPY )
-check_function_exists( strlcat HAVE_STRLCAT )
-check_function_exists( inet_aton HAVE_INET_ATON )
-
-configure_file(
-	${CMAKE_SOURCE_DIR}/config.h.cmake
-	${CMAKE_CURRENT_BINARY_DIR}/config.h
-)
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-set(lib_SRCS
-	options.cc
-	plugin.cc
-	syncAction.cc
-	actions.cc
-	actionQueue.cc
-	idmapping.cc
-	idmapperxml.cc
-	idmapper.cc
-	kpilotlink.cc
-	kpilotdevicelink.cc
-	kpilotlocallink.cc
-	pilot.cc
-	pilotAppInfo.cc
-	pilotRecord.cc
-	pilotDatabase.cc
-	pilotLocalDatabase.cc
-	pilotSerialDatabase.cc
-	pilotMemo.cc
-	pilotAddress.cc
-	pilotDateEntry.cc
-	pilotTodoEntry.cc
-)
-
-kde3_automoc(${lib_SRCS})
-kde3_add_kcfg_files(lib_SRCS kpilotlibSettings.kcfgc)
-add_library(kpilot SHARED ${lib_SRCS})
-target_link_libraries(kpilot ${PILOTLINK_LIBRARY} ${QT_LIBRARIES} kdeui kio)
-kpilot_rpath(kpilot)
-
-#---------- INSTALL -----------------------*
-set(kpilotinclude_HEADERS
-	kpilotlink.h
-	kpilotdevicelink.h
-	kpilotlocallink.h
-	pilot.h
-	pilotDatabase.h
-	pilotLinkVersion.h
-	pilotLocalDatabase.h
-	pilotRecord.h
-	pilotSerialDatabase.h
-	plugin.h
-	pluginfactory.h
-	syncAction.h
-)
-
-install(
-	TARGETS kpilot
-	LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-)
-
-install(
-	FILES ${kpilotinclude_HEADERS}
-	DESTINATION ${CMAKE_INSTALL_PREFIX}/include/kpilot
-)
-
-install(
-	FILES kpilotlib.kcfg DESTINATION ${KDE3_KCFG_DIR}
-)
-
diff --git a/kpilot/lib/COPYING b/kpilot/lib/COPYING
deleted file mode 100644
index 7bbb8e8b..00000000
--- a/kpilot/lib/COPYING
+++ /dev/null
@@ -1,509 +0,0 @@
-[This license applies only to the contents of the lib/ directory,
-whereas the rest of KPilot is under the regular GNU GENERAL PUBLIC
-LICENSE. This has been done to ensure that non-GPL yet LGPL-compatibly
-licensed plugins may be written for KPilot.]
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/kpilot/lib/Makefile.am b/kpilot/lib/Makefile.am
deleted file mode 100644
index b2ceadf1..00000000
--- a/kpilot/lib/Makefile.am
+++ /dev/null
@@ -1,60 +0,0 @@
-### Makefile.am for kpilot/lib
-###
-###
-
-METASOURCES = AUTO
-
-INCLUDES = $(PISOCK_INCLUDE) -I$(top_srcdir) $(all_includes)
-
-### If you must get debugging output on a platform where
-### the libs are built without debugging support, define
-### DEBUG_CERR. Define DEBUG to get debugging support anywhere.
-###
-### KDE_CXXFLAGS=-DDEBUG -DDEBUG_CERR
-##KDE_CXXFLAGS=-DNDEBUG -UDEBUG
-##KDE_CXXFLAGS=-DDEBUG
-
-lib_LTLIBRARIES = libkpilot.la
-
-libkpilot_la_SOURCES = kpilotlibSettings.kcfgc \
-	options.cc plugin.cc syncAction.cc \
-	kpilotlink.cc kpilotdevicelink.cc kpilotlocallink.cc \
-	actions.cc actionQueue.cc \
-	pilot.cc \
-	pilotAppInfo.cc pilotRecord.cc pilotDatabase.cc \
-	pilotLocalDatabase.cc pilotSerialDatabase.cc \
-	pilotMemo.cc \
-	pilotAddress.cc \
-	pilotDateEntry.cc \
-	pilotTodoEntry.cc
-
-libkpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) -no-undefined $(all_libraries) $(KDE_EXTRA_RPATH) $(KDE_RPATH)
-libkpilot_la_LIBADD = $(PISOCK_LIB) $(LIB_KDEUI) $(LIB_KABC) $(top_builddir)/libkcal/libkcal.la
-
-kpilotincludedir = $(includedir)/kpilot
-kpilotinclude_HEADERS = \
-	kpilotlink.h kpilotlocallink.h kpilotdevicelink.h \
-	pilot.h \
-	pilotDatabase.h \
-	pilotLinkVersion.h \
-	pilotLocalDatabase.h \
-	pilotRecord.h \
-	pilotSerialDatabase.h \
-	plugin.h \
-	pluginfactory.h \
-	syncAction.h
-
-
-kde_kcfg_DATA = kpilotlib.kcfg
-
-check-local:
-	rm -f FAILED
-	for i in $(srcdir)/*.h ; do \
-		( echo "#include <kdemacros.h>" ; echo "#include \"$$i\"" ; echo "int main(int argc,char **argv){return 0;}" ) > header-test.cc; \
-		echo "$$i" ; \
-		g++ $(all_includes) -I$(top_builddir) -DQT_THREAD_SUPPORT -c header-test.cc || echo "$$i" >> FAILED; \
-	done
-	test ! -e FAILED
-
-DOXYGEN_REFERENCES=libkcal kdecore
-include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kpilot/lib/actionQueue.cc b/kpilot/lib/actionQueue.cc
deleted file mode 100644
index 69362973..00000000
--- a/kpilot/lib/actionQueue.cc
+++ /dev/null
@@ -1,172 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This defines the "ActionQueue", which is the pile of actions
-** that will occur during a HotSync.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-#include "options.h"
-
-#include <tqtimer.h>
-
-#include "actions.h"
-#include "plugin.h"
-
-#include "actionQueue.moc"
-
-
-
-
-ActionQueue::ActionQueue(KPilotLink *d) :
-	SyncAction(d,"ActionQueue")
-	// The string lists have default constructors
-{
-	FUNCTIONSETUP;
-}
-
-ActionQueue::~ActionQueue()
-{
-	FUNCTIONSETUP;
-	clear();
-}
-
-void ActionQueue::clear()
-{
-	SyncAction *del = 0L;
-	while ( (del = nextAction()) )
-	{
-		delete del;
-	}
-
-	Q_ASSERT(isEmpty());
-}
-
-void ActionQueue::queueInit()
-{
-	FUNCTIONSETUP;
-
-	addAction(new WelcomeAction(fHandle));
-}
-
-void ActionQueue::queueConduits(const TQStringList &l,
-	const SyncAction::SyncMode &m)
-{
-	FUNCTIONSETUP;
-
-	// Add conduits here ...
-	//
-	//
-	for (TQStringList::ConstIterator it = l.begin();
-		it != l.end();
-		++it)
-	{
-		if ((*it).startsWith(CSL1("internal_")))
-		{
-#ifdef DEBUG
-			DEBUGKPILOT << fname <<
-				": Ignoring conduit " << *it << endl;
-#endif
-			continue;
-		}
-
-#ifdef DEBUG
-		DEBUGKPILOT << fname
-			<< ": Creating proxy with mode=" << m.name() << endl;
-#endif
-		ConduitProxy *cp = new ConduitProxy(fHandle,*it,m);
-		addAction(cp);
-	}
-}
-
-void ActionQueue::queueCleanup()
-{
-	addAction(new CleanupAction(fHandle));
-}
-
-bool ActionQueue::exec()
-{
-	actionCompleted(0L);
-	return true;
-}
-
-void ActionQueue::actionCompleted(SyncAction *b)
-{
-	FUNCTIONSETUP;
-
-	if (b)
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname
-			<< ": Completed action "
-			<< b->name()
-			<< endl;
-#endif
-		delete b;
-	}
-
-	if (isEmpty())
-	{
-		delayDone();
-		return;
-	}
-	if ( deviceLink() && (!deviceLink()->tickle()) )
-	{
-		emit logError(i18n("The connection to the handheld "
-			"was lost. Synchronization cannot continue."));
-		clear();
-		delayDone();
-		return;
-	}
-
-	SyncAction *a = nextAction();
-
-	if (!a)
-	{
-		WARNINGKPILOT << "NULL action on stack."
-			<< endl;
-		return;
-	}
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname
-		<< ": Will run action "
-		<< a->name()
-		<< endl;
-#endif
-
-	TQObject::connect(a, TQT_SIGNAL(logMessage(const TQString &)),
-		this, TQT_SIGNAL(logMessage(const TQString &)));
-	TQObject::connect(a, TQT_SIGNAL(logError(const TQString &)),
-		this, TQT_SIGNAL(logMessage(const TQString &)));
-	TQObject::connect(a, TQT_SIGNAL(logProgress(const TQString &, int)),
-		this, TQT_SIGNAL(logProgress(const TQString &, int)));
-	TQObject::connect(a, TQT_SIGNAL(syncDone(SyncAction *)),
-		this, TQT_SLOT(actionCompleted(SyncAction *)));
-
-	// Run the action picked from the queue when we get back
-	// to the event loop.
-	TQTimer::singleShot(0,a,TQT_SLOT(execConduit()));
-}
-
diff --git a/kpilot/lib/actionQueue.h b/kpilot/lib/actionQueue.h
deleted file mode 100644
index 057b4beb..00000000
--- a/kpilot/lib/actionQueue.h
+++ /dev/null
@@ -1,162 +0,0 @@
-#ifndef _KPILOT_ACTIONQUEUE_H
-#define _KPILOT_ACTIONQUEUE_H
-/*
-**
-** Copyright (C) 1998-2001,2003 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <tqptrqueue.h>
-
-#include "syncAction.h"
-
-/** @file
-* This file defines the ActionQueue.
-*
-* This used to be called SyncStack, and while a stack is cool
-* for some things, it actually rather confuses the issue because
-* you _use_ this class for specifying "do this, then that, then ..."
-* and in program code you need to reverse that order when adding
-* items to a stack. So now it's a Queue, FIFO, and program
-* code looks more normal.
-*/
-
-/**
-* The ActionQueue is a meta-action, which handles running a bunch of
-* SyncActions in sequence. It is a SyncAction itself, so it can even
-* be queued on another ActionQueue.
-*
-* An ActionQueue is constructed with a @p device. As usual, you should
-* connect the device's deviceReady() signal with the exec() slot --
-* or something to that effect. The ActionQueue will then run all the
-* actions in the queue in sequence.
-*
-*/
-KDE_EXPORT class ActionQueue : public SyncAction
-{
-Q_OBJECT
-public:
-	/**
-	* Constructor. Pass in a KPilot device link for it to act on.
-	* It is legal to pass in 0 (NULL) as a device. Ownership of
-	* the device is unchanged.
-	*/
-	ActionQueue(KPilotLink *device);
-
-	/** Destructor. */
-	virtual ~ActionQueue();
-
-	/** Is the queue empty? Returns @c true if it is. */
-	bool isEmpty() const
-	{
-		return SyncActionQueue.isEmpty();
-	};
-
-	/**
-	* You can push your own action @p a onto the queue. Ownership
-	* of the action is given to the ActionQueue object.
-	*/
-	void addAction(SyncAction *a)
-	{
-		SyncActionQueue.enqueue(a);
-	};
-
-public:
-	/*
-	* Call these queue*() functions to append standard functional
-	* blocks. You should at least call queueInit() and
-	* queueCleanup() to add the welcome and cleanup actions to
-	* the queue (unless you do that yourself.)
-	*
-	* For queueInit, a WelcomeAction is added.
-	* For queueConduits, whatever is relevant for the conduits
-	*   can be used, usually things in the FlagMask and ActionMask.
-	*   The list of conduits in @p conduits is queued automatically.
-	*/
-
-	/**
-	* Initialize the queue. This empties it out and adds a
-	* welcome action (see WelcomeAction in actions.h) so that
-	* the user knows what is happening when the ActionQueue
-	* begins to execute. Equivalent to
-	* @code
-	* clear(); addAction(new WelcomeAction);
-	* @endcode
-	*/
-	void queueInit();
-
-	/**
-	* Queue a (series) of conduits @p conduits with a given
-	* sync mode @p mode. Each of the conduits named is called
-	* through a ConduitProxy object which handles loading the
-	* conduit's shared library and creating the actual SyncAction
-	* for that conduit. Actions named "internal_*" are silently
-	* ignored since those names are used by KPilot internally
-	* for administrative purposes.
-	*/
-	void queueConduits(const TQStringList &conduits,
-		const SyncAction::SyncMode &mode);
-
-	/**
-	* Convenience function for adding a cleanup action (see
-	* CleanupAction in actions.h) to the queue. Should be the
-	* last action added to the queue because a HotSync can only
-	* have @em one cleanup.
-	*/
-	void queueCleanup();
-
-protected:
-	/**
-	* Remove all the actions from the queue and delete them
-	* (the queue owns the actions, after all).
-	*/
-	void clear();
-
-	/**
-	* Dequeue the next action in the queue, ready for processing.
-	* This takes the action off the queue, so remember to delete it
-	* eventually.
-	*/
-	SyncAction *nextAction()
-	{
-		return SyncActionQueue.dequeue();
-	};
-
-	/** Reimplemented from SyncAction. */
-	virtual bool exec();
-
-protected slots:
-	/**
-	* When one action finishes, start the next one.
-	*/
-	void actionCompleted(SyncAction *);
-
-private:
-	/** A queue of actions to take. */
-	TQPtrQueue < SyncAction > SyncActionQueue;
-};
-
-
-#endif
diff --git a/kpilot/lib/actions.cc b/kpilot/lib/actions.cc
deleted file mode 100644
index 212540f7..00000000
--- a/kpilot/lib/actions.cc
+++ /dev/null
@@ -1,137 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-** Copyright (C) 2006 Adriaan de Groot <groot@kde.org>
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-#include "options.h"
-
-#include <tqapplication.h>
-#include <tqdir.h>
-#include <tqfile.h>
-
-#include <ksavefile.h>
-
-#include "pilot.h"
-#include "pilotUser.h"
-
-#include "actions.h"
-
-
-
-WelcomeAction::WelcomeAction(KPilotLink *p) :
-	SyncAction(p,"welcomeAction")
-{
-	FUNCTIONSETUP;
-}
-
-/* virtual */ bool WelcomeAction::exec()
-{
-	FUNCTIONSETUP;
-
-	addSyncLogEntry(i18n("KPilot %1 HotSync starting...\n")
-		.arg(TQString::fromLatin1(KPILOT_VERSION)));
-	emit logMessage( i18n("Using encoding %1 on the handheld.").arg(Pilot::codecName()) );
-	emit syncDone(this);
-	return true;
-}
-
-SorryAction::SorryAction(KPilotLink *p, const TQString &s) :
-	SyncAction(p,"sorryAction"),
-	fMessage(s)
-{
-	if (fMessage.isEmpty())
-	{
-		fMessage = i18n("KPilot is busy and cannot process the "
-			"HotSync right now.");
-	}
-}
-
-bool SorryAction::exec()
-{
-	FUNCTIONSETUP;
-
-	addSyncLogEntry(fMessage);
-	return delayDone();
-}
-
-CleanupAction::CleanupAction(KPilotLink *p)  : SyncAction(p,"cleanupAction")
-{
-	FUNCTIONSETUP;
-}
-
-/* virtual */ bool CleanupAction::exec()
-{
-	FUNCTIONSETUP;
-
-	if (deviceLink())
-	{
-		deviceLink()->endSync( KPilotLink::UpdateUserInfo );
-	}
-	emit syncDone(this);
-	return true;
-}
-
-
-TestLink::TestLink(KPilotLink * p) :
-	SyncAction(p, "testLink")
-{
-	FUNCTIONSETUP;
-
-}
-
-/* virtual */ bool TestLink::exec()
-{
-	FUNCTIONSETUP;
-
-	int i;
-	int dbindex = 0;
-	int count = 0;
-	struct DBInfo db;
-
-	addSyncLogEntry(i18n("Testing.\n"));
-
-	while ((i = deviceLink()->getNextDatabase(dbindex,&db)) > 0)
-	{
-		count++;
-		dbindex = db.index + 1;
-
-		DEBUGKPILOT << fname
-			<< ": Read database " << db.name
-			<< " with index " << db.index
-			<< endl;
-
-		// Let the Pilot User know what's happening
-		openConduit();
-		// Let the KDE User know what's happening
-		// Pretty sure all database names are in latin1.
-		emit logMessage(i18n("Syncing database %1...")
-			.arg(Pilot::fromPilot(db.name)));
-	}
-
-	emit logMessage(i18n("HotSync finished."));
-	emit syncDone(this);
-	return true;
-}
diff --git a/kpilot/lib/actions.h b/kpilot/lib/actions.h
deleted file mode 100644
index 2e3b9b20..00000000
--- a/kpilot/lib/actions.h
+++ /dev/null
@@ -1,115 +0,0 @@
-#ifndef _KPILOT_ACTIONS_H
-#define _KPILOT_ACTIONS_H
-/*
-**
-** Copyright (C) 1998-2001,2003 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-** Copyright (C) 2006 Adriaan de Groot <groot@kde.org>
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "syncAction.h"
-
-/** @file
-* This file defines some simple standard actions. None of these
-* actions require much in the way of configuration; none provide
-* particularly complicated functionality.
-*/
-
-/**
-* This action puts "Welcome to KPilot" in the sync log of the handheld.
-* It is added automatically to a ActionQueue by queueInit() in order
-* to inform the user of the sync.
-*/
-KDE_EXPORT class WelcomeAction : public SyncAction
-{
-public:
-	/** Constructor. */
-	WelcomeAction(KPilotLink *);
-
-protected:
-	/** Reimplemented from SyncAction. */
-	virtual bool exec();
-} ;
-
-/**
-* This one just says "sorry, can't sync now". This is used
-* in cases when the hotsync starts while KPilot is busy configuring
-* something and can't be interrupted.
-*/
-KDE_EXPORT class SorryAction : public SyncAction
-{
-public:
-	/**
-	* Constructor. The action will be executed on the given
-	* link @p device . If the given string @p s is non-empty,
-	* print that message (it must be i18n()ed already) instead of
-	* the standard message.
-	*/
-	SorryAction(KPilotLink *device, const TQString &s=TQString::null);
-
-protected:
-	/** Reimplemented from SyncAction. */
-	virtual bool exec();
-
-	/** Message to print to the sync log. */
-	TQString fMessage;
-} ;
-
-/**
-* End the HotSync. This action cleans up the handheld and
-* removes cruft. There should be exactly @em one CleanupAction
-* executed during a HotSync. Since this action informs the
-* device that the HotSync is over, it should be the last
-* action executed.
-*/
-KDE_EXPORT class CleanupAction : public SyncAction
-{
-public:
-	/** Constructor. */
-	CleanupAction(KPilotLink *device);
-
-protected:
-	/** Reimplemented from SyncAction. */
-	virtual bool exec();
-} ;
-
-/**
-* This action is intended to test the link with the handheld
-* and not do anything spectacular. It lists all the databases
-* on the handheld in the sync log.
-*/
-KDE_EXPORT class TestLink : public SyncAction
-{
-public:
-	/** Constructor. */
-	TestLink(KPilotLink *device);
-
-protected:
-	/** Reimplemented from SyncAction. */
-	virtual bool exec();
-} ;
-
-
-#endif
diff --git a/kpilot/lib/idmapper.cc b/kpilot/lib/idmapper.cc
deleted file mode 100644
index f4fc38c5..00000000
--- a/kpilot/lib/idmapper.cc
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
-** Copyright (C) 2006 Bertjan Broeksema <bbroeksema@bluebottle.com>
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "idmapper.h"
-#include "idmapperxml.h"
-#include "options.h"
-
-#include <tqsqldatabase.h>
-#include <tqfile.h>
-
-#include <kglobal.h>
-#include <kstandarddirs.h>
-
-class IDMapperPrivate
-{
-public:
-	IDMapperPrivate()
-	{
-		fXmlSource = 0L;
-	}
-	
-	~IDMapperPrivate()
-	{
-		FUNCTIONSETUP;
-		
-		KPILOT_DELETE(fXmlSource);
-	}
-	
-	IDMapperXml *fXmlSource;
-};
-
-IDMapper::IDMapper()
-{
-	FUNCTIONSETUP;
-	
-	fP = new IDMapperPrivate();
-	
-	TQString dbPath = KGlobal::dirs()->
-		saveLocation("data", CSL1("kpilot/") );
-	TQString dbFile = dbPath + CSL1("mapping.xml");
-	
-	if( !openDatasource( dbFile ) )
-	{
-		DEBUGKPILOT << fname << "Could not open or create xml file." << endl;
-	}
-}
-
-IDMapper::IDMapper( const TQString &file)
-{
-	FUNCTIONSETUP;
-	
-	fP = new IDMapperPrivate();
-	
-	if( !openDatasource( file ) )
-	{
-		DEBUGKPILOT << fname << "Could not open or create xml file." << endl;
-	}
-}
-
-IDMapper::~IDMapper()
-{
-	KPILOT_DELETE(fP);
-}
-
-bool IDMapper::openDatasource( const TQString &file )
-{
-	FUNCTIONSETUP;
-	
-	fP->fXmlSource = new IDMapperXml( file );
-	return fP->fXmlSource->open();
-}
-
-void IDMapper::registerPCObjectId( const TQString &conduit, const TQString &uid )
-{
-	FUNCTIONSETUP;
-	
-	IDMapping mapping = IDMapping( conduit );
-	mapping.setUid( uid );
-	
-	fP->fXmlSource->addMapping( mapping );
-	fP->fXmlSource->save();
-}
-
-void IDMapper::registerHHObjectId( const TQString &conduit, recordid_t pid )
-{
-	FUNCTIONSETUP;
-	
-	IDMapping mapping = IDMapping( conduit );
-	mapping.setPid( pid );
-	
-	fP->fXmlSource->addMapping( mapping );
-	fP->fXmlSource->save();
-}
-
-TQValueList<TQString> IDMapper::getPCObjectIds( const TQString &conduit )
-{
-	FUNCTIONSETUP;
-	
-	TQValueList<IDMapping> &mappings = fP->fXmlSource->mappings();
-	TQValueList<IDMapping>::iterator it;
-	TQValueList<TQString> uids;
-	
-	DEBUGKPILOT << fname << ": total " << mappings.count() << endl;
-	
-	for ( it = mappings.begin(); it != mappings.end(); ++it )
-	{
-		IDMapping &mapping = (*it);
-		
-		DEBUGKPILOT << fname << ": mapping.conduit() = " << mapping.conduit() << endl;
-		DEBUGKPILOT << fname << ": conduit = " << conduit << endl;
-		
-		if( (mapping.conduit() == conduit) && !mapping.uid().isNull() )
-		{
-			DEBUGKPILOT << fname << ": mapping.conduit() == conduit" << endl;
-			uids.append( mapping.uid() );
-		}
-	}
-	
-	return uids;
-}
-
-TQValueList<recordid_t> IDMapper::getHHObjectIds( const TQString &conduit )
-{
-	FUNCTIONSETUP;
-	
-	TQValueList<IDMapping> &mappings = fP->fXmlSource->mappings();
-	TQValueList<IDMapping>::iterator it;
-	TQValueList<recordid_t> pids;
-	
-	for ( it = mappings.begin(); it != mappings.end(); ++it )
-	{
-		IDMapping &mapping = *it;
-		DEBUGKPILOT << fname << ": mapping.conduit() = " << mapping.conduit() << endl;
-		DEBUGKPILOT << fname << ": " << mapping.pid() << endl;
-		if( mapping.conduit() == conduit && mapping.pid() != 0 )
-		{
-			DEBUGKPILOT << fname << ": mapping.conduit() == conduit" << endl;
-			pids.append( mapping.pid() );
-		}
-	}
-	
-	return pids;
-}
-
-bool IDMapper::hasPCId( const TQString &conduit, recordid_t pid )
-{
-	FUNCTIONSETUP;
-	
-	TQValueList<IDMapping> &mappings = fP->fXmlSource->mappings();
-	TQValueList<IDMapping>::iterator it;
-	
-	for ( it = mappings.begin(); it != mappings.end(); ++it )
-	{
-		IDMapping &mapping = *it;
-		if( mapping.conduit() == conduit && mapping.pid() == pid )
-		{
-			return !mapping.uid().isNull();
-		}
-	}
-	
-	return false;
-}
-
-bool IDMapper::hasHHId( const TQString &conduit, const TQString &uid )
-{
-	FUNCTIONSETUP;
-	
-	TQValueList<IDMapping> &mappings = fP->fXmlSource->mappings();
-	TQValueList<IDMapping>::iterator it;
-	
-	for ( it = mappings.begin(); it != mappings.end(); ++it )
-	{
-		IDMapping &mapping = *it;
-		if( mapping.conduit() == conduit && mapping.uid() == uid )
-		{
-			return mapping.pid() != 0;
-		}
-	}
-	
-	return false;
-}
-
-void IDMapper::setHHObjectId( const TQString &conduit, const TQString &uid
-		, recordid_t pid )
-{
-	FUNCTIONSETUP;
-	
-	bool modified = false;
-	
-	TQValueList<IDMapping> &mappings = fP->fXmlSource->mappings();
-	TQValueList<IDMapping>::iterator it;
-	
-	for ( it = mappings.begin(); it != mappings.end(); ++it )
-	{
-		IDMapping &mapping = *it;
-		if( mapping.conduit() == conduit && mapping.uid() == uid )
-		{
-			mapping.setPid( pid );
-			fP->fXmlSource->save();
-			modified = true;
-		}
-	}
-}
-
-void IDMapper::setPCObjectId( const TQString &conduit, recordid_t pid
-	, const TQString &uid )
-{
-	FUNCTIONSETUP;
-	
-	bool modified = false;
-	
-	TQValueList<IDMapping> &mappings = fP->fXmlSource->mappings();
-	TQValueList<IDMapping>::iterator it;
-	
-	for ( it = mappings.begin(); it != mappings.end(); ++it )
-	{
-		IDMapping &mapping = *it;
-		if( mapping.conduit() == conduit && mapping.pid() == pid )
-		{
-			mapping.setUid( uid );
-			fP->fXmlSource->save();
-			modified = true;
-		}
-	}
-}
diff --git a/kpilot/lib/idmapper.h b/kpilot/lib/idmapper.h
deleted file mode 100644
index b2ff0efe..00000000
--- a/kpilot/lib/idmapper.h
+++ /dev/null
@@ -1,159 +0,0 @@
-#ifndef _KPILOT_IDMAPPER_H
-#define _KPILOT_IDMAPPER_H
-/*
-** Copyright (C) 2006 Bertjan Broeksema <bbroeksema@bluebottle.com>
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <tqstring.h>
-#include <tqdatetime.h>
-#include <tqvaluelist.h>
-
-#include "pi-macros.h"
-
-#include <kconfig.h>
-
-class IDMapperPrivate;
-
-/**
- * Much of the conduits are recordbased. This class can be used bij the conduits
- * to keep track of the mapping between records on the handheld and records on
- * the pc.
- */
-class IDMapper
-{
-public:
-	/**
-	 * Creates a new IDMapper with default datasource.
-	 */
-	IDMapper();
-	
-	/**
-	 * Creates a new IDMapper with file as datasource.
-	 */
-	IDMapper( const TQString &file );
-	
-	~IDMapper();
-	
-	/**
-	 * Adds an uid for PC objects to the database.
-	 */
-	void registerPCObjectId( const TQString &conduit, const TQString &uid );
-	
-	/**
-	 * Returns all known uid's for given conduit.
-	 */
-	TQValueList<TQString> getPCObjectIds( const TQString &conduit );
-	
-	/**
-	 * Adds a pid for HH objects to the database.
-	 */
-	void registerHHObjectId( const TQString &conduit, recordid_t pid );
-	
-	/**
-	 * Returns all know pids for given conduit.
-	 */
-	TQValueList<recordid_t> getHHObjectIds( const TQString &conduit );
-	
-	/**
-	 * Sets the PC uid for the handheld record with pid. Does nothing when
-	 * there is no handheld record with pid.
-	 */
-	void setPCObjectId( const TQString &conduit, recordid_t pid
-		, const TQString &uid );
-	
-	/**
-	 * Sets the PC uid for the handheld record with pid. Does nothing when
-	 * there is no handheld record with pid.
-	 */
-	void setHHObjectId( const TQString &conduit, const TQString &uid
-		, recordid_t pid );
-	
-	/**
-	 * Returns the PC uid for the handheld record with pid. Returns 0 when no
-	 * pid exists for given uid.
-	 */
-	recordid_t getHHObjectId( const TQString &conduit, const TQString &uid );
-	
-	/**
-	 * Returns the HH pid for the PC record with uid. Returns an empty string
-	 * when no uid exists for given pid.
-	 */
-	TQString getHHObjectId( const TQString &conduit, recordid_t pid );
-	
-	/**
-	 * Returns true when there is a uid set for given pid. The conduit itself
-	 * must determine if the two objects are in sync if this function returns
-	 * true.
-	 */
-	bool hasPCId( const TQString &conduit, recordid_t pid );
-	
-	/**
-	 * Returns true when there is a pid set for given uid. The conduit itself
-	 * must determine if the two objects are in sync if this function returns
-	 * true.
-	 */
-	bool hasHHId( const TQString &conduit, const TQString &uid );
-	
-	/**
-	 * Sets the time that the two objects where last synced. The conduits
-	 * should call this method (or the pid version) when two objects are synced.
-	 * When the uid does not exist nothing happens.
-	 */
-	void setLastSyncTime( const TQString &conduit, const TQString &uid,
-		const TQDateTime &date );
-	
-	/**
-	 * Sets the time that the two objects where last synced. The conduits
-	 * should call this (or the uid version) method when two objects are synced.
-	 * When the pid does not exist nothing happens.
-	 */
-	void setLastSyncTime( const TQString &conduit, recordid_t pid
-		, const TQDateTime &date );
-	
-	/**
-	 * Returns the date/time for the last time that the item with uid was
-	 * synced. This date is set by:
-	 * - setLastSyncTime (uid/pid)
-	 *
-	 * Returns a null datetime when the pid does not excist.
-	 */
-	TQDateTime lastTimeSynced( const TQString &conduit, const TQString &uid );
-	
-	/**
-	 * Returns the date/time for the last time that the item with pid was
-	 * synced. This date is set by:
-	 * - setLastSyncTime (uid/pid)
-	 *
-	 * Returns a null datetime when the pid does not excist.
-	 */
-	TQDateTime lastTimeSynced( const TQString &conduit, recordid_t pid );
-
-protected:
-	bool openDatasource( const TQString &file );
-
-private:
-	IDMapperPrivate *fP;
-};
-
-#endif
diff --git a/kpilot/lib/idmapperxml.cc b/kpilot/lib/idmapperxml.cc
deleted file mode 100644
index 89fe51d9..00000000
--- a/kpilot/lib/idmapperxml.cc
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
-** Copyright (C) 2006 Bertjan Broeksema <bbroeksema@bluebottle.com>
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "idmapperxml.h"
-
-#include "options.h"
-
-IDMapperXml::IDMapperXml( const TQString &file ) : fFile(file)
-	, fCurrentMapping( 0l )
-{
-}
-
-IDMapperXml::~IDMapperXml()
-{
-	FUNCTIONSETUP;
-}
-
-bool IDMapperXml::open()
-{
-	FUNCTIONSETUP;
-	
-	root = doc.createElement( CSL1("mappings") );
-	TQDomNode node = doc.createProcessingInstruction(CSL1("xml")
-		,CSL1("version=\"1.0\" encoding=\"UTF-8\""));
-	
-	doc.appendChild( node );
-	doc.appendChild( root );
-	
-	if( !fFile.exists() )
-	{
-		DEBUGKPILOT << fname << ": Creating " << fFile.name() << endl;
-		
-		if( fFile.open( IO_ReadWrite ) )
-		{
-			TQTextStream out( &fFile );
-			doc.save( out, 4 );
-			fFile.close();
-			return true;
-		}
-		else
-		{
-			DEBUGKPILOT << fname << ": Could not create " << fFile.name() << endl;
-			return false;
-		}
-	}
-	else
-	{
-		DEBUGKPILOT << fname << ": Parsing file " << fFile.name() << endl;
-		TQXmlSimpleReader reader;
-		reader.setContentHandler( this );
-		
-		// Make sure that the file is closed after parsing.
-		bool result = reader.parse( fFile );
-		fFile.close();
-		
-		return result;
-	}
-}
-
-void IDMapperXml::save()
-{
-	FUNCTIONSETUP;
-	
-	DEBUGKPILOT << fname << ": Saving " << fMappings.count()
-		<< " mappings..." << endl;
-	DEBUGKPILOT << fname << ": ";
-	
-	TQValueList<IDMapping>::const_iterator it;
-	for ( it = fMappings.begin(); it != fMappings.end(); ++it )
-	{
-		DEBUGKPILOT << ".";
-		
-		IDMapping mapping = (*it);
-		
-		DEBUGKPILOT << fname << ": " << mapping.conduit();
-		
-		TQDomElement mappingElement = doc.createElement( CSL1("mapping") );
-		mappingElement.setAttribute( CSL1("conduit"), mapping.conduit() );
-		
-		if( !mapping.uid().isNull() )
-		{
-			TQDomElement uidElement = doc.createElement( CSL1("uid") );
-			uidElement.setAttribute( CSL1("value"), mapping.uid() );
-			mappingElement.appendChild( uidElement );
-		}
-		
-		if( mapping.pid() != 0 )
-		{
-			TQDomElement uidElement = doc.createElement( CSL1("pid") );
-			uidElement.setAttribute( CSL1("value"), mapping.pid() );
-			mappingElement.appendChild( uidElement );
-		}
-		
-		if( !mapping.lastSyncTime().isNull() )
-		{
-			TQDomElement uidElement = doc.createElement( CSL1("pid") );
-			uidElement.setAttribute( CSL1("value"), TQString::number( mapping.pid() ) );
-			mappingElement.appendChild( uidElement );
-		}
-		
-		root.appendChild( mappingElement );
-	}
-	
-	if( fFile.open( IO_ReadWrite ) )
-	{
-		TQTextStream out( &fFile );
-		doc.save( out, 4 );
-		fFile.close();
-		
-		DEBUGKPILOT << endl << fname << ": finished saving." << endl;
-	}
-}
-
-void IDMapperXml::addMapping( const IDMapping &mapping )
-{
-	FUNCTIONSETUP;
-	
-	DEBUGKPILOT << fname << ": " << mapping.conduit() << endl;
-	
-	fMappings.append( mapping );
-	
-	DEBUGKPILOT << fname << ": " << fMappings.first().conduit() << endl;
-}
-
-TQValueList<IDMapping>& IDMapperXml::mappings()
-{
-	return fMappings;
-}
-
-bool IDMapperXml::startElement( const TQString &namespaceURI
-	, const TQString &localName, const TQString &qName
-	, const TQXmlAttributes &attribs )
-{
-	FUNCTIONSETUP;
-	Q_UNUSED(namespaceURI);
-	Q_UNUSED(localName);
-	
-	if( qName == CSL1("mapping") )
-	{
-		TQString conduit( attribs.value( CSL1("conduit") ) );
-		
-		fCurrentMapping = new IDMapping( conduit );
-	}
-	else if( qName == CSL1("uid") )
-	{
-		fCurrentMapping->setUid( attribs.value( CSL1("value") ) );
-	}
-	else if( qName == CSL1("pid") )
-	{
-		fCurrentMapping->setPid( attribs.value( CSL1("value") ).toULong() );
-	}
-	else if( qName == CSL1("lastsync") )
-	{
-		// NOTE: this isn't very robuust!
-		// Parses only dates in the form: dd-mm-yyyy hh:mm:ss
-		TQString date = attribs.value( CSL1("value") );
-		int day = date.left(2).toInt();
-		int month = date.mid(3,2).toInt();
-		int year = date.mid(6, 4).toInt();
-		
-		int hour = date.mid(11,2).toInt();
-		int minute = date.mid(14,2).toInt();
-		int second = date.mid(17,2).toInt();
-		
-		TQDate tmpDate = TQDate( year, month, day );
-		TQTime tmpTime = TQTime( hour, minute, second );
-		
-		fCurrentMapping->setLastSyncTime( TQDateTime( tmpDate, tmpTime ) );
-	}
-
-	return true;
-}
-
-bool IDMapperXml::endElement( const TQString &namespaceURI
-	, const TQString &localName, const TQString &qName )
-{
-	FUNCTIONSETUP;
-
-	Q_UNUSED(namespaceURI);
-	Q_UNUSED(localName);
-	Q_UNUSED(qName);
-	
-	if( qName == CSL1("mapping") )
-	{
-		addMapping( *fCurrentMapping );
-		delete fCurrentMapping;
-		fCurrentMapping = 0l;
-	}
-	
-	return true;
-}
diff --git a/kpilot/lib/idmapperxml.h b/kpilot/lib/idmapperxml.h
deleted file mode 100644
index 87c91237..00000000
--- a/kpilot/lib/idmapperxml.h
+++ /dev/null
@@ -1,84 +0,0 @@
-#ifndef _KPILOT_IDMAPPERXML_H
-#define _KPILOT_IDMAPPERXML_H
-/*
-** Copyright (C) 2006 Bertjan Broeksema <bbroeksema@bluebottle.com>
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "idmapping.h"
-
-#include <tqxml.h>
-#include <tqdom.h>
-#include <tqstring.h>
-#include <tqptrcollection.h>
-
-class IDMapperXml : public QXmlDefaultHandler
-{
-public:
-	IDMapperXml( const TQString &file );
-	
-	~IDMapperXml();
-	
-	/**
-	 * Opens and parses the file or creates a new one if the file does not exist.
-	 */
-	bool open();
-	
-	/**
-	 * Saves the current mappings to the xml-file. Note this function must be
-	 * called after changes and before deleting the IDMapperXml object. Otherwise
-	 * the changes won't be saved.
-	 */
-	void save();
-	
-	/**
-	 * Adds a mapping to the collection of mappings.
-	 */
-	void addMapping( const IDMapping &mapping );
-	
-	/**
-	 * Returns the collection of mappings.
-	 */
-	TQValueList<IDMapping> &mappings();
-	 
-	/**
-	 * Overloaded function to parse the xml file.
-	 */
-	bool startElement( const TQString &namespaceURI, const TQString &localName
-		, const TQString &qName, const TQXmlAttributes &attribs );
-		
-	/**
-	 * Overloaded function to parse the xml file.
-	 */
-	bool endElement( const TQString &namespaceURI, const TQString &localName
-		, const TQString &qName );
-
-private:
-	TQFile fFile;
-	TQDomDocument doc;
-	TQDomElement root;
-	IDMapping *fCurrentMapping;
-	TQValueList<IDMapping> fMappings;
-};
-
-#endif
diff --git a/kpilot/lib/idmapping.cc b/kpilot/lib/idmapping.cc
deleted file mode 100644
index 49a1e334..00000000
--- a/kpilot/lib/idmapping.cc
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-** Copyright (C) 2006 Bertjan Broeksema <bbroeksema@bluebottle.com>
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "idmapping.h"
-
-IDMapping::IDMapping()
-{
-}
-
-IDMapping::IDMapping( const TQString &conduit )
-{
-	fConduit = conduit;
-	fPid = 0;
-}
-
-IDMapping::IDMapping( const IDMapping &m )
-{
-	fConduit = m.fConduit;
-	fUid = m.fUid;
-	fPid = m.fPid;
-	fLastSync = m.fLastSync;
-}
-
-IDMapping IDMapping::operator=( const IDMapping &m )
-{
-	IDMapping local( m.fConduit );
-	local.fUid = m.fUid;
-	local.fPid = m.fPid;
-	local.fLastSync = m.fLastSync;
-	
-	return local;
-}
-
-void IDMapping::setUid( const TQString &uid )
-{
-	fUid = uid;
-}
-
-void IDMapping::setPid( recordid_t pid )
-{
-	fPid = pid;
-}
-
-void IDMapping::setLastSyncTime( const TQDateTime &datetime )
-{
-	fLastSync = datetime;
-}
-
-TQString IDMapping::conduit() const
-{
-	return fConduit;
-}
-
-TQString IDMapping::uid() const
-{
-	return fUid;
-}
-
-recordid_t IDMapping::pid() const
-{
-	return fPid;
-}
-
-TQDateTime IDMapping::lastSyncTime() const
-{
-	return fLastSync;
-}
diff --git a/kpilot/lib/idmapping.h b/kpilot/lib/idmapping.h
deleted file mode 100644
index b8ed4d5e..00000000
--- a/kpilot/lib/idmapping.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef _KPILOT_IDMAPPING_H
-#define _KPILOT_IDMAPPING_H
-/*
-** Copyright (C) 2006 Bertjan Broeksema <bbroeksema@bluebottle.com>
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include "pi-macros.h"
-
-#include <tqstring.h>
-#include <tqdatetime.h>
-
-class IDMapping
-{
-public:
-	IDMapping();
-	
-	IDMapping( const TQString &conduit );
-	
-	IDMapping( const IDMapping &m );
-	
-	IDMapping operator=( const IDMapping &m );
-	
-	void setUid( const TQString &uid );
-	
-	void setPid( recordid_t uid );
-	
-	void setLastSyncTime( const TQDateTime &datetime );
-	
-	TQString conduit() const;
-	
-	TQString uid() const;
-	
-	recordid_t pid() const;
-	
-	TQDateTime lastSyncTime() const;
-
-private:
-	TQString fConduit;
-	TQString fUid;
-	recordid_t fPid;
-	TQDateTime fLastSync;
-};
-
-#endif
diff --git a/kpilot/lib/kpilotdevicelink.cc b/kpilot/lib/kpilotdevicelink.cc
deleted file mode 100644
index 5fed7961..00000000
--- a/kpilot/lib/kpilotdevicelink.cc
+++ /dev/null
@@ -1,966 +0,0 @@
-/* KPilot
- **
- ** Copyright (C) 1998-2001 by Dan Pilone
- ** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
- ** Copyright (C) 2006-2007 Adriaan de Groot <groot@kde.org>
- ** Copyright (C) 2007 Jason 'vanRijn' Kasper <vR@movingparts.net>
- **
- */
-
-/*
- ** This program is free software; you can redistribute it and/or modify
- ** it under the terms of the GNU Lesser General Public License as published by
- ** the Free Software Foundation; either version 2.1 of the License, or
- ** (at your option) any later version.
- **
- ** This program is distributed in the hope that it will be useful,
- ** but WITHOUT ANY WARRANTY; without even the implied warranty of
- ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- ** GNU Lesser General Public License for more details.
- **
- ** You should have received a copy of the GNU Lesser General Public License
- ** along with this program in a file called COPYING; if not, write to
- ** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- ** MA 02110-1301, USA.
- */
-
-/*
- ** Bug reports and questions can be sent to kde-pim@kde.org
- */
-
-#include "options.h"
-
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include <iostream>
-
-#include <pi-source.h>
-#include <pi-socket.h>
-#include <pi-dlp.h>
-#include <pi-file.h>
-#include <pi-buffer.h>
-
-#include <tqdir.h>
-#include <tqtimer.h>
-#include <tqdatetime.h>
-#include <tqthread.h>
-#include <tqsocketnotifier.h>
-
-#include <kconfig.h>
-#include <kmessagebox.h>
-#include <kstandarddirs.h>
-#include <kurl.h>
-#include <kio/netaccess.h>
-
-#include "pilotUser.h"
-#include "pilotSysInfo.h"
-#include "pilotCard.h"
-#include "pilotSerialDatabase.h"
-#include "pilotLocalDatabase.h"
-
-#include "kpilotlink.h"
-#include "kpilotdevicelinkPrivate.moc"
-#include "kpilotdevicelink.moc"
-
-
-DeviceMap *DeviceMap::mThis = 0L;
-
-
-static inline void startOpenTimer(DeviceCommThread *dev, TQTimer *&t)
-{
-	if ( !t)
-	{
-		t = new TQTimer(dev);
-		TQObject::connect(t, TQT_SIGNAL(timeout()), dev, TQT_SLOT(openDevice()));
-	}
-	// just a single-shot timer.  we'll know when to start it again...
-	t->start(1000, true);
-}
-
-DeviceCommThread::DeviceCommThread(KPilotDeviceLink *d) :
-	TQThread(),
-	fDone(true),
-	fHandle(d),
-	fOpenTimer(0L),
-	fSocketNotifier(0L),
-	fSocketNotifierActive(false),
-	fWorkaroundUSBTimer(0L),
-	fPilotSocket(-1),
-	fTempSocket(-1),
-	fAcceptedCount(0)
-{
-	FUNCTIONSETUP;
-}
-
-
-DeviceCommThread::~DeviceCommThread()
-{
-	FUNCTIONSETUPL(2);
-	close();
-	KPILOT_DELETE(fWorkaroundUSBTimer);
-}
-
-void DeviceCommThread::close()
-{
-	FUNCTIONSETUPL(2);
-
-	KPILOT_DELETE(fWorkaroundUSBTimer);
-	KPILOT_DELETE(fOpenTimer);
-	KPILOT_DELETE(fSocketNotifier);
-	fSocketNotifierActive=false;
-
-	if (fTempSocket != -1)
-	{
-		DEBUGKPILOT << fname
-		<< ": device comm thread closing socket: ["
-		<< fTempSocket << "]" << endl;
-
-		pi_close(fTempSocket);
-	}
-
-	if (fPilotSocket != -1)
-	{
-		DEBUGKPILOT << fname
-		<< ": device comm thread closing socket: ["
-		<< fPilotSocket << "]" << endl;
-
-		pi_close(fPilotSocket);
-	}
-
-	fTempSocket = (-1);
-	fPilotSocket = (-1);
-
-	DeviceMap::self()->unbindDevice(link()->fRealPilotPath);
-}
-
-void DeviceCommThread::reset()
-{
-	FUNCTIONSETUP;
-
-	if (link()->fMessages->shouldPrint(Messages::OpenFailMessage))
-	{
-		TQApplication::postEvent(link(), new DeviceCommEvent(EventLogMessage,
-				i18n("Could not open device: %1 (will retry)")
-				.arg(link()->pilotPath() )));
-	}
-
-	link()->fMessages->reset();
-	close();
-
-	// Timer already deleted by close() call.
-	startOpenTimer(this,fOpenTimer);
-
-	link()->fLinkStatus = WaitingForDevice;
-}
-
-/**
- * This is an asyncronous process.  We try to create a socket with the Palm
- * and then bind to it (in open()).  If we're able to do those 2 things, then
- * we do 2 things:  we set a timeout timer (which will tell us that X amount of
- * time has transpired before we get into the meat of the sync transaction), and
- * we also set up a TQSocketNotifier, which will tell us when data is available
- * to be read from the Palm socket.  If we were unable to create a socket
- * and/or bind to the Palm in this method, we'll start our timer again.
- */
-void DeviceCommThread::openDevice()
-{
-	FUNCTIONSETUPL(2);
-
-	bool deviceOpened = false;
-
-	// This transition (from Waiting to Found) can only be
-	// taken once.
-	//
-	if (link()->fLinkStatus == WaitingForDevice)
-	{
-		link()->fLinkStatus = FoundDevice;
-	}
-
-	if (link()->fMessages->shouldPrint(Messages::OpenMessage))
-	{
-		TQApplication::postEvent(link(), new DeviceCommEvent(EventLogMessage,
-				i18n("Trying to open device %1...")
-				.arg(link()->fPilotPath)));
-	}
-
-	// if we're not supposed to be done, try to open the main pilot
-	// path...
-	if (!fDone && link()->fPilotPath.length() > 0)
-	{
-		DEBUGKPILOT << fname << ": Opening main pilot path: ["
-			<< link()->fPilotPath << "]." << endl;
-		deviceOpened = open(link()->fPilotPath);
-	}
-
-	// only try the temp device if our earlier attempt didn't work and the temp
-	// device is different than the main device, and it's a non-empty
-	// string
-	bool tryTemp = !deviceOpened && (link()->fTempDevice.length() > 0) && (link()->fPilotPath != link()->fTempDevice);
-
-	// if we're not supposed to be done, and we should try the temp
-	// device, try the temp device...
-	if (!fDone && tryTemp)
-	{
-		DEBUGKPILOT << fname << ": Couldn't open main pilot path. "
-			<< "Now trying temp device: ["
-			<< link()->fTempDevice << "]." << endl;
-		deviceOpened = open(link()->fTempDevice);
-	}
-
-	// if we couldn't connect, try to connect again...
-	if (!fDone && !deviceOpened)
-	{
-		startOpenTimer(this, fOpenTimer);
-	}
-}
-
-bool DeviceCommThread::open(const TQString &device)
-{
-	FUNCTIONSETUPL(2);
-
-	int ret;
-	int e = 0;
-	TQString msg;
-
-	if (fTempSocket != -1)
-	{
-		pi_close(fTempSocket);
-	}
-	fTempSocket = (-1);
-
-	link()->fRealPilotPath
-			= KStandardDirs::realFilePath(device.isEmpty() ? link()->fPilotPath : device);
-
-	if ( !DeviceMap::self()->canBind(link()->fRealPilotPath) )
-	{
-		msg = i18n("Already listening on that device");
-
-		WARNINGKPILOT << "Pilot Path: ["
-			<< link()->fRealPilotPath << "] already connected." << endl;
-		WARNINGKPILOT << msg << endl;
-
-		link()->fLinkStatus = PilotLinkError;
-
-		TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, msg));
-
-		return false;
-	}
-
-	DEBUGKPILOT << fname << ": Trying to create socket." << endl;
-
-	fTempSocket = pi_socket(PI_AF_PILOT, PI_SOCK_STREAM, PI_PF_DLP);
-
-	if (fTempSocket < 0)
-	{
-		e = errno;
-		msg = i18n("Cannot create socket for communicating "
-				"with the Pilot (%1)").arg(errorMessage(e));
-		DEBUGKPILOT << msg << endl;
-		DEBUGKPILOT << "(" << strerror(e) << ")" << endl;
-
-		link()->fLinkStatus = PilotLinkError;
-
-		TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, msg));
-
-		return false;
-	}
-
-	DEBUGKPILOT << fname << ": Got socket: [" << fTempSocket << "]" << endl;
-
-	link()->fLinkStatus = CreatedSocket;
-
-	DEBUGKPILOT << fname << ": Binding to path: ["
-		<< link()->fRealPilotPath << "]" << endl;
-
-	ret = pi_bind(fTempSocket, TQFile::encodeName(link()->fRealPilotPath));
-
-	if (ret < 0)
-	{
-		DEBUGKPILOT << fname
-			<< ": pi_bind error: ["
-			<< strerror(errno) << "]" << endl;
-
-		e = errno;
-		msg = i18n("Cannot open Pilot port \"%1\". ").arg(link()->fRealPilotPath);
-
-		DEBUGKPILOT << msg << endl;
-		DEBUGKPILOT << "(" << strerror(e) << ")" << endl;
-
-		link()->fLinkStatus = PilotLinkError;
-
-		if (link()->fMessages->shouldPrint(Messages::OpenFailMessage))
-		{
-			TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, msg));
-		}
-
-		return false;
-	}
-
-	link()->fLinkStatus = DeviceOpen;
-	DeviceMap::self()->bindDevice(link()->fRealPilotPath);
-
-	fSocketNotifier = new TQSocketNotifier(fTempSocket,
-			TQSocketNotifier::Read, this);
-	TQObject::connect(fSocketNotifier, TQT_SIGNAL(activated(int)),
-			this, TQT_SLOT(acceptDevice()));
-	fSocketNotifierActive=true;
-
-	/**
-	 * We _always_ want to set a maximum amount of time that we will wait
-	 * for the sync process to start.  In the case where our user
-	 * has told us that he has a funky USB device, set the workaround timeout
-	 * for shorter than normal.
-	 */
-	int timeout=20000;
-	if (link()->fWorkaroundUSB)
-	{
-		timeout=5000;
-	}
-
-	fWorkaroundUSBTimer = new TQTimer(this);
-	connect(fWorkaroundUSBTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(workaroundUSB()));
-	fWorkaroundUSBTimer->start(timeout, true);
-
-	return true;
-}
-
-/**
- * We've been notified by our TQSocketNotifier that we have data available on the
- * socket.  Try to go through the remaining steps of the connnection process.
- * Note: If we return at all from this before the very end without a successful
- * connection, we need to make sure we restart our connection open timer, otherwise
- * it won't be restarted.
- */
-void DeviceCommThread::acceptDevice()
-{
-	FUNCTIONSETUP;
-
-	int ret;
-
-	/**
-	 * Our socket notifier should be the only reason that we end up here.
-	 * If we're here without him being active, we have a problem.  Try to clean
-	 * up and get out.
-	 */
-	if (!fSocketNotifierActive)
-	{
-		if (!fAcceptedCount)
-		{
-		kdWarning() << k_funcinfo << ": Accidentally in acceptDevice()"
-			<< endl;
-		}
-		fAcceptedCount++;
-		if (fAcceptedCount>10)
-		{
-			// Damn the torpedoes
-			KPILOT_DELETE(fSocketNotifier);
-		}
-		return;
-	}
-
-	if (fSocketNotifier)
-	{
-		// fSocketNotifier->setEnabled(false);
-		fSocketNotifierActive=false;
-		KPILOT_DELETE(fSocketNotifier);
-	}
-
-	DEBUGKPILOT << fname << ": Found connection on device: ["
-		<< link()->pilotPath().latin1() << "]." <<endl;
-
-	DEBUGKPILOT << fname
-		<< ": Current status: ["
-		<< link()->statusString()
-		<< "] and socket: [" << fTempSocket << "]" << endl;
-
-	ret = pi_listen(fTempSocket, 1);
-	if (ret < 0)
-	{
-		char *s = strerror(errno);
-
-		WARNINGKPILOT << "pi_listen returned: [" << s << "]" << endl;
-
-		// Presumably, strerror() returns things in
-		// local8Bit and not latin1.
-		TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError,
-				i18n("Cannot listen on Pilot socket (%1)").
-				arg(TQString::fromLocal8Bit(s))));
-		reset();
-		return;
-	}
-
-	TQApplication::postEvent(link(), new DeviceCommEvent(EventLogProgress, TQString::null, 10));
-
-	DEBUGKPILOT << fname <<
-		": Listening to pilot. Now trying accept..." << endl;
-
-	int timeout = 20;
-	fPilotSocket = pi_accept_to(fTempSocket, 0, 0, timeout);
-
-	if (fPilotSocket < 0)
-	{
-		char *s = strerror(errno);
-
-		WARNINGKPILOT << "pi_accept returned: [" << s << "]" << endl;
-
-		TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, i18n("Cannot accept Pilot (%1)")
-				.arg(TQString::fromLocal8Bit(s))));
-
-		link()->fLinkStatus = PilotLinkError;
-		reset();
-		return;
-	}
-
-	DEBUGKPILOT << fname << ": Link accept done." << endl;
-
-	if ((link()->fLinkStatus != DeviceOpen) || (fPilotSocket == -1))
-	{
-		link()->fLinkStatus = PilotLinkError;
-		WARNINGKPILOT << "Already connected or unable to connect!" << endl;
-
-		TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, i18n("Cannot accept Pilot (%1)")
-				.arg(i18n("already connected"))));
-
-		reset();
-		return;
-	}
-
-	TQApplication::postEvent(link(), new DeviceCommEvent(EventLogProgress, TQString::null, 30));
-
-	DEBUGKPILOT << fname << ": doing dlp_ReadSysInfo..." << endl;
-
-	struct SysInfo sys_info;
-	if (dlp_ReadSysInfo(fPilotSocket, &sys_info) < 0)
-	{
-		TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError,
-				i18n("Unable to read system information from Pilot")));
-
-		link()->fLinkStatus=PilotLinkError;
-		reset();
-		return;
-	}
-	else
-	{
-		DEBUGKPILOT << fname << ": dlp_ReadSysInfo successful..." << endl;
-
-		KPILOT_DELETE(link()->fPilotSysInfo);
-		link()->fPilotSysInfo = new KPilotSysInfo(&sys_info);
-		DEBUGKPILOT << fname
-			<< ": RomVersion: [" << link()->fPilotSysInfo->getRomVersion()
-			<< "] Locale: [" << link()->fPilotSysInfo->getLocale()
-			<< "] Product: [" << link()->fPilotSysInfo->getProductID()
-			<< "]" << endl;
-	}
-
-	// If we've made it this far, make sure our USB workaround timer doesn't fire!
-	fWorkaroundUSBTimer->stop();
-	KPILOT_DELETE(fWorkaroundUSBTimer);
-
-	TQApplication::postEvent(link(), new DeviceCommEvent(EventLogProgress, TQString::null, 60));
-
-	KPILOT_DELETE(link()->fPilotUser);
-	link()->fPilotUser = new KPilotUser;
-
-	DEBUGKPILOT << fname << ": doing dlp_ReadUserInfo..." << endl;
-
-	/* Ask the pilot who it is.  And see if it's who we think it is. */
-	dlp_ReadUserInfo(fPilotSocket, link()->fPilotUser->data());
-
-	TQString n = link()->getPilotUser().name();
-	DEBUGKPILOT << fname
-		<< ": Read user name: [" << n << "]" << endl;
-
-	TQApplication::postEvent(link(), new DeviceCommEvent(EventLogProgress, i18n("Checking last PC..."), 90));
-
-	/* Tell user (via Pilot) that we are starting things up */
-	if ((ret=dlp_OpenConduit(fPilotSocket)) < 0)
-	{
-		DEBUGKPILOT << fname
-			<< ": dlp_OpenConduit returned: [" << ret << "]" << endl;
-
-		TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError,
-				i18n("Could not read user information from the Pilot. "
-						"Perhaps you have a password set on the device?")));
-
-	}
-	link()->fLinkStatus = AcceptedDevice;
-
-	TQApplication::postEvent(link(), new DeviceCommEvent(EventLogProgress, TQString::null, 100));
-
-	DeviceCommEvent * ev = new DeviceCommEvent(EventDeviceReady);
-	ev->setCurrentSocket(fPilotSocket);
-	TQApplication::postEvent(link(), ev);
-
-}
-
-void DeviceCommThread::workaroundUSB()
-{
-	FUNCTIONSETUP;
-
-	reset();
-}
-
-void DeviceCommThread::run()
-{
-	FUNCTIONSETUP;
-	fDone = false;
-
-	startOpenTimer(this, fOpenTimer);
-
-	int sleepBetweenPoll = 2;
-	// keep the thread alive until we're supposed to be done
-	while (!fDone)
-	{
-		TQThread::sleep(sleepBetweenPoll);
-	}
-
-	close();
-	// now sleep one last bit to make sure the pthread inside
-	// pilot-link (potentially, if it's libusb) is done before we exit
-	TQThread::sleep(1);
-
-	DEBUGKPILOT << fname << ": comm thread now done..." << endl;
-}
-
-KPilotDeviceLink::KPilotDeviceLink(TQObject * parent, const char *name,
-		const TQString &tempDevice) :
-	KPilotLink(parent, name), fLinkStatus(Init), fWorkaroundUSB(false),
-			fPilotSocket(-1), fTempDevice(tempDevice), fMessages(new Messages(this)), fDeviceCommThread(0L)
-{
-	FUNCTIONSETUP;
-
-	DEBUGKPILOT << fname
-		<< ": Pilot-link version: [" << PILOT_LINK_NUMBER
-		<< "]" << endl;
-}
-
-KPilotDeviceLink::~KPilotDeviceLink()
-{
-	FUNCTIONSETUP;
-	close();
-	KPILOT_DELETE(fPilotSysInfo);
-	KPILOT_DELETE(fPilotUser);
-	KPILOT_DELETE(fMessages);
-}
-
-/* virtual */bool KPilotDeviceLink::isConnected() const
-{
-	return fLinkStatus == AcceptedDevice;
-}
-
-/* virtual */bool KPilotDeviceLink::event(TQEvent *e)
-{
-	FUNCTIONSETUP;
-
-	bool handled = false;
-
-	if ((int)e->type() == EventDeviceReady)
-	{
-		DeviceCommEvent* t = static_cast<DeviceCommEvent*>(e);
-		fPilotSocket = t->currentSocket();
-		emit deviceReady( this);
-		handled = true;
-	}
-	else if ((int)e->type() == EventLogMessage)
-	{
-		DeviceCommEvent* t = static_cast<DeviceCommEvent*>(e);
-		emit logMessage(t->message());
-		handled = true;
-	}
-	else if ((int)e->type() == EventLogError)
-	{
-		DeviceCommEvent* t = static_cast<DeviceCommEvent*>(e);
-		emit logError(t->message());
-		handled = true;
-	}
-	else if ((int)e->type() == EventLogProgress)
-	{
-		DeviceCommEvent* t = static_cast<DeviceCommEvent*>(e);
-		emit logProgress(t->message(), t->progress());
-		handled = true;
-	}
-	else
-	{
-		handled = KPilotLink::event(e);
-	}
-
-	return handled;
-}
-
-void KPilotDeviceLink::stopCommThread()
-{
-	FUNCTIONSETUP;
-	if (fDeviceCommThread)
-	{
-		fDeviceCommThread->setDone(true);
-
-		// try to wait for our thread to finish, but don't
-		// block the main thread forever
-		if (fDeviceCommThread->running())
-		{
-			DEBUGKPILOT << fname
-				<< ": comm thread still running. "
-				<< "waiting for it to complete." << endl;
-			bool done = fDeviceCommThread->wait(5000);
-			if (!done)
-			{
-				DEBUGKPILOT << fname
-					<< ": comm thread still running "
-					<< "after wait(). "
-					<< "going to have to terminate it."
-					<< endl;
-				// not normally to be done, but we must make sure
-				// that this device doesn't come back alive
-				fDeviceCommThread->terminate();
-				fDeviceCommThread->wait();
-			}
-		}
-
-		fDeviceCommThread->close();
-
-		KPILOT_DELETE(fDeviceCommThread);
-	}
-}
-
-void KPilotDeviceLink::close()
-{
-	FUNCTIONSETUP;
-
-	stopCommThread();
-
-	fPilotSocket = (-1);
-}
-
-void KPilotDeviceLink::reset(const TQString & dP)
-{
-	FUNCTIONSETUP;
-
-	fLinkStatus = Init;
-
-	// Release all resources
-	//
-	close();
-	fPilotPath = TQString::null;
-
-	fPilotPath = dP;
-	if (fPilotPath.isEmpty())
-		fPilotPath = fTempDevice;
-	if (fPilotPath.isEmpty())
-		return;
-
-	reset();
-}
-
-void KPilotDeviceLink::startCommThread()
-{
-	FUNCTIONSETUP;
-
-	stopCommThread();
-
-	if (fTempDevice.isEmpty() && pilotPath().isEmpty())
-	{
-		WARNINGKPILOT << "No point in trying empty device."
-			<< endl;
-
-		TQString msg = i18n("The Pilot device is not configured yet.");
-		WARNINGKPILOT << msg << endl;
-
-		fLinkStatus = PilotLinkError;
-
-		emit logError(msg);
-		return;
-	}
-
-	fDeviceCommThread = new DeviceCommThread(this);
-	fDeviceCommThread->start();
-}
-
-void KPilotDeviceLink::reset()
-{
-	FUNCTIONSETUP;
-
-	fMessages->reset();
-	close();
-
-	checkDevice();
-
-	fLinkStatus = WaitingForDevice;
-
-	startCommThread();
-}
-
-void KPilotDeviceLink::checkDevice()
-{
-	// If the device exists yet doesn't have the right
-	// permissions, complain and then continue anyway.
-	//
-	TQFileInfo fi(fPilotPath);
-	if (fi.exists())
-	{
-		// If it exists, it ought to be RW already.
-		//
-		if (!(fi.isReadable() && fi.isWritable()))
-		{
-			emit logError(i18n("Pilot device %1 is not read-write.")
-			.arg(fPilotPath));
-		}
-	}
-	else
-	{
-		// It doesn't exist, mention this in the log
-		// (relevant as long as we use only one device type)
-		//
-		emit
-				logError(i18n("Pilot device %1 does not exist. "
-						"Probably it is a USB device and will appear during a HotSync.")
-				.arg(fPilotPath));
-		// Suppress all normal and error messages about opening the device.
-		fMessages->block(Messages::OpenMessage | Messages::OpenFailMessage,
-				true);
-	}
-}
-
-void KPilotDeviceLink::setTempDevice(const TQString &d)
-{
-	fTempDevice = d;
-	DeviceMap::self()->bindDevice(fTempDevice);
-}
-
-/* virtual */bool KPilotDeviceLink::tickle()
-{
-	// No FUNCTIONSETUP here because it may be called from
-	// a separate thread.
-	return pi_tickle(pilotSocket()) >= 0;
-}
-
-/* virtual */void KPilotDeviceLink::addSyncLogEntryImpl(const TQString &entry)
-{
-	dlp_AddSyncLogEntry(fPilotSocket,
-			const_cast<char *>((const char *)Pilot::toPilot(entry)));
-}
-
-bool KPilotDeviceLink::installFile(const TQString & f, const bool deleteFile)
-{
-	FUNCTIONSETUP;
-
-	DEBUGKPILOT << fname << ": Installing file " << f << endl;
-
-	if (!TQFile::exists(f))
-		return false;
-
-	char buffer[PATH_MAX];
-	memset(buffer, 0, PATH_MAX);
-	strlcpy(buffer, TQFile::encodeName(f), PATH_MAX);
-	struct pi_file *pf = pi_file_open(buffer);
-
-	if (!f)
-	{
-		WARNINGKPILOT << "Cannot open file " << f << endl;
-		emit logError(i18n
-			("<qt>Cannot install the file &quot;%1&quot;.</qt>").
-		arg(f));
-		return false;
-	}
-
-	if (pi_file_install(pf, fPilotSocket, 0, 0L) < 0)
-	{
-		WARNINGKPILOT << "Cannot pi_file_install " << f << endl;
-		emit logError(i18n
-				("<qt>Cannot install the file &quot;%1&quot;.</qt>").
-		arg(f));
-		return false;
-	}
-
-	pi_file_close(pf);
-	if (deleteFile)
-		TQFile::remove(f);
-
-	return true;
-}
-
-int KPilotDeviceLink::openConduit()
-{
-	return dlp_OpenConduit(fPilotSocket);
-}
-
-TQString KPilotDeviceLink::statusString(LinkStatus l)
-{
-	TQString s= CSL1("KPilotDeviceLink=");
-
-	switch (l)
-	{
-	case Init:
-		s.append(CSL1("Init"));
-		break;
-	case WaitingForDevice:
-		s.append(CSL1("WaitingForDevice"));
-		break;
-	case FoundDevice:
-		s.append(CSL1("FoundDevice"));
-		break;
-	case CreatedSocket:
-		s.append(CSL1("CreatedSocket"));
-		break;
-	case DeviceOpen:
-		s.append(CSL1("DeviceOpen"));
-		break;
-	case AcceptedDevice:
-		s.append(CSL1("AcceptedDevice"));
-		break;
-	case SyncDone:
-		s.append(CSL1("SyncDone"));
-		break;
-	case PilotLinkError:
-		s.append(CSL1("PilotLinkError"));
-		break;
-	case WorkaroundUSB:
-		s.append(CSL1("WorkaroundUSB"));
-		break;
-	}
-
-	return s;
-}
-
-TQString KPilotDeviceLink::statusString() const
-{
-	return statusString(status() );
-}
-
-void KPilotDeviceLink::endSync(EndOfSyncFlags f)
-{
-	FUNCTIONSETUP;
-
-	if (UpdateUserInfo == f)
-	{
-		getPilotUser().setLastSyncPC((unsigned long) gethostid());
-		getPilotUser().setLastSyncDate(time(0));
-
-		DEBUGKPILOT << fname << ": Writing username " << getPilotUser().name() << endl;
-
-		dlp_WriteUserInfo(pilotSocket(), getPilotUser().data());
-		addSyncLogEntry(i18n("End of HotSync\n"));
-	}
-	dlp_EndOfSync(pilotSocket(), 0);
-	KPILOT_DELETE(fPilotSysInfo);
-	KPILOT_DELETE(fPilotUser);
-}
-
-int KPilotDeviceLink::getNextDatabase(int index, struct DBInfo *dbinfo)
-{
-	FUNCTIONSETUP;
-
-	pi_buffer_t buf = 	{ 0, 0, 0 };
-	int r = dlp_ReadDBList(pilotSocket(), 0, dlpDBListRAM, index, &buf);
-	if (r >= 0)
-	{
-		memcpy(dbinfo, buf.data, sizeof(struct DBInfo));
-	}
-	return r;
-}
-
-// Find a database with the given name. Info about the DB is stored into dbinfo (e.g. to be used later on with retrieveDatabase).
-int KPilotDeviceLink::findDatabase(const char *name, struct DBInfo *dbinfo,
-		int index, unsigned long type, unsigned long creator)
-{
-	FUNCTIONSETUP;
-	return dlp_FindDBInfo(pilotSocket(), 0, index, const_cast<char *>(name),
-			type, creator, dbinfo);
-}
-
-bool KPilotDeviceLink::retrieveDatabase(const TQString &fullBackupName,
-		DBInfo *info)
-{
-	FUNCTIONSETUP;
-
-	if (fullBackupName.isEmpty() || !info)
-	{
-		// Don't even bother trying to convert or retrieve.
-		return false;
-	}
-
-	DEBUGKPILOT << fname << ": Writing DB <" << info->name << "> "
-		<< " to " << fullBackupName << endl;
-
-	TQCString encodedName = TQFile::encodeName(fullBackupName);
-	struct pi_file *f = pi_file_create(encodedName, info);
-
-	if (!f)
-	{
-		WARNINGKPILOT << "Failed, unable to create file" << endl;
-		return false;
-	}
-
-	if (pi_file_retrieve(f, pilotSocket(), 0, 0L) < 0)
-	{
-		WARNINGKPILOT << "Failed, unable to back up database" << endl;
-
-		pi_file_close(f);
-		return false;
-	}
-
-	pi_file_close(f);
-	return true;
-}
-
-KPilotLink::DBInfoList KPilotDeviceLink::getDBList(int cardno, int flags)
-{
-	bool cont=true;
-	DBInfoList dbs;
-	int index=0;
-	while (cont)
-	{
-		pi_buffer_t buf = { 0, 0, 0 };
-		pi_buffer_clear(&buf);
-		// DBInfo*dbi=new DBInfo();
-		if (dlp_ReadDBList(pilotSocket(), cardno, flags | dlpDBListMultiple,
-				index, &buf)<0)
-		{
-			cont=false;
-		}
-		else
-		{
-			DBInfo db_n;
-			DBInfo *db_it = (DBInfo *)buf.data;
-			int info_count = buf.used / sizeof(struct DBInfo);
-
-			while (info_count>0)
-			{
-				memcpy(&db_n, db_it, sizeof(struct DBInfo));
-				++db_it;
-				info_count--;
-				dbs.append(db_n);
-			}
-			index=db_n.index+1;
-		}
-	}
-	return dbs;
-}
-
-const KPilotCard *KPilotDeviceLink::getCardInfo(int card)
-{
-	KPilotCard *cardinfo=new KPilotCard();
-	if (dlp_ReadStorageInfo(pilotSocket(), card, cardinfo->cardInfo())<0)
-	{
-		WARNINGKPILOT << "Could not get info for card " << card << endl;
-
-		KPILOT_DELETE(cardinfo);
-		return 0L;
-	}
-	return cardinfo;
-}
-
-PilotDatabase *KPilotDeviceLink::database(const TQString &name)
-{
-	return new PilotSerialDatabase( this, name );
-}
-
-PilotDatabase *KPilotDeviceLink::database(const DBInfo *info)
-{
-	return new PilotSerialDatabase( this, info );
-}
-
diff --git a/kpilot/lib/kpilotdevicelink.h b/kpilot/lib/kpilotdevicelink.h
deleted file mode 100644
index a648b23c..00000000
--- a/kpilot/lib/kpilotdevicelink.h
+++ /dev/null
@@ -1,220 +0,0 @@
-#ifndef _KPILOT_KPILOTDEVICELINK_H
-#define _KPILOT_KPILOTDEVICELINK_H
-/*
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-** Copyright (C) 2006 Adriaan de Groot <groot@kde.org>
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "kpilotlink.h"
-
-class TQThread;
-
-class DeviceMap; ///< Globally tracks all devices that have a link assigned
-class Messages; ///< Tracks which messages have been printed
-class DeviceCommThread; ///< Thread for doing all palm device communications
-
-/**
-* The link behaves like a state machine most of the time:
-* it waits for the actual device to become available, and
-* then becomes ready to handle syncing.
-*/
-enum LinkStatus {
-	Init,
-	WaitingForDevice,
-	FoundDevice,
-	CreatedSocket,
-	DeviceOpen,
-	AcceptedDevice,
-	SyncDone,
-	PilotLinkError,
-	WorkaroundUSB
-} ;
-
-/**
-* Custom events we can be handling...
-*/
-enum DeviceCustomEvents { 
-	EventLogMessage = TQEvent::User + 777,
-	EventLogError,
-	EventLogProgress,
-	EventDeviceReady
-};
-		 
-/**
-* Definition of the device link class for physical
-* handheld devices, which communicate with the PC
-* using DLP / SLP via the pilot-link library.
-*/
-class KDE_EXPORT KPilotDeviceLink : public KPilotLink
-{
-friend class PilotSerialDatabase;
-friend class DeviceCommThread;
-
-Q_OBJECT
-
-public:
-	/**
-	* Constructor. Creates a link that can sync to a physical handheld.
-	* Call reset() on it to start looking for a device.
-	*
-	* @param parent Parent object.
-	* @param name   Name of this object.
-	* @param tempDevice Path to device node to use as an alternative
-	*                   to the "normal" one set by KPilot.
-	*/
-	KPilotDeviceLink( TQObject *parent = 0,
-		const char *name = 0,
-		const TQString &tempDevice = TQString::null );
-
-	/**
-	* Destructor. This rudely ends the communication with the handheld.
-	* It is best to call endOfSync() or finishSync() before destroying
-	* the device.
-	*/
-	virtual ~KPilotDeviceLink();
-
-	/**
-	* Get the status (state enum) of this link.
-	* @return The LinkStatus enum for the link's current state.
-	*/
-	LinkStatus status() const
-	{
-		return fLinkStatus;
-	}
-
-	/** Get a human-readable string for the given status @p l. */
-	static TQString statusString(LinkStatus l);
-
-	// The following API is the actual implementation of
-	// the KPilotLink API, for documentation see that file.
-	//
-	virtual TQString statusString() const;
-	virtual bool isConnected() const;
-	virtual void reset( const TQString & );
-	virtual void close();
-	virtual void reset();
-	virtual bool event(TQEvent *e);
-	virtual bool tickle();
-	virtual const KPilotCard *getCardInfo(int card);
-	virtual void endSync( EndOfSyncFlags f );
-	virtual int openConduit();
-	virtual int getNextDatabase(int index,struct DBInfo *);
-	virtual int findDatabase(const char *name, struct DBInfo*,
-		int index=0, unsigned long type=0, unsigned long creator=0);
-	virtual bool retrieveDatabase(const TQString &path, struct DBInfo *db);
-	virtual DBInfoList getDBList(int cardno=0, int flags=dlpDBListRAM);
-	virtual PilotDatabase *database( const TQString &name );
-	virtual PilotDatabase *database( const DBInfo *info );
-
-protected:
-	virtual bool installFile(const TQString &, const bool deleteFile);
-	virtual void addSyncLogEntryImpl( const TQString &s );
-	virtual int pilotSocket() const
-	{
-		return fPilotSocket;
-	}
-
-
-private:
-	LinkStatus fLinkStatus;
-
-
-public:
-
-	/**
-	* Special-cases. Call this after a reset to set device-
-	* specific workarounds; the only one currently known
-	* is the Zire 31/72 T5 quirk of doing a non-HotSync
-	* connect when it's switched on.
-	*/
-	void setWorkarounds(bool usb)
-	{
-		fWorkaroundUSB = usb;
-	}
-
-	/**
-	* Sets an additional device, which should be tried as fallback.
-	* Useful for hotplug enviroments, this device is used @em once
-	* for accepting a connection.
-	*/
-	void setTempDevice( const TQString &device );
-	
-	/**
-	* Sets the device to use.  Used by probe dialog, since we know
-	* what device to use, but we don't want to start the detection
-	* immediately.
-	*/
-	void setDevice( const TQString &device ) 
-	{ 
-		fPilotPath = device;
-	}
-	
-
-protected:
-	/** Should we work around the Zire31/72 quirk? @see setWorkarounds() */
-	bool fWorkaroundUSB;
-
-
-	/**
-	* Check for device permissions and existence, emitting
-	* warnings for weird situations. This is primarily intended
-	* to inform the user.
-	*/
-	void checkDevice();
-
-protected:
-	/**
-	* Path with resolved symlinks, to prevent double binding
-	* to the same device.
-	*/
-	TQString fRealPilotPath;
-
-	/**
-	* Pilot-link library handles for the device once it's opened.
-	*/
-	int fPilotSocket;
-	TQString fTempDevice;
-
-	/**
-	* Handle cases where we can't accept or open the device,
-	* and data remains available on the pilot socket.
-	*/
-	int fAcceptedCount;
-	
-	/**
-	* Start/Stop our device communication thread.
-	*/
-	void startCommThread();
-	void stopCommThread();
-
-protected:
-	Messages *fMessages;
-	DeviceCommThread *fDeviceCommThread;
-} ;
-
-#endif
-
diff --git a/kpilot/lib/kpilotdevicelinkPrivate.h b/kpilot/lib/kpilotdevicelinkPrivate.h
deleted file mode 100644
index 823d9372..00000000
--- a/kpilot/lib/kpilotdevicelinkPrivate.h
+++ /dev/null
@@ -1,330 +0,0 @@
-#ifndef _KPILOT_KPILOTDEVICELINKPRIVATE_H
-#define _KPILOT_KPILOTDEVICELINKPRIVATE_H
-/*
-**
-** Copyright (C) 2007 by Jason 'vanRijn' Kasper <vR@movingparts.net>
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <errno.h>
-
-#include <tqstringlist.h>
-#include <tqthread.h>
-
-#include "kpilotdevicelink.h"
-#include "options.h"
-
-class TQTimer;
-class TQSocketNotifier;
-
-// singleton helper class
-class DeviceMap
-{
-public:
-	static DeviceMap *self()
-	{
-		if (!mThis)
-			mThis = new DeviceMap();
-		return mThis;
-	}
-
-	bool canBind(const TQString &device)
-	{
-		FUNCTIONSETUPL(5);
-		DEBUGKPILOT << fname << ": device: ["
-			<< device << "]" << endl;
-
-		showList();
-		return !mBoundDevices.contains(device);
-	}
-
-	void bindDevice(const TQString &device)
-	{
-		FUNCTIONSETUPL(5);
-		DEBUGKPILOT << fname << ": device: ["
-			<< device << "]" << endl;
-
-		mBoundDevices.append(device);
-		showList();
-	}
-
-	void unbindDevice(const TQString &device)
-	{
-		FUNCTIONSETUPL(5);
-		DEBUGKPILOT << fname << ": device: ["
-			<< device << "]" << endl;
-
-		mBoundDevices.remove(device);
-		showList();
-	}
-
-protected:
-	DeviceMap()
-	{
-		mBoundDevices.clear();
-	}
-	~DeviceMap()
-	{
-	}
-
-	TQStringList mBoundDevices;
-	static DeviceMap *mThis;
-
-private:
-	void showList() const
-	{
-		FUNCTIONSETUPL(5);
-
-		if ( !(mBoundDevices.count() > 0))
-			return;
-
-		DEBUGKPILOT << fname << ": Bound devices: ["
-			<< ((mBoundDevices.count() > 0) ?
-					mBoundDevices.join(CSL1(", ")) : CSL1("<none>"))
-			<< "]" << endl;
-	}
-};
-
-class Messages
-{
-public:
-	Messages(KPilotDeviceLink *parent) :
-		fDeviceLink(parent)
-	{
-		reset();
-	}
-
-	void reset()
-	{
-		messages = 0;
-		messagesMask = ~messageIsError; // Never block errors
-	}
-
-	void block(unsigned int m, bool force=false)
-	{
-		if (force)
-		{
-			// Force blocking this message, even if it's an error msg.
-			messages |= m;
-		}
-		else
-		{
-			messages |= (m & messagesMask);
-		}
-	}
-
-	/**
-	 * Some messages are only printed once and are suppressed
-	 * after that. These are indicated by flag bits in
-	 * messages. The following enum is a bitfield.
-	 */
-	enum
-	{
-		OpenMessage=1, ///< Trying to open device ..
-		OpenFailMessage=2 ///< Failed to open device ...
-	};
-	int messages;
-	int messagesMask;
-	static const int messageIsError = 0;
-
-	/** Determines whether message @p s which has an id of @p msgid (one of
-	 *  the enum values mentioned above) should be printed, which is only if that
-	 *  message has not been suppressed through messagesMask.
-	 *  If return is true, this method also adds it to the messagesMask.
-	 */
-	bool shouldPrint(int msgid)
-	{
-		if (!(messages & msgid))
-		{
-			block(msgid);
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-protected:
-	KPilotDeviceLink *fDeviceLink;
-};
-
-class DeviceCommEvent : public QEvent
-{
-public:
-	DeviceCommEvent(DeviceCustomEvents type, TQString msg = TQString::null,
-			int progress = 0) :
-		TQEvent( (TQEvent::Type)type ), fMessage(msg), fProgress(progress),
-				fPilotSocket(-1)
-	{
-	}
-	TQString message() const
-	{
-		return fMessage;
-	}
-	int progress()
-	{
-		return fProgress;
-	}
-
-	inline void setCurrentSocket(int i)
-	{
-		fPilotSocket = i;
-	}
-
-	inline int currentSocket()
-	{
-		return fPilotSocket;
-	}
-private:
-	TQString fMessage;
-	int fProgress;
-	/**
-	 * Pilot-link library handles for the device once it's opened.
-	 */
-	int fPilotSocket;
-};
-
-/** Class that handles all device communications.  We do this
- in a different thread so that we do not block the main Qt
- Event thread (similar to Swing's AWT event dispatch thread).
- */
-
-class DeviceCommThread : public TQObject, public QThread
-{
-friend class KPilotDeviceLink;
-
-Q_OBJECT
-
-public:
-	DeviceCommThread(KPilotDeviceLink *d);
-	virtual ~DeviceCommThread();
-
-	virtual void run();
-
-	void setDone(bool b)
-	{
-		FUNCTIONSETUP;
-		fDone = b;
-	}
-
-protected:
-
-	void close();
-	
-	void reset();
-
-	/**
-	 * Does the low-level opening of the device and handles the
-	 * pilot-link library initialisation.
-	 */
-	bool open(const TQString &device = TQString::null);
-
-protected slots:
-	/**
-	* Attempt to open the device. Called regularly to check
-	* if the device exists (to handle USB-style devices).
-	*/
-	void openDevice();
-
-	/**
-	* Called when the device is opened *and* activity occurs on the
-	* device. This indicates the beginning of a hotsync.
-	*/
-	void acceptDevice();
-	
-	/**
-	* This slot fires whenever we've been trying to establish a hotsync with
-	* the device for longer than a given amount of time.  When this slot is
-	* fired, we will tear down the communications process and start over again.
-	*/
-	void workaroundUSB();
-
-private:
-	volatile bool fDone;
-
-	KPilotDeviceLink *fHandle;
-	inline KPilotDeviceLink *link()
-	{
-		if (fHandle)
-		{
-			return fHandle;
-		}
-		else
-		{
-			FUNCTIONSETUP;
-			WARNINGKPILOT << "Link asked for, but either I'm "
-				<< "done or I don't have a valid handle.  "
-				<< "Shutting down comm thread." << endl;
-			TQThread::exit();
-			return 0;
-		}
-	}
-
-	/**
-	 * Timers and Notifiers for detecting activity on the device.
-	 */
-	TQTimer *fOpenTimer;
-	TQSocketNotifier *fSocketNotifier;
-	bool fSocketNotifierActive;
-
-	/** Timer used to check for a badly-connected Z31/72 */
-	TQTimer *fWorkaroundUSBTimer;
-	
-	/**
-	 * Pilot-link library handles for the device once it's opened.
-	 */
-	int fPilotSocket;
-	int fTempSocket;
-
-	inline TQString errorMessage(int e)
-	{
-		switch (e)
-		{
-		case ENOENT:
-			return i18n(" The port does not exist.");
-			break;
-		case ENODEV:
-			return i18n(" There is no such device.");
-			break;
-		case EPERM:
-			return i18n(" You do not have permission to open the "
-				"Pilot device.");
-			break;
-		default:
-			return i18n(" Check Pilot path and permissions.");
-		}
-	}
-	
-	/**
-	* Handle cases where we can't accept or open the device,
-	* and data remains available on the pilot socket.
-	*/
-	int fAcceptedCount;
-
-};
-
-
-#endif
-
diff --git a/kpilot/lib/kpilotlib.kcfg b/kpilot/lib/kpilotlib.kcfg
deleted file mode 100644
index 09e82921..00000000
--- a/kpilot/lib/kpilotlib.kcfg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
-      http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <kcfgfile name="kpilotrc"/> 
-  <group name="Notification Messages">
-  </group>
-</kcfg>
diff --git a/kpilot/lib/kpilotlibSettings.kcfgc b/kpilot/lib/kpilotlibSettings.kcfgc
deleted file mode 100644
index d3b0d135..00000000
--- a/kpilot/lib/kpilotlibSettings.kcfgc
+++ /dev/null
@@ -1,7 +0,0 @@
-File=kpilotlib.kcfg
-ClassName=KPilotLibSettings
-Singleton=true
-ItemAccessors=true
-Mutators=true
-GlobalEnums=true
-SetUserTexts=true
diff --git a/kpilot/lib/kpilotlink.cc b/kpilot/lib/kpilotlink.cc
deleted file mode 100644
index da85d489..00000000
--- a/kpilot/lib/kpilotlink.cc
+++ /dev/null
@@ -1,272 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-** Copyright (C) 2006-2007 Adriaan de Groot <groot@kde.org>
-** Copyright (C) 2007 Jason 'vanRijn' Kasper <vR@movingparts.net>
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-
-
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include <iostream>
-
-#include <pi-source.h>
-#include <pi-socket.h>
-#include <pi-dlp.h>
-#include <pi-file.h>
-#include <pi-buffer.h>
-
-#include <tqdir.h>
-#include <tqtimer.h>
-#include <tqdatetime.h>
-#include <tqthread.h>
-
-#include <kconfig.h>
-#include <kmessagebox.h>
-#include <kstandarddirs.h>
-#include <kurl.h>
-#include <kio/netaccess.h>
-
-#include "pilotUser.h"
-#include "pilotSysInfo.h"
-#include "pilotCard.h"
-#include "pilotSerialDatabase.h"
-#include "pilotLocalDatabase.h"
-
-#include "kpilotlink.moc"
-
-/** Class that handles periodically tickling the handheld through
-*   the virtual tickle() method; deals with cancels through the
-*   shared fDone variable.
-*/
-class TickleThread : public QThread
-{
-public:
-	TickleThread(KPilotLink *d, bool *done, int timeout) :
-		TQThread(),
-		fHandle(d),
-		fDone(done),
-		fTimeout(timeout)
-	{ };
-	virtual ~TickleThread();
-
-	virtual void run();
-
-	static const int ChecksPerSecond = 5;
-	static const int SecondsPerTickle = 5;
-
-private:
-	KPilotLink *fHandle;
-	bool *fDone;
-	int fTimeout;
-} ;
-
-TickleThread::~TickleThread()
-{
-}
-
-void TickleThread::run()
-{
-	FUNCTIONSETUP;
-	int subseconds = ChecksPerSecond;
-	int ticktock = SecondsPerTickle;
-	int timeout = fTimeout;
-	DEBUGKPILOT << fname << ": Running for "
-		<< timeout << " seconds." << endl;
-	DEBUGKPILOT << fname << ": Done @" << (void *) fDone << endl;
-
-	while (!(*fDone))
-	{
-		TQThread::msleep(1000/ChecksPerSecond);
-		if (!(--subseconds))
-		{
-			if (timeout)
-			{
-				if (!(--timeout))
-				{
-					TQApplication::postEvent(fHandle, new TQEvent(static_cast<TQEvent::Type>(KPilotLink::EventTickleTimeout)));
-					break;
-				}
-			}
-			subseconds=ChecksPerSecond;
-			if (!(--ticktock))
-			{
-				ticktock=SecondsPerTickle;
-				fHandle->tickle();
-			}
-		}
-	}
-}
-
-
-
-
-
-
-
-
-
-KPilotLink::KPilotLink( TQObject *parent, const char *name ) :
-	TQObject( parent, name ),
-	fPilotPath(TQString::null),
-	fPilotUser(0L),
-	fPilotSysInfo(0L),
-	fTickleDone(true),
-	fTickleThread(0L)
-
-{
-	FUNCTIONSETUP;
-
-	fPilotUser = new KPilotUser();
-	strncpy( fPilotUser->data()->username, "Henk Westbroek",
-		sizeof(fPilotUser->data()->username)-1);
-	fPilotUser->setLastSuccessfulSyncDate( 1139171019 );
-
-	fPilotSysInfo = new KPilotSysInfo();
-	memset(fPilotSysInfo->sysInfo()->prodID, 0,
-		sizeof(fPilotSysInfo->sysInfo()->prodID));
-	strncpy(fPilotSysInfo->sysInfo()->prodID, "LocalLink",
-		sizeof(fPilotSysInfo->sysInfo()->prodID)-1);
-	fPilotSysInfo->sysInfo()->prodIDLength =
-		strlen(fPilotSysInfo->sysInfo()->prodID);
-}
-
-KPilotLink::~KPilotLink()
-{
-	FUNCTIONSETUP;
-	KPILOT_DELETE(fPilotUser);
-	KPILOT_DELETE(fPilotSysInfo);
-}
-
-/* virtual */ bool KPilotLink::event(TQEvent *e)
-{
-	if ((int)e->type() == EventTickleTimeout)
-	{
-		stopTickle();
-		emit timeout();
-		return true;
-	}
-	else return TQObject::event(e);
-}
-
-/*
-Start a tickle thread with the indicated timeout.
-*/
-void KPilotLink::startTickle(unsigned int timeout)
-{
-	FUNCTIONSETUP;
-
-	Q_ASSERT(fTickleDone);
-
-	/*
-	** We've told the thread to finish up, but it hasn't
-	** done so yet - so wait for it to do so, should be
-	** only 200ms at most.
-	*/
-	if (fTickleDone && fTickleThread)
-	{
-		fTickleThread->wait();
-		KPILOT_DELETE(fTickleThread);
-	}
-
-	DEBUGKPILOT << fname << ": Done @" << (void *) (&fTickleDone) << endl;
-
-	fTickleDone = false;
-	fTickleThread = new TickleThread(this,&fTickleDone,timeout);
-	fTickleThread->start();
-}
-
-void KPilotLink::stopTickle()
-{
-	FUNCTIONSETUP;
-	fTickleDone = true;
-	if (fTickleThread)
-	{
-		fTickleThread->wait();
-		KPILOT_DELETE(fTickleThread);
-	}
-}
-
-unsigned int KPilotLink::installFiles(const TQStringList & l, const bool deleteFiles)
-{
-	FUNCTIONSETUP;
-
-	TQStringList::ConstIterator i,e;
-	unsigned int k = 0;
-	unsigned int n = 0;
-	unsigned int total = l.count();
-
-	for (i = l.begin(), e = l.end(); i != e; ++i)
-	{
-		emit logProgress(TQString::null,
-			(int) ((100.0 / total) * (float) n));
-
-		if (installFile(*i, deleteFiles))
-			k++;
-		n++;
-	}
-	emit logProgress(TQString::null, 100);
-
-	return k;
-}
-
-void KPilotLink::addSyncLogEntry(const TQString & entry, bool log)
-{
-	FUNCTIONSETUP;
-	if (entry.isEmpty()) return;
-
-	addSyncLogEntryImpl(entry);
-	if (log)
-	{
-		emit logMessage(entry);
-	}
-}
-
-
-/* virtual */ int KPilotLink::openConduit()
-{
-	return 0;
-}
-
-/* virtual */ int KPilotLink::pilotSocket() const
-{
-	return -1;
-}
-
-/* virtual */ PilotDatabase *KPilotLink::database( const DBInfo *info )
-{
-	FUNCTIONSETUP;
-	return database( Pilot::fromPilot( info->name ) );
-}
-
diff --git a/kpilot/lib/kpilotlink.h b/kpilot/lib/kpilotlink.h
deleted file mode 100644
index 4389cb8b..00000000
--- a/kpilot/lib/kpilotlink.h
+++ /dev/null
@@ -1,501 +0,0 @@
-#ifndef _KPILOT_KPILOTLINK_H
-#define _KPILOT_KPILOTLINK_H
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-** Copyright (C) 2006 Adriaan de Groot <groot@kde.org>
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <pi-dlp.h>
-
-#include <tqobject.h>
-#include <tqvaluelist.h>
-
-/** @file
-* Encapsulates all the communication with the handheld. Also
-* does daemon-like polling of the handheld. Interesting status
-* changes are signalled.
-*/
-
-class TQThread;
-class KPilotUser;
-class KPilotSysInfo;
-class KPilotCard;
-class PilotDatabase;
-
-
-
-/**
-* KPilotLink handles some aspects of
-* communication with a Handheld. A KPilotLink object represents a
-* connection to a device (which may be active or inactive -- the latter in
-* cases where the link is @e waiting for a device to show up). The object
-* handles waiting, protocol initialization and some general
-* tasks such as getting system information or user data.
-*
-* The actual communication with the handheld should use the
-* PilotDatabase methods or use pilot-link dlp_* functions directly
-* on the file descriptor returned by handle().
-*
-* Implementations of this abstract class are KPilotDeviceLink
-* (for real physical devices) and KPilotLocalLink (for devices
-* represented by an on-disk directory).
-*
-*
-* @section General
-*
-* A KPilotLink object (or one of its subclasses) represents a single
-* (potential) link to a handheld device. The handheld device may be
-* a real physical one (subclass KPilotDeviceLink) or a virtual one
-* (subclass KPilotLocalLink). Every KPilotLink is associated with exactly
-* one identifier for @em what device it is attached to. Physical devices
-* have physical locations as interpreted by libpisock -- /dev/ttyUSB0 for
-* instance, or net:any -- while virtual devices are associated with a location
-* in the filesystem.
-*
-* A particular KPilotLink object may be connected -- communicating with
-* a device -- or not. For physical devices, that means that the device is
-* attached to the system (for USB-connected devices, think of it as a
-* metaphor in the case of net:any) and that the HotSync button has been
-* pressed. Virtual devices are immediately connected on creation, since there
-* is no sensible "not connected" state. A connected KPilotLink has access to the
-* data on the handheld and can give that data to the rest of the application.
-*
-* The data access API is divided into roughly three parts, with tickle handling
-* being a special fourth part (see section below). These are:
-*
-* - Message logging
-* - System information access
-* - Database access
-*
-* @section Lifecycle
-*
-* The life-cycle of a KPilotLink object is as follows:
-*
-* # Object is created (one of the concrete subclasses, anyway)
-* # Object gets a location assigned through reset(const TQString &)
-* # Object is connected to the handheld device (somehow, depends on subclass)
-* # Object emits signal deviceReady()
-*
-* After this, the application is free to use the API to access the information from
-* the handheld. When the device connection is no longer needed, call either
-* endOfSync() or finishSync() to wrap up the communications. The object remains
-* alive and may be re-used by calling reset() to use the same location or
-* reset(const TQString &) to give it a new location.
-*
-* @section Tickle handling.
-*
-* During a HotSync, the Pilot expects to be kept awake by (nearly)
-* continuous communication with the PC. The Pilot doesn't like
-* long periods of inactivity, since they drain the batteries while
-* the communications hardware is kept powered up. If the period of
-* inactivity is too long, the Pilot times out, shuts down the
-* communication, and the HotSync is broken.
-
-* Sometimes, however, periods of inactivity cannot be avoided --
-* for instance, if you _have_ to ask the user something during a
-* sync, or if you are fetching a large amount of data from a slow
-* source (libkabc can do that, if your addressbook is on an LDAP
-* server). During these periods of inactivity (as far as the Pilot
-* can tell), you can "tickle" the Pilot to keep it awake. This
-* prevents the communications from being shut down. It's not
-* a good idea to do this all the time -- battery life and possible
-* corruption of the dlp_ communications streams. Hence, you should
-* start and stop tickling the Pilot around any computation which:
-*   - may take a long time
-*   - does not in itself @em ever communicate directly with the Pilot
-*
-*
-*
-* You can call slot tickle() whenever you like just to do a
-* dlp_tickle() call on the Pilot. It will return true if the
-* tickle was successful, false otherwise (this can be used to
-* detect if the communication with the Pilot has shut down for
-* some reason).
-*
-* The protected methods startTickle() and stopTickle() are intended
-* to be called only from SyncActions -- I can't think of any other
-* legitimate use, since everything being done during a HotSync is
-* done via subclasses of SyncActions anyway, and SyncAction provides
-* access to these methods though its own start- and stopTickle().
-*
-* Call startTickle with a timeout in seconds, or 0 for no timeout.
-* This timeout is _unrelated_ to the timeout in the Pilot's
-* communications. Instead, it indicates how long to continue
-* tickling the Pilot before emitting the timeout() signal. This
-* can be useful for placing an upper bound on the amount of
-* time to wait for, say, user interaction -- you don't want an
-* inattentive user to drain the batteries during a sync because
-* he doesn't click on "Yes" for some question. If you pass a
-* timeout of 0, the Pilot will continue to be tickled until you
-* call stopTickle().
-*
-* Call stopTickle() to stop tickling the Pilot and continue with
-* normal operation. You @em must call stopTickle() before calling
-* anything else that might communicate with the Pilot, to avoid
-* corrupting the dlp_ communications stream. (TODO: Mutex the heck
-* out of this to avoid this problem). Note that stopTickle() may
-* hang up the caller for a small amount of time (up to 200ms)
-* before returning.
-*
-* event() and TickleTimeoutEvent are part of the implementation
-* of tickling, and are only accidentally visible.
-*
-* Signal timeout() is emitted if startTickle() has been called
-* with a non-zero timeout and that timeout has elapsed. The
-* tickler is stopped before timeout is emitted.
-*/
-class KDE_EXPORT KPilotLink : public QObject
-{
-Q_OBJECT
-friend class SyncAction;
-public:
-	/** A list of DBInfo structures. */
-	typedef TQValueList<struct DBInfo> DBInfoList;
-
-	/** Constructor. Use reset() to start looking for a device. */
-	KPilotLink( TQObject *parent = 0, const char *name = 0 );
-
-	/** Destructor. This rudely interrupts any communication in progress.
-	* It is best to call endOfSync() or finishSync() before destroying
-	* the device.
-	*/
-	virtual ~KPilotLink();
-
-
-	/** Provides a human-readable status string. */
-	virtual TQString statusString() const = 0;
-
-	/**
-	* True if HotSync has been started but not finished yet
-	* (ie. the physical Pilot is waiting for sync commands)
-	*/
-	virtual bool isConnected() const = 0;
-
-
-	/**
-	* Information on what kind of device we're dealing with.
-	* A link is associated with a path -- either the node in
-	* /dev that the physical device is attached to, or an
-	* IP address, or a filesystem path for local links.
-	* Whichever is being used, this function returns its
-	* name in a human-readable form.
-	*/
-	TQString pilotPath() const
-	{
-		return fPilotPath;
-	}
-
-	/**
-	* Return the device link to the Init state and try connecting
-	* to the given device path (if it's non-empty). What the
-	* path means depends on the kind of link we're instantiating.
-	*
-	* @see reset()
-	* @see pilotPath()
-	*/
-	virtual void reset(const TQString &pilotPath) = 0;
-
-	/** Allows our class to receive custom events that our threads
-	* will be giving to us, including tickle timeouts and 
-	* device communication events. 
-	*/
-	virtual bool event(TQEvent *e);
-
-	/**
-	* Install the list of files (full paths!) named by @p l
-	* onto the handheld (or whatever this link represents).
-	* If @p deleteFiles  is true, the source files are removed.
-	*
-	* @return the number of files successfully installed.
-	*/
-	unsigned int installFiles(const TQStringList &l, const bool deleteFiles);
-
-	/**
-	* Write a log entry to the handheld. If @p log is true,
-	* then the signal logMessage() is also emitted. This
-	* function is supposed to @em only write to the handheld's
-	* log (with a physical device, that is what appears on
-	* screen at the end of a sync).
-	*/
-	void addSyncLogEntry(const TQString &entry,bool log=true);
-
-	/**
-	* Find a database with the given @p name (and optionally,
-	* type @p type and creator ID (from pi_mktag) @p creator,
-	* on searching from index @p index on the handheld.
-	* Fills in the DBInfo structure @p info if found.
-	*
-	* @return >=0 on success. See the documentation for each
-	*         subclass for particular meanings.
-	* @return < 0 on error.
-	*/
-	virtual int findDatabase(const char *name,
-		struct DBInfo *info,
-		int index=0,
-		unsigned long type=0,
-		unsigned long creator=0) = 0;
-
-	/**
-	* Retrieve the database indicated by DBInfo @p *db into the
-	* local file @p path. This copies all the data, and you can
-	* create a PilotLocalDatabase from the resulting @p path .
-	*
-	* @return @c true on success
-	*/
-	virtual bool retrieveDatabase(const TQString &path, struct DBInfo *db) = 0;
-
-	/**
-	* Fill the DBInfo structure @p db with information about
-	* the next database (in some ordering) counting from
-	* @p index.
-	*
-	* @return < 0 on error
-	*/
-	virtual int getNextDatabase(int index,struct DBInfo *db) = 0;
-
-	/**
-	* Returns a list of DBInfo structures describing all the
-	* databases available on the link (ie. device) with the
-	* given card number @p cardno and flags @p flags. No known
-	* handheld uses a cardno other than 0; use flags to
-	* indicate what kind of databases to fetch -- @c dlpDBListRAM
-	* or @c dlpDBListROM.
-	*
-	* @return list of DBInfo objects, one for each database
-	* @note ownership of the DBInfo objects is passed to the
-	*       caller, who must delete the objects.
-	*/
-	virtual DBInfoList getDBList(int cardno=0, int flags=dlpDBListRAM) = 0;
-
-	/**
-	* Return a database object for manipulating the database with
-	* name @p name on the link. This database may be local or
-	* remote, depending on the kind of link in use.
-	*
-	* @return pointer to database object, or 0 on error.
-	* @note ownership of the database object is given to the caller,
-	*       who must delete the object in time.
-	*/
-	virtual PilotDatabase *database( const TQString &name ) = 0;
-
-	/**
-	* Return a database object for manipulating the database with
-	* the name stored in the DBInfo structure @p info . The default
-	* version goes through method database( const TQString & ), above.
-	*
-	* @return pointer to database object, or 0 on error.
-	* @note ownership of the database object is given to the caller.
-	*/
-	virtual PilotDatabase *database( const DBInfo *info );
-
-	/**
-	* Retrieve the user information from the device. Ownership
-	* is kept by the link, and at the end of a sync the user
-	* information is synced back to the link -- so it may be
-	* modified, but don't make local copies of it.
-	*
-	* @note Do not call this before the sync begins!
-	*/
-	KPilotUser &getPilotUser()
-	{
-		return *fPilotUser;
-	}
-
-	/**
-	* System information about the handheld. Ownership is kept
-	* by the link. For non-device links, something fake is
-	* returned.
-	*
-	* @note Do not call this before the sync begins!
-	*/
-	const KPilotSysInfo &getSysInfo()
-	{
-		return *fPilotSysInfo;
-	}
-
-	/**
-	* Retrieve information about the data card @p card;
-	* I don't think that any pilot supports card numbers
-	* other than 0. Non-device links return something fake.
-	*
-	* This function may return NULL (non-device links or
-	* on error).
-	*
-	* @note Ownership of the KPilotCard object is given
-	*       to the caller, who must delete it.
-	*/
-	virtual const KPilotCard *getCardInfo(int card=0) = 0;
-
-	/**
-	* When ending the sync, you can do so gracefully, updating the
-	* last-sync time to indicate a successful sync and setting the
-	* user name on the device, or you can skip that (for unsuccessful
-	* syncs, generally).
-	*/
-	enum EndOfSyncFlags {
-		NoUpdate, ///<  Do not update the user info
-		UpdateUserInfo ///< Update user info and last successful sync date
-	} ;
-
-	/**
-	* Custom events we can be handling...
-	*/
-	enum CustomEvents { 
-		EventTickleTimeout = 1066
-	};
-	
-	/**
-	* End the sync in a gracuful manner. If @p f is UpdateUserInfo,
-	* the sync was successful and the user info and last successful sync
-	* timestamp are updated.
-	*/
-	virtual void endSync( EndOfSyncFlags f ) = 0;
-
-signals:
-	/**
-	* A timeout associated with tickling has occurred. Each
-	* time startTickle() is called, you can state how long
-	* tickling should last (at most) before timing out.
-	*
-	* You can only get a timeout when the Qt event loop is
-	* running, which somewhat limits the usefulness of timeouts.
-	*/
-	void timeout();
-
-	/** Signal that a message has been written to the sync log. */
-	void logMessage(const TQString &);
-
-	/** Signal that an error has occurred, for logging. */
-	void logError(const TQString &);
-
-	/**
-	* Signal that progress has been made, for logging purposes.
-	* @p p is the percentage completed (0 <= s <= 100).
-	* The string @p s is logged as well, if non-Null.
-	*/
-	void logProgress(const TQString &s, int p);
-
-	/**
-	* Emitted once the user information has been read and
-	* the HotSync is really ready to go.
-	*/
-	void deviceReady( KPilotLink * );
-
-
-public slots:
-	/**
-	* Release all resources, including the master pilot socket,
-	* timers, etc.
-	*/
-	virtual void close() = 0;
-
-	/**
-	* Assuming things have been set up at least once already by
-	* a call to reset() with parameters, use this slot to re-start
-	* with the same settings.
-	*/
-	virtual void reset() = 0;
-
-	/** Tickle the underlying device exactly once. */
-	virtual bool tickle() = 0;
-
-protected:
-	/**
-	* Path of the device special file that will be used.
-	* Usually /dev/pilot, /dev/ttySx, or /dev/usb/x. May be
-	* a filesystem path for local links.
-	*/
-	TQString fPilotPath;
-
-	/**
-	* Start tickling the Handheld (every few seconds). This
-	* lasts until @p timeout seconds have passed (or forever
-	* if @p timeout is zero).
-	*
-	* @note Do not call startTickle() twice with no intervening
-	*       stopTickle().
-	*/
-	void startTickle(unsigned int timeout=0);
-
-	/**
-	* Stop tickling the Handheld. This may block for some
-	* time (less than a second) to allow the tickle thread
-	* to finish.
-	*/
-	void stopTickle();
-
-	/**
-	* Install a single file onto the device link. Full pathname
-	* @p f is used; in addition, if @p deleteFile is true remove
-	* the source file. Returns @c true if the install succeeded.
-	*/
-	virtual bool installFile( const TQString &f, const bool deleteFile ) = 0;
-
-	/**
-	* Notify the Pilot user that a conduit is running now.
-	* On real devices, this prints out (on screen) which database
-	* is now opened; useful for progress reporting.
-	*
-	* @return -1 on error
-	* @note the default implementation returns 0
-	*/
-	virtual int openConduit();
-
-	/**
-	* Returns a file handle for raw operations. Not recommended.
-	* On links with no physical device backing, returns -1.
-	*
-	* @note the default implementation returns -1
-	*/
-	virtual int pilotSocket() const;
-
-	/**
-	* Actually write an entry to the device link. The message
-	* @p s must be guaranteed non-empty.
-	*/
-	virtual void addSyncLogEntryImpl( const TQString &s ) = 0;
-
-	/**
-	* User information structure. Should be filled in when a sync
-	* starts, so that conduits can use the information.
-	*/
-	KPilotUser  *fPilotUser;
-
-	/**
-	* System information about the device. Filled in when the
-	* sync starts. Non-device links need to fake something.
-	*/
-	KPilotSysInfo *fPilotSysInfo;
-
-
-private:
-	bool fTickleDone;
-	TQThread *fTickleThread;
-
-} ;
-
-#endif
diff --git a/kpilot/lib/kpilotlocallink.cc b/kpilot/lib/kpilotlocallink.cc
deleted file mode 100644
index 8834b4a8..00000000
--- a/kpilot/lib/kpilotlocallink.cc
+++ /dev/null
@@ -1,368 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-** Copyright (C) 2006-2007 Adriaan de Groot <groot@kde.org>
-** Copyright (C) 2007 Jason 'vanRijn' Kasper <vR@movingparts.net>
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-
-
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include <iostream>
-
-#include <pi-source.h>
-#include <pi-socket.h>
-#include <pi-dlp.h>
-#include <pi-file.h>
-#include <pi-buffer.h>
-
-#include <tqdir.h>
-#include <tqtimer.h>
-#include <tqdatetime.h>
-#include <tqthread.h>
-
-#include <kconfig.h>
-#include <kmessagebox.h>
-#include <kstandarddirs.h>
-#include <kurl.h>
-#include <kio/netaccess.h>
-
-#include "pilotSerialDatabase.h"
-#include "pilotLocalDatabase.h"
-
-#include "kpilotlink.h"
-#include "kpilotlocallink.moc"
-
-
-typedef QPair<TQString, struct DBInfo> DatabaseDescriptor;
-typedef TQValueList<DatabaseDescriptor> DatabaseDescriptorList;
-
-class KPilotLocalLink::Private
-{
-public:
-	DatabaseDescriptorList fDBs;
-} ;
-
-unsigned int KPilotLocalLink::findAvailableDatabases( KPilotLocalLink::Private &info, const TQString &path )
-{
-	FUNCTIONSETUP;
-
-	info.fDBs.clear();
-
-	TQDir d(path);
-	if (!d.exists())
-	{
-		// Perhaps return an error?
-		return 0;
-	}
-
-	// Use this to fake indexes in the list of DBInfo structs
-	unsigned int counter = 0;
-
-	TQStringList dbs = d.entryList( CSL1("*.pdb"), TQDir::Files | TQDir::NoSymLinks | TQDir::Readable );
-	for ( TQStringList::ConstIterator i = dbs.begin(); i != dbs.end() ; ++i)
-	{
-		struct DBInfo dbi;
-
-		// Remove the trailing 4 characters
-		TQString dbname = (*i);
-		dbname.remove(dbname.length()-4,4);
-
-		TQString dbnamecheck = (*i).left((*i).findRev(CSL1(".pdb")));
-		Q_ASSERT(dbname == dbnamecheck);
-
-		if (PilotLocalDatabase::infoFromFile( path + CSL1("/") + (*i), &dbi))
-		{
-			DEBUGKPILOT << fname << ": Loaded "
-				<< dbname << endl;
-			dbi.index = counter;
-			info.fDBs.append( DatabaseDescriptor(dbname,dbi) );
-			++counter;
-		}
-	}
-
-	DEBUGKPILOT << fname << ": Total " << info.fDBs.count()
-		<< " databases." << endl;
-	return info.fDBs.count();
-}
-
-
-KPilotLocalLink::KPilotLocalLink( TQObject *parent, const char *name ) :
-	KPilotLink(parent,name),
-	fReady(false),
-	d( new Private )
-{
-	FUNCTIONSETUP;
-}
-
-KPilotLocalLink::~KPilotLocalLink()
-{
-	FUNCTIONSETUP;
-	KPILOT_DELETE(d);
-}
-
-/* virtual */ TQString KPilotLocalLink::statusString() const
-{
-	return fReady ? CSL1("Ready") : CSL1("Waiting") ;
-}
-
-/* virtual */ bool KPilotLocalLink::isConnected() const
-{
-	return fReady;
-}
-
-/* virtual */ void KPilotLocalLink::reset( const TQString &p )
-{
-	FUNCTIONSETUP;
-	fPath = p;
-	reset();
-}
-
-/* virtual */ void KPilotLocalLink::reset()
-{
-	FUNCTIONSETUP;
-	TQFileInfo info( fPath );
-	fReady = !fPath.isEmpty() && info.exists() && info.isDir() ;
-	if (fReady)
-	{
-		findAvailableDatabases(*d, fPath);
-		TQTimer::singleShot(500,this,TQT_SLOT(ready()));
-	}
-	else
-	{
-		WARNINGKPILOT << "The local link path <"
-			<< fPath
-			<< "> does not exist or is not a directory. No sync can be done."
-			<< endl;
-	}
-}
-
-/* virtual */ void KPilotLocalLink::close()
-{
-	fReady = false;
-}
-
-/* virtual */ bool KPilotLocalLink::tickle()
-{
-	return true;
-}
-
-/* virtual */ const KPilotCard *KPilotLocalLink::getCardInfo(int)
-{
-	return 0;
-}
-
-/* virtual */ void KPilotLocalLink::endSync( EndOfSyncFlags f )
-{
-	Q_UNUSED(f);
-	fReady = false;
-}
-
-/* virtual */ int KPilotLocalLink::openConduit()
-{
-	FUNCTIONSETUP;
-	return 0;
-}
-
-
-/* virtual */ int KPilotLocalLink::getNextDatabase( int index, struct DBInfo *info )
-{
-	FUNCTIONSETUP;
-
-	if ( (index<0) || (index>=(int)d->fDBs.count()) )
-	{
-		WARNINGKPILOT << "Index out of range." << endl;
-		return -1;
-	}
-
-	DatabaseDescriptor dd = d->fDBs[index];
-
-	DEBUGKPILOT << fname << ": Getting database " << dd.first << endl;
-
-	if (info)
-	{
-		*info = dd.second;
-	}
-
-	return index+1;
-}
-
-/* virtual */ int KPilotLocalLink::findDatabase(const char *name, struct DBInfo*info,
-		int index, unsigned long type, unsigned long creator)
-{
-	FUNCTIONSETUP;
-
-	if ( (index<0) || (index>=(int)d->fDBs.count()) )
-	{
-		WARNINGKPILOT << "Index out of range." << endl;
-		return -1;
-	}
-
-	if (!name)
-	{
-		WARNINGKPILOT << "NULL name." << endl;
-		return -1;
-	}
-
-	TQString desiredName = Pilot::fromPilot(name);
-	DEBUGKPILOT << fname << ": Looking for DB " << desiredName << endl;
-	for ( DatabaseDescriptorList::ConstIterator i = d->fDBs.at(index);
-		i != d->fDBs.end(); ++i)
-	{
-		const DatabaseDescriptor &dd = *i;
-		if (dd.first == desiredName)
-		{
-			if ( (!type || (type == dd.second.type)) &&
-				(!creator || (creator == dd.second.creator)) )
-			{
-				if (info)
-				{
-					*info = dd.second;
-				}
-				return index;
-			}
-		}
-
-		++index;
-	}
-
-	return -1;
-}
-
-/* virtual */ void KPilotLocalLink::addSyncLogEntryImpl(TQString const &s)
-{
-	FUNCTIONSETUP;
-	DEBUGKPILOT << fname << ": " << s << endl ;
-}
-
-/* virtual */ bool KPilotLocalLink::installFile(TQString const &path, bool deletefile)
-{
-	FUNCTIONSETUP;
-
-	TQFileInfo srcInfo(path);
-	TQString canonicalSrcPath = srcInfo.dir().canonicalPath() + CSL1("/") + srcInfo.fileName() ;
-	TQString canonicalDstPath = fPath + CSL1("/") + srcInfo.fileName();
-
-	if (canonicalSrcPath == canonicalDstPath)
-	{
-		// That's a cheap copy operation
-		return true;
-	}
-
-	KURL src = KURL::fromPathOrURL( canonicalSrcPath );
-	KURL dst = KURL::fromPathOrURL( canonicalDstPath );
-
-	KIO::NetAccess::file_copy(src,dst,-1,true);
-
-	if (deletefile)
-	{
-		KIO::NetAccess::del(src, 0L);
-	}
-
-	return true;
-}
-
-/* virtual */ bool KPilotLocalLink::retrieveDatabase( const TQString &path, struct DBInfo *db )
-{
-	FUNCTIONSETUP;
-
-	TQString dbname = Pilot::fromPilot(db->name) + CSL1(".pdb") ;
-	TQString sourcefile = fPath + CSL1("/") + dbname ;
-	TQString destfile = path ;
-
-	DEBUGKPILOT << fname << ": src=" << sourcefile << endl;
-	DEBUGKPILOT << fname << ": dst=" << destfile << endl;
-
-	TQFile in( sourcefile );
-	if ( !in.exists() )
-	{
-		WARNINGKPILOT << "Source file " << sourcefile << " doesn't exist." << endl;
-		return false;
-	}
-	if ( !in.open( IO_ReadOnly | IO_Raw ) )
-	{
-		WARNINGKPILOT << "Can't read source file " << sourcefile << endl;
-		return false;
-	}
-
-	TQFile out( destfile );
-	if ( !out.open( IO_WriteOnly | IO_Truncate | IO_Raw ) )
-	{
-		WARNINGKPILOT << "Can't write destination file " << destfile << endl;
-		return false;
-	}
-
-	const Q_ULONG BUF_SIZ = 8192 ;
-	char buf[BUF_SIZ];
-	Q_LONG r;
-
-	while ( (r=in.readBlock(buf,BUF_SIZ))>0 )
-	{
-		out.writeBlock(buf,r);
-	}
-	out.flush();
-	in.close();
-
-	return out.exists();
-}
-
-KPilotLink::DBInfoList KPilotLocalLink::getDBList( int, int )
-{
-	FUNCTIONSETUP;
-	DBInfoList l;
-	for ( DatabaseDescriptorList::ConstIterator i=d->fDBs.begin();
-		i != d->fDBs.end(); ++i)
-	{
-		l.append( (*i).second );
-	}
-	return l;
-}
-
-
-/* virtual */ PilotDatabase *KPilotLocalLink::database( const TQString &name )
-{
-	FUNCTIONSETUP;
-	return new PilotLocalDatabase( fPath, name );
-}
-
-
-
-/* slot */ void KPilotLocalLink::ready()
-{
-	if (fReady)
-	{
-		emit deviceReady(this);
-	}
-}
-
diff --git a/kpilot/lib/kpilotlocallink.h b/kpilot/lib/kpilotlocallink.h
deleted file mode 100644
index ca37bb57..00000000
--- a/kpilot/lib/kpilotlocallink.h
+++ /dev/null
@@ -1,95 +0,0 @@
-#ifndef _KPILOT_KPILOTLOCALLINK_H
-#define _KPILOT_KPILOTLOCALLINK_H
-/*
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-** Copyright (C) 2006 Adriaan de Groot <groot@kde.org>
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "kpilotlink.h"
-
-/** @file
-* Definition of the local link class; implemented in kpilotlink.cc .
-*/
-
-
-/**
-* Implementation of the device link for file-system backed (ie. local, fake)
-* devices. Uses a directory specified in the reset() call to serve databases.
-*/
-class KDE_EXPORT KPilotLocalLink : public KPilotLink
-{
-Q_OBJECT
-public:
-	KPilotLocalLink( TQObject *parent=0L, const char *name=0L );
-	virtual ~KPilotLocalLink();
-
-	virtual TQString statusString() const;
-	virtual bool isConnected() const;
-	virtual void reset( const TQString & );
-	virtual void close();
-	virtual void reset();
-	virtual bool tickle();
-	virtual const KPilotCard *getCardInfo(int card);
-	virtual void endSync( EndOfSyncFlags f );
-	virtual int openConduit();
-	virtual int getNextDatabase(int index,struct DBInfo *);
-	virtual int findDatabase(const char *name, struct DBInfo*,
-		int index=0, unsigned long type=0, unsigned long creator=0);
-	virtual bool retrieveDatabase(const TQString &path, struct DBInfo *db);
-	virtual DBInfoList getDBList(int cardno=0, int flags=dlpDBListRAM);
-	virtual PilotDatabase *database( const TQString &name );
-
-public slots:
-	void ready();
-
-protected:
-	virtual bool installFile(const TQString &, const bool deleteFile);
-	virtual void addSyncLogEntryImpl( const TQString &s );
-	virtual int pilotSocket() const
-	{
-		return -1;
-	}
-
-protected:
-	bool fReady;
-	TQString fPath;
-
-	class Private;
-	Private *d;
-
-	/**
-	* Pre-process the directory @p path to find out which databases
-	* live there.
-	*
-	* @return Number of database in @p path.
-	*/
-	unsigned int findAvailableDatabases( Private &, const TQString &path );
-} ;
-
-
-#endif
-
diff --git a/kpilot/lib/options.cc b/kpilot/lib/options.cc
deleted file mode 100644
index be2b5e6e..00000000
--- a/kpilot/lib/options.cc
+++ /dev/null
@@ -1,157 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2000-2001 by Adriaan de Groot
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This is a file of odds and ends, with debugging functions and stuff.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include "options.h"
-
-
-#include <iostream>
-
-#include <tqsize.h>
-
-#include <kconfig.h>
-#include <kdebug.h>
-#include <kcmdlineargs.h>
-
-#ifdef DEBUG
-int debug_level = 1;
-#else
-int debug_level = 0;
-#endif
-
-// The daemon also has a debug level; debug_spaces is 60 spaces,
-// to align FUNCTIONSETUP output. The one byte extra is for the NUL.
-//
-//
-static const char debug_spaces[61] =
-	"                    "
-	"                    "
-	"                    ";
-
-
-TQString rtExpand(const TQString &s, Qt::TextFormat richText)
-{
-	if (richText == Qt::RichText)
-	{
-		TQString t(s);
-		return t.replace(CSL1("\n"), CSL1("<br/>\n"));
-	}
-	else
-	{
-		return s;
-	}
-
-}
-
-TQDateTime readTm(const struct tm &t)
-{
-	TQDateTime dt;
-	dt.setDate(TQDate(1900 + t.tm_year, t.tm_mon + 1, t.tm_mday));
-	dt.setTime(TQTime(t.tm_hour, t.tm_min, t.tm_sec));
-	return dt;
-}
-
-
-
-struct tm writeTm(const TQDateTime &dt)
-{
-	struct tm t;
-
-	t.tm_wday = 0; // unimplemented
-	t.tm_yday = 0; // unimplemented
-	t.tm_isdst = 0; // unimplemented
-#ifdef HAVE_STRUCT_TM_TM_ZONE
-	t.tm_zone = 0; // unimplemented
-#endif
-
-	t.tm_year = dt.date().year() - 1900;
-	t.tm_mon = dt.date().month() - 1;
-	t.tm_mday = dt.date().day();
-	t.tm_hour = dt.time().hour();
-	t.tm_min = dt.time().minute();
-	t.tm_sec = dt.time().second();
-
-	return t;
-}
-
-
-
-struct tm writeTm(const TQDate &d)
-{
-	TQDateTime dt(d);
-	return writeTm(dt);
-}
-
-KPilotDepthCount::KPilotDepthCount(int, int level, const char *s) :
-	fDepth(depth),
-	fLevel(level),
-	fName(s)
-{
-	DEBUGKPILOT << "! DEPRECATED Depth call.\n!   "
-		<< kdBacktrace(4) << endl;
-
-	if (debug_level>=fLevel)
-	{
-		DEBUGKPILOT << indent() << ">" << name() << endl;
-	}
-	depth++;
-}
-
-KPilotDepthCount::KPilotDepthCount(int level, const char *s) :
-	fDepth(depth),
-	fLevel(level),
-	fName(s)
-{
-	if (debug_level>=fLevel)
-	{
-		DEBUGKPILOT << indent() << ">" << name() << endl;
-	}
-	depth++;
-}
-
-KPilotDepthCount::~KPilotDepthCount()
-{
-	depth--;
-	std::cerr.clear(std::ios_base::goodbit);
-}
-
-const char *KPilotDepthCount::indent() const
-{
-	if (fDepth < 30)
-	{
-		return debug_spaces + 60-fDepth*2;
-	}
-	else
-	{
-		return debug_spaces;
-	}
-}
-
-int KPilotDepthCount::depth = 0;
-
diff --git a/kpilot/lib/options.h b/kpilot/lib/options.h
deleted file mode 100644
index 9fe0f8be..00000000
--- a/kpilot/lib/options.h
+++ /dev/null
@@ -1,199 +0,0 @@
-#ifndef _KPILOT_OPTIONS_H
-#define _KPILOT_OPTIONS_H
-/* options.h			KPilot
-**
-** Copyright (C) 1998-2001,2002,2003 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This file defines some global constants and macros for KPilot.
-** In particular, KDE2 is defined when KDE2 seems to be the environment
-** (is there a better way to do this?). Use of KDE2 to #ifdef sections
-** of code is deprecated though.
-**
-** Many debug functions are defined as well.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "config.h"
-
-#include <tqglobal.h>
-#include <tqnamespace.h>
-#include <tqstring.h>
-
-#if (QT_VERSION < 0x030300)
-#error "This is KPilot for KDE3.5 and won't compile with Qt < 3.3.0"
-#endif
-
-#include <kdebug.h>
-#include <kdeversion.h>
-#include <klocale.h>
-
-#if !(KDE_IS_VERSION(3,4,0))
-#error "This is KPilot for (really) KDE 3.5 and won't compile with KDE < 3.4.0"
-#endif
-
-#if !(KDE_IS_VERSION(3,5,0))
-#warning "This is KPilot for KDE 3.5 and might not compile with KDE < 3.5.0"
-#endif
-
-#include "pilotLinkVersion.h"
-
-#include <iostream>
-
-using namespace std;
-inline std::ostream& operator <<(std::ostream &o, const TQString &s)
-	{ if (s.isEmpty()) return o<<"<empty>"; else return o<<s.latin1(); }
-inline std::ostream& operator <<(std::ostream &o, const TQCString &s)
-	{ if (s.isEmpty()) return o<<"<empty>"; else return o << *s; }
-
-
-#ifndef NDEBUG
-#define DEBUG	(1)
-#endif
-
-extern KDE_EXPORT int debug_level;
-
-class KDE_EXPORT KPilotDepthCount
-{
-public:
-	KPilotDepthCount(int, int level, const char *s);
-	KPilotDepthCount(int level, const char *s);
-	~KPilotDepthCount();
-	const char *indent() const;
-	inline const char *name() const { return fName; } ;
-	inline int level() const { return fLevel; } ;
-
-protected:
-	static int depth;
-	int fDepth;
-	int fLevel;
-	const char *fName;
-} ;
-
-
-#ifdef DEBUG
-#ifdef __GNUC__
-#define KPILOT_FNAMEDEF(l)	KPilotDepthCount fname(l,__FUNCTION__)
-#else
-#define	KPILOT_FNAMEDEF(l)	KPilotDepthCount fname(l,__FILE__ ":" "__LINE__")
-#endif
-
-#define FUNCTIONSETUP		KPILOT_FNAMEDEF(1)
-#define FUNCTIONSETUPL(l)	KPILOT_FNAMEDEF(l)
-
-// stderr / iostream-based debugging.
-//
-//
-#define DEBUGKPILOT   std::cerr
-#define WARNINGKPILOT std::cerr.clear(std::ios_base::goodbit),\
-	std::cerr << "! " << k_funcinfo << std::endl << "!   "
-
-
-
-
-inline std::ostream& operator <<(std::ostream &o, const KPilotDepthCount &d)
-{
-	if (debug_level >= d.level())
-	{
-		o.clear(std::ios_base::goodbit);
-		return o << d.indent() << ' ' << d.name();
-	}
-	else
-	{
-		o.setstate(std::ios_base::badbit | std::ios_base::failbit);
-		return o;
-	}
-}
-
-#else
-
-// no debugging at all
-//
-#define DEBUGSTREAM   kndbgstream
-#define DEBUGKPILOT   kndDebug()
-#define WARNINGKPILOT kndDebug()
-
-// With debugging turned off, FUNCTIONSETUP doesn't do anything.
-//
-//
-#define FUNCTIONSETUP const int fname = 0; Q_UNUSED(fname);
-#define FUNCTIONSETUPL(a) const int fname = a; Q_UNUSED(fname);
-#endif
-
-#define KPILOT_VERSION	"4.9.4-3510 (elsewhere)"
-
-
-// Function to expand newlines in rich text to <br>\n
-TQString rtExpand(const TQString &s, Qt::TextFormat richText);
-
-
-
-/**
- * Convert a struct tm from the pilot-link package to a QDateTime
- */
-KDE_EXPORT TQDateTime readTm(const struct tm &t);
-/**
- * Convert a TQDateTime to a struct tm for use with the pilot-link package
- */
-KDE_EXPORT struct tm writeTm(const TQDateTime &dt);
-KDE_EXPORT struct tm writeTm(const TQDate &dt);
-
-
-// Some layout macros
-//
-// SPACING is a generic distance between visual elements;
-// 10 seems reasonably good even at high resolutions.
-//
-//
-#define SPACING		(10)
-
-// Semi-Standard safe-free expression. Argument a may be evaluated more
-// than once though, so be careful.
-//
-//
-#define KPILOT_FREE(a)	{ if (a) { ::free(a); a=0L; } }
-#define KPILOT_DELETE(a) { if (a) { delete a; a=0L; } }
-
-
-// This marks strings that need to be i18n()ed in future,
-// but cannot be done now due to message freeze. The _P
-// variant is to handle plurals and is wrong, but unavoidable.
-//
-//
-#define TODO_I18N(a)	TQString::fromLatin1(a)
-#define TODO_I18N_P(a,b,c) ((c>1) ? a : b)
-
-// Handle some cases for QT_NO_CAST_ASCII and NO_ASCII_CAST.
-// Where possible in the source, known constant strings in
-// latin1 encoding are marked with CSL1(), to avoid gobs
-// of latin1() or fromlatin1() calls which might obscure
-// those places where the code really is translating
-// user data from latin1.
-//
-// The extra "" in CSL1 is to enforce that it's only called
-// with constant strings.
-//
-//
-#define CSL1(a)		TQString::fromLatin1(a "")
-
-#endif
diff --git a/kpilot/lib/pilot.cc b/kpilot/lib/pilot.cc
deleted file mode 100644
index 6a1267a9..00000000
--- a/kpilot/lib/pilot.cc
+++ /dev/null
@@ -1,264 +0,0 @@
-/* pilot.cc			KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-** Copyright (C) 2003-2006 Adriaan de Groot <groot@kde.org>
-**
-** These are the base class structures that reside on the
-** handheld device -- databases and their parts.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <tqtextcodec.h>
-#include <tqmutex.h>
-#include <kcharsets.h>
-#include <kglobal.h>
-
-#include "pilot.h"
-#include "pilotDatabase.h"
-#include "pilotAppInfo.h"
-#include "pilotRecord.h"
-
-
-namespace Pilot
-{
-static TQTextCodec *codec = 0L;
-static TQMutex* mutex = 0L;
-
-
-TQString fromPilot( const char *c, int len )
-{
-	mutex->lock();
-	TQString str = codec->toUnicode(c,len);
-	mutex->unlock();
-	return str;
-}
-
-TQString fromPilot( const char *c )
-{
-	mutex->lock();
-	TQString str = codec->toUnicode(c);
-	mutex->unlock();
-	return str;
-}
-
-TQCString toPilot( const TQString &s )
-{
-	mutex->lock();
-	TQCString str = codec->fromUnicode(s);
-	mutex->unlock();
-	return str;
-}
-
-int toPilot( const TQString &s, char *buf, int len)
-{
-	mutex->lock();
-	// See toPilot() below.
-	memset( buf, 0, len );
-	int used = len;
-	TQCString cbuf = codec->fromUnicode(s,used);
-	if (used > len)
-	{
-		used=len;
-	}
-	memcpy( buf, cbuf.data(), used );
-	mutex->unlock();
-	return used;
-}
-
-int toPilot( const TQString &s, unsigned char *buf, int len)
-{
-	mutex->lock();
-	// Clear the buffer
-	memset( buf, 0, len );
-
-	// Convert to 8-bit encoding
-	int used = len;
-	TQCString cbuf = codec->fromUnicode(s,used);
-
-	// Will it fit in the buffer?
-	if (used > len)
-	{
-		// Ought to be impossible, anyway, since 8-bit encodings
-		// are shorter than the UTF-8 encodings (1 byte per character
-		// vs. 1-or-more byte per character).
-		used=len;
-	}
-
-	// Fill the buffer with encoded data.
-	memcpy( buf, cbuf.data(), used );
-	mutex->unlock();
-	return used;
-}
-
-bool setupPilotCodec(const TQString &s)
-{
-	FUNCTIONSETUP;
-	mutex = new TQMutex();
-	mutex->lock();
-	TQString encoding(KGlobal::charsets()->encodingForName(s));
-
-	DEBUGKPILOT << fname << ": Using codec name " << s << endl;
-	DEBUGKPILOT << fname << ": Creating codec " << encoding << endl;
-
-	// if the desired codec can't be found, latin1 will be returned anyway, no need to do this manually
-	codec = KGlobal::charsets()->codecForName(encoding);
-
-	if (codec)
-	{
-		DEBUGKPILOT << fname << ": Got codec " << codec->name() << endl;
-	}
-
-	mutex->unlock();
-	return codec;
-}
-
-TQString codecName()
-{
-	return TQString::fromLatin1(codec->name());
-}
-
-TQString category(const struct CategoryAppInfo *info, unsigned int i)
-{
-	if (!info || (i>=CATEGORY_COUNT))
-	{
-		return TQString::null;
-	}
-
-	mutex->lock();
-	TQString str = codec->toUnicode(info->name[i],
-                                  MIN(strlen(info->name[i]), CATEGORY_SIZE-1));
-	mutex->unlock();
-	return str;
-}
-
-
-int findCategory(const struct CategoryAppInfo *info,
-	const TQString &selectedCategory,
-	bool unknownIsUnfiled)
-{
-	FUNCTIONSETUP;
-
-	if (!info)
-	{
-		WARNINGKPILOT << "Bad CategoryAppInfo pointer" << endl;
-		return -1;
-	}
-
-	int currentCatID = -1;
-	for (unsigned int i=0; i<CATEGORY_COUNT; i++)
-	{
-		if (!info->name[i][0]) continue;
-		if (selectedCategory == category(info, i))
-		{
-			currentCatID = i;
-			break;
-		}
-	}
-
-	if (-1 == currentCatID)
-	{
-		DEBUGKPILOT << fname << ": Category name "
-			<< selectedCategory << " not found." << endl;
-	}
-	else
-	{
-		DEBUGKPILOT << fname << ": Matched category " << currentCatID << endl;
-	}
-
-	if ((currentCatID == -1) && unknownIsUnfiled)
-		currentCatID = 0;
-	return currentCatID;
-}
-
-int insertCategory(struct CategoryAppInfo *info,
-	const TQString &label,
-	bool unknownIsUnfiled)
-{
-	FUNCTIONSETUP;
-
-	if (!info)
-	{
-		WARNINGKPILOT << "Bad CategoryAppInfo pointer" << endl;
-		return -1;
-	}
-
-
-	int c = findCategory(info,label,unknownIsUnfiled);
-	if (c<0)
-	{
-		// This is the case when the category is not known
-		// and unknownIsUnfiled is false.
-		for (unsigned int i=0; i<CATEGORY_COUNT; i++)
-		{
-			if (!info->name[i][0])
-			{
-				c = i;
-				break;
-			}
-		}
-
-		if ((c>0) && (c < (int)CATEGORY_COUNT))
-		{
-			// 0 is always unfiled, can't change that.
-			toPilot(label,info->name[c],CATEGORY_SIZE);
-		}
-		else
-		{
-			WARNINGKPILOT << "Category name "
-				<< label
-				<< " could not be added." << endl;
-			c = -1;
-		}
-	}
-
-	return c;
-}
-
-void dumpCategories(const struct CategoryAppInfo *info)
-{
-	FUNCTIONSETUP;
-
-	if (!info)
-	{
-		WARNINGKPILOT << "Dumping bad pointer." << endl;
-		return;
-	}
-
-	DEBUGKPILOT << fname << " lastUniqueId: "
-		<< (int) info->lastUniqueID << endl;
-	for (unsigned int i = 0; i < CATEGORY_COUNT; i++)
-	{
-		if (!info->name[i][0]) continue;
-		DEBUGKPILOT << fname << ": " << i << " = "
-			<< (int)(info->ID[i]) << " <"
-			<< info->name[i] << ">" << endl;
-	}
-}
-
-
-}
-
-
diff --git a/kpilot/lib/pilot.h b/kpilot/lib/pilot.h
deleted file mode 100644
index 3ac2918b..00000000
--- a/kpilot/lib/pilot.h
+++ /dev/null
@@ -1,410 +0,0 @@
-#ifndef _KPILOT_PILOT_H
-#define _KPILOT_PILOT_H
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-** Copyright (C) 2003-2006 Adriaan de Groot <groot@kde.org>
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <sys/types.h>
-
-#include <pi-appinfo.h>
-#include <pi-buffer.h>
-#include <pi-dlp.h>
-
-#include <tqstring.h>
-#include <tqstringlist.h>
-#include <tqvaluelist.h>
-
-#include "pilotLinkVersion.h"
-
-
-/** @file
-* These are some base structures that reside on the
-* handheld device -- strings and binary data.
-*/
-
-class PilotDatabase;     // A database
-class PilotRecord;       // ... has records
-class PilotCategoryInfo; // ... and category information
-
-#define MIN(X, Y)  ((X) < (Y) ? (X) : (Y))
-
-/**
-* The Pilot namespace holds constants that are global for
-* the handheld data structures. Also contains some global
-* functions that deal with pilot-link structures as well
-* as mapping user-visible strings from UTF8 (KDE side) to
-* the encoding used on the handheld.
-*/
-namespace Pilot
-{
-	/** Maximum size of an AppInfo block, taken roughly from the pilot-link source. */
-	static const int MAX_APPINFO_SIZE=8192;
-
-	/** Maximum number of categories the handheld has */
-	static const unsigned int CATEGORY_COUNT=16;
-
-	/** Maximum size of a category label */
-	static const unsigned int CATEGORY_SIZE=16;
-
-	/** Category number for unfiled records */
-	static const int Unfiled = 0;
-
-	/** Maximum size (in bytes) of a record's data */
-	static const int MAX_RECORD_SIZE = 65535;
-
-	typedef TQValueList<recordid_t> RecordIDList;
-
-	/** Static translation function that maps handheld native (8 bit,
-	* usually latin1 but sometimes someting else) encoded data to
-	* a Unicode string. Converts the @p len characters in @p c
-	* to a Unicode string.
-	*/
-	TQString fromPilot( const char *c, int len );
-
-	/** Static translation function mapping a NUL-terminated
-	* string from the handheld's encoding to UTF-8.
-	* @param c the NUL-terminated string to decode
-	* @return TQString (UTF-8) value of @p c
-	* @note NUL-terminated strings are rare on the handheld.
-	*/
-	TQString fromPilot( const char *c );
-
-	/** Static translation function that maps a TQString onto the
-	* native 8 bit encoding of the handheld. Writes the result into
-	* the buffer @p buf which has size @p len. Returns the length
-	* of the result. Zero-fills the buffer as needed.
-	*/
-	int toPilot( const TQString &s, char *buf, int len);
-	int toPilot( const TQString &s, unsigned char *buf, int len);
-
-	/** Static translation function that maps a TQString onto the
-	* native 8 bit encoding of the handheld.
-	*
-	* @param s String to encode
-	* @return Encoded string in a QCString
-	*/
-	TQCString toPilot( const TQString &s );
-
-	/** Create a codec for translating handheld native 8 bit to Unicode,
-	* using the given codec @p name -- this will often be latin1, but
-	* might be something else for, say, Russian-language Pilots.
-	* If @p name is empty, use latin1.
-	*
-	* @return @c true on success, @c false otherwise
-	*/
-	bool setupPilotCodec(const TQString &name);
-
-	/** Returns the name of the codec being used. */
-	TQString codecName();
-
-	/** For debugging, display category names for the given AppInfo
-	* structure. Called by dump(). You must pass a valid reference.
-	*/
-	void dumpCategories(const struct CategoryAppInfo *info);
-
-	/** Check that a given category number is valid. This
-	* restricts the range of integers to [0..CATEGORY_COUNT-1]
-	* (i.e. [0..15]) which is what the handheld supports.
-	*/
-	inline bool validCategory(int c)
-	{
-		if (c<0)
-		{
-			return false;
-		}
-		return ((unsigned int)c<CATEGORY_COUNT);
-	}
-
-	/** Returns the TQString for the requested category @p i
-	* in the category structure @p info. Returns @c TQString::null
-	* on error (bad pointer or bad category number). May also
-	* return @c TQString::null if the category name is empty.
-	*/
-	inline TQString categoryName(const struct CategoryAppInfo *info, unsigned int i)
-	{
-		if ( ( i < CATEGORY_COUNT ) && ( info->name[i][0] ) )
-		{
-			/*
-			 * Seems to be important that we try to pass the real length here
-			 * to the codec.
-			 */
-			return fromPilot( info->name[i], MIN(strlen(info->name[i]),CATEGORY_SIZE) );
-		}
-		else
-		{
-			return TQString::null;
-		}
-	}
-
-	/** Returns a list of all the category names available on the
-	*  handheld. This list is neither ordered nor does it contain
-	*  all sixteen categories -- empty category names on the
-	*  handheld are skipped.
-	*/
-	inline TQStringList categoryNames(const struct CategoryAppInfo *info)
-	{
-		TQStringList l;
-		if (!info)
-		{
-			return l;
-		}
-		for (unsigned int i=0; i<CATEGORY_COUNT; ++i)
-		{
-			TQString s = categoryName(info,i);
-			if (!s.isEmpty())
-			{
-				l.append(s);
-			}
-		}
-		return l;
-	}
-
-	/** Search for the given category @p name in the list
-	* of categories; returns the category number. If @p unknownIsUnfiled
-	* is true, then map unknown categories to Unfiled instead of returning
-	* an error number.
-	*
-	* @return >=0   is a specific category based on the text-to-
-	*               category number mapping defined by the Pilot,
-	*               where 0 is always the 'unfiled' category.
-	*  @return -1   means unknown category selected when
-	*               @p unknownIsUnfiled is false.
-	*  @return  0   == Unfiled means unknown category selected when
-	*               @p unknownIsUnfiled is true.
-	*
-	*/
-	int findCategory(const struct CategoryAppInfo *info, const TQString &name, bool unknownIsUnfiled);
-
-	/** Search for the given category @p name in the list
-	* of categories; returns the category number. If @p unknownIsUnfiled
-	* is @c true, then map unknown categories to Unfiled.
-	* If @p unknownIsUnfiled is @c false, insert a @em new
-	* category into the structure and return the category
-	* number of the new category. Return -1 if (and only if)
-	* @p unknownIsUnfiled is false and the category structure
-	* is already full.
-	*
-	* @return >=0   is a specific category based on the text-to-
-	*               category number mapping defined by the Pilot,
-	*               where 0 is always the 'unfiled' category.
-	* @return 0     Unknown category and @p unknownIsUnfiled is @c true
-	* @return -1    means unknown category selected when
-	*               @p unknownIsUnfiled is false and categories
-	*               are all full.
-	*
-	*/
-	int insertCategory(struct CategoryAppInfo *info, const TQString &label, bool unknownIsUnfiled);
-
-	/** The handheld also holds data about each database
-	* in a DBInfo structure; check if the database described
-	* by this structure is a resource database.
-	*/
-	static inline bool isResource(struct DBInfo *info)
-	{
-		return (info->flags & dlpDBFlagResource);
-	}
-
-
-/** @section Binary blob handling
-*
-* For reading and writing binary blobs -- which has to happen to
-* pack data into the format that the handheld needs -- it is important
-* to remember that the handheld has only four data types (as far
-* as I can tell: byte, short (a 2 byte integer), long (a 4 byte integer)
-* and string (NUL terminated). The sizes of the types on the handheld
-* do not necessarily correspond to the sizes of the same-named types
-* on the desktop. This means that 'reading a long' from a binary
-* blob must always be 4 bytes -- not sizeof(long).
-*
-* The following templates help out in manipulating the blobs.
-* Instantiate them with the type @em name you need (char, short, long or
-* char *) and you get a ::size enum specifying the number of bytes
-* (where applicable) and ::append and ::read methods for appending
-* a value of the given type to a pi_buffer_t or reading one from
-* the buffer, respectively.
-*
-* The usage of ::read and ::append is straightforward:
-*
-* append(pi_buffer_t *b, TYPE_VALUE v) Appends the type value @p v to the
-* buffer @p b , extending the buffer as needed.
-*
-* TYPE_VALUE read(pi_buffer_t *b, unsigned int &offset) Read a value from
-* the buffer @p b at position @p offset and return it. The offset value
-* is increased by the number of bytes read from the buffer.
-*
-* To write a binary blob, a sequence of ::append calls constructs the
-* blob. To read the same blob, a sequence of ::read calls with the
-* @em same type parameters is sufficient.
-*
-* The calls may vary a little: the exact interface differs depending
-* on the needs of the type of data to be written to the blob.
-*/
-template<typename t> struct dlp { } ;
-
-template<> struct dlp<char>
-{
-	enum { size = 1 };
-
-	static void append(pi_buffer_t *b, char v)
-	{
-		pi_buffer_append(b,&v,size);
-	}
-
-	/**
-	* Returns next byte from buffer or 0 on error (0 is also a
-	* valid return value, though).
-	*/
-	static char read(const pi_buffer_t *b, unsigned int &offset)
-	{
-		if (offset+size > b->used)
-		{
-			return 0;
-		}
-		char c = b->data[offset];
-		offset+=size;
-		return c;
-	}
-} ;
-
-template<> struct dlp<short>
-{
-	enum { size = 2 };
-
-	static void append(pi_buffer_t *b, short v)
-	{
-		char buf[size];
-		set_short(buf,v);
-		pi_buffer_append(b,buf,size);
-	}
-
-	/**
-	* Returns the next short (2 byte) value from the buffer, or
-	* -1 on error (which is also a valid return value).
-	*/
-	static int read(const pi_buffer_t *b, unsigned int &offset)
-	{
-		if (offset+size > b->used)
-		{
-			return -1;
-		}
-		else
-		{
-			int r = get_short(b->data + offset);
-			offset+=size;
-			return r;
-		}
-	}
-
-	/**
-	* Overload to read from a data buffer instead of a real pi_buffer;
-	* does no bounds checking.
-	*/
-	static int read(const unsigned char *b, unsigned int &offset)
-	{
-		int r = get_short(b+offset);
-		offset+=size;
-		return r;
-	}
-} ;
-
-template<> struct dlp<long>
-{
-	enum { size = 4 };
-
-	static void append(pi_buffer_t *b, int v)
-	{
-		char buf[size];
-		set_long(buf,v);
-		pi_buffer_append(b,buf,size);
-	}
-
-	/**
-	* Returns the next long (4 byte) value from the buffer or
-	* -1 on error (which is also a valid value).
-	*/
-	static int read(const pi_buffer_t *b, unsigned int &offset)
-	{
-		if (offset+size > b->used)
-		{
-			return -1;
-		}
-		else
-		{
-			int r = get_long(b->data + offset);
-			offset+=size;
-			return r;
-		}
-	}
-
-	/**
-	* Overload to read a long value from a data buffer; does
-	* no bounds checking.
-	*/
-	static int read(const unsigned char *b, unsigned int &offset)
-	{
-		int r = get_long(b+offset);
-		offset+=size;
-		return r;
-	}
-} ;
-
-template<> struct dlp<char *>
-{
-	// No size enum, doesn't make sense
-	// No append, use pi_buffer_append
-	/**
-	* Read a fixed-length string from the buffer @p b into data buffer
-	* @p v which has size (including terminating NUL) of @p s.
-	* Returns the number of bytes read (which will normally  be @p s
-	* but will be less than @p s on error).
-	*/
-	static int read(const pi_buffer_t *b,
-		unsigned int &offset,
-		unsigned char *v,
-		size_t s)
-	{
-		if ( s+offset > b->used )
-		{
-			s = b->allocated - offset;
-		}
-		memcpy(v, b->data + offset, s);
-		offset+=s;
-		return s;
-	}
-
-	/** Overload for signed char. */
-	inline static int read(const pi_buffer_t *b, unsigned int &offset, char *v, size_t s)
-	{
-		return read(b,offset,(unsigned char *)v,s);
-	}
-} ;
-
-}
-
-#endif
-
diff --git a/kpilot/lib/pilotAddress.cc b/kpilot/lib/pilotAddress.cc
deleted file mode 100644
index f12e9cc5..00000000
--- a/kpilot/lib/pilotAddress.cc
+++ /dev/null
@@ -1,636 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-** Copyright (C) 2007 by Adriaan de Groot <groot@kde.org>
-**
-** This is a C++ wrapper for the pilot's address database structures.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include "options.h"
-
-
-#include <stdlib.h>
-#include <assert.h>
-
-#include <tqnamespace.h>
-#include <tqstringlist.h>
-
-#include "pilotAddress.h"
-
-static const char *default_address_category_names[] = {
-	"Unfiled",
-	"Business",
-	"Personal",
-	"Quicklist",
-	0L
-} ;
-
-static const char *default_address_field_labels[] = {
-	"Last name",
-	"First name",
-	"Company",
-	"Work",
-	"Home",
-	"Fax",
-	"Other",
-	"E-mail",
-	"Addr(W)",
-	"City",
-	"State",
-	"Zip Code",
-	"Country",
-	"Title",
-	"Custom 1",
-	"Custom 2",
-	"Custom 3",
-	"Custom 4",
-	"Note",
-	0L
-} ;
-
-void PilotAddressInfo::resetToDefault()
-{
-	FUNCTIONSETUP;
-	// Reset to all 0s
-	memset(&fInfo,0,sizeof(fInfo));
-	// Fill up default categories
-	for (unsigned int i=0; (i<4) && default_address_category_names[i]; ++i)
-	{
-		strncpy(fInfo.category.name[i],default_address_category_names[i],sizeof(fInfo.category.name[0]));
-	}
-	// Weird hack, looks like there's an extra copy of Unfiled
-	strncpy(fInfo.category.name[15],default_address_category_names[0],sizeof(fInfo.category.name[0]));
-
-	// And fill up the default labels.
-	for (unsigned int i=0; (i<19) && default_address_field_labels[i]; ++i)
-	{
-		strncpy(fInfo.labels[i],default_address_field_labels[i],sizeof(fInfo.labels[0]));
-	}
-}
-
-TQString PilotAddressInfo::phoneLabel(EPhoneType i) const
-{
-	if (i<=eMobile)
-	{
-		return Pilot::fromPilot(info()->phoneLabels[i]);
-	}
-	else
-	{
-		return TQString();
-	}
-}
-
-PhoneSlot::PhoneSlot( const int v )
-{
-	i = entryPhone1;
-	operator=(v);
-}
-
-const PhoneSlot &PhoneSlot::operator=( const int &v )
-{
-	if ( (entryPhone1 <= v) && (v <= entryPhone5) )
-	{
-		i = v;
-	}
-	else
-	{
-		i = invalid;
-	}
-	return *this;
-}
-
-const PhoneSlot &PhoneSlot::operator++()
-{
-	if ( (i!=invalid) && (i<entryPhone5) )
-	{
-		++i;
-	}
-	else
-	{
-		i = invalid;
-	}
-	return *this;
-}
-
-/* static */ const PhoneSlot PhoneSlot::begin()
-{
-	return PhoneSlot( entryPhone1 );
-}
-
-/* static */ const PhoneSlot PhoneSlot::end()
-{
-	return PhoneSlot( invalid );
-}
-
-unsigned int PhoneSlot::toOffset() const
-{
-	if ( isValid() )
-	{
-		return i-entryPhone1;
-	}
-	else
-	{
-		return 0;
-	}
-}
-
-unsigned int PhoneSlot::toField() const
-{
-	if ( isValid() )
-	{
-		return i;
-	}
-	else
-	{
-		return entryPhone1;
-	}
-}
-
-PhoneSlot::operator TQString() const
-{
-	return TQString("%1,%2").arg(toOffset()).arg(toField());
-}
-
-#define MAXFIELDS 19
-
-PilotAddress::PilotAddress(PilotRecord *rec) :
-	PilotRecordBase(rec),
-	fAddressInfo()
-{
-	FUNCTIONSETUPL(4);
-	memset(&fAddressInfo,0,sizeof(fAddressInfo));
-
-	if (rec)
-	{
-		pi_buffer_t b;
-		b.data = (unsigned char *) rec->data();
-		b.allocated = b.used = rec->size();
-		unpack_Address(&fAddressInfo, &b, address_v1);
-	}
-	else
-	{
-		fAddressInfo.phoneLabel[0] = (int) PilotAddressInfo::eWork;
-		fAddressInfo.phoneLabel[1] = (int) PilotAddressInfo::eHome;
-		fAddressInfo.phoneLabel[2] = (int) PilotAddressInfo::eOther;
-		fAddressInfo.phoneLabel[3] = (int) PilotAddressInfo::eMobile;
-		fAddressInfo.phoneLabel[4] = (int) PilotAddressInfo::eEmail;
-	}
-}
-
-PilotAddress::PilotAddress(const PilotAddress & copyFrom) :
-	PilotRecordBase(copyFrom),
-	fAddressInfo()
-{
-	FUNCTIONSETUPL(4);
-	_copyAddressInfo(copyFrom.fAddressInfo);
-}
-
-PilotAddress & PilotAddress::operator = (const PilotAddress & copyFrom)
-{
-	FUNCTIONSETUPL(4);
-	PilotRecordBase::operator = (copyFrom);
-	_copyAddressInfo(copyFrom.fAddressInfo);
-	return *this;
-}
-
-bool PilotAddress::operator==(const PilotAddress &compareTo)
-{
-	FUNCTIONSETUPL(4);
-
-	// now compare all the fields stored in the fAddressInfo.entry array of char*[19]
-	for (int i=0; i<MAXFIELDS; i++) {
-		// if one is NULL, and the other non-empty, they are not equal for sure
-		if ( !getFieldP(i) && compareTo.getFieldP(i))
-		{
-			return false;
-		}
-		if ( getFieldP(i) && !compareTo.getFieldP(i))
-		{
-			return false;
-		}
-
-		// test for getField(i)!=... to prevent strcmp or NULL strings!  None or both can be zero, but not a single one.
-		if ( (getFieldP(i) != compareTo.getFieldP(i)) && ( strcmp(getFieldP(i), compareTo.getFieldP(i)) ) )
-		{
-			return false;
-		}
-	}
-	return true;
-}
-
-
-void PilotAddress::_copyAddressInfo(const struct Address &copyFrom)
-{
-	FUNCTIONSETUPL(4);
-	fAddressInfo.showPhone = copyFrom.showPhone;
-
-	for (int labelLp = 0; labelLp < 5; labelLp++)
-	{
-		fAddressInfo.phoneLabel[labelLp] =
-			copyFrom.phoneLabel[labelLp];
-	}
-
-	for (unsigned int i = 0; i< MAXFIELDS; ++i)
-	{
-		if (copyFrom.entry[i])
-		{
-			fAddressInfo.entry[i] = qstrdup(copyFrom.entry[i]);
-		}
-		else
-		{
-			fAddressInfo.entry[i] = 0L;
-		}
-	}
-}
-
-
-PilotAddress::~PilotAddress()
-{
-	FUNCTIONSETUPL(4);
-	free_Address(&fAddressInfo);
-}
-
-TQString PilotAddress::getTextRepresentation(const PilotAddressInfo *info, Qt::TextFormat richText) const
-{
-	TQString text, tmp;
-
-	TQString par = (richText==Qt::RichText) ?CSL1("<p>"): TQString();
-	TQString ps = (richText==Qt::RichText) ?CSL1("</p>"):CSL1("\n");
-	TQString br = (richText==Qt::RichText) ?CSL1("<br/>"):CSL1("\n");
-
-	// title + name
-	text += par;
-	if (!getField(entryTitle).isEmpty())
-	{
-		text += rtExpand(getField(entryTitle), richText);
-		text += CSL1(" ");
-	}
-
-	tmp = richText ? CSL1("<b><big>%1 %2</big></b>") : CSL1("%1 %2");
-	TQString firstName = getField(entryFirstname);
-	if (firstName.isEmpty())
-	{
-		// So replace placeholder for first name (%1) with empty
-		tmp = tmp.arg(TQString());
-	}
-	else
-	{
-		tmp = tmp.arg(rtExpand(firstName,richText));
-	}
-	tmp=tmp.arg(rtExpand(getField(entryLastname), richText));
-	text += tmp;
-	text += ps;
-
-	// company
-	if (!getField(entryCompany).isEmpty())
-	{
-		text += par;
-		text += rtExpand(getField(entryCompany), richText);
-		text += ps;
-	}
-
-	// phone numbers (+ labels)
-	text += par;
-	for ( PhoneSlot i = PhoneSlot::begin(); i.isValid(); ++i )
-	{
-		if (!getField(i.toField()).isEmpty())
-		{
-			if (richText)
-			{
-				if (getShownPhone() == i)
-				{
-					tmp=CSL1("<small>%1: </small><b>%2</b>");
-				}
-				else
-				{
-					tmp=CSL1("<small>%1: </small>%2");
-				}
-			}
-			else
-			{
-				tmp=CSL1("%1: %2");
-			}
-			if (info)
-			{
-				tmp=tmp.arg(info->phoneLabel( getPhoneType( i ) ));
-			}
-			else
-			{
-				tmp=tmp.arg(CSL1("Contact: "));
-			}
-			tmp=tmp.arg(rtExpand(getField(i.toField()), richText));
-			text += tmp;
-			text += br;
-		}
-	}
-	text += ps;
-
-	// address, city, state, country
-	text += par;
-	if (!getField(entryAddress).isEmpty())
-	{
-		text += rtExpand(getField(entryAddress), richText);
-		text += br;
-	}
-	if (!getField(entryCity).isEmpty())
-	{
-		text += rtExpand(getField(entryCity), richText);
-		text += CSL1(" ");
-	}
-	if (!getField(entryState).isEmpty())
-	{
-		text += rtExpand(getField(entryState), richText);
-		text += CSL1(" ");
-	}
-	if (!getField(entryZip).isEmpty())
-	{
-		text += rtExpand(getField(entryZip), richText);
-	}
-	text += br;
-	if (!getField(entryCountry).isEmpty())
-	{
-		text += rtExpand(getField(entryCountry), richText);
-		text += br;
-	}
-	text += ps;
-
-	// custom fields
-	text += par;
-	for (int i = entryCustom1; i <= entryCustom4; i++)
-	{
-		if (!getField(i).isEmpty())
-		{
-			text += rtExpand(getField(i), richText);
-			text += br;
-		}
-	}
-	text += ps;
-
-	// category
-	if (info)
-	{
-		TQString categoryName = info->categoryName( category() );
-		if (!categoryName.isEmpty())
-		{
-			text += par;
-			text += rtExpand(categoryName, richText);
-			text += ps;
-		}
-	}
-
-	// note
-	if (!getField(entryNote).isEmpty())
-	{
-		text += richText?CSL1("<hr/>"):CSL1("-----------------------------\n");
-		text += par;
-		text += rtExpand(getField(entryNote), richText);
-		text += ps;
-	}
-
-	return text;
-}
-
-TQStringList PilotAddress::getEmails() const
-{
-	TQStringList list;
-
-	for ( PhoneSlot i = PhoneSlot::begin(); i.isValid(); ++i)
-	{
-		PilotAddressInfo::EPhoneType t = getPhoneType( i );
-		if ( t == PilotAddressInfo::eEmail )
-		{
-			TQString s = getField(i.toField());
-			if (!s.isEmpty())
-			{
-				list.append(s);
-			}
-		}
-	}
-
-	return list;
-}
-
-void PilotAddress::setEmails(const TQStringList &list)
-{
-	FUNCTIONSETUPL(4);
-	TQString test;
-
-	// clear all e-mails first
-	for ( PhoneSlot i = PhoneSlot::begin(); i.isValid(); ++i )
-	{
-		PilotAddressInfo::EPhoneType t = getPhoneType( i );
-		if (t == PilotAddressInfo::eEmail)
-		{
-			setField(i.toField(), TQString() );
-		}
-	}
-
-	for(TQStringList::ConstIterator listIter = list.begin();
-		   listIter != list.end(); ++listIter)
-	{
-		TQString email = *listIter;
-		if (!setPhoneField(PilotAddressInfo::eEmail, email, NoFlags).isValid())
-		{
-			WARNINGKPILOT << "Email accounts overflowed, silently dropped." << endl;
-		}
-	}
-}
-
-TQString PilotAddress::getField(int field) const
-{
-	if ( (entryLastname <= field) && (field <= entryNote) )
-	{
-		return Pilot::fromPilot(fAddressInfo.entry[field]);
-	}
-	else
-	{
-		return TQString();
-	}
-}
-
-PhoneSlot PilotAddress::_getNextEmptyPhoneSlot() const
-{
-	FUNCTIONSETUPL(4);
-	for (PhoneSlot i = PhoneSlot::begin(); i.isValid(); ++i)
-	{
-		const char *phoneField = getFieldP(i.toField());
-
-		if (!phoneField || !phoneField[0])
-		{
-			return i;
-		}
-	}
-	return PhoneSlot();
-}
-
-PhoneSlot PilotAddress::setPhoneField(PilotAddressInfo::EPhoneType type,
-	const TQString &field,
-	PhoneHandlingFlags flags)
-{
-	FUNCTIONSETUPL(4);
-
-	const bool overwriteExisting = (flags == Replace);
-	PhoneSlot fieldSlot;
-	if (overwriteExisting)
-	{
-		fieldSlot = _findPhoneFieldSlot(type);
-	}
-
-	if ( !fieldSlot.isValid() )
-	{
-		fieldSlot = _getNextEmptyPhoneSlot();
-	}
-
-	// store the overflow phone
-	if ( !fieldSlot.isValid() )
-	{
-		DEBUGKPILOT << fname << ": Phone would overflow." << endl;
-	}
-	else			// phone field 1 - 5; straight forward storage
-	{
-		setField(fieldSlot.toField(), field);
-		fAddressInfo.phoneLabel[fieldSlot.toOffset()] = (int) type;
-	}
-	return fieldSlot;
-}
-
-PhoneSlot PilotAddress::_findPhoneFieldSlot(PilotAddressInfo::EPhoneType t) const
-{
-	FUNCTIONSETUPL(4);
-	for ( PhoneSlot i = PhoneSlot::begin(); i.isValid(); ++i )
-	{
-		if ( getPhoneType(i) == t )
-		{
-			return i;
-		}
-	}
-
-	return PhoneSlot();
-}
-
-TQString PilotAddress::getPhoneField(PilotAddressInfo::EPhoneType type) const
-{
-	FUNCTIONSETUPL(4);
-	PhoneSlot fieldSlot = _findPhoneFieldSlot(type);
-
-	if (fieldSlot.isValid())
-	{
-		return getField(fieldSlot.toField());
-	}
-
-	return TQString();
-}
-
-PhoneSlot PilotAddress::getShownPhone() const
-{
-	// The slot is stored as an offset
-	return PhoneSlot(entryPhone1 + fAddressInfo.showPhone);
-}
-
-const PhoneSlot &PilotAddress::setShownPhone( const PhoneSlot &v )
-{
-	FUNCTIONSETUPL(4);
-	if (v.isValid())
-	{
-		fAddressInfo.showPhone = v.toOffset();
-	}
-	return v;
-}
-
-PhoneSlot PilotAddress::setShownPhone(PilotAddressInfo::EPhoneType type)
-{
-	FUNCTIONSETUPL(4);
-	PhoneSlot fieldSlot = _findPhoneFieldSlot(type);
-
-	// Did we find a slot with the requested type?
-	if (!fieldSlot.isValid())
-	{
-		// No, so look for first non-empty phone slot
-		for ( fieldSlot = PhoneSlot::begin(); fieldSlot.isValid(); ++fieldSlot )
-		{
-			const char *p = getFieldP(fieldSlot.toField());
-			if (p && p[0])
-			{
-				break;
-			}
-		}
-		// If all of them are empty, then use first slot instead
-		if (!fieldSlot.isValid())
-		{
-			fieldSlot = PhoneSlot::begin();
-		}
-	}
-	setShownPhone(fieldSlot);
-	return fieldSlot;
-}
-
-PilotAddressInfo::EPhoneType PilotAddress::getPhoneType( const PhoneSlot &field ) const
-{
-	if ( field.isValid() )
-	{
-		return (PilotAddressInfo::EPhoneType) fAddressInfo.phoneLabel[field.toOffset()];
-	}
-	else
-	{
-		return PilotAddressInfo::eNone;
-	}
-}
-
-void PilotAddress::setField(int field, const TQString &text)
-{
-	FUNCTIONSETUPL(4);
-	// This will have either been created with unpack_Address, and/or will
-	// be released with free_Address, so use malloc/free here:
-	if (fAddressInfo.entry[field])
-	{
-		free(fAddressInfo.entry[field]);
-		fAddressInfo.entry[field]=0L;
-	}
-	if (!text.isEmpty())
-	{
-		fAddressInfo.entry[field] = (char *) malloc(text.length() + 1);
-		Pilot::toPilot(text, fAddressInfo.entry[field], text.length()+1);
-	}
-	else
-	{
-		fAddressInfo.entry[field] = 0L;
-	}
-}
-
-PilotRecord *PilotAddress::pack() const
-{
-	FUNCTIONSETUPL(4);
-	int i;
-
-	pi_buffer_t *b = pi_buffer_new( sizeof(fAddressInfo) );
-	i = pack_Address(const_cast<Address_t *>(&fAddressInfo), b, address_v1);
-	if (i<0)
-	{
-		return 0L;
-	}
-	// pack_Address sets b->used
-	return new PilotRecord( b, this );
-}
diff --git a/kpilot/lib/pilotAddress.h b/kpilot/lib/pilotAddress.h
deleted file mode 100644
index 5bd0a1e0..00000000
--- a/kpilot/lib/pilotAddress.h
+++ /dev/null
@@ -1,339 +0,0 @@
-#ifndef _KPILOT_PILOTADDRESS_H
-#define _KPILOT_PILOTADDRESS_H
-/* pilotAddress.h			KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-** Copyright (C) 2007 by Adriaan de Groot <groot@kde.org>
-**
-** This is a wrapper for pilot-link's address structures.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <pi-macros.h>
-#include <pi-address.h>
-
-#include <tqnamespace.h>
-
-#include "pilotRecord.h"
-#include "pilotAppInfo.h"
-
-/** Interpreted form of the AppInfo block in the address database. */
-typedef PilotAppInfo<
-	AddressAppInfo,
-	unpack_AddressAppInfo,
-	pack_AddressAppInfo> PilotAddressInfo_;
-
-/** This class exists @em only to clear up the type mess that
-*   is the field-numbers-and-indexes for phone numbers in the
-*   handheld records. The standard address record has 19 fields,
-*   five of which are phone fields. Those are fields 3..7 and they
-*   are referred to as fields Phone1 .. Phone5. Sometimes we
-*   need to act as if the phone field numbers are indeed the field
-*   numbers (3..7) and sometimes we need to use those same field
-*   numbers to index into a C array (0 based!) so then we map
-*   field number 3 (Phone1) to a 0 index.
-*
-*   Also handles iteration nicely.
-*
-*   A phone slot value may be invalid. If so, operations on it will
-*   fail (yielding invalid again) and isValid() will return @c false.
-*/
-class PhoneSlot
-{
-friend class PilotAddress;
-protected:
-	/** Constructor. Use the specified value for the phone slot.
-	*   @p v is a field number (3..8).
-	*/
-	explicit PhoneSlot( const int v );
-
-	/** Assignment operator. Set the value of the slot to
-	*   the specified value @p v . This may yield an invalid
-	*   phone slot.
-	*/
-	const PhoneSlot &operator=(const int &v);
-
-	/** Map the slot to an offset (for use in finding the phone type
-	*   for a given slot).
-	* @return Offset of this slot within the phone fields.
-	*/
-	unsigned int toOffset() const;
-
-	/** Map the slot to a field number. */
-	unsigned int toField() const;
-
-public:
-	static const int invalid = -1; ///< Value for invalid slots. */
-
-	/** Constructor. The slot is invalid. */
-	PhoneSlot()
-	{
-		i = invalid;
-	}
-
-	/** Comparison operator. */
-	bool operator ==( const PhoneSlot &v ) const
-	{
-		return v.i == i;
-	}
-
-	/** Iterator operation. Go to the next slot (or invalid when
-	*   the range runs out).
-	*/
-	const PhoneSlot &operator++();
-
-	/** Begin value of an iteration through the phone slots. */
-	static const PhoneSlot begin();
-
-	/** When the slot range runs out (past entryPhone5) it
-	*   is invalid, so the end compares with that.
-	*/
-	static const PhoneSlot end();
-
-	/** Valid slots are entryPhone1 (3) through entryPhone5 (7).
-	*   @return @c true if the slot is valid.
-	*/
-	bool isValid() const
-	{
-		return (entryPhone1 <= i) && (i <= entryPhone5);
-	}
-
-	operator TQString() const;
-private:
-	int i;
-} ;
-
-
-class PilotAddressInfo : public PilotAddressInfo_
-{
-public:
-	PilotAddressInfo(PilotDatabase *d) : PilotAddressInfo_(d)
-	{
-	}
-
-	/** This resets the entire AppInfo block to one as it would be
-	*   in an English-language handheld, with 3 categories and
-	*   default field labels for everything.
-	*/
-	void resetToDefault();
-
-	enum EPhoneType {
-		eWork=0,
-		eHome,
-		eFax,
-		eOther,
-		eEmail,
-		eMain,
-		ePager,
-		eMobile,
-		eNone=-1
-	} ;
-
-	TQString phoneLabel(EPhoneType i) const;
-} ;
-
-/** @brief A wrapper class around the Address struct provided by pi-address.h
- *
- * This class allows the user to set and get address field values.
- * For everything but phone fields, the user can simply pass the
- * the pi-address enum for the index for setField() and getField() such
- * as entryLastname.
- *
- * Phone fields are a bit trickier.  The structure allows for 8 possible
- * phone fields with 5 possible slots.  That means there could be three
- * fields that don't have available storage. The setPhoneField() method
- * will attempt to store the extra fields in a custom field if there
- * is an overflow.
- *
- * There are eight possible fields for 5 view slots:
- * - fields: Work, Home, Fax, Other, Pager, Mobile, E-mail, Main
- * - slots: entryPhone1, entryPhone2, entryPhone3, entryPhone4, entryPhone5
- *
- * Internally in the pilot-link library, the AddressAppInfo phone
- * array stores the strings for the eight possible phone values.
- * Their English string values are :
- * - phone[0] = Work
- * - phone[1] = Home
- * - phone[2] = Fax
- * - phone[3] = Other
- * - phone[4] = E-mail
- * - phone[5] = Main
- * - phone[6] = Pager
- * - phone[7] = Mobile
- *
- * Apparently, this order is kept for all languages, just with localized
- * strings.  The implementation of the internal methods will assume
- * this order is kept. In other languages, main can replaced with
- * Corporation.
- */
-class KDE_EXPORT PilotAddress : public PilotRecordBase
-{
-public:
-	PilotAddress(PilotRecord *rec = 0L);
-	PilotAddress(const PilotAddress &copyFrom);
-	PilotAddress& operator=( const PilotAddress &r );
-	bool operator==(const PilotAddress &r);
-
-	virtual ~PilotAddress();
-
-	/** Returns a text representation of the address. If @p richText is true, the
-	 *  text will be formatted with Qt-HTML tags. The AppInfo structure @p info
-	 *  is used to figure out the phone labels; if it is NULL then bogus labels are
-	 *  used to identify phone types.
-	 */
-	TQString getTextRepresentation(const PilotAddressInfo *info, Qt::TextFormat richText) const;
-
-	/**
-	*   @param text set the field value
-	*   @param field int values associated with the enum defined in
-	*  pi-address.h.
-	*  The copied possible enum's are: (copied from pi-address.h on 1/12/01)
-	*  enum { entryLastname, entryFirstname, entryCompany,
-	*  entryPhone1, entryPhone2, entryPhone3, entryPhone4, entryPhone5,
-	*  entryAddress, entryCity, entryState, entryZip, entryCountry,
-	*  entryTitle, entryCustom1, entryCustom2, entryCustom3, entryCustom4,
-	*  entryNote };
-	*/
-	void setField(int field, const TQString &text);
-	/** Set a field @p i to a given text value. Uses the phone slots only. */
-	void setField(const PhoneSlot &i, const TQString &t)
-	{
-		if (i.isValid())
-		{
-			setField(i.toField(),t);
-		}
-	}
-
-	/** Returns the text value of a given field @p field (or TQString::null
-	*   if there is no such field).
-	*/
-	TQString getField(int field) const;
-	/** Returns the value of the phone field @p i . */
-	TQString getField(const PhoneSlot &i) const
-	{
-		return i.isValid() ? getField(i.toField()) : TQString();
-	}
-
-	/**
-	*   Return list of all email addresses.  This will search through our "phone"
-	*   fields and will return only those which are e-mail addresses.
-	*/
-	TQStringList getEmails() const;
-	void setEmails(const TQStringList &emails);
-
-	enum PhoneHandlingFlags
-	{
-		NoFlags=0, ///< No special handling
-		Replace    ///< Replace existing entries of same type
-	} ;
-
-	/**
-	*  @param type is the type of phone
-	*  @param checkCustom4 flag if true, checks the entryCustom4 field
-	*  for extra phone fields
-	*  @return the field associated with the type
-	*/
-	TQString getPhoneField(PilotAddressInfo::EPhoneType type) const;
-
-	/**
-	*  @param type is the type of phone
-	*  @param field is value to store
-	*  @param overflowCustom is true, and entryPhone1 to entryPhone5 is full
-	*  it will use entryCustom4 field to store the field
-	*  @param overwriteExisting is true, it will overwrite an existing record-type
-	*  with the field, else it will always search for the first available slot
-	 * @return index of the field that this information was set to
-	*/
-	PhoneSlot setPhoneField(PilotAddressInfo::EPhoneType type, const TQString &value, PhoneHandlingFlags flags);
-
-	/**
-	* Returns the slot of the phone number
-	* selected by the user to be shown in the
-	* overview of addresses.
-	*
-	* @return Slot of phone entry (between entryPhone1 and entryPhone5)
-	*/
-	PhoneSlot getShownPhone() const;
-
-	/**
-	* Set the shown phone (the one preferred by the user for display
-	* on the handheld's overview page) to the @em type (not index)
-	* indicated. Looks through the phone entries of this record to
-	* find the first one one of this type.
-	*
-	* @return Slot of phone entry.
-	*
-	* @note Sets the shown phone to the first entry if no field of
-	*       type @p phoneType can be found @em and no Home phone
-	*       field (the fallback) can be found either.
-	*/
-	PhoneSlot setShownPhone(PilotAddressInfo::EPhoneType phoneType);
-
-	/**
-	* Set the shown phone (the one preferred by the user for display
-	* on the handheld's overview page) to the given @p slot .
-	*
-	* @return @p v
-	*/
-	const PhoneSlot &setShownPhone(const PhoneSlot &v);
-
-	/** Get the phone type (label) for a given field @p field
-	*   in the record. The @p field must be within the
-	*   phone range (entryPhone1 .. entryPhone5).
-	*
-	* @return Phone type for phone field @p field .
-	* @return @c eNone (fake phone type) if @p field is invalid.
-	*/
-	PilotAddressInfo::EPhoneType getPhoneType(const PhoneSlot &field) const;
-
-	PilotRecord *pack() const;
-
-	const struct Address *address() const { return &fAddressInfo; } ;
-
-
-protected:
-	// Get the pointers in cases where no conversion to
-	// unicode is desired.
-	//
-	const char *getFieldP(int field) const
-	{
-		return fAddressInfo.entry[field];
-	}
-
-private:
-	void _copyAddressInfo(const struct Address &copyFrom);
-	PhoneSlot _getNextEmptyPhoneSlot() const;
-
-	/** @return entryPhone1 to entryPhone5 if the appTypeNum number is
-	*  found in the phoneLabel array; return -1 if not found
-	*/
-	PhoneSlot _findPhoneFieldSlot(PilotAddressInfo::EPhoneType t) const;
-
-	struct Address fAddressInfo;
-};
-
-
-
-
-#endif
diff --git a/kpilot/lib/pilotAppInfo.cc b/kpilot/lib/pilotAppInfo.cc
deleted file mode 100644
index 5edc5716..00000000
--- a/kpilot/lib/pilotAppInfo.cc
+++ /dev/null
@@ -1,77 +0,0 @@
-/* pilotAppInfo.cc		KPilot
-**
-** Copyright (C) 2005-2006 Adriaan de Groot <groot@kde.org>
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include "options.h"
-
-#include <stdio.h>
-
-#include "pilotAppInfo.h"
-
-PilotAppInfoBase::PilotAppInfoBase(PilotDatabase *d) :
-	fC( 0L ),
-	fLen(0),
-	fOwn(true)
-{
-	FUNCTIONSETUP;
-	int appLen = Pilot::MAX_APPINFO_SIZE;
-	unsigned char buffer[Pilot::MAX_APPINFO_SIZE];
-
-	if (!d || !d->isOpen())
-	{
-		WARNINGKPILOT << "Bad database pointer." << endl;
-		fLen = 0;
-		KPILOT_DELETE( fC );
-		return;
-	}
-
-	fC = new struct CategoryAppInfo;
-	fLen = appLen = d->readAppBlock(buffer,appLen);
-	unpack_CategoryAppInfo(fC, buffer, appLen);
-}
-
-PilotAppInfoBase::~PilotAppInfoBase()
-{
-	if (fOwn)
-	{
-		delete fC;
-	}
-}
-
-bool PilotAppInfoBase::setCategoryName(unsigned int i, const TQString &s)
-{
-	if ( (i>=Pilot::CATEGORY_COUNT) || // bad category number
-		(!categoryInfo())) // Nowhere to write to
-	{
-		return false;
-	}
-
-	(void) Pilot::toPilot(s, categoryInfo()->name[i], Pilot::CATEGORY_SIZE - 1);
-	return true;
-}
-
-
diff --git a/kpilot/lib/pilotAppInfo.h b/kpilot/lib/pilotAppInfo.h
deleted file mode 100644
index b14cf0ac..00000000
--- a/kpilot/lib/pilotAppInfo.h
+++ /dev/null
@@ -1,216 +0,0 @@
-#ifndef _KPILOT_PILOTAPPINFO_H
-#define _KPILOT_PILOTAPPINFO_H
-/* pilotAppInfo.h			KPilot
-**
-** Copyright (C) 2005-2006 Adriaan de Groot <groot@kde.org>
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "pilotLinkVersion.h"
-
-#include "pilot.h"
-#include "pilotDatabase.h"
-
-/**
-* A database on the handheld has an "AppInfo" block at the beginning
-* with some database-specific information and a common part.
-* This base class deals with the common part, the categories.
-*
-* Most data in the handheld is stored in @em categories ; every
-* record in every database, for instance, has a category assigned
-* to it (perhaps "Unfiled", but that's just another category).
-*
-* Every database has a category table assigning labels to the
-* categories that exist. There are CATEGORY_COUNT (16) categories
-* available for each database; labels may vary per database.
-*
-* This class encapsulates the basic category table manipulations.
-*/
-class KDE_EXPORT PilotAppInfoBase
-{
-protected:
-	/** Initialize class members after reading header, to alias data elsewhere.
-	* Only for use by the (derived) template classes below.
-	*/
-	void init(struct CategoryAppInfo *c, int len)
-	{
-		fC = c;
-		fLen = len ;
-	} ;
-
-public:
-	/** Constructor. This is for use by derived classes (using the template below
-	* only, and says that the category info in the base class aliases data in
-	* the derived class. Remember to call init()!
-	*/
-	PilotAppInfoBase() : fC(0L), fLen(0), fOwn(false) { } ;
-
-	/** Constructor, intended for untyped access to the AppInfo only. This throws
-	* away everything but the category information. In this variety, the
-	* CategoryAppInfo structure is owned by the PilotAppInfoBase object.
-	*/
-	PilotAppInfoBase(PilotDatabase *d);
-
-	/** Destructor. */
-	virtual ~PilotAppInfoBase();
-
-	/** Retrieve the most basic part of the AppInfo block -- the category
-	* information which is guaranteed to be the first 240-odd bytes of
-	* a database.
-	*/
-	struct CategoryAppInfo *categoryInfo()
-	{
-		return fC;
-	} ;
-
-	/** Const version of the above function. */
-	inline const struct CategoryAppInfo *categoryInfo() const
-	{
-		return fC;
-	} ;
-
-	/** Returns the length of the (whole) AppInfo block. */
-	inline PI_SIZE_T length() const
-	{
-		return fLen;
-	} ;
-
-	/** @see findCategory(const TQString &name, bool unknownIsUnfiled, struct CategoryAppInfo *info). */
-	inline int findCategory(const TQString &name, bool unknownIsUnfiled = false) const
-	{
-		return Pilot::findCategory(fC,name,unknownIsUnfiled);
-	} ;
-
-	/** Gets a single category name. Returns TQString::null if there is no
-	* such category number @p i . */
-	inline TQString categoryName(unsigned int i) const
-	{
-		return Pilot::categoryName(fC,i);
-	}
-
-	/** Sets a category name. @return true if this succeeded. @return false
-	* on failure, e.g. the index @p i was out of range or the category name
-	* was invalid. Category names that are too long are truncated to 15 characters.
-	*/
-	bool setCategoryName(unsigned int i, const TQString &s);
-
-	/** For debugging, display all the category names */
-	inline void dump() const
-	{
-		Pilot::dumpCategories(fC);
-	};
-
-protected:
-	struct CategoryAppInfo *fC;
-	PI_SIZE_T fLen;
-
-	bool fOwn;
-} ;
-
-/** A template class for reading and interpreting AppInfo blocks;
-* the idea is that it handles all the boilerplate code for reading
-* the app block, converting it to the right kind, and then unpacking
-* it. Template parameters are the type (struct, from pilot-link probably)
-* of the interpreted appinfo, and the pack and unpack functions for it
-* (again, from pilot-link).
-*/
-template <typename appinfo,
-#if PILOT_LINK_IS(0,12,2)
-	/* There are additional consts introduced in 0.12.2 */
-	int(*unpack)(appinfo *, const unsigned char *, PI_SIZE_T),
-	int(*pack)(const appinfo *, unsigned char *, PI_SIZE_T)
-#else
-	int(*unpack)(appinfo *, unsigned char *, PI_SIZE_T),
-	int(*pack)(appinfo *, unsigned char *, PI_SIZE_T)
-#endif
-	>
-class PilotAppInfo : public PilotAppInfoBase
-{
-public:
-	/** Constructor. Read the appinfo from database @p d and
-	* interpret it.
-	*/
-	PilotAppInfo(PilotDatabase *d) : PilotAppInfoBase()
-	{
-		int appLen = Pilot::MAX_APPINFO_SIZE;
-		unsigned char buffer[Pilot::MAX_APPINFO_SIZE];
-
-		memset(&fInfo,0,sizeof(fInfo));
-		if (d && d->isOpen())
-		{
-			appLen = d->readAppBlock(buffer,appLen);
-			(*unpack)(&fInfo, buffer, appLen);
-			// fInfo is just a struct, so we can point to it anyway.
-			init(&fInfo.category,appLen);
-		}
-		else
-		{
-			delete fC;
-			fC = 0L;
-			fLen = 0;
-			init(&fInfo.category,sizeof(fInfo));
-		}
-	} ;
-
-	PilotAppInfo()
-	{
-		memset(&fInfo,0,sizeof(fInfo));
-		init(&fInfo.category,sizeof(fInfo));
-	}
-
-
-	/** Write this appinfo block to the database @p d; returns
-	* the number of bytes written or -1 on failure. This
-	* function is robust when called with a NULL database @p d.
-	*/
-	int writeTo(PilotDatabase *d)
-	{
-		unsigned char buffer[Pilot::MAX_APPINFO_SIZE];
-		if (!d || !d->isOpen())
-		{
-			return -1;
-		}
-		int appLen = (*pack)(&fInfo, buffer, length());
-		if (appLen > 0)
-		{
-			d->writeAppBlock(buffer,appLen);
-		}
-		return appLen;
-	} ;
-
-	/** Returns a (correctly typed) pointer to the interpreted
-	* appinfo block.
-	*/
-	appinfo *info() { return &fInfo; } ;
-	/** Returns a const (correctly typed) pointer to the interpreted
-	* appinfo block.
-	*/
-	const appinfo *info() const { return &fInfo; } ;
-
-protected:
-	appinfo fInfo;
-} ;
-
-
-#endif
diff --git a/kpilot/lib/pilotCard.h b/kpilot/lib/pilotCard.h
deleted file mode 100644
index 86d1f70c..00000000
--- a/kpilot/lib/pilotCard.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef _KPILOT_PILOTCARD_H
-#define _KPILOT_PILOTCARD_H
-/* pilotCard.h			KPilot
-**
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This class is a wrapper around pilot-link's CardInfo structure
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#ifndef _PILOT_DLP_H_
-#include <pi-dlp.h>
-#endif
-
-class KPilotCard
-{
-public:
-	KPilotCard() { ::memset(&fCard,0,sizeof(struct CardInfo)); }
-	KPilotCard(const CardInfo* card) { fCard = *card; }
-
-	CardInfo *cardInfo() { return &fCard; }
-
-	/**
-	* Ensures the names are properly terminated.  Needed incase we
-	* are syncing a new and bogus pilot.
-	*/
-	void boundsCheck() {}
-
-	const int getCardIndex() const          { return fCard.card; }
-	const int getCardVersion() const        { return fCard.version; }
-	unsigned long getRomSize() const        { return fCard.romSize; }
-	unsigned long getRamSize() const        { return fCard.ramSize; }
-	unsigned long getRamFree() const        { return fCard.ramFree; }
-	const char* getCardName() const         { return fCard.name; }
-	const char* getCardManufacturer() const { return fCard.manufacturer; }
-
-private:
-	struct CardInfo fCard;
-};
-
-#endif
diff --git a/kpilot/lib/pilotDatabase.cc b/kpilot/lib/pilotDatabase.cc
deleted file mode 100644
index cc65895e..00000000
--- a/kpilot/lib/pilotDatabase.cc
+++ /dev/null
@@ -1,112 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-** Copyright (C) 2005-2006 Adriaan de Groot <groot@kde.org>
-**
-** This is the abstract base class for databases, which is used both
-** by local databases and by the serial databases held in the Pilot.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <time.h> // Needed by pilot-link include
-#include <pi-appinfo.h>
-
-#include <tqstringlist.h>
-
-#include <kglobal.h>
-
-#include "pilotDatabase.h"
-#include "pilotRecord.h"
-
-static int creationCount = 0;
-static TQStringList *createdNames = 0L;
-
-PilotDatabase::PilotDatabase(const TQString &s) :
-	fDBOpen(false),
-	fName(s)
-{
-	FUNCTIONSETUP;
-	creationCount++;
-	if (!createdNames)
-	{
-		createdNames = new TQStringList();
-	}
-	createdNames->append(s.isEmpty() ? CSL1("<empty>") : s);
-}
-
-/* virtual */ PilotDatabase::~PilotDatabase()
-{
-	FUNCTIONSETUP;
-	creationCount--;
-	if (createdNames)
-	{
-		createdNames->remove(fName.isEmpty() ? CSL1("<empty>") : fName);
-	}
-}
-
-/* static */ int PilotDatabase::instanceCount()
-{
-	FUNCTIONSETUP;
-	DEBUGKPILOT << fname << ": " << creationCount << " databases." << endl;
-	if (createdNames)
-	{
-		DEBUGKPILOT << fname << ": "
-			<< createdNames->join(CSL1(",")) << endl;
-	}
-	return creationCount;
-}
-
-/* virtual */ Pilot::RecordIDList PilotDatabase::idList()
-{
-	Pilot::RecordIDList l;
-
-	for (unsigned int i = 0 ; ; i++)
-	{
-		PilotRecord *r = readRecordByIndex(i);
-		if (!r) break;
-		l.append(r->id());
-		delete r;
-	}
-
-	return l;
-}
-
-/* virtual */ Pilot::RecordIDList PilotDatabase::modifiedIDList()
-{
-	Pilot::RecordIDList l;
-
-	resetDBIndex();
-	while(1)
-	{
-		PilotRecord *r = readNextModifiedRec();
-		if (!r) break;
-		l.append(r->id());
-		delete r;
-	}
-
-	return l;
-}
-
diff --git a/kpilot/lib/pilotDatabase.h b/kpilot/lib/pilotDatabase.h
deleted file mode 100644
index 82a6431d..00000000
--- a/kpilot/lib/pilotDatabase.h
+++ /dev/null
@@ -1,272 +0,0 @@
-#ifndef _KPILOT_PILOTDATABASE_H
-#define _KPILOT_PILOTDATABASE_H
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-** Copyright (C) 2005-2006 Adriaan de Groot <groot@kde.org>
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include "pilot.h"
-
-
-/** @file
-* This is the abstract base class for databases, which is used both
-* by local databases and by the serial databases held in the Pilot.
-*/
-
-
-/**
- * Methods to access a database on the pilot.
- *
- * NOTE:  It is the users responsibility
- * to delete PilotRecords returned by
- * PilotDatabase methods when finished with them!
- */
-
-class KDE_EXPORT PilotDatabase
-{
-public:
-	PilotDatabase(const TQString &name = TQString::null);
-	virtual ~PilotDatabase();
-
-
-	TQString name() const { return fName; } ;
-
-	/**
-	* Debugging information: tally how many databases are created
-	* or destroyed. Returns the count of currently existing databases.
-	*/
-	static int instanceCount();
-
-	/* -------------------- Abstract interface for subclasses ----------------- */
-
-	/**
-	* Creates the database with the given creator, type and flags
-	* on the given card (default is RAM). If the database already
-	* exists, this function does nothing.
-	*/
-	virtual bool createDatabase(long creator=0, long type=0,
-		int cardno=0, int flags=0, int version=0) = 0;
-
-	/**
-	* Deletes the database (by name, as given in the constructor,
-	* the database name is stored depending on the implementation
-	* of PilotLocalDatabase and PilotSerialDatabas)
-	*/
-	virtual int deleteDatabase()=0;
-
-	/** Reads the application block info, returns size. */
-	virtual int readAppBlock(unsigned char* buffer, int maxLen) = 0;
-
-	/** Writes the application block info. */
-	virtual int writeAppBlock(unsigned char* buffer, int len) = 0;
-
-	/** Returns the number of records in the database.
-	 *  If the database is not open, return -1.
-	 */
-	virtual unsigned int recordCount() const=0;
-
-	/** Returns a TQValueList of all record ids in the database.
-	    This implementation is really bad. */
-	virtual Pilot::RecordIDList idList();
-
-	/** Returns a list of all record ids that have been modified in the
-	    database. This implementation is really bad. */
-	virtual Pilot::RecordIDList modifiedIDList();
-
-
-	/** Reads a record from database by id, returns record length */
-	virtual PilotRecord* readRecordById(recordid_t id) = 0;
-
-	/** Reads a record from database, returns the record length */
-	virtual PilotRecord* readRecordByIndex(int index) = 0;
-
-	/** Reads the next record from database in category 'category' */
-	virtual PilotRecord* readNextRecInCategory(int category) = 0;
-
-	/**
-	* Reads the next record from database that has the dirty flag set.
-	* If @p ind is non-NULL, *ind is set to the index of the current
-	* record (i.e. before the record pointer moves to the next
-	* modified record).
-	*/
-	virtual PilotRecord* readNextModifiedRec(int *ind=NULL) = 0;
-
-	/**
-	* Writes a new record to database (if 'id' == 0, one will be
-	* assigned to newRecord)
-	*/
-	virtual recordid_t writeRecord(PilotRecord* newRecord) = 0;
-
-	/**
-	* Deletes a record with the given recordid_t from the database,
-	* or all records, if @p all is set to true. The recordid_t will
-	* be ignored in this case.
-	*
-	* Return value is negative on error, 0 otherwise.
-	*/
-	virtual int deleteRecord(recordid_t id, bool all=false) = 0;
-
-	/** Resets all records in the database to not dirty. */
-	virtual int resetSyncFlags() = 0;
-
-	/** Resets next record index to beginning */
-	virtual int resetDBIndex() = 0;
-
-	/** Purges all Archived/Deleted records from Palm Pilot database */
-	virtual int cleanup() = 0;
-
-	bool isOpen() const { return fDBOpen; }
-
-	/** Returns some sensible human-readable identifier for
-	*   the database. Serial databases get Pilot:, local
-	*   databases return the full path.
-	*/
-	virtual TQString dbPathName() const = 0;
-
-	/**
-	* Use this instead of RTTI to determine the type of a
-	* PilotDatabase, for those cases where it's important.
-	*/
-	typedef enum { eNone=0,
-		eLocalDB=1,
-		eSerialDB=2 } DBType;
-	virtual DBType dbType() const = 0;
-
-	static inline bool isResource(struct DBInfo *info)
-	{
-		return (info->flags & dlpDBFlagResource);
-	}
-
-protected:
-	virtual void openDatabase() = 0;
-	virtual void closeDatabase() = 0;
-
-	void setDBOpen(bool yesno) { fDBOpen = yesno; }
-
-private:
-	bool fDBOpen;
-	TQString fName;
-};
-
-/** A template class for reading and interpreting a database. This removes
-* the need for a lot of boilerplate code that does the conversions.
-* Parameters are two interpretation classes: one for the KDE side of
-* things (e.g. Event) and one that interprets the Pilot's records into
-* a more sensible structure (e.g. PilotDatebookEntry). The mapping from
-* the KDE type to the Pilot type and vice-versa is done by the mapper
-* class's convert() functions.
-*
-* To interpret a database as pilot-link interpretations (e.g. as
-* PilotDatebookEntry records, not as Events) use the NullMapper class
-* below in combination with a template instantiation with kdetype==pilottype.
-*
-* The database interpreter intentionally has an interface similar to
-* that of a PilotDatabase, but it isn't one.
-*/
-template <class kdetype, class pilottype, class mapper>
-class DatabaseInterpreter
-{
-private:
-	/** Interpret a PilotRecord as an object of type kdetype. */
-	kdetype *interpret(PilotRecord *r)
-	{
-		// NULL records return NULL kde objects.
-		if (!r) return 0;
-		// Interpret the binary blob as a pilot-link object.
-		pilottype *a = new pilottype(r);
-		// The record is now obsolete.
-		delete r;
-		// Interpretation failed.
-		if (!a) { return 0; }
-		// Now convert to KDE type.
-		kdetype *t = mapper::convert(a);
-		// The NULL mapper just returns the pointer a, so we
-		// need to check if anything has changed before deleting.
-		if ( (void *)t != (void *)a )
-		{
-			delete a;
-		}
-		return t;
-	}
-public:
-	/** Constructor. Interpret the database @p d. */
-	DatabaseInterpreter(PilotDatabase *d) : fDB(d) { } ;
-
-	/** Reads a record from database by @p id */
-	kdetype *readRecordById(recordid_t id)
-	{
-		return interpret(fDB->readRecordById(id));
-	}
-
-	/** Reads a record from database with index @p index */
-	kdetype *readRecordByIndex(int index)
-	{
-		return interpret(fDB->readRecordByIndex(index));
-	}
-
-	/** Reads the next record from database in category @p category */
-	kdetype *readNextRecInCategory(int category)
-	{
-		return interpret(fDB->readNextRecInCategory(category));
-	}
-
-	/**
-	* Reads the next record from database that has the dirty flag set.
-	* If @p ind is non-NULL, *ind is set to the index of the current
-	* record (i.e. before the record pointer moves to the next
-	* modified record).
-	*/
-	kdetype *readNextModifiedRec(int *ind=NULL)
-	{
-		return interpret(fDB->readNextModifiedRec(ind));
-	}
-
-
-	/** Retrieve the database pointer; this is useful to just pass
-	* around DatabaseInterpreter objects as if they are databases,
-	* and then perform DB operations on the database it wraps.
-	*/
-	PilotDatabase *db() const { return fDB; }
-
-protected:
-	PilotDatabase *fDB;
-} ;
-
-/** NULL mapper class; the conversions here don't @em do anything,
-* so you can use this when you only need 1 conversion step (from
-* PilotRecord to PilotDatebookEntry, for instance) instead of 2.
-*/
-template <class T>
-class NullMapper
-{
-public:
-	/** NULL Conversion function. */
-	static T *convert(T *t) { return t; }
-} ;
-
-#endif
diff --git a/kpilot/lib/pilotDateEntry.cc b/kpilot/lib/pilotDateEntry.cc
deleted file mode 100644
index d7844b89..00000000
--- a/kpilot/lib/pilotDateEntry.cc
+++ /dev/null
@@ -1,478 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This is a C++ wrapper for the Pilot's datebook structures.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <stdlib.h>
-
-#include <tqdatetime.h>
-#include <tqnamespace.h>
-#include <tqregexp.h>
-
-#include <kglobal.h>
-
-#include "pilotDateEntry.h"
-
-static const char *default_date_category_names[] = {
-	"Unfiled",
-	"Business",
-	"Personal",
-	0L
-} ;
-
-void PilotDateInfo::resetToDefault()
-{
-	FUNCTIONSETUP;
-	// Reset to all 0s
-	memset(&fInfo,0,sizeof(fInfo));
-	// Fill up default categories
-	for (unsigned int i=0; (i<4) && default_date_category_names[i]; ++i)
-	{
-		strncpy(fInfo.category.name[i],default_date_category_names[i],sizeof(fInfo.category.name[0]));
-	}
-
-	fInfo.startOfWeek = 0;
-
-}
-
-
-PilotDateEntry::PilotDateEntry():PilotRecordBase()
-{
-	::memset(&fAppointmentInfo, 0, sizeof(struct Appointment));
-}
-
-/* initialize the entry from another one. If rec==NULL, this constructor does the same as PilotDateEntry()
-*/
-PilotDateEntry::PilotDateEntry(PilotRecord * rec) :
-	PilotRecordBase(rec)
-{
-	::memset(&fAppointmentInfo, 0, sizeof(fAppointmentInfo));
-	if (rec)
-	{
-		// Construct a fake pi_buffer for unpack_Appointment.
-		// No ownership changes occur here.
-		pi_buffer_t b = { (unsigned char *) rec->data(), rec->size(), rec->size() } ;
-		unpack_Appointment(&fAppointmentInfo, &b, datebook_v1);
-	}
-	return;
-
-}
-
-void PilotDateEntry::_copyExceptions(const PilotDateEntry & e)
-{
-	if (e.fAppointmentInfo.exceptions > 0)
-	{
-		size_t blocksize = e.fAppointmentInfo.exceptions *
-			sizeof(struct tm);
-
-		fAppointmentInfo.exception = (struct tm *)::malloc(blocksize);
-
-		if (fAppointmentInfo.exception)
-		{
-			fAppointmentInfo.exceptions =
-				e.fAppointmentInfo.exceptions;
-			::memcpy(fAppointmentInfo.exception,
-				e.fAppointmentInfo.exception, blocksize);
-		}
-		else
-		{
-			WARNINGKPILOT << "malloc() failed, exceptions not copied" << endl;
-			fAppointmentInfo.exceptions = 0;
-		}
-	}
-	else
-	{
-		fAppointmentInfo.exceptions = 0;
-		fAppointmentInfo.exception = 0L;
-	}
-}
-
-
-PilotDateEntry::PilotDateEntry(const PilotDateEntry & e) :
-	PilotRecordBase(e)
-{
-	::memcpy(&fAppointmentInfo, &e.fAppointmentInfo,
-		sizeof(struct Appointment));
-	// See operator = for explanation
-	fAppointmentInfo.exception = 0L;
-	fAppointmentInfo.description = 0L;
-	fAppointmentInfo.note = 0L;
-
-	_copyExceptions(e);
-	setDescriptionP(e.fAppointmentInfo.description);
-	setNoteP(e.fAppointmentInfo.note);
-}
-
-
-PilotDateEntry & PilotDateEntry::operator = (const PilotDateEntry & e)
-{
-	if (this != &e)		// Pointer equality!
-	{
-		KPILOT_FREE(fAppointmentInfo.exception);
-		KPILOT_FREE(fAppointmentInfo.description);
-		KPILOT_FREE(fAppointmentInfo.note);
-		::memcpy(&fAppointmentInfo, &e.fAppointmentInfo,
-			sizeof(fAppointmentInfo));
-
-		// The original pointers were already freed; since we're now
-		// got the pointers from the new structure and we're going
-		// to use the standard set functions make sure that
-		// we don't free() the copies-of-pointers from e, which
-		// would be disastrous.
-		//
-		//
-		fAppointmentInfo.exception = 0L;
-		fAppointmentInfo.description = 0L;
-		fAppointmentInfo.note = 0L;
-
-		_copyExceptions(e);
-		setDescriptionP(e.fAppointmentInfo.description);
-		setNoteP(e.fAppointmentInfo.note);
-	}
-
-	return *this;
-}				// end of assignment operator
-
-
-TQString PilotDateEntry::getTextRepresentation(Qt::TextFormat richText)
-{
-	TQString text, tmp;
-	TQString par = (richText==Qt::RichText) ?CSL1("<p>"):TQString::null;
-	TQString ps = (richText==Qt::RichText) ?CSL1("</p>"):CSL1("\n");
-	TQString br = (richText==Qt::RichText) ?CSL1("<br/>"):CSL1("\n");
-
-	// title + name
-	text += par;
-	tmp=richText?CSL1("<b><big>%1</big></b>"):CSL1("%1");
-	text += tmp.arg(rtExpand(getDescription(), richText));
-	text += ps;
-
-	TQDateTime dt(readTm(getEventStart()));
-	TQString startDate(dt.toString(Qt::LocalDate));
-	text+=par;
-	text+=i18n("Start date: %1").arg(startDate);
-	text+=ps;
-
-	if (isEvent())
-	{
-		text+=par;
-		text+=i18n("Whole-day event");
-		text+=ps;
-	}
-	else
-	{
-		dt=readTm(getEventEnd());
-		TQString endDate(dt.toString(Qt::LocalDate));
-		text+=par;
-		text+=i18n("End date: %1").arg(endDate);
-		text+=ps;
-	}
-
-	if ( isAlarmEnabled() )
-	{
-		text+=par;
-		tmp=i18n("%1 is the duration, %2 is the time unit", "Alarm: %1 %2 before event starts").
-			arg(getAdvance());
-		switch (getAdvanceUnits())
-		{
-			case advMinutes: tmp=tmp.arg(i18n("minutes")); break;
-			case advHours: tmp=tmp.arg(i18n("hours")); break;
-			case advDays: tmp=tmp.arg(i18n("days")); break;
-			default: tmp=tmp.arg(TQString::null); break;;
-		}
-		text+=tmp;
-		text+=ps;
-	}
-
-	if (getRepeatType() != repeatNone)
-	{
-		text+=par;
-		tmp=i18n("Recurrence: every %1 %2");
-		int freq = getRepeatFrequency();
-		tmp=tmp.arg(freq);
-
-		switch(getRepeatType())
-		{
-			case repeatDaily: tmp=tmp.arg(i18n("day(s)")); break;
-			case repeatWeekly: tmp=tmp.arg(i18n("week(s)")); break;
-			case repeatMonthlyByDay:
-			case repeatMonthlyByDate: tmp=tmp.arg(i18n("month(s)")); break;
-			case repeatYearly: tmp=tmp.arg(i18n("year(s)")); break;
-			default: tmp=tmp.arg(TQString::null); break;
-		}
-		text+=tmp;
-		text+=br;
-
-		bool repeatsForever = getRepeatForever();
-		if (repeatsForever)
-		{
-			text+=i18n("Repeats indefinitely");
-		}
-		else
-		{
-			dt = readTm(getRepeatEnd()).date();
-			text+=i18n("Until %1").arg(dt.toString(Qt::LocalDate));
-		}
-		text+=br;
-
-		if (getRepeatType()==repeatMonthlyByDay) text+=i18n("Repeating on the i-th day of week j")+br;
-		if (getRepeatType()==repeatMonthlyByDate) text+=i18n("Repeating on the n-th day of the month")+br;
-		// TODO: show the dayArray when repeating weekly
-		/*TQBitArray dayArray(7);
-		if (getRepeatType()==repeatWeekly) text+=i18n("Repeat day flags: %1").arg(getRepeatDays
-		const int *days = dateEntry->getRepeatDays();
-		// Rotate the days of the week, since day numbers on the Pilot and
-		// in vCal / Events are different.
-		if (days[0]) dayArray.setBit(6);
-		for (int i = 1; i < 7; i++)
-		{
-			if (days[i]) dayArray.setBit(i-1);
-		}*/
-		text+=ps;
-	}
-
-	if (getExceptionCount()>0 )
-	{
-		text+=par;
-		text+=i18n("Exceptions:")+br;
-		for (int i = 0; i < getExceptionCount(); i++)
-		{
-			TQDate exdt=readTm(getExceptions()[i]).date();
-			text+=exdt.toString(Qt::LocalDate);
-			text+=br;
-		}
-		text+=ps;
-	}
-
-	if (!getNote().isEmpty())
-	{
-		text += richText?CSL1("<hr/>"):CSL1("-------------------------\n");
-		text+=par;
-		text+=richText?i18n("<b><em>Note:</em></b><br>"):i18n("Note:\n");
-		text+=rtExpand(getNote(), richText);
-		text+=ps;
-	}
-
-	return text;
-}
-
-TQDateTime PilotDateEntry::dtStart() const
-{
-	FUNCTIONSETUP;
-	return readTm( getEventStart() );
-}
-
-TQDateTime PilotDateEntry::dtEnd() const
-{
-	FUNCTIONSETUP;
-	return readTm( getEventEnd() );
-}
-
-TQDateTime PilotDateEntry::dtRepeatEnd() const
-{
-	FUNCTIONSETUP;
-	return readTm( getRepeatEnd() );
-}
-
-unsigned int PilotDateEntry::alarmLeadTime() const
-{
-	FUNCTIONSETUP;
-	if (!isAlarmEnabled()) return 0;
-
-	int adv = getAdvance();
-	if ( adv < 0 )
-	{
-		return 0; // Not possible to enter on the pilot
-	}
-	unsigned int t = adv;
-	int u = getAdvanceUnits();
-
-
-	switch(u)
-	{
-	case advMinutes : t *= 60; break;
-	case advHours : t *= 3600; break;
-	case advDays : t *= 3600 * 24; break;
-	default: t = 0;
-	}
-
-	return t;
-}
-
-PilotRecord *PilotDateEntry::pack() const
-{
-	int i;
-
-	pi_buffer_t *b = pi_buffer_new( sizeof(fAppointmentInfo) );
-	i = pack_Appointment(const_cast<Appointment_t *>(&fAppointmentInfo), b, datebook_v1);
-	if (i<0)
-	{
-		// Generic error from the pack_*() functions.
-		return 0;
-	}
-
-	// pack_Appointment sets b->used
-	return new PilotRecord( b, this );
-}
-
-/* setExceptions sets a new set of exceptions. Note that
-	PilotDateEntry assumes ownership of the array and will
-	delete the old one. */
-void PilotDateEntry::setExceptions(struct tm *e) {
-	if (fAppointmentInfo.exception != e)
-	{
-		KPILOT_FREE(fAppointmentInfo.exception);
-	}
-	fAppointmentInfo.exception=e;
-}
-
-
-void PilotDateEntry::setDescriptionP(const char *desc, int l)
-{
-	FUNCTIONSETUP;
-	KPILOT_FREE(fAppointmentInfo.description);
-
-	if (desc && *desc)
-	{
-		if (-1 == l) l=::strlen(desc);
-		fAppointmentInfo.description =
-			(char *) ::malloc(l + 1);
-		if (fAppointmentInfo.description)
-		{
-			strlcpy(fAppointmentInfo.description, desc, l+1);
-		}
-		else
-		{
-			WARNINGKPILOT << "malloc() failed, description not set" << endl;
-		}
-	}
-	else
-	{
-		fAppointmentInfo.description = 0L;
-	}
-}
-
-void PilotDateEntry::setNoteP(const char *note, int l)
-{
-	FUNCTIONSETUP;
-	KPILOT_FREE(fAppointmentInfo.note);
-
-	if (note && *note)
-	{
-		if (-1 == l) l=::strlen(note);
-		fAppointmentInfo.note = (char *)::malloc(l + 1);
-		if (fAppointmentInfo.note)
-		{
-			strlcpy(fAppointmentInfo.note, note,l+1);
-		}
-		else
-		{
-			WARNINGKPILOT << "malloc() failed, note not set" << endl;
-		}
-	}
-	else
-	{
-		fAppointmentInfo.note = 0L;
-	}
-}
-
-void PilotDateEntry::setNote(const TQString &s)
-{
-	TQCString t = Pilot::toPilot(s);
-	setNoteP( t.data(),t.length() );
-}
-
-void PilotDateEntry::setLocation(const TQString &s)
-{
-	TQString note = Pilot::fromPilot(getNoteP());
-	TQRegExp rxp = TQRegExp("^[Ll]ocation:[^\n]+\n");
-
-	// per TQString docs, this covers null and 0 length
-	if( s.isEmpty() )
-	{
-		note.replace(rxp,"");
-	}
-	else
-	{
-		TQString location = "Location: " + s + "\n";
-		int pos = note.find(rxp);
-
-		if(pos >= 0)
-		{
-			note.replace( rxp, location );
-		}
-		else
-		{
-			note = location + note;
-			setNote( note );
-		}
-	}
-}
-
-TQString PilotDateEntry::getLocation() const
-{
-	// Read the complete note here and not the filtered
-	// one from PilotDateEntry::getNote();
-	TQString note = Pilot::fromPilot(getNoteP());
-	TQRegExp rxp = TQRegExp("^[Ll]ocation:[^\n]+\n");
-	int pos = note.find(rxp, 0);
-
-	if(pos >= 0)
-	{
-		TQString location = rxp.capturedTexts().first();
-		rxp = TQRegExp("^[Ll]ocation:[\\s|\t]*");
-		location.replace(rxp,"");
-		location.replace("\n", "");
-		return location;
-	}
-	else
-	{
-		return "";
-	}
-}
-
-void PilotDateEntry::setDescription(const TQString &s)
-{
-	TQCString t = Pilot::toPilot(s);
-	setDescriptionP( t.data(),t.length() );
-}
-
-TQString PilotDateEntry::getNote() const
-{
-	TQString note = Pilot::fromPilot(getNoteP());
-	TQRegExp rxp = TQRegExp("^[Ll]ocation:[^\n]+\n");
-	note.replace(rxp, "" );
-	return note;
-}
-
-TQString PilotDateEntry::getDescription() const
-{
-	return Pilot::fromPilot(getDescriptionP());
-}
-
diff --git a/kpilot/lib/pilotDateEntry.h b/kpilot/lib/pilotDateEntry.h
deleted file mode 100644
index 43601013..00000000
--- a/kpilot/lib/pilotDateEntry.h
+++ /dev/null
@@ -1,388 +0,0 @@
-#ifndef _KPILOT_PILOTDATEENTRY_H
-#define _KPILOT_PILOTDATEENTRY_H
-/* pilotDateEntry.h	-*- C++ -*-	KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** See the .cc file for an explanation of what this file is for.
-*/
-
-/** @file pilotDateEntry.h defines a wrapper for datebook entries. */
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <pi-macros.h>
-#include <pi-datebook.h>
-
-#include <tqbitarray.h>
-#include <tqdatetime.h>
-#include <tqnamespace.h>
-
-#include "pilotRecord.h"
-#include "pilotAppInfo.h"
-
-namespace KCal
-{
-class Event;
-}
-
-/** Interpreted form of the AppInfo block in the datebook database. */
-typedef PilotAppInfo<
-	AppointmentAppInfo,
-	unpack_AppointmentAppInfo, 
-	pack_AppointmentAppInfo> PilotDateInfo_;
-
-
-class PilotDateInfo : public PilotDateInfo_
-{
-public:
-	PilotDateInfo(PilotDatabase *d) : PilotDateInfo_(d)
-	{
-	}
-
-	/** This resets the entire AppInfo block to one as it would be
-	*   in an English-language handheld, with 3 categories and
-	*   default field labels for everything.
-	*/
-	void resetToDefault();
-
-};
-
-/** This class is a wrapper for pilot-link's datebook entries (struct Appointment). */
-class KDE_EXPORT PilotDateEntry : public PilotRecordBase
-{
-public:
-	/** Constructor. Zeroes out the appointment. */
-	PilotDateEntry();
-
-	/** Constructor. Interprets the given record as an appointment. */
-	PilotDateEntry(PilotRecord *rec);
-
-	/** Copy constructor. */
-	PilotDateEntry(const PilotDateEntry &e);
-
-	/** Destructor. */
-	~PilotDateEntry()
-	{
-		free_Appointment(&fAppointmentInfo);
-	}
-
-	/** Assignment operator. */
-	PilotDateEntry& operator=(const PilotDateEntry &e);
-
-	/** Create a textual representation (human-readable) of this appointment.
-	* If @p richText is true, then the text representation uses qt style
-	* tags as well.
-	*/
-	TQString getTextRepresentation(Qt::TextFormat richText);
-
-	/** Is this appointment a "floating" appointment?
-	*
-	* Floating appointments are those that have a day assigned, but no time
-	*  in that day (birthday appointments are like that).  You can think of these
-	*  as "events", which don't have a time associated with them for a given day,
-	*  as opposed to a regular "appointment", which does normally have a time
-	*  associated with it.
-	*/
-	inline bool doesFloat() const
-	{
-		return fAppointmentInfo.event;
-	}
-
-	/** Is this a non-time-related event as opposed to an appointment that has a
-	* time associated with it?.
-	*/
-	inline bool isEvent() const
-	{
-		return doesFloat();
-	}
-
-	/** Sets this appointment's floating status.
-	*
-	* Floating appointments are those that have a day assigned, but no time
-	*  in that day (birthday appointments are like that).  You can think of these
-	*  as "events", which don't have a time associated with them for a given day,
-	*  as opposed to a regular "appointment", which does normally have a time
-	*  associated with it.
-	*/
-	inline void setFloats(bool f)
-	{
-		fAppointmentInfo.event = (f ? 1 : 0) /* Force 1 or 0 */ ;
-	}
-
-	/** Get the start time of this appointment.  See dtStart() for caveats. */
-	inline struct tm getEventStart() const { return fAppointmentInfo.begin; }
-
-	/** Get a pointer to the start time of this appointment.  See dtStart() for caveats. */
-	inline const struct tm *getEventStart_p() const
-	{
-		return &fAppointmentInfo.begin;
-	}
-
-	/** Sets the start time of this appointment. */
-	inline void setEventStart(struct tm& start)
-	{
-		fAppointmentInfo.begin = start;
-	}
-
-	/** Get the start time of this appointment. For floating appointments, the
-	* time is undefined (perhaps 1 minute past midnight).
-	*
-	* Floating appointments are those that have a day assigned, but no time
-	* in that day (birthday appointments are like that).
-	*/
-	TQDateTime dtStart() const;
-
-	/** Get the end time of this appointment.  See dtEnd() for caveats. */
-	inline struct tm getEventEnd() const
-	{
-		return fAppointmentInfo.end;
-	}
-
-	/** Get a pointer to the end time of this appointment.  See dtEnd() for caveats. */
-	inline const struct tm *getEventEnd_p() const
-	{
-		return &fAppointmentInfo.end;
-	}
-
-	/** Set the end time of this appointment. */
-	inline void setEventEnd(struct tm& end)
-	{
-		fAppointmentInfo.end = end;
-	}
-
-	/** Get the end time of this appointment. For floating appointments, the
-	* time is undefined (perhaps 1 minute past midnight).
-	*
-	* Floating appointments are those that have a day assigned, but no time
-	* in that day (birthday appointments are like that).
-	*/
-	TQDateTime dtEnd() const;
-
-	/** Does this appointment have an alarm set? On the Pilot, an event
-	* may have an alarm (or not). If it has one, it is also enabled and
-	* causes the Pilot to beep (or whatever is set in the system preferences).
-	*/
-	inline bool isAlarmEnabled() const
-	{
-		return fAppointmentInfo.alarm;
-	}
-
-	/** Set whether this appointment has an alarm. */
-	inline void setAlarmEnabled(bool b)
-	{
-		fAppointmentInfo.alarm = (b?1:0) /* Force to known int values */ ;
-	}
-
-	/** Get the numeric part of "alarm: __ (v) minutes" on the pilot -- you
-	* set the alarm time in two parts, a number and a unit type to use; unit
-	* types are minutes, hours, days and the number is whatever you like.
-	*
-	* If alarms are not enabled for this appointment, returns garbage.
-	*
-	* @see alarmLeadTime()
-	* @see dtAlarm()
-	*/
-	inline int getAdvance() const
-	{
-		return fAppointmentInfo.advance;
-	}
-
-	/** Set the numeric part of the alarm setting.  See getAdvance for details. */
-	inline void setAdvance(int advance)
-	{
-		fAppointmentInfo.advance = advance;
-	}
-
-	/** Returns the units part of the alarm time.  See getAdvance . */
-	inline int getAdvanceUnits() const
-	{
-		return fAppointmentInfo.advanceUnits;
-	}
-
-	/** Sets the unites part of the alarm time.  See getAdvance . */
-	inline void setAdvanceUnits(int units)
-	{
-		fAppointmentInfo.advanceUnits = units;
-	}
-
-	/** Returns the number of @em seconds "lead time" the alarm should sound
-	* before the actual appointment. This interprets the advance number and units.
-	* The value is always positive, 0 if no alarms are enabled.
-	*/
-	unsigned int alarmLeadTime() const;
-
-	/** Returns the absolute date and time that the alarm should sound for
-	* this appointment.
-	*/
-	inline TQDateTime dtAlarm() const
-	{
-		return dtStart().addSecs(-alarmLeadTime());
-	}
-
-	// The following need set routines written
-	inline repeatTypes getRepeatType() const
-	{
-		return fAppointmentInfo.repeatType;
-	}
-	inline void setRepeatType(repeatTypes r)
-	{
-		fAppointmentInfo.repeatType = r;
-	}
-
-	inline int getRepeatForever() const
-	{
-		return fAppointmentInfo.repeatForever;
-	}
-	inline void setRepeatForever(int f = 1)
-	{
-		fAppointmentInfo.repeatForever = f;
-	}
-
-	inline struct tm getRepeatEnd() const
-	{
-		return fAppointmentInfo.repeatEnd;
-	}
-	inline void setRepeatEnd(struct tm tm)
-	{
-		fAppointmentInfo.repeatEnd = tm;
-	}
-
-	/** Returns the date and time that the repeat ends. If there is no repeat,
-	* returns an invalid date and time.
-	*/
-	TQDateTime dtRepeatEnd() const;
-
-	inline int getRepeatFrequency() const
-	{
-		return fAppointmentInfo.repeatFrequency;
-	}
-	inline void setRepeatFrequency(int f)
-	{
-		fAppointmentInfo.repeatFrequency = f;
-	}
-
-	inline DayOfMonthType getRepeatDay() const
-	{
-		return fAppointmentInfo.repeatDay;
-	}
-	inline void setRepeatDay(DayOfMonthType rd)
-	{
-		fAppointmentInfo.repeatDay = rd;
-	};
-
-	inline const int *getRepeatDays() const
-	{
-		return fAppointmentInfo.repeatDays;
-	}
-	inline void setRepeatDays(int *rd)
-	{
-		for (int i = 0; i < 7; i++)
-		{
-			fAppointmentInfo.repeatDays[i] = rd[i];
-		}
-	}
-	inline void setRepeatDays(TQBitArray rba)
-	{
-		for (int i = 0; i < 7; i++)
-		{
-			fAppointmentInfo.repeatDays[i] = (rba[i] ? 1 : 0);
-		}
-	}
-
-	inline int getExceptionCount() const
-	{
-		return fAppointmentInfo.exceptions;
-	}
-	inline void setExceptionCount(int e)
-	{
-		fAppointmentInfo.exceptions = e;
-	}
-
-	inline const struct tm *getExceptions() const
-	{
-		return fAppointmentInfo.exception;
-	}
-	void setExceptions(struct tm *e);
-
-	/** Sets the description of the appointment. This is the short string
-	* entered in the day view on the handheld, and it is called the summary
-	* in libkcal.
-	*/
-	void setDescription(const TQString &);
-	/** Gets the description of the appointment.  See setDescription for meaning. */
-	TQString getDescription() const;
-
-	/** Sets the note for the appointment. The note is the long text entry
-	* that is possible - but clumsy - on the handheld. It is called the
-	* description in libkcal.
-	*/
-	void setNote(const TQString &);
-	/** Gets the note for this appointment.  See setNote for meaning. */
-	TQString getNote() const;
-
-	/**
-	 * Sets the location for the appointment. For now it will be placed within
-	 * the notes on the handheld. It will be placed on one line and starts with:
-	 * Location: {location}. Everything on that line will be counted as location.
-	 * TODO: Make distinguish between handhelds that support the location field
-	 * and the ones that don't. (Shouldn't this be done in the pilot-link lib?)
-	 */
-	void setLocation(const TQString &);
-
-	/** Gets the location for this appointment.  See setNote for meaning. */
-	TQString getLocation() const;
-
-protected:
-	void  setDescriptionP(const char* desc, int l=-1);
-	const char* getDescriptionP() const
-	{
-		return fAppointmentInfo.description;
-	}
-
-	void  setNoteP(const char* note, int l=-1);
-	const char* getNoteP() const
-	{
-		return fAppointmentInfo.note;
-	}
-
-public:
-	bool isMultiDay() const
-	{
-	return ((fAppointmentInfo.repeatType == repeatDaily) &&
-		(fAppointmentInfo.repeatFrequency == 1) &&
-		( !getRepeatForever() ) &&
-		!doesFloat() );
-	}
-
-	PilotRecord *pack() const;
-
-private:
-	struct Appointment fAppointmentInfo;
-	void _copyExceptions(const PilotDateEntry &e);
-};
-
-
-
-#endif
-
diff --git a/kpilot/lib/pilotLinkVersion.h b/kpilot/lib/pilotLinkVersion.h
deleted file mode 100644
index 1255baad..00000000
--- a/kpilot/lib/pilotLinkVersion.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef _KPILOT_PILOTLINKVERSION_H
-#define _KPILOT_PILOTLINKVERSION_H
-/* KPilot
-**
-** Copyright (C) 2005 by Adriaan de Groot
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include <pi-version.h>
-
-/** @file
-* Checks the pilot-link version and defines some convenience macros.
-* The main point of this file is to complain if you have a version
-* of pilot-link before 0.12, which no longer work with KPilot.
-*/
-
-#ifndef PILOT_LINK_VERSION
-#error "You need at least pilot-link version 0.12.0"
-#endif
-
-
-#define PILOT_LINK_NUMBER	((10000*PILOT_LINK_VERSION) + \
-				(100*PILOT_LINK_MAJOR)+PILOT_LINK_MINOR)
-#define PILOT_LINK_0_10_0	(1000)
-#define PILOT_LINK_0_11_0	(1100)
-#define PILOT_LINK_0_11_8	(1108)
-#define PILOT_LINK_0_12_0	(1200)
-#define PILOT_LINK_0_12_1	(1201)
-
-#if PILOT_LINK_NUMBER < PILOT_LINK_0_12_0
-#error "You need at least pilot-link version 0.12.0 for KPilot"
-#endif
-
-#define PI_SIZE_T size_t
-
-
-#endif
-
diff --git a/kpilot/lib/pilotLocalDatabase.cc b/kpilot/lib/pilotLocalDatabase.cc
deleted file mode 100644
index 735632de..00000000
--- a/kpilot/lib/pilotLocalDatabase.cc
+++ /dev/null
@@ -1,762 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This defines an interface to Pilot databases on the local disk.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include "options.h"
-
-#include <stdio.h>
-#include <unistd.h>
-#include <assert.h>
-
-#include <iostream>
-
-#include <pi-file.h>
-
-#include <tqstring.h>
-#include <tqfile.h>
-#include <tqregexp.h>
-#include <tqdatetime.h>
-#include <tqvaluevector.h>
-
-#include <kdebug.h>
-#include <kglobal.h>
-#include <kstandarddirs.h>
-#include <ksavefile.h>
-
-#include "pilotRecord.h"
-#include "pilotLocalDatabase.h"
-
-typedef TQValueVector<PilotRecord *> Records;
-
-class PilotLocalDatabase::Private : public Records
-{
-public:
-	static const int DEFAULT_SIZE = 128;
-	Private(int size=DEFAULT_SIZE) : Records(size) { resetIndex(); }
-	~Private() { deleteRecords(); }
-
-	void deleteRecords()
-	{
-		for (unsigned int i=0; i<size(); i++)
-		{
-			delete at(i);
-		}
-		clear();
-		resetIndex();
-	}
-
-	void resetIndex()
-	{
-		current = 0;
-		pending = -1;
-	}
-
-	unsigned int current;
-	int pending;
-} ;
-
-PilotLocalDatabase::PilotLocalDatabase(const TQString & path,
-	const TQString & dbName, bool useDefaultPath) :
-	PilotDatabase(dbName),
-	fPathName(path),
-	fDBName(dbName),
-	fAppInfo(0L),
-	fAppLen(0),
-	d(0L)
-{
-	FUNCTIONSETUP;
-	fixupDBName();
-	openDatabase();
-
-	if (!isOpen() && useDefaultPath)
-	{
-		if (fPathBase && !fPathBase->isEmpty())
-		{
-			fPathName = *fPathBase;
-		}
-		else
-		{
-			fPathName = KGlobal::dirs()->saveLocation("data",
-				CSL1("kpilot/DBBackup/"));
-		}
-		fixupDBName();
-		openDatabase();
-		if (!isOpen())
-		{
-			fPathName=path;
-		}
-	}
-
-}
-
-PilotLocalDatabase::PilotLocalDatabase(const TQString &dbName) :
-	PilotDatabase( TQString() ),
-	fPathName( TQString() ),
-	fDBName( TQString() ),
-	fAppInfo(0L),
-	fAppLen(0),
-	d(0L)
-{
-	FUNCTIONSETUP;
-
-	int p = dbName.findRev( '/' );
-	if (p<0)
-	{
-		// No slash
-		fPathName = CSL1(".");
-		fDBName = dbName;
-	}
-	else
-	{
-		fPathName = dbName.left(p);
-		fDBName = dbName.mid(p+1);
-	}
-	openDatabase();
-}
-
-PilotLocalDatabase::~PilotLocalDatabase()
-{
-	FUNCTIONSETUP;
-
-	closeDatabase();
-	delete[]fAppInfo;
-	delete d;
-}
-
-// Changes any forward slashes to underscores
-void PilotLocalDatabase::fixupDBName()
-{
-	FUNCTIONSETUP;
-	fDBName = fDBName.replace(CSL1("/"),CSL1("_"));
-}
-
-bool PilotLocalDatabase::createDatabase(long creator, long type, int, int flags, int version)
-{
-	FUNCTIONSETUP;
-
-	// if the database is already open, we cannot create it again.
-	// How about completely resetting it? (i.e. deleting it and then
-	// creating it again)
-	if (isOpen())
-	{
-		DEBUGKPILOT << fname << ": Database " << fDBName
-			<< " already open. Cannot recreate it." << endl;
-		return true;
-	}
-
-	DEBUGKPILOT << fname << ": Creating database " << fDBName << endl;
-
-	// Database names seem to be latin1.
-	Pilot::toPilot(fDBName, fDBInfo.name, sizeof(fDBInfo.name));
-	fDBInfo.creator=creator;
-	fDBInfo.type=type;
-	fDBInfo.more=0;
-	fDBInfo.flags=flags;
-	fDBInfo.miscFlags=0;
-	fDBInfo.version=version;
-	fDBInfo.modnum=0;
-	fDBInfo.index=0;
-	fDBInfo.createDate=(TQDateTime::currentDateTime()).toTime_t();
-	fDBInfo.modifyDate=(TQDateTime::currentDateTime()).toTime_t();
-	fDBInfo.backupDate=(TQDateTime::currentDateTime()).toTime_t();
-
-	delete[] fAppInfo;
-	fAppInfo=0L;
-	fAppLen=0;
-
-	d = new Private;
-
-	// TODO: Do I have to open it explicitly???
-	setDBOpen(true);
-	return true;
-}
-
-int PilotLocalDatabase::deleteDatabase()
-{
-	FUNCTIONSETUP;
-	if (isOpen())
-	{
-		closeDatabase();
-	}
-
-	TQString dbpath=dbPathName();
-	TQFile fl(dbpath);
-	if (TQFile::remove(dbPathName()))
-	{
-		return 0;
-	}
-	else
-	{
-		return -1;
-	}
-}
-
-
-
-// Reads the application block info
-int PilotLocalDatabase::readAppBlock(unsigned char *buffer, int size)
-{
-	FUNCTIONSETUP;
-
-	size_t m = kMin((size_t)size,(size_t)fAppLen);
-
-	if (!isOpen())
-	{
-		WARNINGKPILOT << "DB not open!" << endl;
-		memset(buffer,0,m);
-		return -1;
-	}
-
-	memcpy((void *) buffer, fAppInfo, m);
-	return fAppLen;
-}
-
-int PilotLocalDatabase::writeAppBlock(unsigned char *buffer, int len)
-{
-	FUNCTIONSETUP;
-
-	if (!isOpen())
-	{
-		WARNINGKPILOT << "DB not open!" << endl;
-		return -1;
-	}
-	delete[]fAppInfo;
-	fAppLen = len;
-	fAppInfo = new char[fAppLen];
-
-	memcpy(fAppInfo, (void *) buffer, fAppLen);
-	return 0;
-}
-
-
-// returns the number of records in the database
-unsigned int PilotLocalDatabase::recordCount() const
-{
-	if (d && isOpen())
-	{
-		return d->size();
-	}
-	else
-	{
-		return 0;
-	}
-}
-
-
-// Returns a TQValueList of all record ids in the database.
-TQValueList<recordid_t> PilotLocalDatabase::idList()
-{
-	int idlen=recordCount();
-	TQValueList<recordid_t> idlist;
-	if (idlen<=0)
-	{
-		return idlist;
-	}
-
-	// now create the QValue list from the idarr:
-	for (int i=0; i<idlen; i++)
-	{
-		idlist.append((*d)[i]->id());
-	}
-
-	return idlist;
-}
-
-// Reads a record from database by id, returns record length
-PilotRecord *PilotLocalDatabase::readRecordById(recordid_t id)
-{
-	FUNCTIONSETUP;
-
-	if (!isOpen())
-	{
-		WARNINGKPILOT << "Database '" << fDBName << " not open!" << endl;
-		return 0L;
-	}
-
-	d->pending = -1;
-
-	for (unsigned int i = 0; i < d->size(); i++)
-	{
-		if ((*d)[i]->id() == id)
-		{
-			PilotRecord *newRecord = new PilotRecord((*d)[i]);
-			d->current = i;
-			return newRecord;
-		}
-	}
-	return 0L;
-}
-
-// Reads a record from database, returns the record
-PilotRecord *PilotLocalDatabase::readRecordByIndex(int index)
-{
-	FUNCTIONSETUP;
-
-	if (index < 0)
-	{
-		DEBUGKPILOT << fname << ": Index " << index << " is bogus." << endl;
-		return 0L;
-	}
-
-	d->pending = -1;
-	if (!isOpen())
-	{
-		WARNINGKPILOT << "DB not open!" << endl;
-		return 0L;
-	}
-
-	DEBUGKPILOT << fname << ": Index=" << index << " Count=" << recordCount() << endl;
-
-	if ( (unsigned int)index >= recordCount() )
-	{
-		return 0L;
-	}
-	PilotRecord *newRecord = new PilotRecord((*d)[index]);
-	d->current = index;
-
-	return newRecord;
-}
-
-// Reads the next record from database in category 'category'
-PilotRecord *PilotLocalDatabase::readNextRecInCategory(int category)
-{
-	FUNCTIONSETUP;
-	d->pending  = -1;
-	if (!isOpen())
-	{
-		WARNINGKPILOT << "DB not open!" << endl;
-		return 0L;
-	}
-
-	while ((d->current < d->size())
-		&& ((*d)[d->current]->category() != category))
-	{
-		d->current++;
-	}
-
-	if (d->current >= d->size())
-		return 0L;
-	PilotRecord *newRecord = new PilotRecord((*d)[d->current]);
-
-	d->current++;	// so we skip it next time
-	return newRecord;
-}
-
-const PilotRecord *PilotLocalDatabase::findNextNewRecord()
-{
-	FUNCTIONSETUP;
-
-	if (!isOpen())
-	{
-		WARNINGKPILOT << "DB not open!" << endl;
-		return 0L;
-	}
-	DEBUGKPILOT << fname << ": looking for new record from " << d->current << endl;
-	// Should this also check for deleted?
-	while ((d->current < d->size())
-		&& ((*d)[d->current]->id() != 0 ))
-	{
-		d->current++;
-	}
-
-	if (d->current >= d->size())
-		return 0L;
-
-	d->pending = d->current;	// Record which one needs the new id
-	d->current++;	// so we skip it next time
-	return (*d)[d->pending];
-}
-
-PilotRecord *PilotLocalDatabase::readNextModifiedRec(int *ind)
-{
-	FUNCTIONSETUP;
-
-	if (!isOpen())
-	{
-		WARNINGKPILOT << "DB not open!" << endl;
-		return 0L;
-	}
-
-	d->pending = -1;
-	// Should this also check for deleted?
-	while ((d->current < d->size())
-		&& !((*d)[d->current]->isModified())  && ((*d)[d->current]->id()>0 ))
-	{
-		d->current++;
-	}
-
-	if (d->current >= d->size())
-	{
-		return 0L;
-	}
-	PilotRecord *newRecord = new PilotRecord((*d)[d->current]);
-	if (ind)
-	{
-		*ind=d->current;
-	}
-
-	d->pending = d->current;	// Record which one needs the new id
-	d->current++;	// so we skip it next time
-	return newRecord;
-}
-
-// Writes a new ID to the record specified the index.  Not supported on Serial connections
-recordid_t PilotLocalDatabase::updateID(recordid_t id)
-{
-	FUNCTIONSETUP;
-
-	if (!isOpen())
-	{
-		WARNINGKPILOT << "DB not open!" << endl;
-		return 0;
-	}
-	if (d->pending  < 0)
-	{
-		WARNINGKPILOT << "Last call was NOT readNextModifiedRec()" << endl;
-		return 0;
-	}
-	(*d)[d->pending]->setID(id);
-	d->pending = -1;
-	return id;
-}
-
-// Writes a new record to database (if 'id' == 0, it is assumed that this is a new record to be installed on pilot)
-recordid_t PilotLocalDatabase::writeRecord(PilotRecord * newRecord)
-{
-	FUNCTIONSETUP;
-
-	if (!isOpen())
-	{
-		WARNINGKPILOT << "DB not open!" << endl;
-		return 0;
-	}
-
-	d->pending = -1;
-	if (!newRecord)
-	{
-		WARNINGKPILOT << "Record to be written is invalid!" << endl;
-		return 0;
-	}
-
-	// Instead of making the app do it, assume that whenever a record is
-	// written to the database it is dirty.  (You can clean up the database with
-	// resetSyncFlags().)  This will make things get copied twice during a hot-sync
-	// but shouldn't cause any other major headaches.
-	newRecord->setModified( true );
-
-	// First check to see if we have this record:
-  	if (newRecord->id() != 0)
-  	{
- 		for (unsigned int i = 0; i < d->size(); i++)
- 			if ((*d)[i]->id() == newRecord->id())
-  			{
- 				delete (*d)[i];
-
- 				(*d)[i] = new PilotRecord(newRecord);
-  				return 0;
-  			}
-  	}
-  	// Ok, we don't have it, so just tack it on.
- 	d->append( new PilotRecord(newRecord) );
-  	return newRecord->id();
-}
-
-// Deletes a record with the given recordid_t from the database, or all records, if all is set to true. The recordid_t will be ignored in this case
-int PilotLocalDatabase::deleteRecord(recordid_t id, bool all)
-{
-	FUNCTIONSETUP;
-	if (!isOpen())
-	{
-		WARNINGKPILOT <<"DB not open"<<endl;
-		return -1;
-	}
-	d->resetIndex();
-	if (all)
-	{
-		d->deleteRecords();
-		d->clear();
-		return 0;
-	}
-	else
-	{
-		Private::Iterator i;
-		for ( i=d->begin() ; i!=d->end(); ++i)
-		{
-			if ((*i) && (*i)->id() == id) break;
-		}
-		if ( (i!=d->end()) && (*i) && (*i)->id() == id)
-		{
-			d->erase(i);
-		}
-		else
-		{
-			// Record with this id does not exist!
-			return -1;
-		}
-	}
-	return 0;
-}
-
-
-// Resets all records in the database to not dirty.
-int PilotLocalDatabase::resetSyncFlags()
-{
-	FUNCTIONSETUP;
-
-	if (!isOpen())
-	{
-		WARNINGKPILOT << "DB not open!" << endl;
-		return -1;
-	}
-	d->pending = -1;
-	for (unsigned int i = 0; i < d->size(); i++)
-	{
-		(*d)[i]->setModified( false );
-	}
-	return 0;
-}
-
-// Resets next record index to beginning
-int PilotLocalDatabase::resetDBIndex()
-{
-	FUNCTIONSETUP;
-	if (!isOpen())
-	{
-		WARNINGKPILOT << "DB not open!" << endl;
-		return -1;
-	}
-	d->resetIndex();
-	return 0;
-}
-
-// Purges all Archived/Deleted records from Palm Pilot database
-int PilotLocalDatabase::cleanup()
-{
-	FUNCTIONSETUP;
-	if (!isOpen())
-	{
-		WARNINGKPILOT << "DB not open!" << endl;
-		return -1;
-	}
-	d->resetIndex();
-
-	/* Not the for loop one might expect since when we erase()
-	* a record the iterator changes too.
-	*/
-	Private::Iterator i = d->begin();
-	while ( i!=d->end() )
-	{
-		if ( (*i)->isDeleted() || (*i)->isArchived() )
-		{
-			delete (*i);
-			i = d->erase(i);
-		}
-		else
-		{
-			++i;
-		}
-	}
-
-	// Don't have to do anything.  Will be taken care of by closeDatabase()...
-	// Changed!
-	return 0;
-}
-
-TQString PilotLocalDatabase::dbPathName() const
-{
-	FUNCTIONSETUP;
-	TQString tempName(fPathName);
-	TQString slash = CSL1("/");
-
-	if (!tempName.endsWith(slash)) tempName += slash;
-	tempName += getDBName();
-	tempName += CSL1(".pdb");
-	return tempName;
-}
-
-void PilotLocalDatabase::openDatabase()
-{
-	FUNCTIONSETUP;
-
-	pi_file *dbFile;
-
-	setDBOpen(false);
-
-	dbFile = pi_file_open( TQFile::encodeName(dbPathName()) );
-	if (dbFile == 0L)
-	{
-		TQString path = dbPathName();
-		DEBUGKPILOT << fname << ": Failed to open " << path << endl;
-		return;
-	}
-
-
-	PI_SIZE_T size = 0;
-	void *tmpBuffer;
-	pi_file_get_info(dbFile, &fDBInfo);
-	pi_file_get_app_info(dbFile, &tmpBuffer, &size);
-	fAppLen = size;
-	fAppInfo = new char[fAppLen];
-	memcpy(fAppInfo, tmpBuffer, fAppLen);
-
-	int count;
-	pi_file_get_entries(dbFile, &count);
-	if (count >= 0)
-	{
-		KPILOT_DELETE(d);
-		d = new Private(count);
-	}
-
-	int attr, cat;
-	recordid_t id;
-	unsigned int i = 0;
-	while (pi_file_read_record(dbFile, i,
-			&tmpBuffer, &size, &attr, &cat, &id) == 0)
-	{
-		pi_buffer_t *b = pi_buffer_new(size);
-		memcpy(b->data,tmpBuffer,size);
-		b->used = size;
-		(*d)[i] = new PilotRecord(b, attr, cat, id);
-		i++;
-	}
-	pi_file_close(dbFile);	// We done with it once we've read it in.
-
-	KSaveFile::backupFile( dbPathName() );
-
-	setDBOpen(true);
-}
-
-void PilotLocalDatabase::closeDatabase()
-{
-	FUNCTIONSETUP;
-	pi_file *dbFile;
-
-	if (!isOpen())
-	{
-		DEBUGKPILOT << fname << ": Database " << fDBName
-			<< " is not open. Cannot close and write it"
-			<< endl;
-		return;
-	}
-
-	TQString newName = dbPathName() + CSL1(".new");
-	TQString path = dbPathName();
-	DEBUGKPILOT << fname
-		<< ": Creating temp file " << newName
-		<< " for the database file " << path << endl;
-
-	dbFile = pi_file_create(TQFile::encodeName(newName),&fDBInfo);
-	pi_file_set_app_info(dbFile, fAppInfo, fAppLen);
-
-	for (unsigned int i = 0; i < d->size(); i++)
-	{
-		// How did a NULL pointer sneak in here?
-		if (!(*d)[i])
-		{
-			continue;
-		}
-
-		if (((*d)[i]->id() == 0) && ((*d)[i]->isDeleted()))
-		{
-			// Just ignore it
-		}
-		else
-		{
-			pi_file_append_record(dbFile,
-				(*d)[i]->data(),
-				(*d)[i]->size(),
-				(*d)[i]->attributes(), (*d)[i]->category(),
-				(*d)[i]->id());
-		}
-	}
-
-	pi_file_close(dbFile);
-	TQFile::remove(dbPathName());
-	rename((const char *) TQFile::encodeName(newName),
-		(const char *) TQFile::encodeName(dbPathName()));
-	setDBOpen(false);
-}
-
-
-TQString *PilotLocalDatabase::fPathBase = 0L;
-
-void PilotLocalDatabase::setDBPath(const TQString &s)
-{
-	FUNCTIONSETUP;
-
-	DEBUGKPILOT << fname
-		<< ": Setting default DB path to "
-		<< s
-		<< endl;
-
-	if (!fPathBase)
-	{
-		fPathBase = new TQString(s);
-	}
-	else
-	{
-		*fPathBase = s;
-	}
-}
-
-/* virtual */ PilotDatabase::DBType PilotLocalDatabase::dbType() const
-{
-	return eLocalDB;
-}
-
-
-/* static */ bool PilotLocalDatabase::infoFromFile( const TQString &path, DBInfo *d )
-{
-	FUNCTIONSETUP;
-
-	pi_file *f = 0L;
-
-	if (!d)
-	{
-		return false;
-	}
-	if (!TQFile::exists(path))
-	{
-		return false;
-	}
-
-	TQCString fileName = TQFile::encodeName( path );
-	f = pi_file_open( fileName );
-	if (!f)
-	{
-		WARNINGKPILOT << "Can't open " << path << endl;
-		return false;
-	}
-
-	pi_file_get_info(f,d);
-	pi_file_close(f);
-
-	return true;
-}
-
diff --git a/kpilot/lib/pilotLocalDatabase.h b/kpilot/lib/pilotLocalDatabase.h
deleted file mode 100644
index e5d11a63..00000000
--- a/kpilot/lib/pilotLocalDatabase.h
+++ /dev/null
@@ -1,201 +0,0 @@
-#ifndef _KPILOT_PILOTLOCALDATABASE_H
-#define _KPILOT_PILOTLOCALDATABASE_H
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-** Copyright (C) 2006 Adriaan de Groot <groot@kde.org>
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "pilotDatabase.h"
-
-/** @file
-* Defines the PilotLocalDatabase class, for databases stored
-* on disk (as opposed to in a handheld).
-*/
-
-/**
-* PilotLocalDatabase represents databases in the same binary format
-* as on the handheld but which are stored on local disk.
-*/
-class KDE_EXPORT PilotLocalDatabase : public PilotDatabase
-{
-public:
-	/**
-	* Opens the local database. If the database cannot be found at the
-	* given position, a default path is used
-	*     ($KDEHOME/share/apps/kpilot/DBBackup)
-	* and if the file is found there, it is opened. In some cases this should
-	* not be done, so the parameter useDefaultPath controls this behavior.
-	* If it is set to true, the default path is used if the file cannot be
-	* found in the explicitly given location. If it is set to false and
-	* the database cannot be found, no database is opened. It can then be
-	* created explicitly at the specified location.
-	*/
-	PilotLocalDatabase( const TQString& path,
-		const TQString& name, bool useDefaultPath=true);
-
-	/**
-	* Opens the local database. This is primarily for testing
-	* purposes; only tries the given path.
-	*/
-	PilotLocalDatabase(const TQString &name);
-
-	virtual ~PilotLocalDatabase();
-
-	/** Creates the database with the given creator, type and flags on
-	* the given card (default is RAM). If the database already exists,
-	* this function does nothing.
-	*/
-	virtual bool createDatabase(long creator=0,
-		long type=0, int cardno=0, int flags=0, int version=0);
-
-
-
-	/** Deletes the database (by name, as given in the constructor
-	* and stored in the fDBName field. )
-	*/
-	virtual int deleteDatabase();
-
-	// Reads the application block info
-	virtual int readAppBlock(unsigned char* buffer, int maxLen);
-	// Writes the application block info.
-	virtual int writeAppBlock(unsigned char* buffer, int len);
-	// returns the number of records in the database, 0 if not open
-	virtual unsigned int recordCount() const;
-	// Returns a TQValueList of all record ids in the database.
-	virtual TQValueList<recordid_t> idList();
-	// Reads a record from database by id, returns record
-	virtual PilotRecord* readRecordById(recordid_t id);
-	// Reads a record from database, returns the record
-	virtual PilotRecord* readRecordByIndex(int index);
-	// Reads the next record from database in category 'category'
-	virtual PilotRecord* readNextRecInCategory(int category);
-	/**
-	* Returns the next "new" record, ie. the next record
-	* that has not been synced yet. These records all have ID=0, so are
-	* not easy to find with the other methods. The record is the one
-	* contained in the database, not a copy like the read*() functions
-	* give you -- so be careful with it. Don't delete it, in any case.
-	* Casting it to non-const and marking it deleted is OK, though,
-	* which is mostly its intended use.
-	*/
-	const PilotRecord *findNextNewRecord();
-
-	/**
-	* Reads the next record from database that has the dirty flag set.
-	* ind (if a valid pointer is given) will receive the index of the
-	* returned record.
-	*/
-	virtual PilotRecord* readNextModifiedRec(int *ind=0L);
-	// Writes a new record to database (if 'id' == 0, none is assigned, either)
-	virtual recordid_t writeRecord(PilotRecord* newRecord);
-	/**
-	* Deletes a record with the given recordid_t from the database,
-	* or all records, if all is set to true. The recordid_t will be
-	* ignored in this case. Return value is negative on error, 0 otherwise.
-	*/
-	virtual int deleteRecord(recordid_t id, bool all=false);
-	// Resets all records in the database to not dirty.
-	virtual int resetSyncFlags();
-	// Resets next record index to beginning
-	virtual int resetDBIndex();
-	// Purges all Archived/Deleted records from Palm Pilot database
-	virtual int cleanup();
-
-
-	/** Update the ID of the current record in the database with
-	* the specified @param id . This is allowed only after
-	* reading or writing a modified or new record.
-	*/
-	virtual recordid_t  updateID(recordid_t id);
-
-
-	/** Return the name of the database (as it would be on the handheld). */
-	TQString getDBName() const { return fDBName; }
-
-	/**
-	* Returns the full path of the current database, based on
-	* the path and dbname passed to the constructor, and including
-	* the .pdb extension.
-	*/
-	virtual TQString dbPathName() const;
-
-	/**
-	* Accessor functions for the application info block.
-	*/
-	int appInfoSize() const
-		{ if (isOpen()) return fAppLen; else return -1; } ;
-	char *appInfo() { return fAppInfo; } ;
-
-	const struct DBInfo &getDBInfo() const { return fDBInfo; }
-	void setDBInfo(const struct DBInfo &dbi) {fDBInfo=dbi; }
-
-	virtual DBType dbType() const;
-
-	/** Reads local file @p path and fills in the DBInfo
-	*   structure @p d with the DBInfo from the file.
-	*
-	*   @return @c false if d is NULL
-	*   @return @c false if the file @p path does not exist
-	*   @return @c true if reading the DBInfo succeeds
-	*
-	*   @note Relatively expensive operation, since the pilot-link
-	*         library doesn't provide a cheap way of getting this
-	*         information.
-	*/
-	static bool infoFromFile( const TQString &path, DBInfo *d );
-
-protected:
-	// Changes any forward slashes to underscores
-	void fixupDBName();
-	virtual void openDatabase();
-	virtual void closeDatabase();
-
-private:
-	struct DBInfo fDBInfo;
-	TQString fPathName,fDBName;
-	char*       fAppInfo;
-	size_t      fAppLen;
-
-	class Private;
-	Private *d;
-
-public:
-	/**
-	* For databases opened by name only (constructor 2 -- which is the
-	* preferred one, too) try this path first before the default path.
-	* Set statically so it's shared for all local databases.
-	*/
-	static void setDBPath(const TQString &);
-	/**
-	* Accessor for the extra search path.
-	*/
-	static const TQString &getDBPath() { return *fPathBase; } ;
-private:
-	static TQString *fPathBase;
-};
-
-#endif
diff --git a/kpilot/lib/pilotMemo.cc b/kpilot/lib/pilotMemo.cc
deleted file mode 100644
index 946a995b..00000000
--- a/kpilot/lib/pilotMemo.cc
+++ /dev/null
@@ -1,135 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-**
-** This is a C++ wrapper for the Pilot's Memo Pad structures.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <tqnamespace.h>
-
-#include "pilotMemo.h"
-#include "pilotDatabase.h"
-
-
-
-PilotMemo::PilotMemo(const PilotRecord * rec) : PilotRecordBase(rec)
-{
-	FUNCTIONSETUP;
-	fText = Pilot::fromPilot((const char *)(rec->data()),rec->size());
-}
-
-PilotRecord *PilotMemo::pack()
-{
-	FUNCTIONSETUPL(4);
-	int i;
-	
-	int len = fText.length() + 8;
-	struct Memo buf;
-	buf.text = new char[len];
-
-	// put our text into buf
-	i = Pilot::toPilot(fText, buf.text, len);
-
-	pi_buffer_t *b = pi_buffer_new(len);
-	i = pack_Memo(&buf, b, memo_v1);
-
-	DEBUGKPILOT << fname << ": original text: [" << fText 
-		<< "], buf.text: [" << buf.text 
-		<< "], b->data: [" << b->data << "]" << endl;
-
-	if (i<0)
-	{
-		// Generic error from the pack_*() functions.
-		delete[] buf.text;
-		return 0;
-	}
-
-	// pack_Appointment sets b->used
-	PilotRecord *r = new PilotRecord(b, this);
-	delete[] buf.text;
-	return r;
-}
-
-
-TQString PilotMemo::getTextRepresentation(Qt::TextFormat richText)
-{
-	if (richText==Qt::RichText)
-	{
-		return i18n("<i>Title:</i> %1<br>\n<i>MemoText:</i><br>%2").
-			arg(rtExpand(getTitle(), richText)).arg(rtExpand(text(), richText));
-	}
-	else
-	{
-		return i18n("Title: %1\nMemoText:\n%2").arg(getTitle()).arg(text());
-	}
-}
-
-
-TQString PilotMemo::getTitle() const
-{
-	if (fText.isEmpty()) return TQString::null;
-
-	int memoTitleLen = fText.find('\n');
-	if (-1 == memoTitleLen) memoTitleLen=fText.length();
-	return fText.left(memoTitleLen);
-}
-
-TQString PilotMemo::shortTitle() const
-{
-	FUNCTIONSETUP;
-	TQString t = TQString(getTitle()).simplifyWhiteSpace();
-
-	if (t.length() < 32)
-		return t;
-	t.truncate(40);
-
-	int spaceIndex = t.findRev(' ');
-
-	if (spaceIndex > 32)
-	{
-		t.truncate(spaceIndex);
-	}
-
-	t += CSL1("...");
-
-	return t;
-}
-
-TQString PilotMemo::sensibleTitle() const
-{
-	FUNCTIONSETUP;
-	TQString s = getTitle();
-
-	if (!s.isEmpty())
-	{
-		return s;
-	}
-	else
-	{
-		return i18n("[unknown]");
-	}
-}
-
diff --git a/kpilot/lib/pilotMemo.h b/kpilot/lib/pilotMemo.h
deleted file mode 100644
index f4436ab7..00000000
--- a/kpilot/lib/pilotMemo.h
+++ /dev/null
@@ -1,105 +0,0 @@
-#ifndef _KPILOT_PILOTMEMO_H
-#define _KPILOT_PILOTMEMO_H
-/* pilotMemo.h			KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-**
-** See the .cc file for an explanation of what this file is for.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <tqnamespace.h>
-#include <tqstring.h>
-
-#include <pi-memo.h>
-
-#include "pilotRecord.h"
-#include "pilotAppInfo.h"
-
-class KDE_EXPORT PilotMemo : public PilotRecordBase
-{
-public:
-	/**
-	* Constructor. Create an empty memo.
-	*/
-	PilotMemo(void) : PilotRecordBase() { } ;
-
-	/**
-	* Constructor. Create a memo in the Unfiled category with
-	* text @p s .
-	*/
-	PilotMemo(const TQString &s) : PilotRecordBase()
-	{
-		setText(s);
-	} ;
-
-	/**
-	* Constructor. Create a memo with the category and
-	* attributes of the given record @p rec, and extract
-	* the text from that record as if it comes from the MemoDB.
-	*/
-	PilotMemo(const PilotRecord* rec);
-
-	/**
-	* Constructor. Create a memo with category and
-	* attributes from the argument @p r, and set the
-	* text of the memo from string @p s.
-	*/
-	PilotMemo(const PilotRecordBase *r, const TQString &s) :
-		PilotRecordBase(r)
-	{
-		setText(s);
-	}
-
-	~PilotMemo() { } ;
-
-	virtual TQString getTextRepresentation(Qt::TextFormat richText);
-	TQString text(void) const { return fText; } ;
-	void setText(const TQString &text) { fText = text.left(MAX_MEMO_LEN); } ;
-	TQString getTitle(void) const ;
-	PilotRecord* pack();
-
-	static const int MAX_MEMO_LEN=8192;
-
-	/**
-	* Return a "short but sensible" title. getTitle() returns the
-	* first line of the memo, which may be very long
-	* and inconvenient. shortTitle() returns about 30
-	* characters.
-	*/
-	TQString shortTitle() const;
-
-	/**
-	* Returns a (complete) title if there is one and [unknown]
-	* otherwise.
-	*/
-	TQString sensibleTitle() const;
-
-private:
-	TQString fText;
-
-};
-
-typedef PilotAppInfo<struct MemoAppInfo,unpack_MemoAppInfo, pack_MemoAppInfo> PilotMemoInfo;
-
-#endif
diff --git a/kpilot/lib/pilotRecord.cc b/kpilot/lib/pilotRecord.cc
deleted file mode 100644
index 59f055c3..00000000
--- a/kpilot/lib/pilotRecord.cc
+++ /dev/null
@@ -1,132 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This is a wrapper for pilot-link's general
-** Pilot database structures. These records are
-*** just collections of bits. See PilotAppCategory
-** for interpreting the bits in a meaningful way.
-**
-** As a crufty hack, the non-inline parts of
-** PilotAppCategory live in this file as well.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-#include "options.h"
-
-#include <string.h>
-
-#include <tqregexp.h>
-
-#include <kglobal.h>
-#include <kcharsets.h>
-
-#include "pilot.h"
-#include "pilotRecord.h"
-
-
-
-/* virtual */ TQString PilotRecordBase::textRepresentation() const
-{
-	return CSL1("[ %1,%2,%3 ]") . arg(attributes(),category(),id());
-}
-
-/* virtual */ TQString PilotRecord::textRepresentation() const
-{
-	return CSL1("[ %1,%2 ]")
-		.arg(PilotRecordBase::textRepresentation())
-		.arg(size());
-}
-
-
-
-/* static */ int PilotRecord::fAllocated = 0;
-/* static */ int PilotRecord::fDeleted = 0;
-
-/* static */ void PilotRecord::allocationInfo()
-{
-	FUNCTIONSETUP;
-	DEBUGKPILOT << fname
-		<< ": Allocated " << fAllocated
-		<< "  Deleted " << fDeleted << endl;
-}
-
-PilotRecord::PilotRecord(void *data, int len, int attrib, int cat, recordid_t uid) :
-	PilotRecordBase(attrib,cat,uid),
-	fData(0L),
-	fLen(len),
-	fBuffer(0L)
-{
-	FUNCTIONSETUPL(4);
-	fData = new char[len];
-
-	memcpy(fData, data, len);
-
-	fAllocated++;
-}
-
-PilotRecord::PilotRecord(PilotRecord * orig) :
-	PilotRecordBase( orig->attributes(), orig->category(), orig->id() ) ,
-	fBuffer(0L)
-{
-	FUNCTIONSETUPL(4);
-	fData = new char[orig->size()];
-
-	memcpy(fData, orig->data(), orig->size());
-	fLen = orig->size();
-	fAllocated++;
-}
-
-PilotRecord & PilotRecord::operator = (PilotRecord & orig)
-{
-	FUNCTIONSETUP;
-	if (fBuffer)
-	{
-		pi_buffer_free(fBuffer);
-		fBuffer=0L;
-		fData=0L;
-	}
-
-	if (fData)
-		delete[]fData;
-	fData = new char[orig.size()];
-
-	memcpy(fData, orig.data(), orig.size());
-	fLen = orig.size();
-	setAttributes( orig.attributes() );
-	setCategory( orig.category() );
-	setID( orig.id() );
-	return *this;
-}
-
-void PilotRecord::setData(const char *data, int len)
-{
-	FUNCTIONSETUP;
-	if (fData)
-		delete[]fData;
-	fData = new char[len];
-
-	memcpy(fData, data, len);
-	fLen = len;
-}
-
diff --git a/kpilot/lib/pilotRecord.h b/kpilot/lib/pilotRecord.h
deleted file mode 100644
index fdf8a33e..00000000
--- a/kpilot/lib/pilotRecord.h
+++ /dev/null
@@ -1,355 +0,0 @@
-#ifndef _KPILOT_PILOTRECORD_H
-#define _KPILOT_PILOTRECORD_H
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-** Copyright (C) 2006 Adriaan de Groot <groot@kde.org>
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include "pilot.h"
-
-/**
-* @file This file defines the lowest- denominator representation(s)
-*of the bits used in a Pilot-based database record.
-*/
-
-
-/**
-* All entries in the Handheld -- whether interpreted or binary blobs --
-* have some common characteristics, viz. an ID number, a category,
-* and some attributes defined by the handheld. PilotRecordBase is
-* a common base class collecting methods to manipulate those
-* common characteristics.
-*/
-class KDE_EXPORT PilotRecordBase
-{
-public:
-	/** Constructor. Initialize the characteristics to the
-	*   given values.
-	*
-	* @param attrib Attributes (bitfield) for this entry.
-	* @param cat Category for this entry. Should be in the
-	*        range 0 <= cat < Pilot::CATEGORY_COUNT . Using an
-	*        invalid category means 0 (unfiled) is used.
-	* @param id Unique ID for this entry. May be 0 (non-unique) as well.
-	*/
-	PilotRecordBase(int attrib=0, int cat=0, recordid_t id=0) :
-		fAttrib(attrib),fCat(0),fID(id)
-	{
-		setCategory(cat);
-	}
-
-	/** Constructor. Initializes the characteristics from
-	 *  the values the given record @p b has. When @p b is
-	 *  NULL (which is allowed), everything is assumed zero.
-	 *  No ownership is transferred.
-	 *
-	 *  @param b Record to take characteristics from.
-	 */
-	PilotRecordBase( const PilotRecordBase *b ) :
-		fAttrib( b ? b->attributes() : 0 ),
-		fCat( 0 ),
-		fID( b ? b->id() : 0 )
-	{
-		if (b)
-		{
-			setCategory( b->category() );
-		}
-	}
-
-	/** Destructor. Nothing to do for it. */
-	virtual ~PilotRecordBase() { } ;
-
-	/** Attributes of this record (deleted, secret, ...);
-	* it's a bitfield.
-	*/
-	inline int attributes() const
-	{
-		return fAttrib;
-	}
-
-	/** Set the attributes of this record. */
-	inline void  setAttributes(int attrib)
-	{
-		fAttrib = attrib;
-	}
-
-	/** Returns the category number [ 0 .. Pilot::CATEGORY_COUNT-1]
-	* of this record.
-	*/
-	inline int   category() const
-	{
-		return fCat;
-	}
-
-	/** Sets the category number [ 0 .. Pilot::CATEGORY_COUNT-1]
-	* of this record.
-	* Trying to set an illegal category number files this one under
-	* "Unfiled" (which is 0).
-	*/
-	inline void  setCategory(int cat)
-	{
-		if ( (cat<0) || (cat>=(int)Pilot::CATEGORY_COUNT))
-		{
-			cat=0;
-		}
-		fCat = cat;
-	}
-
-	/** Sets the category number by looking up the string @p label
-	* in the category table @p info . Leaves the category unchanged
-	* if no match is found and returns @c false.
-	*
-	* @param info AppInfo structure containing the labels (in handheld
-	*        native encoding).
-	* @param label The label to look for.
-	*
-	* @return @c true on success, @c false on failure
-	*/
-	bool setCategory(const struct CategoryAppInfo *info, const TQString &label)
-	{
-		if (!info)
-		{
-			return false;
-		}
-
-		int cat = Pilot::findCategory( info, label, false );
-		if ( (cat<0) || (cat>=(int)Pilot::CATEGORY_COUNT) )
-		{
-			return false;
-		}
-		else
-		{
-			setCategory( cat );
-			return true;
-		}
-	}
-
-	/** Returns the record ID for this record. Record IDs are unique for a given
-	* handheld and database.
-	*/
-	inline recordid_t id() const
-	{
-		return fID;
-	}
-
-	/** Sets the record ID for this record. Use with caution -- you ca confuse
-	* the handheld by doing weird things here.
-	*/
-	void setID(recordid_t id)
-	{
-		fID = id;
-	}
-
-	/** Accessor for one bit of the record's attributes. Is this record marked
-	* deleted (on the handheld) ? Deleted records are not removed from the
-	* database until a HotSync is done (which normally calls purge deleted
-	* or so to really get rid of the records from storage.
-	*/
-	inline bool isDeleted() const
-	{
-		return fAttrib & dlpRecAttrDeleted;
-	}
-
-	/** Accessor for one bit of the record's attributes. Is this record secret?
-	* Secret records are not displayed on the desktop by default.
-	*/
-	inline bool isSecret() const
-	{
-		return fAttrib & dlpRecAttrSecret;
-	}
-
-	/** Accessor for one bit of the record's attributes. Is this record a
-	* to-be-archived record? When a record is deleted, it may be marked
-	* as "archive on PC" which means the PC should keep a copy. The
-	* PC data correspondng to an archived-but-deleted record must not
-	* be deleted.
-	*/
-	inline bool isArchived() const
-	{
-		return fAttrib & dlpRecAttrArchived;
-	}
-
-	/** Accessor for one bit of the record's attributes. Is this record modified?
-	* Modified records are those that have been modified since the last HotSync.
-	*/
-	inline bool isModified() const
-	{
-		return fAttrib & dlpRecAttrDirty;
-	}
-
-#define SETTER(a) {\
-		if (d) { fAttrib |= a; } \
-		else   { fAttrib &= ~a; } }
-
-	/** Mark a record as deleted (or not).*/
-	inline void setDeleted(bool d=true) SETTER(dlpRecAttrDeleted)
-
-	/** Mark a record as secret (or not). */
-	inline void setSecret(bool d=true) SETTER(dlpRecAttrSecret)
-
-	/** Mark a record as archived (or not). */
-	inline void setArchived(bool d=true) SETTER(dlpRecAttrArchived)
-
-	/** Mark a record as modified (or not). */
-	inline void setModified(bool d=true) SETTER(dlpRecAttrDirty)
-
-#undef SETTER
-
-	/** Returns a text representation of this record. */
-	virtual TQString textRepresentation() const;
-
-private:
-	int fAttrib, fCat;
-	recordid_t fID;
-} ;
-
-/** An "uninterpreted" representation of the bits comprising a HH record.
-* This binary blob only exposes the data via the data() and size() functions,
-* and also exposes the common characteristics of all entries.
-*/
-class KDE_EXPORT PilotRecord : public PilotRecordBase
-{
-public:
-	/** Constructor. Using the given @p data and @p length, create
-	* a record. Give it the additional attributes and category numbers;
-	* the UID is a HH unique ID for identifying records.
-	*
-	* This constructor makes a copy of the data buffer (and owns that buffer).
-	*/
-	PilotRecord(void* data, int length, int attrib, int cat, recordid_t uid) KDE_DEPRECATED;
-
-	/** Constructor. Using the given buffer @p buf (which carries its
-	* own data and length), create a record. Otherwise much like the
-	* above constructor @em except that this record assumes ownership
-	* of the buffer, and doesn't make an additional copy
-	* (In practice, this just saves copying around extra buffers).
-	*/
-	PilotRecord(pi_buffer_t *buf, int attrib, int cat, recordid_t uid) :
-		PilotRecordBase(attrib,cat,uid),
-		fData((char *)buf->data),
-		fLen(buf->used),
-		fBuffer(buf)
-	{
-		fAllocated++;
-	}
-
-	/** Constructor. Like the above, only take the attributes, category
-	* and id from the given @p entry.
-	*/
-	PilotRecord( pi_buffer_t *buf, const PilotRecordBase *entry ) :
-		PilotRecordBase( entry ),
-		fData((char *)buf->data),
-		fLen(buf->used),
-		fBuffer(buf)
-	{
-		fAllocated++;
-	}
-
-	/** Destructor. Dispose of the buffers in the right form. */
-	virtual ~PilotRecord()
-	{
-		if (fBuffer)
-		{
-			pi_buffer_free(fBuffer);
-		}
-		else
-		{
-			delete [] fData;
-		}
-		fDeleted++;
-	}
-
-	/** Constructor. Copies the data from the @p orig record. */
-	PilotRecord(PilotRecord* orig);
-
-	/** Retrieve the data buffer for this record. Note that trying
-	* to change this data is fraught with peril -- especially trying
-	* to lengthen it.
-	*
-	* @see setData
-	*/
-	char *data() const
-	{
-		if (fBuffer)
-		{
-			return (char *)(fBuffer->data);
-		}
-		else
-		{
-			return fData;
-		}
-	}
-
-	/** Returns the size of the data for this record. */
-	int size() const
-	{
-		if (fBuffer) return fBuffer->used; else
-		return fLen;
-	}
-
-	/** Returns the data buffer associated with this record. */
-	const pi_buffer_t *buffer() const { return fBuffer; }
-
-	/** Set the data for this record. Frees old data. Assumes
-	* ownership of the passed in buffer @p b.
-	*/
-	void setData(pi_buffer_t *b)
-	{
-		if (fBuffer) { pi_buffer_free(fBuffer); }
-		else { delete[] fData; } ;
-		fData = (char *)b->data;
-		fLen = b->used;
-		fBuffer = b;
-	}
-
-	/** Assignment operator. Makes a copy of the @p orig record. */
-	PilotRecord& operator=(PilotRecord& orig);
-
-	/** Sets the data for this record. Makes a copy of the data buffer. */
-	void setData(const char* data, int len);
-
-	/** Returns a text representation of this record. */
-	virtual TQString textRepresentation() const;
-
-private:
-	char* fData;
-	int   fLen;
-	pi_buffer_t *fBuffer;
-
-public:
-	/**
-	* This is an interface for tracking down memory leaks
-	* in the use of PilotRecords (for those without valgrind).
-	* Count the number of allocations and deallocations.
-	*/
-	static void allocationInfo();
-private:
-	static int fAllocated,fDeleted;
-};
-
-#endif
diff --git a/kpilot/lib/pilotSerialDatabase.cc b/kpilot/lib/pilotSerialDatabase.cc
deleted file mode 100644
index f57cac93..00000000
--- a/kpilot/lib/pilotSerialDatabase.cc
+++ /dev/null
@@ -1,432 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** Databases approached through DLP / Pilot-link look different,
-** so this file defines an API for them.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-#include "options.h"
-
-#include <time.h>
-#include <iostream>
-
-#include <pi-dlp.h>
-
-#include <tqfile.h>
-
-#include <klocale.h>
-#include <kdebug.h>
-#include <kglobal.h>
-
-#include "pilotRecord.h"
-#include "pilotSerialDatabase.h"
-#include "kpilotdevicelink.h"
-
-PilotSerialDatabase::PilotSerialDatabase(KPilotDeviceLink *l,
-	const TQString &dbName) :
-	PilotDatabase(dbName),
-	fDBName( dbName ),
-	fDBHandle(-1),
-	fDBSocket(l->pilotSocket())
-{
-	FUNCTIONSETUP;
-	openDatabase();
-}
-
-PilotSerialDatabase::PilotSerialDatabase( KPilotDeviceLink *l, const DBInfo *info ) :
-	PilotDatabase( info ? Pilot::fromPilot( info->name ) : TQString::null ),
-	fDBName( TQString::null ),
-	fDBHandle( -1 ),
-	fDBSocket( l->pilotSocket() )
-{
-	// Rather unclear  why both the base class and this one have separate names.
-	fDBName = name();
-	setDBOpen(false);
-	if (fDBName.isEmpty() || !info)
-	{
-		WARNINGKPILOT << "Bad database name requested." << endl;
-		return;
-	}
-
-	int db;
-	if (dlp_OpenDB(fDBSocket, 0, dlpOpenReadWrite, info->name, &db) < 0)
-	{
-		WARNINGKPILOT << "Cannot open database on handheld." << endl;
-		return;
-	}
-	setDBHandle(db);
-	setDBOpen(true);
-}
-
-PilotSerialDatabase::~PilotSerialDatabase()
-{
-	FUNCTIONSETUP;
-	closeDatabase();
-}
-
-TQString PilotSerialDatabase::dbPathName() const
-{
-	TQString s = CSL1("Pilot:");
-	s.append(fDBName);
-	return s;
-}
-
-// Reads the application block info
-int PilotSerialDatabase::readAppBlock(unsigned char *buffer, int maxLen)
-{
-	FUNCTIONSETUP;
-	if (!isOpen())
-	{
-		WARNINGKPILOT << "DB not open" << endl;
-		return -1;
-	}
-	pi_buffer_t *buf = pi_buffer_new(maxLen);
-	int r = dlp_ReadAppBlock(fDBSocket, getDBHandle(), 0 /* offset */, maxLen, buf);
-	if (r>=0)
-	{
-		memcpy(buffer, buf->data, KMAX(maxLen, r));
-	}
-	pi_buffer_free(buf);
-	return r;
-}
-
-// Writes the application block info.
-int PilotSerialDatabase::writeAppBlock(unsigned char *buffer, int len)
-{
-	FUNCTIONSETUP;
-	if (!isOpen())
-	{
-		WARNINGKPILOT << "DB not open" << endl;
-		return -1;
-	}
-	return dlp_WriteAppBlock(fDBSocket, getDBHandle(), buffer, len);
-}
-
-	// returns the number of records in the database
-unsigned int PilotSerialDatabase::recordCount() const
-{
-	int idlen;
-	// dlp_ReadOpenDBInfo returns the number of bytes read and sets idlen to the # of recs
-	if (isOpen() && dlp_ReadOpenDBInfo(fDBSocket, getDBHandle(), &idlen)>0)
-	{
-		return idlen;
-	}
-	else
-	{
-		return 0;
-	}
-}
-
-
-// Returns a TQValueList of all record ids in the database.
-TQValueList<recordid_t> PilotSerialDatabase::idList()
-{
-	TQValueList<recordid_t> idlist;
-	int idlen=recordCount();
-	if (idlen<=0) return idlist;
-
-	recordid_t *idarr=new recordid_t[idlen];
-	int idlenread;
-	int r = dlp_ReadRecordIDList (fDBSocket, getDBHandle(), 0, 0, idlen, idarr, &idlenread);
-
-	if ( (r<0) || (idlenread<1) )
-	{
-		WARNINGKPILOT << "Failed to read ID list from database." << endl;
-		return idlist;
-	}
-
-	// now create the QValue list from the idarr:
-	for (idlen=0; idlen<idlenread; idlen++)
-	{
-		idlist.append(idarr[idlen]);
-	}
-	delete[] idarr;
-	return idlist;
-}
-
-
-// Reads a record from database by id, returns record length
-PilotRecord *PilotSerialDatabase::readRecordById(recordid_t id)
-{
-	FUNCTIONSETUPL(3);
-	int index, attr, category;
-
-	if (!isOpen())
-	{
-		WARNINGKPILOT << "DB not open" << endl;
-		return 0L;
-	}
-	if (id>0xFFFFFF)
-	{
-		WARNINGKPILOT <<  "Encountered an invalid record id "
-			<< id << endl;
-		return 0L;
-	}
-	pi_buffer_t *b = pi_buffer_new(InitialBufferSize);
-	if (dlp_ReadRecordById(fDBSocket,getDBHandle(),id,b,&index,&attr,&category) >= 0)
-	{
-		return new PilotRecord(b, attr, category, id);
-	}
-	return 0L;
-}
-
-// Reads a record from database, returns the record length
-PilotRecord *PilotSerialDatabase::readRecordByIndex(int index)
-{
-	FUNCTIONSETUPL(3);
-
-	if (!isOpen())
-	{
-		WARNINGKPILOT << "DB not open" << endl;
-		return 0L;
-	}
-
-	int attr, category;
-	recordid_t id;
-	PilotRecord *rec = 0L;
-
-	pi_buffer_t *b = pi_buffer_new(InitialBufferSize);
-	if (dlp_ReadRecordByIndex(fDBSocket, getDBHandle(), index,
-		b, &id, &attr, &category) >= 0)
-	{
-		rec = new PilotRecord(b, attr, category, id);
-	}
-
-
-	return rec;
-}
-
-// Reads the next record from database in category 'category'
-PilotRecord *PilotSerialDatabase::readNextRecInCategory(int category)
-{
-	FUNCTIONSETUP;
-	int index, attr;
-	recordid_t id;
-
-	if (!isOpen())
-	{
-		WARNINGKPILOT << "DB not open" << endl;
-		return 0L;
-	}
-	pi_buffer_t *b = pi_buffer_new(InitialBufferSize);
-	if (dlp_ReadNextRecInCategory(fDBSocket, getDBHandle(),
-		category,b,&id,&index,&attr) >= 0)
-		return new PilotRecord(b, attr, category, id);
-	return 0L;
-}
-
-// Reads the next record from database that has the dirty flag set.
-PilotRecord *PilotSerialDatabase::readNextModifiedRec(int *ind)
-{
-	FUNCTIONSETUP;
-	int index, attr, category;
-	recordid_t id;
-
-	if (!isOpen())
-	{
-		WARNINGKPILOT << "DB not open" << endl;
-		return 0L;
-	}
-	pi_buffer_t *b = pi_buffer_new(InitialBufferSize);
-	if (dlp_ReadNextModifiedRec(fDBSocket, getDBHandle(), b, &id, &index, &attr, &category) >= 0)
-	{
-		if (ind) *ind=index;
-		return new PilotRecord(b, attr, category, id);
-	}
-	return 0L;
-}
-
-// Writes a new record to database (if 'id' == 0 or id>0xFFFFFF, one will be assigned and returned in 'newid')
-recordid_t PilotSerialDatabase::writeRecord(PilotRecord * newRecord)
-{
-	FUNCTIONSETUP;
-	recordid_t newid;
-	int success;
-
-	if (!isOpen())
-	{
-		WARNINGKPILOT << "DB not open" << endl;
-		return 0;
-	}
-	// Do some sanity checking to prevent invalid UniqueIDs from being written
-	// to the handheld (RecordIDs are only 3 bytes!!!). Under normal conditions
-	// this check should never yield true, so write out an error to indicate
-	// someone messed up full time...
-	if (newRecord->id()>0xFFFFFF)
-	{
-		WARNINGKPILOT << "Encountered an invalid record id "
-			<< newRecord->id() << ", resetting it to zero." << endl;
-		newRecord->setID(0);
-	}
-	success =
-		dlp_WriteRecord(fDBSocket, getDBHandle(),
-		newRecord->attributes(), newRecord->id(),
-		newRecord->category(), newRecord->data(),
-		newRecord->size(), &newid);
-	if ( (newRecord->id() != newid) && (newid!=0) )
-		newRecord->setID(newid);
-	return newid;
-}
-
-// Deletes a record with the given recordid_t from the database, or all records, if all is set to true. The recordid_t will be ignored in this case
-int PilotSerialDatabase::deleteRecord(recordid_t id, bool all)
-{
-	FUNCTIONSETUP;
-	if (!isOpen())
-	{
-		WARNINGKPILOT <<"DB not open"<<endl;
-		return -1;
-	}
-	return dlp_DeleteRecord(fDBSocket, getDBHandle(), all?1:0, id);
-}
-
-
-// Resets all records in the database to not dirty.
-int PilotSerialDatabase::resetSyncFlags()
-{
-	FUNCTIONSETUP;
-	if (!isOpen())
-	{
-		WARNINGKPILOT << "DB not open" << endl;
-		return -1;
-	}
-	return dlp_ResetSyncFlags(fDBSocket, getDBHandle());
-}
-
-// Resets next record index to beginning
-int PilotSerialDatabase::resetDBIndex()
-{
-	FUNCTIONSETUP;
-	if (!isOpen())
-	{
-		WARNINGKPILOT << "DB not open" << endl;
-		return -1;
-	}
-	return dlp_ResetDBIndex(fDBSocket, getDBHandle());
-}
-
-// Purges all Archived/Deleted records from Palm Pilot database
-int PilotSerialDatabase::cleanup()
-{
-	FUNCTIONSETUP;
-	if (!isOpen())
-	{
-		WARNINGKPILOT << "DB not open" << endl;
-		return -1;
-	}
-	return dlp_CleanUpDatabase(fDBSocket, getDBHandle());
-}
-
-void PilotSerialDatabase::openDatabase()
-{
-	FUNCTIONSETUP;
-	int db;
-
-	setDBOpen(false);
-
-	TQString s = getDBName();
-	if (s.isEmpty())
-	{
-		WARNINGKPILOT << "Bad DB name, " << s << " string given." << endl;
-		return;
-	}
-
-	TQCString encodedName = TQFile::encodeName(s);
-	if (encodedName.isEmpty())
-	{
-		WARNINGKPILOT << "Bad DB name, "
-			<< (encodedName.isNull() ? "null" : "empty")
-			<< " string given."
-			<< endl;
-		return;
-	}
-
-	char encodedNameBuffer[PATH_MAX];
-	strlcpy(encodedNameBuffer,(const char *)encodedName,PATH_MAX);
-
-	DEBUGKPILOT << fname << ": opening database: [" 
-		<< encodedNameBuffer << "]" << endl;
-
-	if (dlp_OpenDB(fDBSocket, 0, dlpOpenReadWrite,
-		encodedNameBuffer, &db) < 0)
-	{
-		WARNINGKPILOT << "Cannot open database on handheld." << endl;
-		return;
-	}
-	setDBHandle(db);
-	setDBOpen(true);
-}
-
-bool PilotSerialDatabase::createDatabase(long creator, long type, int cardno, int flags, int version)
-{
-	FUNCTIONSETUP;
-	int db;
-
-	// if the database is already open, we cannot create it again. How about completely resetting it? (i.e. deleting it and the createing it again)
-	if (isOpen()) return true;
-	// The latin1 seems ok, database names are latin1.
-	int res=dlp_CreateDB(fDBSocket,
-		creator, type, cardno, flags, version,
-		Pilot::toPilot(getDBName()), &db);
-	if (res<0) {
-		WARNINGKPILOT << "Cannot create database " << getDBName() << " on the handheld" << endl;
-		return false;
-	}
-	// TODO: Do I have to open it explicitly???
-	setDBHandle(db);
-	setDBOpen(true);
-	return true;
-}
-
-void PilotSerialDatabase::closeDatabase()
-{
-	FUNCTIONSETUP;
-	if (!isOpen() )
-	{
-		return;
-	}
-
-	DEBUGKPILOT << fname << ": Closing DB handle #" << getDBHandle() << endl;
-	dlp_CloseDB(fDBSocket, getDBHandle());
-	DEBUGKPILOT << fname << ": after closing" << endl;
-	setDBOpen(false);
-}
-
-int PilotSerialDatabase::deleteDatabase()
-{
-	FUNCTIONSETUP;
-
-	if (isOpen()) closeDatabase();
-
-	return dlp_DeleteDB(fDBSocket, 0, Pilot::toPilot(fDBName));
-}
-
-
-
-/* virtual */ PilotDatabase::DBType PilotSerialDatabase::dbType() const
-{
-	return eSerialDB;
-}
-
diff --git a/kpilot/lib/pilotSerialDatabase.h b/kpilot/lib/pilotSerialDatabase.h
deleted file mode 100644
index 1da2aaac..00000000
--- a/kpilot/lib/pilotSerialDatabase.h
+++ /dev/null
@@ -1,144 +0,0 @@
-#ifndef _KPILOT_PILOTSERIALDATABASE_H
-#define _KPILOT_PILOTSERIALDATABASE_H
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-** Copyright (C) 2006 Adriaan de Groot <groot@kde.org>
-**
-** See the .cc file for an explanation of what this file is for.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-
-#include "pilotDatabase.h"
-#include "pilotRecord.h"
-
-/** @file
-* Database class for a database on the pilot connected
-* via the serial port (ie: hot-sync cradle)
-*/
-
-class KPilotDeviceLink;
-
-/**
-* PilotSerialDatabase represents databases stored on the handheld
-* and accessed through the SLP / DLP protocol.
-*/
-class KDE_EXPORT PilotSerialDatabase : public PilotDatabase
-{
-friend class KPilotDeviceLink;
-protected:
-	PilotSerialDatabase( KPilotDeviceLink *l, const TQString &dbName );
-	PilotSerialDatabase( KPilotDeviceLink *l, const DBInfo *info );
-
-public:
-	virtual ~PilotSerialDatabase();
-
-	/** Reads the application block info, returns size */
-	virtual int readAppBlock(unsigned char* buffer, int maxLen);
-	/** Writes the application block info. */
-	virtual int writeAppBlock(unsigned char* buffer, int len);
-	/**  returns the number of records in the database, 0 if not open */
-	virtual unsigned int recordCount() const;
-	/** Returns a TQValueList of all record ids in the database. */
-	 virtual TQValueList<recordid_t> idList();
-	/** Reads a record from database by id, returns record length */
-	virtual PilotRecord* readRecordById(recordid_t id);
-	/** Reads a record from database, returns the record length */
-	virtual PilotRecord* readRecordByIndex(int index);
-	/** Reads the next record from database in category 'category' */
-	virtual PilotRecord* readNextRecInCategory(int category);
-	/**
-	* Reads the next record from database that has the dirty flag set.
-	* ind (if a valid pointer is given) will receive the index of the
-	* returned record.
-	*/
-	virtual PilotRecord* readNextModifiedRec(int *ind=NULL);
-
-	/**
-	* Writes a new record to database (if 'id' == 0, one will be
-	* assigned to newRecord)
-	*/
-	virtual recordid_t writeRecord(PilotRecord* newRecordb);
-
-	/**
-	* Deletes a record with the given recordid_t from the database,
-	* or all records, if all is set to true. The recordid_t will be
-	* ignored in this case. Return value is negative on error, 0 otherwise.
-	*/
-	virtual int deleteRecord(recordid_t id, bool all=false);
-	/** Resets all records in the database to not dirty. */
-	virtual int resetSyncFlags();
-	/** Resets next record index to beginning */
-	virtual int resetDBIndex();
-	/** Purges all Archived/Deleted records from Palm Pilot database */
-	virtual int cleanup();
-
-	virtual TQString dbPathName() const;
-
-	/**
-	* Deletes the database (by name, as given in the constructor and
-	* stored in the fDBName field).
-	*/
-	virtual int deleteDatabase();
-
-	/**
-	* Creates the database with the given creator, type and flags on
-	* the given card (default is RAM). If the database already exists,
-	* this function does nothing.
-	*/
-	virtual bool createDatabase(long creator=0,
-		long type=0, int cardno=0, int flags=0, int version=0);
-	TQString getDBName() { return fDBName; }
-
-
-	virtual DBType dbType() const;
-
-protected:
-	virtual void openDatabase();
-	virtual void closeDatabase();
-	/** Returns the file handle used to communicate with the handheld.
-	*   This is an internal value to be passed to DLP functions.
-	*/
-	int getDBHandle() const
-	{
-		return fDBHandle;
-	}
-
-
-private:
-	void setDBHandle(int handle) { fDBHandle = handle; }
-
-	TQString     fDBName;
-	int         fDBHandle;
-	int         fDBSocket;
-	// Pilot-link 0.12 allocates buffers as needed and resizes them.
-	// Start with a buffer that is _probably_ big enough for most
-	// PIM records, but much smaller than the 64k that we use otherwise.
-	// Might want to add algorithm for trying to optimize the initial
-	// allocation for a given database.
-	static const int InitialBufferSize = 2048;
-};
-
-#endif
diff --git a/kpilot/lib/pilotSysInfo.h b/kpilot/lib/pilotSysInfo.h
deleted file mode 100644
index 4deb4f1b..00000000
--- a/kpilot/lib/pilotSysInfo.h
+++ /dev/null
@@ -1,144 +0,0 @@
-#ifndef _KPILOT_SYSINFO_H
-#define _KPILOT_SYSINFO_H
-/* sysInfo.h			KPilot
-**
-** Copyright (C) 2003 by Reinhold Kainhofer
-**
-** Wrapper for pilot-link's SysInfo Structure
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include <pi-version.h>
-#include <pi-dlp.h>
-
-
-
-class KPilotSysInfo
-{
-public:
-	/** Constructor. Create an empty SysInfo structure. */
-	KPilotSysInfo() 
-	{
-		::memset(&fSysInfo,0,sizeof(struct SysInfo)); 
-	}
-
-	/** Constructor. Copy an existing pilot-link SysInfo structure. 
-	 *  Ownership is not changed. @p sys_info may be NULL.
-	 */ 
-	KPilotSysInfo(const SysInfo *sys_info) 
-	{
-		::memset(&fSysInfo,0,sizeof(struct SysInfo)); 
-		if (sys_info)
-		{
-			fSysInfo = *sys_info;
-		}
-	}
-
-	/** Access to the raw SysInfo structure. */
-	SysInfo *sysInfo()
-	{
-		return &fSysInfo;
-	}
-
-	/** Get the ROM version of the handheld. This is a pilot-link
-	 *  long value (4 bytes) with major, minor, bugfix version
-	 *  numbers encoded in the value.
-	 */
-	const unsigned long getRomVersion() const 
-	{
-		return fSysInfo.romVersion;
-	}
-
-	/** Get the locale number of the handheld. 
-	 *  @note I do not know what this means.
-	 */
-	const unsigned long getLocale() const 
-	{
-		return fSysInfo.locale;
-	}
-	/** Set the locale number of the handheld.
-	 *  @note I do not know what this means.
-	 */
-	void setLocale(unsigned long newval)
-	{
-		fSysInfo.locale=newval;
-	}
-
-	/** Get the length (in bytes) of the ProductID string. */
-	const int getProductIDLength() const
-	{
-		return fSysInfo.prodIDLength;
-	}
-	/** Get the ProductID string from the handheld. This is
-	 *  guaranteed to be NUL terminated.
-	 */
-	const char* getProductID() const
-	{
-		return fSysInfo.prodID;
-	}
-
-	/** Accessor for the major version of the DLP protocol in use. */
-	const unsigned short getMajorVersion() const 
-	{
-		return fSysInfo.dlpMajorVersion;
-	}
-	/** Accessor for the minor version of the DLP protocol in use. */
-	const unsigned short getMinorVersion() const 
-	{
-		return fSysInfo.dlpMinorVersion;
-	}
-
-	/** Accessor for the major compatibility version of the handheld.
-	 *  @note I do not know what this means.
-	 */
-	const unsigned short getCompatMajorVersion() const 
-	{
-		return fSysInfo.compatMajorVersion;
-	}
-	/** Accessor for the minor compatibility version of the handheld.
-	 *  @note I do not know what this means.
-	 */
-	const unsigned short getCompatMinorVersion() const 
-	{
-		return fSysInfo.compatMinorVersion;
-	}
-
-
-	/** Returns the maximum record size that the handheld supports.
-	 *  Normally this is 65524 or so (which means that larger values
-	 *  don't necessarily @em fit in a short).
-	 */
-	const unsigned short getMaxRecSize() const 
-	{
-		return fSysInfo.maxRecSize;
-	}
-
-private:
-	struct SysInfo fSysInfo;
-};
-
-#endif
diff --git a/kpilot/lib/pilotTodoEntry.cc b/kpilot/lib/pilotTodoEntry.cc
deleted file mode 100644
index 1ed9dfa7..00000000
--- a/kpilot/lib/pilotTodoEntry.cc
+++ /dev/null
@@ -1,270 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This is a C++ wrapper for the todo-list entry structures.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-#include "options.h"
-
-
-#include <stdlib.h>
-
-#include <tqdatetime.h>
-#include <tqnamespace.h>
-
-#include <kglobal.h>
-#include <kdebug.h>
-
-
-#include "pilotTodoEntry.h"
-
-
-PilotTodoEntry::PilotTodoEntry() :
-	fDescriptionSize(0),
-	fNoteSize(0)
-{
-	FUNCTIONSETUP;
-	::memset(&fTodoInfo, 0, sizeof(struct ToDo));
-}
-
-PilotTodoEntry::PilotTodoEntry(PilotRecord * rec) :
-	PilotRecordBase(rec),
-	fDescriptionSize(0),
-	fNoteSize(0)
-{
-	::memset(&fTodoInfo, 0, sizeof(struct ToDo));
-	if (rec)
-	{
-		pi_buffer_t b;
-		b.data = (unsigned char *) rec->data();
-		b.allocated = b.used = rec->size();
-		unpack_ToDo(&fTodoInfo, &b, todo_v1);
-		if (fTodoInfo.description)
-		{
-			// Assume size of buffer allocated is just large enough;
-			// count trailing NUL as well.
-			fDescriptionSize = strlen(fTodoInfo.description)+1;
-		}
-		if (fTodoInfo.note)
-		{
-			// Same
-			fNoteSize = strlen(fTodoInfo.note)+1;
-		}
-	}
-
-}
-
-
-PilotTodoEntry::PilotTodoEntry(const PilotTodoEntry & e) :
-	PilotRecordBase( &e ),
-	fDescriptionSize(0),
-	fNoteSize(0)
-{
-	FUNCTIONSETUP;
-	::memcpy(&fTodoInfo, &e.fTodoInfo, sizeof(fTodoInfo));
-	// See PilotDateEntry::operator = for details
-	fTodoInfo.description = 0L;
-	fTodoInfo.note = 0L;
-
-	setDescriptionP(e.getDescriptionP());
-	setNoteP(e.getNoteP());
-}
-
-
-PilotTodoEntry & PilotTodoEntry::operator = (const PilotTodoEntry & e)
-{
-	if (this != &e)
-	{
-		KPILOT_FREE(fTodoInfo.description);
-		KPILOT_FREE(fTodoInfo.note);
-
-		::memcpy(&fTodoInfo, &e.fTodoInfo, sizeof(fTodoInfo));
-		// See PilotDateEntry::operator = for details
-		fTodoInfo.description = 0L;
-		fTodoInfo.note = 0L;
-		fDescriptionSize = 0;
-		fNoteSize = 0;
-
-		setDescriptionP(e.getDescriptionP());
-		setNoteP(e.getNoteP());
-
-	}
-
-	return *this;
-}
-
-TQString PilotTodoEntry::getTextRepresentation(Qt::TextFormat richText)
-{
-	TQString text, tmp;
-	TQString par = (richText==Qt::RichText) ?CSL1("<p>"): TQString();
-	TQString ps = (richText==Qt::RichText) ?CSL1("</p>"):CSL1("\n");
-	TQString br = (richText==Qt::RichText) ?CSL1("<br/>"):CSL1("\n");
-
-	// title + name
-	text += par;
-	tmp= (richText==Qt::RichText) ?CSL1("<b><big>%1</big></b>"):CSL1("%1");
-	text += tmp.arg(rtExpand(getDescription(), richText));
-	text += ps;
-
-	text += par;
-	if (getComplete())
-		text += i18n("Completed");
-	else
-		text += i18n("Not completed");
-	text += ps;
-
-	if (!getIndefinite())
-	{
-		TQDate dt(readTm(getDueDate()).date());
-		TQString dueDate(dt.toString(Qt::LocalDate));
-		text+=par;
-		text+=i18n("Due date: %1").arg(dueDate);
-		text+=ps;
-	}
-
-	text+=par;
-	text+=ps;
-
-	text+=par;
-	text+=i18n("Priority: %1").arg(getPriority());
-	text+=ps;
-
-	if (!getNote().isEmpty())
-	{
-		text += (richText==Qt::RichText) ?CSL1("<hr/>"):CSL1("-------------------------\n");
-		text+=par;
-		text+= (richText==Qt::RichText) ?i18n("<b><em>Note:</em></b><br>"):i18n("Note:\n");
-		text+=rtExpand(getNote(), richText);
-		text+=ps;
-	}
-
-	return text;
-}
-
-PilotRecord *PilotTodoEntry::pack() const
-{
-	int i;
-
-	pi_buffer_t *b = pi_buffer_new( sizeof(fTodoInfo) );
-	i = pack_ToDo(const_cast<ToDo_t *>(&fTodoInfo), b, todo_v1);
-	if (i<0)
-	{
-		return 0;
-	}
-	// pack_ToDo sets b->used
-	return new PilotRecord( b, this );
-}
-
-void PilotTodoEntry::setDescription(const TQString &desc)
-{
-	if (desc.length() < fDescriptionSize)
-	{
-		Pilot::toPilot(desc, fTodoInfo.description, fDescriptionSize);
-	}
-	else
-	{
-		setDescriptionP(Pilot::toPilot(desc),desc.length());
-	}
-}
-
-void PilotTodoEntry::setDescriptionP(const char *desc, int len)
-{
-	KPILOT_FREE(fTodoInfo.description);
-	if (desc && *desc)
-	{
-		if (-1 == len)
-		{
-			len=::strlen(desc);
-		}
-
-		fDescriptionSize = len+1;
-		fTodoInfo.description = (char *)::malloc(len + 1);
-		if (fTodoInfo.description)
-		{
-			strncpy(fTodoInfo.description, desc, len);
-			fTodoInfo.description[len] = 0;
-		}
-		else
-		{
-			WARNINGKPILOT << "malloc() failed, description not set"
-				<< endl;
-		}
-	}
-	else
-	{
-		fTodoInfo.description = 0L;
-	}
-}
-
-TQString PilotTodoEntry::getDescription() const
-{
-	return Pilot::fromPilot(getDescriptionP());
-}
-
-void PilotTodoEntry::setNote(const TQString &note)
-{
-	if (note.length() < fNoteSize)
-	{
-		Pilot::toPilot(note, fTodoInfo.note, fNoteSize);
-	}
-	else
-	{
-		setNoteP(Pilot::toPilot(note),note.length());
-	}
-}
-
-void PilotTodoEntry::setNoteP(const char *note, int len)
-{
-	KPILOT_FREE(fTodoInfo.note);
-	if (note && *note)
-	{
-		if (-1 == len)
-		{
-			len=::strlen(note);
-		}
-
-		fNoteSize = len+1;
-		fTodoInfo.note = (char *)::malloc(len + 1);
-		if (fTodoInfo.note)
-		{
-			strncpy(fTodoInfo.note, note, len);
-			fTodoInfo.note[len] = 0;
-		}
-		else
-		{
-			WARNINGKPILOT << "malloc() failed, note not set" << endl;
-		}
-	}
-	else
-	{
-		fTodoInfo.note = 0L;
-	}
-}
-
-TQString PilotTodoEntry::getNote() const
-{
-	return Pilot::fromPilot(getNoteP());
-}
-
diff --git a/kpilot/lib/pilotTodoEntry.h b/kpilot/lib/pilotTodoEntry.h
deleted file mode 100644
index 020912f9..00000000
--- a/kpilot/lib/pilotTodoEntry.h
+++ /dev/null
@@ -1,166 +0,0 @@
-#ifndef _KPILOT_PILOTTODOENTRY_H
-#define _KPILOT_PILOTTODOENTRY_H
-/* pilotTodoEntry.h	-*- C++ -*-		KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This is a wrapper around the pilot-link Memo structure. It is
-** the interpreted form of a Pilot database record.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <time.h>
-
-#include <pi-macros.h>
-#include <pi-todo.h>
-
-#include <tqnamespace.h>
-#include <tqstring.h>
-
-#include "pilotRecord.h"
-#include "pilotAppInfo.h"
-
-/** @file This file defines structures wrapped around the ToDo database
-* on the Pilot, based on pilot-link's ToDo stuff.
-*/
-
-/** A decoded ToDo item. */
-class KDE_EXPORT PilotTodoEntry : public PilotRecordBase
-{
-public:
-	/** Create an empty ToDo item. All attributes are 0. */
-	PilotTodoEntry();
-
-	/**
-	* Constructor. Create a ToDo item and fill it with data from the
-	* uninterpreted record @p rec. The record may be NULL, in which
-	* case the todo is empty and its category and ID are zero, as in
-	* the constructor above.
-	*/
-	PilotTodoEntry(PilotRecord * rec);
-
-	/** Copy an existing ToDo item. */
-	PilotTodoEntry(const PilotTodoEntry &e);
-
-	/** Delete a ToDo item. */
-	~PilotTodoEntry()
-	{
-		free_ToDo(&fTodoInfo);
-	}
-
-	/** Return a string for the ToDo item. If @param richText is true, then
-	* use qt style markup to make the string clearer when displayed.
-	*/
-	TQString getTextRepresentation(Qt::TextFormat richText);
-
-	/** Assign an existing ToDo item to this one. */
-	PilotTodoEntry& operator=(const PilotTodoEntry &e);
-
-	/** Accessor for the Due Date of the ToDo item. */
-	struct tm getDueDate() const { return fTodoInfo.due; }
-
-	/** Set the Due Date for the ToDo item. */
-	void setDueDate(struct tm& d)
-	{
-		fTodoInfo.due = d;
-	}
-
-	/** Return the indefinite status of the ToDo (? that is, whether it
-	* had a Due Date that is relevant or not). Return values are 0
-	* (not indefinite) or non-0.
-	*/
-	int getIndefinite() const
-	{
-		return fTodoInfo.indefinite;
-	}
-
-	/** Set whether the ToDo is indefinite or not. */
-	void setIndefinite(int i)
-	{
-		fTodoInfo.indefinite = i;
-	}
-
-	/** Return the priority of the ToDo item. The priority ranges
-	* from 1-5 on the handheld, so this needs to be mapped (perhaps)
-	* onto KOrganizer's priority levels.
-	*/
-	int getPriority() const
-	{
-		return fTodoInfo.priority;
-	}
-
-	/** Set the priority of the ToDo. */
-	void setPriority(int p)
-	{
-		fTodoInfo.priority = p;
-	}
-
-	/** Return whether the ToDo is complete (done, finished) or not. */
-	int getComplete() const
-	{
-		return fTodoInfo.complete;
-	}
-
-	/** Set whether the ToDo is done. */
-	void setComplete(int c)
-	{
-		fTodoInfo.complete = c;
-	}
-
-	/** Get the ToDo item's description (which is the title shown on
-	* the handheld, and the item's Title in KDE). This uses the default codec.
-	*/
-	TQString getDescription() const;
-	/** Set the ToDo item's description. */
-	void  setDescription(const TQString &);
-
-	/** Get the ToDo item's note (the longer text, not immediately accessible
-	* on the handheld). This uses the default codec.
-	*/
-	TQString getNote() const;
-
-	/** Set the ToDo item's note. */
-	void  setNote(const TQString &note);
-
-	/** Returns the label for the category this ToDo item is in. */
-	TQString getCategoryLabel() const;
-
-	PilotRecord *pack() const;
-
-protected:
-	const char *getDescriptionP() const { return fTodoInfo.description; } ;
-	void setDescriptionP(const char *, int len=-1) ;
-	const char *getNoteP() const { return fTodoInfo.note; } ;
-	void setNoteP(const char *, int len=-1) ;
-
-private:
-	struct ToDo fTodoInfo;
-	unsigned int fDescriptionSize, fNoteSize;
-};
-
-typedef PilotAppInfo<ToDoAppInfo,unpack_ToDoAppInfo, pack_ToDoAppInfo> PilotToDoInfo;
-
-
-#endif
-
diff --git a/kpilot/lib/pilotUser.h b/kpilot/lib/pilotUser.h
deleted file mode 100644
index f7e17489..00000000
--- a/kpilot/lib/pilotUser.h
+++ /dev/null
@@ -1,128 +0,0 @@
-#ifndef _KPILOT_PILOTUSER_H
-#define _KPILOT_PILOTUSER_H
-/* pilotUser.h			KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-**
-** Wrapper for the PilotUser struct from pilot-link, which describes
-** the user-data set in the Pilot.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include <pi-dlp.h>
-
-#include "pilot.h"
-
-class KPilotUser
-{
-public:
-	/** Constructor. Create an empty PilotUser structure. */
-	KPilotUser()
-	{
-		::memset(&fUser,0,sizeof(struct PilotUser));
-	}
-	/** Constructor. Use the given PilotUser structure.
-	*  This creates a copy; no ownership is transferred.
-	*/
-	KPilotUser(const PilotUser *user)
-	{
-		fUser = *user;
-	}
-
-	/** Accessor for the whole PilotUser structure. */
-	PilotUser *data()
-	{
-		return &fUser;
-	}
-
-	/** @return The username set on the handheld. */
-	TQString name() const
-	{
-		return Pilot::fromPilot( fUser.username );
-	}
-	/** Set the user name to the given @p name , truncated
-	*  if necessary to the size of the field on the handheld.
-	*/
-	void setName( const TQString &name )
-	{
-		Pilot::toPilot( name, fUser.username, sizeof(fUser.username) );
-	}
-
-	/** @return The length of the password on the handheld,
-	*           in bytes.
-	*/
-	const int passwordLength() const
-	{
-		return fUser.passwordLength;
-	}
-
-	/** @return the ID (4 bytes) of the last PC to sync this handheld.
-	 *          This is intended to help identify when the use has
-	 *          changed PCs and needs a new full sync.
-	 */
-	unsigned long getLastSyncPC() const
-	{
-		return fUser.lastSyncPC;
-	}
-	/** Set the ID of the PC syncing the handheld to @p pc . This
-	 *  should be unique in some way (perhaps IP addresses can be
-	 *  used this way, or hostnames).
-	 */
-	void setLastSyncPC(unsigned long pc)
-	{
-		fUser.lastSyncPC = pc;
-	}
-
-	/** @return the timestamp that the handheld was last synced
-	 *  successfully.
-	 */
-	time_t getLastSuccessfulSyncDate()
-	{
-		return fUser.successfulSyncDate;
-	}
-	/** Set the timestamp for a successful sync. */
-	void setLastSuccessfulSyncDate(time_t when)
-	{
-		fUser.successfulSyncDate = when;
-	}
-
-	/** @return the timestamp of the last sync attempt. */
-	time_t getLastSyncDate()
-	{
-		return fUser.lastSyncDate;
-	}
-	/** Set the timestamp of the sync attempt. */
-	void setLastSyncDate(time_t when)
-	{
-		fUser.lastSyncDate = when;
-	}
-
-private:
-	struct PilotUser fUser;
-};
-
-#endif
diff --git a/kpilot/lib/plugin.cc b/kpilot/lib/plugin.cc
deleted file mode 100644
index 128c8ba9..00000000
--- a/kpilot/lib/plugin.cc
+++ /dev/null
@@ -1,760 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-** This file defines the base class of all KPilot conduit plugins configuration
-** dialogs. This is necessary so that we have a fixed API to talk to from
-** inside KPilot.
-**
-** The factories used by KPilot plugins are also documented here.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <stdlib.h>
-
-#include <tqdir.h>
-#include <tqfileinfo.h>
-#include <tqhbox.h>
-#include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqpushbutton.h>
-#include <tqregexp.h>
-#include <tqstringlist.h>
-#include <tqtabwidget.h>
-#include <tqtextview.h>
-#include <tqtimer.h>
-
-#include <dcopclient.h>
-#include <kaboutapplication.h>
-#include <kactivelabel.h>
-#include <kapplication.h>
-#include <kglobal.h>
-#include <kiconloader.h>
-#include <kinstance.h>
-#include <klibloader.h>
-#include <kmessagebox.h>
-#include <kservice.h>
-#include <kservicetype.h>
-#include <kstandarddirs.h>
-
-#include "pilotSerialDatabase.h"
-#include "pilotLocalDatabase.h"
-
-#include "plugin.moc"
-
-ConduitConfigBase::ConduitConfigBase(TQWidget *parent,
-	const char *name) :
-	TQObject(parent,name),
-	fModified(false),
-	fWidget(0L),
-	fConduitName(i18n("Unnamed"))
-{
-	FUNCTIONSETUP;
-}
-
-ConduitConfigBase::~ConduitConfigBase()
-{
-	FUNCTIONSETUP;
-}
-
-/* slot */ void ConduitConfigBase::modified()
-{
-	fModified=true;
-	emit changed(true);
-}
-
-/* virtual */ TQString ConduitConfigBase::maybeSaveText() const
-{
-	FUNCTIONSETUP;
-
-	return i18n("<qt>The <i>%1</i> conduit's settings have been changed. Do you "
-		"want to save the changes before continuing?</qt>").arg(this->conduitName());
-}
-
-/* virtual */ bool ConduitConfigBase::maybeSave()
-{
-	FUNCTIONSETUP;
-
-	if (!isModified()) return true;
-
-	int r = KMessageBox::questionYesNoCancel(fWidget,
-		maybeSaveText(),
-		i18n("%1 Conduit").arg(this->conduitName()), KStdGuiItem::save(), KStdGuiItem::discard());
-	if (r == KMessageBox::Cancel) return false;
-	if (r == KMessageBox::Yes) commit();
-	return true;
-}
-
-TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad)
-{
-	FUNCTIONSETUP;
-
-	TQWidget *w = new TQWidget(parent, "aboutpage");
-
-	TQString s;
-	TQLabel *text;
-	KIconLoader *l = KGlobal::iconLoader();
-	const KAboutData *p = ad ? ad : KGlobal::instance()->aboutData();
-
-	TQGridLayout *grid = new TQGridLayout(w, 5, 4, SPACING);
-
-	grid->addColSpacing(0, SPACING);
-	grid->addColSpacing(4, SPACING);
-
-
-	TQPixmap applicationIcon =
-		l->loadIcon(TQString::fromLatin1(p->appName()),
-		KIcon::Desktop,
-		64, KIcon::DefaultState, 0L,
-		true);
-
-	if (applicationIcon.isNull())
-	{
-		applicationIcon = l->loadIcon(TQString::fromLatin1("kpilot"),
-			KIcon::Desktop);
-	}
-
-	text = new TQLabel(w);
-	// Experiment with a long non-<qt> string. Use that to find
-	// sensible widths for the columns.
-	//
-	text->setText(i18n("Send questions and comments to kdepim-users@kde.org"));
-	text->adjustSize();
-
-	int linewidth = text->size().width();
-	int lineheight = text->size().height();
-
-	// Use the label to display the applciation icon
-	text->setText(TQString::null);
-	text->setPixmap(applicationIcon);
-	text->adjustSize();
-	grid->addWidget(text, 0, 1);
-
-
-	KActiveLabel *linktext = new KActiveLabel(w);
-	grid->addRowSpacing(1,kMax(100,6*lineheight));
-	grid->addRowSpacing(2,kMax(100,6*lineheight));
-	grid->addColSpacing(2,SPACING+linewidth/2);
-	grid->addColSpacing(3,SPACING+linewidth/2);
-	grid->setRowStretch(1,50);
-	grid->setRowStretch(2,50);
-	grid->setColStretch(2,50);
-	grid->setColStretch(3,50);
-	linktext->setMinimumSize(linewidth,kMax(260,60+12*lineheight));
-	linktext->setFixedHeight(kMax(260,60+12*lineheight));
-	linktext->setVScrollBarMode(TQScrollView::Auto/*AlwaysOn*/);
-	text = new TQLabel(w);
-	grid->addMultiCellWidget(text,0,0,2,3);
-	grid->addMultiCellWidget(linktext,1,2,1,3);
-
-	// Now set the program and copyright information.
-	s = CSL1("<qt><h3>");
-	s += p->programName();
-	s += ' ';
-	s += p->version();
-	s += CSL1("</h3>");
-	s += p->copyrightStatement() + CSL1("<br></qt>");
-	text->setText(s);
-
-	linktext->append(p->shortDescription() + CSL1("<br>"));
-
-	if (!p->homepage().isEmpty())
-	{
-		s = TQString::null;
-		s += CSL1("<a href=\"%1\">").arg(p->homepage());
-		s += p->homepage();
-		s += CSL1("</a><br>");
-		linktext->append(s);
-	}
-
-	s = TQString::null;
-	s += i18n("Send questions and comments to <a href=\"mailto:%1\">%2</a>.")
-		.arg( CSL1("kdepim-users@kde.org") )
-		.arg( CSL1("kdepim-users@kde.org") );
-	s += ' ';
-	s += i18n("Send bug reports to <a href=\"mailto:%1\">%2</a>.")
-		.arg(p->bugAddress())
-		.arg(p->bugAddress());
-	s += ' ';
-	s += i18n("For trademark information, see the "
-		"<a href=\"help:/kpilot/trademarks.html\">KPilot User's Guide</a>.");
-	s += CSL1("<br>");
-	linktext->append(s);
-	linktext->append(TQString::null);
-
-
-
-	TQValueList<KAboutPerson> pl = p->authors();
-	TQValueList<KAboutPerson>::ConstIterator i;
-
-	s = i18n("<b>Authors:</b> ");
-
-	TQString comma = CSL1(", ");
-
-	unsigned int count=1;
-	for (i=pl.begin(); i!=pl.end(); ++i)
-	{
-		s.append(CSL1("%1 (<i>%2</i>)%3")
-			.arg((*i).name())
-			.arg((*i).task())
-			.arg(count<pl.count() ? comma : TQString::null)
-			);
-		count++;
-	}
-	linktext->append(s);
-
-	s = TQString::null;
-	pl = p->credits();
-	if (pl.count()>0)
-	{
-		count=1;
-		s.append(i18n("<b>Credits:</b> "));
-		for (i=pl.begin(); i!=pl.end(); ++i)
-		{
-			s.append(CSL1("%1 (<i>%2</i>)%3")
-				.arg((*i).name())
-				.arg((*i).task())
-				.arg(count<pl.count() ? comma : TQString::null)
-				);
-			count++;
-		}
-	}
-	linktext->append(s);
-	linktext->ensureVisible(0,0);
-
-	w->adjustSize();
-
-	return w;
-}
-
-/* static */ void ConduitConfigBase::addAboutPage(TQTabWidget *tw,
-	KAboutData *ad)
-{
-	FUNCTIONSETUP;
-
-	Q_ASSERT(tw);
-
-	TQWidget *w = aboutPage(tw,ad);
-	TQSize sz = w->size();
-
-	if (sz.width() < tw->size().width())
-	{
-		sz.setWidth(tw->size().width());
-	}
-	if (sz.height() < tw->size().height())
-	{
-		sz.setHeight(tw->size().height());
-	}
-
-	tw->resize(sz);
-	tw->addTab(w, i18n("About"));
-	tw->adjustSize();
-}
-
-
-
-ConduitAction::ConduitAction(KPilotLink *p,
-	const char *name,
-	const TQStringList &args) :
-	SyncAction(p,name),
-	fDatabase(0L),
-	fLocalDatabase(0L),
-	fCtrHH(0L),
-	fCtrPC(0L), 
-	fSyncDirection(args),
-	fConflictResolution(SyncAction::eAskUser),
-	fFirstSync(false)
-{
-	FUNCTIONSETUP;
-
-	TQString cResolution(args.grep(TQRegExp(CSL1("--conflictResolution \\d*"))).first());
-	if (cResolution.isEmpty())
-	{
-		fConflictResolution=(SyncAction::ConflictResolution)
-			cResolution.replace(TQRegExp(CSL1("--conflictResolution (\\d*)")), CSL1("\\1")).toInt();
-	}
-
-	for (TQStringList::ConstIterator it = args.begin();
-		it != args.end();
-		++it)
-	{
-		DEBUGKPILOT << fname << ": " << *it << endl;
-	}
-
-	DEBUGKPILOT << fname << ": Direction=" << fSyncDirection.name() << endl;
-	fCtrHH = new CUDCounter(i18n("Handheld"));
-	fCtrPC = new CUDCounter(i18n("PC")); 
-}
-
-/* virtual */ ConduitAction::~ConduitAction()
-{
-	FUNCTIONSETUP;
-	
-	KPILOT_DELETE(fDatabase);
-	KPILOT_DELETE(fLocalDatabase);
-
-	KPILOT_DELETE(fCtrHH);
-	KPILOT_DELETE(fCtrPC);
-}
-
-bool ConduitAction::openDatabases(const TQString &name, bool *retrieved)
-{
-	FUNCTIONSETUP;
-
-	DEBUGKPILOT << fname
-		<< ": Trying to open database "
-		<< name << endl;
-	DEBUGKPILOT << fname
-		<< ": Mode="
-		<< (syncMode().isTest() ? "test " : "")
-		<< (syncMode().isLocal() ? "local " : "")
-		<< endl ;
-
-	KPILOT_DELETE(fLocalDatabase);
-
-	TQString localPathName = PilotLocalDatabase::getDBPath() + name;
-
-	// we always want to use the conduits/ directory for our local
-	// databases. this keeps our backups and data that our conduits use
-	// for record keeping separate
-	localPathName.replace(CSL1("DBBackup/"), CSL1("conduits/"));
-
-	DEBUGKPILOT << fname << ": localPathName: [" << localPathName 
-		<< "]" << endl;
-
-	PilotLocalDatabase *localDB = new PilotLocalDatabase( localPathName );
-
-	if (!localDB)
-	{
-		WARNINGKPILOT << "Could not initialize object for local copy of database \""
-			<< name
-			<< "\"" << endl;
-		if (retrieved) *retrieved = false;
-		return false;
-	}
-
-	// if there is no backup db yet, fetch it from the palm, open it and set the full sync flag.
-	if (!localDB->isOpen() )
-	{
-		TQString dbpath(localDB->dbPathName());
-		KPILOT_DELETE(localDB);
-		DEBUGKPILOT << fname
-			<< ": Backup database " << dbpath
-			<< " not found." << endl;
-		struct DBInfo dbinfo;
-
-// TODO Extend findDatabase() with extra overload?
-		if (deviceLink()->findDatabase(Pilot::toPilot( name ), &dbinfo)<0 )
-		{
-			WARNINGKPILOT << "Could not get DBInfo for " << name << endl;
-			if (retrieved) *retrieved = false;
-			return false;
-		}
-
-		DEBUGKPILOT << fname
-				<< ": Found Palm database: " << dbinfo.name <<endl
-				<< fname << ": type = " << dbinfo.type
-				<< " creator = " << dbinfo.creator
-				<< " version = " << dbinfo.version
-				<< " index = " << dbinfo.index << endl;
-		dbinfo.flags &= ~dlpDBFlagOpen;
-
-		// make sure the dir for the backup db really exists!
-		TQFileInfo fi(dbpath);
-		TQString path(TQFileInfo(dbpath).dir(true).absPath());
-		if (!path.endsWith(CSL1("/"))) path.append(CSL1("/"));
-		if (!KStandardDirs::exists(path))
-		{
-			DEBUGKPILOT << fname << ": Trying to create path for database: <"
-				<< path << ">" << endl;
-			KStandardDirs::makeDir(path);
-		}
-		if (!KStandardDirs::exists(path))
-		{
-			DEBUGKPILOT << fname << ": Database directory does not exist." << endl;
-			if (retrieved) *retrieved = false;
-			return false;
-		}
-
-		if (!deviceLink()->retrieveDatabase(dbpath, &dbinfo) )
-		{
-			WARNINGKPILOT << "Could not retrieve database "
-				<< name << " from the handheld." << endl;
-			if (retrieved) *retrieved = false;
-			return false;
-		}
-		localDB = new PilotLocalDatabase( localPathName );
-		if (!localDB || !localDB->isOpen())
-		{
-			WARNINGKPILOT << "local backup of database " << name << " could not be initialized." << endl;
-			if (retrieved) *retrieved = false;
-			return false;
-		}
-		if (retrieved) *retrieved=true;
-	}
-	fLocalDatabase = localDB;
-
-	fDatabase = deviceLink()->database( name );
-
-	if (!fDatabase)
-	{
-		WARNINGKPILOT << "Could not open database \""
-			<< name
-			<< "\" on the pilot."
-			<< endl;
-	}
-	else
-	{
-		fCtrHH->setStartCount(fDatabase->recordCount());
-	}
-
-	return (fDatabase && fDatabase->isOpen() &&
-	        fLocalDatabase && fLocalDatabase->isOpen() );
-}
-
-
-bool ConduitAction::changeSync(SyncMode::Mode m)
-{
-	FUNCTIONSETUP;
-
-	if ( fSyncDirection.isSync() && SyncMode::eFullSync == m)
-	{
-		fSyncDirection.setMode(m);
-		return true;
-	}
-	return false;
-}
-
-void ConduitAction::finished()
-{
-	FUNCTIONSETUP;
-
-	if (fDatabase && fCtrHH)
-		fCtrHH->setEndCount(fDatabase->recordCount());
-
-	if (fCtrHH && fCtrPC) 
-	{
-		addSyncLogEntry(fCtrHH->moo() +"\n",false); 
-		DEBUGKPILOT << fname << ": " << fCtrHH->moo() << endl;
-		addSyncLogEntry(fCtrPC->moo() +"\n",false);
-		DEBUGKPILOT << fname << ": " << fCtrPC->moo() << endl;
-
-		// STEP2 of making sure we don't delete our little user's
-		// precious data...
-		// sanity checks for handheld...
-		int hhVolatility = fCtrHH->percentDeleted() + 
-				 fCtrHH->percentUpdated() +
-		    		 fCtrHH->percentCreated();
-
-		int pcVolatility = fCtrPC->percentDeleted() + 
-				 fCtrPC->percentUpdated() +
-		    		 fCtrPC->percentCreated();
-
-		// TODO: allow user to configure this...
-		// this is a percentage...
-		int allowedVolatility = 70;
-
-		TQString caption = i18n("Large Changes Detected");
-		// args are already i18n'd
-		TQString query = i18n("The %1 conduit has made a "
-			"large number of changes to your %2.  Do you want "
-			"to allow this change?\nDetails:\n\t%3");
-
-		if (hhVolatility > allowedVolatility)
-		{
-			query = query.arg(fConduitName)
-				.arg(fCtrHH->type()).arg(fCtrHH->moo());
-
-			DEBUGKPILOT << fname << ": Yikes, lots of volatility "
-				<< "caught.  Check with user: [" << query
-				<< "]." << endl;
-
-			/*
-			int rc = questionYesNo(query, caption,
-				TQString::null, 0 );
-			if (rc == KMessageBox::Yes)
-			{
-				// TODO: add commit and rollback code.
-				// note: this will require some thinking,
-				// since we have to undo changes to the
-				// pilot databases, changes to the PC
-				// resources, changes to the mappings files
-				// (record id mapping, etc.)
-			}
-			*/
-		}
-
-
-	}
-
-}
-
-
-ConduitProxy::ConduitProxy(KPilotLink *p,
-	const TQString &name,
-	const SyncAction::SyncMode &m) :
-	ConduitAction(p,name.latin1(),m.list()),
-	fDesktopName(name)
-{
-	FUNCTIONSETUP;
-}
-
-/* virtual */ bool ConduitProxy::exec()
-{
-	FUNCTIONSETUP;
-
-	// query that service
-	KSharedPtr < KService > o = KService::serviceByDesktopName(fDesktopName);
-	if (!o)
-	{
-		WARNINGKPILOT << "Can't find desktop file for conduit "
-			<< fDesktopName
-			<< endl;
-		addSyncLogEntry(i18n("Could not find conduit %1.").arg(fDesktopName));
-		return false;
-	}
-
-
-	// load the lib
-	fLibraryName = o->library();
-	DEBUGKPILOT << fname
-		<< ": Loading desktop "
-		<< fDesktopName
-		<< " with lib "
-		<< fLibraryName
-		<< endl;
-
-	KLibrary *library = KLibLoader::self()->library(
-		TQFile::encodeName(fLibraryName));
-	if (!library)
-	{
-		WARNINGKPILOT << "Can't load library "
-			<< fLibraryName
-			<< " - "
-			<< KLibLoader::self()->lastErrorMessage()
-			<< endl;
-		addSyncLogEntry(i18n("Could not load conduit %1.").arg(fDesktopName));
-		return false;
-	}
-
-	unsigned long version = PluginUtility::pluginVersion(library);
-	if ( Pilot::PLUGIN_API != version )
-	{
-		WARNINGKPILOT << "Library "
-			<< fLibraryName
-			<< " has version "
-			<< version
-			<< endl;
-		addSyncLogEntry(i18n("Conduit %1 has wrong version (%2).").arg(fDesktopName).arg(version));
-		return false;
-	}
-
-	KLibFactory *factory = library->factory();
-	if (!factory)
-	{
-		WARNINGKPILOT << "Can't find factory in library "
-			<< fLibraryName
-			<< endl;
-		addSyncLogEntry(i18n("Could not initialize conduit %1.").arg(fDesktopName));
-		return false;
-	}
-
-	TQStringList l = syncMode().list();
-
-	DEBUGKPILOT << fname << ": Flags: " << syncMode().name() << endl;
-
-	TQObject *object = factory->create(fHandle,name(),"SyncAction",l);
-
-	if (!object)
-	{
-		WARNINGKPILOT << "Can't create SyncAction." << endl;
-		addSyncLogEntry(i18n("Could not create conduit %1.").arg(fDesktopName));
-		return false;
-	}
-
-	fConduit = dynamic_cast<ConduitAction *>(object);
-
-	if (!fConduit)
-	{
-		WARNINGKPILOT << "Can't cast to ConduitAction." << endl;
-		addSyncLogEntry(i18n("Could not create conduit %1.").arg(fDesktopName));
-		return false;
-	}
-
-	addSyncLogEntry(i18n("[Conduit %1]").arg(fDesktopName));
-
-	// Handle the syncDone signal properly & unload the conduit.
-	TQObject::connect(fConduit,TQT_SIGNAL(syncDone(SyncAction *)),
-		this,TQT_SLOT(execDone(SyncAction *)));
-	// Proxy all the log and error messages.
-	TQObject::connect(fConduit,TQT_SIGNAL(logMessage(const TQString &)),
-		this,TQT_SIGNAL(logMessage(const TQString &)));
-	TQObject::connect(fConduit,TQT_SIGNAL(logError(const TQString &)),
-		this,TQT_SIGNAL(logError(const TQString &)));
-	TQObject::connect(fConduit,TQT_SIGNAL(logProgress(const TQString &,int)),
-		this,TQT_SIGNAL(logProgress(const TQString &,int)));
-
-	TQTimer::singleShot(0,fConduit,TQT_SLOT(execConduit()));
-	return true;
-}
-
-void ConduitProxy::execDone(SyncAction *p)
-{
-	FUNCTIONSETUP;
-
-	if (p!=fConduit)
-	{
-		WARNINGKPILOT << "Unknown conduit @"
-			<< (void *) p
-			<< " finished."
-			<< endl;
-		emit syncDone(this);
-		return;
-	}
-
-	// give our worker a chance to sanity check the results...
-	fConduit->finished();
-
-	addSyncLogEntry(CSL1("\n"),false); // Put bits of the conduit logs on separate lines
-
-	KPILOT_DELETE(p);
-
-	emit syncDone(this);
-}
-
-
-namespace PluginUtility
-{
-
-TQString findArgument(const TQStringList &a, const TQString &arg)
-{
-	FUNCTIONSETUP;
-
-	TQString search;
-
-	if (arg.startsWith( CSL1("--") ))
-	{
-		search = arg;
-	}
-	else
-	{
-		search = CSL1("--") + arg;
-	}
-	search.append( CSL1("=") );
-
-
-	TQStringList::ConstIterator end = a.end();
-	for (TQStringList::ConstIterator i = a.begin(); i != end; ++i)
-	{
-		if ((*i).startsWith( search ))
-		{
-			TQString s = (*i).mid(search.length());
-			return s;
-		}
-	}
-
-	return TQString::null;
-}
-
-/* static */ bool isRunning(const TQCString &n)
-{
-	DCOPClient *dcop = KApplication::kApplication()->dcopClient();
-	QCStringList apps = dcop->registeredApplications();
-	return apps.contains(n);
-}
-
-
-/* static */ unsigned long pluginVersion(const KLibrary *lib)
-{
-	TQString symbol = CSL1("version_");
-	symbol.append(lib->name());
-
-	if (!lib->hasSymbol(symbol.latin1())) return 0;
-
-	unsigned long *p = (unsigned long *)(lib->symbol(symbol.latin1()));
-	return *p;
-}
-
-
-/* static */ TQString pluginVersionString(const KLibrary *lib)
-{
-	TQString symbol= CSL1("id_");
-	symbol.append(lib->name());
-
-	if (!lib->hasSymbol(symbol.latin1())) return TQString::null;
-
-	return TQString::fromLatin1(*((const char **)(lib->symbol(symbol.latin1()))));
-}
-
-
-}
-
-
-CUDCounter::CUDCounter(TQString s) :
-	fC(0),fU(0),fD(0),fStart(0),fEnd(0),fType(s)
-{
-}
-
-void CUDCounter::created(unsigned int c)
-{
-	fC += c;
-}
-
-void CUDCounter::updated(unsigned int c)
-{
-	fU += c;
-}
-
-void CUDCounter::deleted(unsigned int c)
-{
-	fD += c;
-}
-
-void CUDCounter::setStartCount(unsigned int t)
-{
-	fStart = t;
-}
-
-void CUDCounter::setEndCount(unsigned int t)
-{
-	fEnd = t;
-}
-
-TQString CUDCounter::moo() const
-{
-	TQString result = fType + ": " + 
-		i18n("Start: %1. End: %2. ").arg(fStart).arg(fEnd);
-
-	if (fC > 0) result += i18n("%1 new. ").arg(fC);
-	if (fU > 0) result += i18n("%1 changed. ").arg(fU);
-	if (fD > 0) result += i18n("%1 deleted. ").arg(fD);
-
-	if ( (fC+fU+fD) <= 0) result += i18n("No changes made. ");
-
-	return result;
-}
-
-
diff --git a/kpilot/lib/plugin.h b/kpilot/lib/plugin.h
deleted file mode 100644
index 168cd2fd..00000000
--- a/kpilot/lib/plugin.h
+++ /dev/null
@@ -1,476 +0,0 @@
-#ifndef _KPILOT_PLUGIN_H
-#define _KPILOT_PLUGIN_H
-/* KPilot
-**
-** Copyright (C) 2001 by Dan Pilone
-** Copyright (C) 2002-2004,2006 Adriaan de Groot <groot@kde.org>
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <tqstringlist.h>
-
-#include "syncAction.h"
-
-/** @file
-* This file defines the base class of all KPilot conduit plugins configuration
-* dialogs. This is necessary so that we have a fixed API to talk to from
-* inside KPilot.
-*
-* The factories used by KPilot plugins are also documented here.
-*/
-
-
-class TQTabWidget;
-class KAboutData;
-class KLibrary;
-
-class PilotDatabase;
-
-namespace Pilot
-{
-	/**
-	* As the API for conduits may change in the course of time,
-	* identify them and refuse to load incompatible API versions.
-	* Bump this number every release to the current YYYYMMDD
-	* value.
-	*/
-	static const unsigned int PLUGIN_API = 20061118;
-}
-
-/**
-* ConduitConfigBase is for configuration purposes.
-*
-* ConduitConfigBase: this is an object (with a widget!) that is embedded
-* in a dialog. This is the currently preferred form for configuration,
-* and it's what is used in the KPilot conduit configuration dialog.
-* The factory is asked for a "ConduitConfigBase" object.
-*
-* NB. The reason that this is a TQObject which needs to create a
-* separate widget - instead of a TQWidget subclass - has to do with
-* layouting. If you make the widget with designer then the easiest
-* thing to do is to use a grid layout there. Making ConduitConfigBase
-* a TQWidget subclass would require an additional layout here, which
-* seems a little foolish.
-*
-*/
-class KDE_EXPORT ConduitConfigBase : public QObject
-{
-Q_OBJECT
-public:
-	/**
-	* Constructor. Creates a conduit configuration support object
-	* with the given parent @p parent and name (optional) @p n.
-	*/
-	ConduitConfigBase(TQWidget *parent=0L, const char *n=0L);
-
-	/** Destructor. */
-	virtual ~ConduitConfigBase();
-
-	/**
-	* This function is called to check whether the configuration
-	* of the conduit has changed -- and hence, whether the user
-	* needs to be prompted. By default, this just returns
-	* fModified, but you can do more complicated things.
-	*/
-	virtual bool isModified() const
-	{
-		return fModified;
-	} ;
-
-	/** Accessor for the actual widget for the configuration. */
-	TQWidget *widget() const
-	{
-		return fWidget;
-	} ;
-
-	/**
-	* Load or save the config widget's settings in the given
-	* KConfig object; leave the group unchanged. load() and
-	* commit() should both call unmodified() to indicate that
-	* the current settings match the on-disk ones.
-	*/
-	virtual void commit() = 0;
-	virtual void load() = 0;
-	/**
-	* Called when the object is to be hidden again and might
-	* need to save changed settings. Should prompt the user
-	* and call commit() if needed. Override this function only
-	* if you need a very different kind of prompt window.
-	*
-	* Returns false if the change is to be canceled. Returns
-	* true otherwise, whether or not the changes were saved.
-	*/
-	virtual bool maybeSave();
-
-	TQString conduitName() const { return fConduitName; } ;
-
-	/**
-	* This is the function that does the work of adding an about
-	* page to a tabwidget. It is made public and static so that
-	* it can be used elsewhere wherever tabwidgets appear.
-	*
-	* The about tab is created using aboutPage(). The new about
-	* widget is added to the tab widget @p w with the heading
-	* "About".
-	*
-	* @param w The tab widget to which the about page is added.
-	* @param data The KAboutData that is used.
-	*
-	*/
-	static  void addAboutPage(TQTabWidget *w,
-		KAboutData *data=0L);
-
-	/**
-	* This creates the actual about widget. Again, public & static so
-	* you can slap in an about widget wherever.
-	*
-	* An about widget is created that shows the contributors to
-	* the application, along with copyright information and the
-	* application's icon. This widget can be used pretty much
-	* anywhere. Copied from KAboutDialog, mostly.
-	*
-	* @param parent The widget that holds the about widget.
-	* @param data The KAboutData that is used to populate the widget.
-	*/
-	static TQWidget *aboutPage(TQWidget *parent, KAboutData *data=0L);
-
-protected:
-	/**
-	* This function provides the string for the prompt used
-	* in maybeSave(). Override it to change the text.
-	*/
-	virtual TQString maybeSaveText() const;
-
-	void unmodified() { fModified=false; } ;
-
-	bool fModified;
-	TQWidget *fWidget;
-	TQString fConduitName;
-
-
-protected slots:
-	void modified();
-signals:
-	void changed(bool);
-
-} ;
-
-
-/**
-* Create-Update-Delete tracking of the plugin,
-* used for reporting purposes (in a consistent manner).  The intent
-* is that this class is used by the conduit as it is syncing data.
-* For this to be useful (and be used properly), the conduit needs
-* to tell us how many creates, updates, and deletes it has made to
-* a data store (PC or HH).  It also needs to tell us how many
-* records it started with and how many records it has at the
-* conclusion of its processing.  Using this information, we can
-* report on it consistently as well as analyze the activity taken
-* by the conduit and offer rollback functionality if we think the
-* conduit has behaved improperly.
-*/
-class KDE_EXPORT CUDCounter
-{
-public:
-	/** Create new counter initialized to 0, and be told what
-	 * kind of CUD we're counting (PC or Handheld, etc.) */
-	CUDCounter(TQString s);
-
-	/** Track the creation of @p c items */
-	void created(unsigned int c=1);
-	/** Track updates to @p u items */
-	void updated(unsigned int u=1);
-	/** Track the destruction of @p d items */
-	void deleted(unsigned int d=1);
-	/** How many @p t items did we start with? */
-	void setStartCount(unsigned int t);
-	/** How many @p t items did we end with? */
-	void setEndCount(unsigned int t);
-
-	unsigned int countCreated() { return fC; }
-	unsigned int countUpdated() { return fU; }
-	unsigned int countDeleted() { return fD; }
-	unsigned int countStart() { return fStart; }
-	unsigned int countEnd() { return fEnd; }
-
-	/** percentage of changes.  unfortunately, we have to rely on our
-	 * developers (hi, self!) to correctly set total number of records
-	 * conduits start with, so add a little protection...
-	 */
-	unsigned int percentCreated() { return (fEnd   > 0 ? fC/fEnd   : 0); }
-	unsigned int percentUpdated() { return (fEnd   > 0 ? fU/fEnd   : 0); }
-	unsigned int percentDeleted() { return (fStart > 0 ? fD/fStart : 0); }
-
-	/** Measurement Of Objects -- report numbers of
-	* objects created, updated, deleted. This
-	* string is already i18n()ed.
-	*/
-	TQString moo() const;
-
-	/** Type of counter(Handheld or PC).  This string is already
-	 * i18n()ed.
-	*/
-	TQString type() const { return fType; }
-private:
-	/** keep track of Creates, Updates, Deletes, and Total
-	 * number of records so we can detect abnormal behavior and
-	 * hopefully prevent data loss.
-	 */
-	unsigned int fC,fU,fD,fStart,fEnd;
-
-	/** What kind of CUD are we keeping track of so we can
-	 * moo() it out later?  (PC, Handheld, etc.)
-	 */
-	TQString fType;
-} ;
-
-
-/**
-* The SyncActions created by the factory should obey at least
-* the argument test, indicating a dry run. The device link is
-* the link where the sync should run -- don't get the pilotPort()
-* until the sync runs!
-*
-* setConfig() will be called before the sync starts so that the
-* conduit can read/write metadata and local settings.
-*/
-
-class KDE_EXPORT ConduitAction : public SyncAction
-{
-Q_OBJECT
-
-public:
-	ConduitAction(KPilotLink *,
-		const char *name=0L,
-		const TQStringList &args = TQStringList());
-	virtual ~ConduitAction();
-
-	/** ConduitAction is done doing work.  Allow it to sanity-check the
-	 * results
-	 */
-	void finished();
-
-	TQString conduitName() const { return fConduitName; } ;
-
-	/** Retrieve the sync mode set for this action. */
-	const SyncMode &syncMode() const { return fSyncDirection; };
-
-	/**
-	* A full sync happens for eFullSync, eCopyPCToHH and eCopyHHToPC. It
-	* completely ignores all modified flags and walks through all records
-	* in the database.
-	*/
-	bool isFullSync() const
-	{
-		return fFirstSync || fSyncDirection.isFullSync() ;
-	}
-
-	/**
-	* A first sync (i.e. database newly fetched from the handheld )
-	* does not check for deleted records, but understands them as
-	* added on the other side. The flag is set by the conduits
-	* when opening the local database, or the calendar/addressbook
-	* (if it is empty). This also implies a full sync.
-	*/
-	bool isFirstSync() const
-	{
-		return fFirstSync || fSyncDirection.isFirstSync() ;
-	}
-
-protected:
-	/** Retrieve the conflict resolution setting for this action. */
-	ConflictResolution getConflictResolution() const
-		{ return fConflictResolution; };
-
-	/** Try to change the sync mode from what it is now to the mode @p m.
-	* This may fail (ie. changing a backup to a restore is not kosher) and
-	* changeSync() will return false then.
-	*/
-	bool changeSync(SyncMode::Mode m);
-
-	// Set the conflict resolution, except if the resolution
-	// form is UseGlobalSetting, in which case nothing changes
-	// (assumes then that the resolution form is already set
-	// according to that global setting).
-	//
-	void setConflictResolution(ConflictResolution res)
-	{
-		if (SyncAction::eUseGlobalSetting != res)
-			fConflictResolution=res;
-	}
-
-	void setFirstSync(bool first) { fFirstSync=first; } ;
-
-	PilotDatabase *fDatabase;
-	PilotDatabase *fLocalDatabase; // Guaranteed to be a PilotLocalDatabase
-
-	/**
-	* Open both the local copy of database @p dbName
-	* and the version on the Pilot. Return true only
-	* if both opens succeed. If the local copy of the database
-	* does not exist, it is retrieved from the handheld. In this
-	* case, retrieved is set to true, otherwise it is left alone
-	* (i.e. retains its value and is not explicitly set to false).
-	*
-	* @param dbName database name to open.
-	* @param retrieved indicator whether the database had to be loaded
-	*        from the handheld.
-	*/
-	bool openDatabases(const TQString &dbName, bool*retrieved=0L);
-
-	/**
-	* Name of the conduit; might be changed by subclasses. Should
-	* normally be set in the constructor.
-	*/
-	TQString fConduitName;
-
-	/** Every plugin has 2 CUDCounters--one for keeping track of
-	 * changes made to PC data and one for keeping track of Palm data. */
-	CUDCounter *fCtrHH;
-	CUDCounter *fCtrPC;
-
-private:
-	SyncMode fSyncDirection;
-	ConflictResolution fConflictResolution;
-
-	bool fFirstSync;
-} ;
-
-/**
-* The ConduitProxy action delays loading the plugin for a conduit until the conduit
-* actually executes; the proxy then loads the file, creates a SyncAction for the conduit
-* and runs that. Once the conduit has finished, the proxy unloads everything
-* and emits syncDone().
-*/
-class ConduitProxy : public ConduitAction
-{
-Q_OBJECT
-
-public:
-	ConduitProxy(KPilotLink *,
-		const TQString &desktopName,
-		const SyncAction::SyncMode &m);
-
-protected:
-	virtual bool exec();
-protected slots:
-	void execDone(SyncAction *);
-
-protected:
-	TQString fDesktopName;
-	TQString fLibraryName;
-	ConduitAction *fConduit;
-} ;
-
-/** A namespace containing only static helper methods. */
-namespace PluginUtility
-{
-	/** Searches the argument list for --foo=bar and returns bar, TQString::null if not found.
-	* Don't include the -- in the argname. */
-	TQString findArgument(const TQStringList &a, const TQString argname);
-
-	/**
-	* This function attempts to detect whether or not the given
-	* application is running. If it is, true is returned, otherwise
-	* false.
-	*
-	* The current approach is to ask the DCOP server if the application
-	* has registered.
-	*/
-	bool isRunning(const TQCString &appName);
-
-	/**
-	* Check a given library for its version, returning 0 if no
-	* version symbol is found.
-	*/
-	unsigned long pluginVersion(const KLibrary *);
-	TQString pluginVersionString(const KLibrary *);
-}
-
-/**
-* All KPilot conduits should subclass KLibFactory like this.
-*
-* Boilerplate for inheritance:
-*
-* <pre>
-* class KPilotPlugin : public KLibFactory
-* {
-* Q_OBJECT
-*
-* public:
-* 	KPilotPlugin(TQObject * = 0L,const char * = 0L) ;
-* 	virtual ~KPilotPlugin();
-* </pre>
-*
-* You don't @em have to provide about information for the plugin,
-* but it's useful, particularly for the about box in a conduit.
-*
-*
-* <pre>
-* 	static KAboutData *about() { return fAbout; } ;
-* </pre>
-*
-*
-* This is what it's all about: creating objects for the plugin.
-* One classname that @em must be supported is ConduitConfig,
-* which is defined above. The other is SyncAction.
-*
-*
-* <pre>
-* protected:
-* 	virtual TQObject* createObject( TQObject* parent = 0,
-* 		const char* name = 0,
-* 		const char* classname = "TQObject",
-* 		const TQStringList &args = TQStringList() );
-* </pre>
-*
-* More boilerplate, and support for an instance and about data, used
-* by about() above.
-*
-* <pre>
-* 	KInstance *fInstance;
-* 	static KAboutData *fAbout;
-* } ;
-* </pre>
-*
-*
-*
-* The implementation of a conduit needs an init_conduit_name() function,
-* just like any KLibLoader library that uses factories.
-*
-* The createObject() function needs to support at least two creation
-* calls: "ConduitConfigBase" and "SyncAction".
-* "ConduitConfigBase" should return a subclass of ConduitConfigBase,
-* "SyncAction" a subclass of SyncAction.
-*
-* Finally, a conduit should have a symbol version_conduit_name,
-* that returns a long; much like the init_conduit_name() function. This
-* should return the version of the plugin API (KPILOT_PLUGIN_VERSION)
-* the conduit was compiled against. Additionally, a plugin may have a
-* id_conduit_name, which should be a const char *.
-*
-*/
-
-#endif
diff --git a/kpilot/lib/pluginfactory.h b/kpilot/lib/pluginfactory.h
deleted file mode 100644
index f43c706d..00000000
--- a/kpilot/lib/pluginfactory.h
+++ /dev/null
@@ -1,98 +0,0 @@
-#ifndef _KPILOT_PLUGINFACTORY_H
-#define _KPILOT_PLUGINFACTORY_H
-/* KPilot
-**
-** Copyright (C) 2005-2006 by Adriaan de Groot <groot@kde.org>
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <tqwidget.h>
-
-#include <kdebug.h>
-#include <klibloader.h>
-
-#include "options.h"
-
-/** @file Defines a template class for factories for KPilot's conduits. */
-
-class KPilotLink;
-
-
-
-/** Template class that defines a conduit's factory. */
-
-template <class Widget, class Action> class ConduitFactory : public KLibFactory
-{
-public:
-	ConduitFactory(TQObject *parent = 0, const char *name = 0) :
-		KLibFactory(parent,name)
-		{ fInstance = new KInstance(name); } ;
-	virtual ~ConduitFactory()
-		{ delete fInstance; } ;
-
-protected:
-	virtual TQObject *createObject(
-		TQObject* parent = 0,
-		const char* name = 0,
-		const char* classname = "TQObject",
-		const TQStringList &args = TQStringList() )
-	{
-		if (qstrcmp(classname,"ConduitConfigBase")==0)
-		{
-			TQWidget *w = dynamic_cast<TQWidget *>(parent);
-			if (w) return new Widget(w,name);
-			else
-			{
-				WARNINGKPILOT << "Could not cast parent to widget." << endl;
-				return 0L;
-			}
-		}
-
-		if (qstrcmp(classname,"SyncAction")==0)
-		{
-			KPilotLink *d = 0L;
-			if (parent) d = dynamic_cast<KPilotLink *>(parent);
-
-			if (d || !parent)
-			{
-				if (!parent)
-				{
-					kdDebug() << k_funcinfo << ": Using NULL device." << endl;
-				}
-				return new Action(d,name,args);
-			}
-			else
-			{
-				WARNINGKPILOT << "Could not cast parent to KPilotLink" << endl;
-				return 0L;
-			}
-		}
-		return 0L;
-	}
-
-	KInstance *fInstance;
-} ;
-
-#endif
-
diff --git a/kpilot/lib/recordConduit.cc b/kpilot/lib/recordConduit.cc
deleted file mode 100644
index f7692de4..00000000
--- a/kpilot/lib/recordConduit.cc
+++ /dev/null
@@ -1,1145 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 2004 by Reinhold Kainhofer
-** Based on the addressbook conduit:
-** Copyright (C) 2000,2001 by Dan Pilone
-** Copyright (C) 2000 Gregory Stern
-** Copyright (C) 2002-2003 by Reinhold Kainhofer
-**
-** This conduit is the base class for all record-based conduits.
-** all the sync logic is included in this class, and all child classes
-** just have to implement some specific copying and conflict resolution
-** methods.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org.
-*/
-
-
-
-#include "options.h"
-
-#include <tqtimer.h>
-#include <tqfile.h>
-
-#include "pilotAppCategory.h"
-#include "pilotSerialDatabase.h"
-#include "pilotLocalDatabase.h"
-#include "recordConduit.h"
-
-
-// Something to allow us to check what revision
-// the modules are that make up a binary distribution.
-//
-//
-extern "C"
-{
-long version_record_conduit = Pilot::PLUGIN_API;
-}
-
-
-/* virtual */ bool RecordConduitBase::exec()
-{
-	FUNCTIONSETUP;
-	fState = Initialize;
-
-	setFirstSync(false);
-
-	bool retrieved = false;
-	if (!openDatabases( fDBName, &retrieved))
-	{
-		emit logError(i18n("Unable to open the %1 database on the handheld.").arg( fDBName ) );
-		return false;
-	}
-	if (retrieved) setFirstSync(true);
-
-	if (isFirstSync()) fIDList=fDatabase->idList();
-	else fIDList=fDatabase->modifiedIDList();
-	fIDListIterator = fIDList.begin();
-
-	fTimer = new TQTimer(this);
-	connect(fTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(process()));
-	fTimer->start(0,false); // Fire as often as possible to prompt processing
-	return true;
-}
-
-/* virtual */ void RecordConduitBase::process()
-{
-	FUNCTIONSETUP;
-	SyncProgress p = Error;
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": From state " << name(fState) << endl;
-#endif
-
-	switch(fState)
-	{
-	case Initialize :
-		p = loadPC();
-		break;
-	case PalmToPC :
-		p = palmRecToPC();
-		break;
-	case PCToPalm :
-		p = pcRecToPalm();
-		break;
-	case Cleanup :
-		p = cleanup();
-		break;
-	}
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Step returned " << name(p) << endl;
-#endif
-
-	switch(p)
-	{
-	case Error :
-		fTimer->stop();
-		delayDone();
-		return;
-	case NotDone :
-		// Return so we get called again.
-		return;
-	case Done :
-		// Get on with it.
-		break;
-	}
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Step is done, moving to next state." << endl;
-#endif
-
-	// Here the previous call was done.
-	switch(fState)
-	{
-	case Initialize :
-		switch (syncMode().mode())
-		{
-		case SyncMode::eRestore :
-		case SyncMode::eCopyPCToHH : /* These two don't copy Palm records to the PC */
-			fState = PCToPalm;
-			break;
-		default :
-			fState = PalmToPC;
-		}
-		break;
-	case PalmToPC :
-		switch (syncMode().mode())
-		{
-		case SyncMode::eBackup :
-		case SyncMode::eCopyHHToPC : /* These modes don't copy PC records back */
-			fState = Cleanup;
-			break;
-		default :
-			fState = PCToPalm;
-		}
-		break;
-	case PCToPalm :
-		fState = Cleanup;
-		break;
-	case Cleanup :
-		fTimer->stop();
-		delayDone();
-		// No change in state, timer stopped and we're done.
-		break;
-	}
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Next state is " << name(fState) << endl;
-#endif
-
-}
-
-
-TQString RecordConduitBase::name(RecordConduitBase::SyncProgress s)
-{
-	switch(s)
-	{
-	case RecordConduitBase::NotDone:
-		return CSL1("NotDone");
-	case RecordConduitBase::Done:
-		return CSL1("Done");
-	case RecordConduitBase::Error:
-		return CSL1("Error");
-	}
-}
-
-
-TQString RecordConduitBase::name(RecordConduitBase::States s)
-{
-	switch(s)
-	{
-	case RecordConduitBase::Initialize:
-		return CSL1("Initialize");
-	case RecordConduitBase::PalmToPC:
-		return CSL1("Handheld-to-PC");
-	case RecordConduitBase::PCToPalm:
-		return CSL1("PC-to-Handheld");
-	case RecordConduitBase::Cleanup:
-		return CSL1("Cleanup");
-	}
-}
-
-
-#if 0
-/** make that entry on the pc archived (i.e. deleted on the handheld,
- *  while present on the pc, but not synced to the handheld */
-bool RecordConduit::PCData::makeArchived( RecordConduit::PCEntry *pcEntry )
-{
-	if ( pcEntry ) {
-		pcEntry->makeArchived();
-		setChanged( true );
-		return true;
-	} else return false;
-}
-
-
-/* Builds the map which links record ids to uid's of PCEntry. This is the slow implementation,
- * that should always work. subclasses should reimplement it to speed things up.
-*/
-bool RecordConduit::PCData::mapContactsToPilot( TQMap<recordid_t,TQString> &idContactMap )
-{
-	FUNCTIONSETUP;
-
-	idContactMap.clear();
-
-	Iterator it = begin();
-	PCEntry *ent;
-	while ( !atEnd( it ) ) {
-		ent = *it;
-		recordid_t id( ent->recid() );
-		if ( id != 0 ) {
-			idContactMap.insert( id, ent->uid() );
-		}
-		++it;
-	}
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Loaded " << idContactMap.size() <<
-	    " Entries on the pc and mapped them to records on the handheld. " << endl;
-#endif
-	return true;
-}
-
-
-
-/*********************************************************************
-                        C O N S T R U C T O R
- *********************************************************************/
-
-
-
-bool RecordConduit::mArchiveDeleted = false;
-
-RecordConduit::RecordConduit(TQString name, KPilotDeviceLink * o, const char *n, const TQStringList & a):
-		ConduitAction(o, n, a),
-		mPCData(0), mPalmIndex(0),
-		mEntryMap(), mSyncedIds(), mAllIds()
-{
-	FUNCTIONSETUP;
-	fConduitName = name;
-}
-
-
-
-RecordConduit::~RecordConduit()
-{
-	if ( mPCData ) KPILOT_DELETE(mPCData);
-}
-
-
-
-
-
-
-/*********************************************************************
-                S Y N C   S T R U C T U R E
- *********************************************************************/
-
-
-
-/* virtual */ bool RecordConduit::exec()
-{
-	FUNCTIONSETUP;
-
-	if ( !_prepare() ) return false;
-
-	fFirstSync = false;
-	// Database names probably in latin1.
-	if( !openDatabases( dbName(), &fFirstSync ) )
-	{
-		emit logError(i18n("Unable to open the %1 database on the handheld.").arg( dbName() ) );
-		return false;
-	}
-	_getAppInfo();
-	if( !mPCData->loadData() )
-	{
-		emit logError( i18n("Unable to open %1.").arg( mPCData->description() ) );
-		return false;
-	}
-	// get the addresseMap which maps Pilot unique record(address) id's to
-	// a Abbrowser Addressee; allows for easy lookup and comparisons
-	if ( mPCData->isEmpty() )
-		fFirstSync = true;
-	else
-		mPCData->mapContactsToPilot( mEntryMap );
-	fFirstSync = fFirstSync || ( mPCData->isEmpty() );
-
-	// perform syncing from palm to abbrowser
-	// iterate through all records in palm pilot
-	mPalmIndex = 0;
-
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": fullsync=" << isFullSync() << ", firstSync=" << isFirstSync() << endl;
-	DEBUGKPILOT << fname << ": "
-		<< "syncDirection=" << getSyncDirection() << ", "
-//		<< "archive = " << AbbrowserSettings::archiveDeleted()
-		<< endl;
-	DEBUGKPILOT << fname << ": conflictRes="<< getConflictResolution() << endl;
-//	DEBUGKPILOT << fname << ": PilotStreetHome=" << AbbrowserSettings::pilotStreet() << ", PilotFaxHOme" << AbbrowserSettings::pilotFax() << endl;
-#endif
-
-	if ( !isFirstSync() )
-		mAllIds=fDatabase->idList();
-
-	/* Note:
-	   if eCopyPCToHH or eCopyHHToPC, first sync everything, then lookup
-	   those entries on the receiving side that are not yet syncced and delete
-	   them. Use slotDeleteUnsyncedPCRecords and slotDeleteUnsyncedHHRecords
-	   for this, and no longer purge the whole addressbook before the sync to
-	   prevent data loss in case of connection loss. */
-
-	TQTimer::singleShot(0, this, TQT_SLOT(slotPalmRecToPC()));
-
-	return true;
-}
-
-
-
-void RecordConduit::slotPalmRecToPC()
-{
-	FUNCTIONSETUP;
-	PilotRecord *palmRec = 0L, *backupRec = 0L;
-
-	if ( getSyncDirection() == SyncAction::eCopyPCToHH )
-	{
-		mPCIter = mPCData->begin();
-		TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm()));
-		return;
-	}
-
-	if ( isFullSync() )
-		palmRec = fDatabase->readRecordByIndex( mPalmIndex++ );
-	else
-		palmRec = dynamic_cast <PilotSerialDatabase * >(fDatabase)->readNextModifiedRec();
-
-	if ( !palmRec )
-	{
-		mPCIter = mPCData->begin();
-		TQTimer::singleShot( 0, this, TQT_SLOT( slotPCRecToPalm() ) );
-		return;
-	}
-
-	// already synced, so skip:
-	if ( mSyncedIds.contains( palmRec->id() ) )
-	{
-		KPILOT_DELETE( palmRec );
-		TQTimer::singleShot( 0, this, TQT_SLOT( slotPalmRecToPC() ) );
-		return;
-	}
-
-	backupRec = fLocalDatabase->readRecordById( palmRec->id() );
-	PilotRecord *compareRec = backupRec ? backupRec : palmRec;
-	PilotAppCategory *compareEntry = createPalmEntry( compareRec );
-	PCEntry *pcEntry = findMatch( compareEntry );
-	KPILOT_DELETE( compareEntry );
-
-	PilotAppCategory *backupEntry=0L;
-	if ( backupRec )
-		backupEntry = createPalmEntry( backupRec );
-	PilotAppCategory *palmEntry=0L;
-	if ( palmRec )
-		palmEntry = createPalmEntry( palmRec );
-
-	syncEntry( pcEntry, backupEntry, palmEntry );
-
-	mSyncedIds.append( palmRec->id() );
-
-	KPILOT_DELETE( pcEntry );
-	KPILOT_DELETE( palmEntry );
-	KPILOT_DELETE( backupEntry );
-	KPILOT_DELETE( palmRec );
-	KPILOT_DELETE( backupRec );
-
-	TQTimer::singleShot(0, this, TQT_SLOT(slotPalmRecToPC()));
-}
-
-
-
-void RecordConduit::slotPCRecToPalm()
-{
-	FUNCTIONSETUP;
-
-	if ( ( getSyncDirection()==SyncAction::eCopyHHToPC ) ||
-		mPCData->atEnd( mPCIter ) )
-	{
-		mPalmIndex = 0;
-		TQTimer::singleShot( 0, this, TQT_SLOT( slotDeletedRecord() ) );
-		return;
-	}
-
-	PilotRecord *backupRec=0L;
-	PCEntry *pcEntry = *mPCIter;
-	++mPCIter;
-
-	// If marked as archived, don't sync!
-	if ( isArchived( pcEntry ) )
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": address with id " << pcEntry->uid() <<
-			" marked archived, so don't sync." << endl;
-#endif
-		KPILOT_DELETE( pcEntry );
-		TQTimer::singleShot( 0, this, TQT_SLOT( slotPCRecToPalm() ) );
-		return;
-	}
-
-	recordid_t recID( pcEntry->recid() );
-	if ( recID == 0 )
-	{
-		// it's a new item(no record ID and not inserted by the Palm -> PC sync), so add it
-		syncEntry( pcEntry, 0L, 0L );
-		KPILOT_DELETE( pcEntry );
-		TQTimer::singleShot( 0, this, TQT_SLOT( slotPCRecToPalm() ) );
-		return;
-	}
-
-	// look into the list of already synced record ids to see if the PCEntry hasn't already been synced
-	if ( mSyncedIds.contains( recID ) )
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << ": address with id " << recID << " already synced." << endl;
-#endif
-		KPILOT_DELETE( pcEntry );
-		TQTimer::singleShot( 0, this, TQT_SLOT( slotPCRecToPalm() ) );
-		return;
-	}
-
-
-	backupRec = fLocalDatabase->readRecordById( recID );
-	// only update if no backup record or the backup record is not equal to the PCEntry
-
-	PilotAppCategory*backupEntry=0L;
-	if ( backupRec )
-		backupEntry = createPalmEntry( backupRec );
-	if( !backupRec || isFirstSync() || !_equal( backupEntry, pcEntry ) )
-	{
-		PilotRecord *palmRec = fDatabase->readRecordById( recID );
-		PilotAppCategory *palmEntry=0L;
-		if (palmRec)
-			palmEntry = createPalmEntry( palmRec );
-		syncEntry( pcEntry, backupEntry, palmEntry );
-		// update the id just in case it changed
-		if ( palmRec )
-			recID = palmRec->id();
-		KPILOT_DELETE( palmRec );
-		KPILOT_DELETE( palmEntry );
-	}
-
-	KPILOT_DELETE( pcEntry );
-	KPILOT_DELETE( backupEntry );
-	KPILOT_DELETE( backupRec );
-	mSyncedIds.append( recID );
-
-	// done with the sync process, go on with the next one:
-	TQTimer::singleShot( 0, this, TQT_SLOT( slotPCRecToPalm() ) );
-}
-
-
-
-void RecordConduit::slotDeletedRecord()
-{
-	FUNCTIONSETUP;
-
-	PilotRecord *backupRec = fLocalDatabase->readRecordByIndex( mPalmIndex++ );
-	if( !backupRec || isFirstSync() )
-	{
-		KPILOT_DELETE(backupRec);
-		TQTimer::singleShot( 0, this, TQT_SLOT( slotDeleteUnsyncedPCRecords() ) );
-		return;
-	}
-
-	// already synced, so skip this record:
-	if ( mSyncedIds.contains( backupRec->id() ) )
-	{
-		KPILOT_DELETE( backupRec );
-		TQTimer::singleShot( 0, this, TQT_SLOT( slotDeletedRecord() ) );
-		return;
-	}
-
-	TQString uid = mEntryMap[ backupRec->id() ];
-	PCEntry *pcEntry = mPCData->findByUid( uid );
-	PilotRecord *palmRec = fDatabase->readRecordById( backupRec->id() );
-	PilotAppCategory *backupEntry = 0L;
-	if (backupRec)
-		backupEntry = createPalmEntry( backupRec );
-	PilotAppCategory*palmEntry=0L;
-	if (palmRec)
-		palmEntry = createPalmEntry( palmRec );
-
-	mSyncedIds.append( backupRec->id() );
-	syncEntry( pcEntry, backupEntry, palmEntry );
-
-	KPILOT_DELETE( pcEntry );
-	KPILOT_DELETE( palmEntry );
-	KPILOT_DELETE( backupEntry );
-	KPILOT_DELETE( palmRec );
-	KPILOT_DELETE( backupRec );
-	TQTimer::singleShot( 0, this, TQT_SLOT( slotDeletedRecord() ) );
-}
-
-
-
-void RecordConduit::slotDeleteUnsyncedPCRecords()
-{
-	FUNCTIONSETUP;
-	if ( getSyncDirection() == SyncAction::eCopyHHToPC )
-	{
-		TQStringList uids;
-		RecordIDList::iterator it;
-		TQString uid;
-		for ( it = mSyncedIds.begin(); it != mSyncedIds.end(); ++it)
-		{
-			uid = mEntryMap[ *it ];
-			if ( !uid.isEmpty() ) uids.append( uid );
-		}
-		// TODO: Does this speed up anything?
-		// qHeapSort( uids );
-		const TQStringList alluids( mPCData->uids() );
-		TQStringList::ConstIterator uidit;
-		for ( uidit = alluids.constBegin(); uidit != alluids.constEnd(); ++uidit )
-		{
-			if ( !uids.contains( *uidit ) )
-			{
-#ifdef DEBUG
-				DEBUGKPILOT << "Deleting PCEntry with uid " << (*uidit) << " from PC (is not on HH, and syncing with HH->PC direction)" << endl;
-#endif
-				mPCData->removeEntry( *uidit );
-			}
-		}
-	}
-	TQTimer::singleShot(0, this, TQT_SLOT(slotDeleteUnsyncedHHRecords()));
-}
-
-
-
-void RecordConduit::slotDeleteUnsyncedHHRecords()
-{
-	FUNCTIONSETUP;
-	if ( getSyncDirection() == SyncAction::eCopyPCToHH )
-	{
-		RecordIDList ids = fDatabase->idList();
-		RecordIDList::iterator it;
-		for ( it = ids.begin(); it != ids.end(); ++it )
-		{
-			if ( !mSyncedIds.contains(*it) )
-			{
-#ifdef DEBUG
-				DEBUGKPILOT << "Deleting record with ID " << *it << " from handheld (is not on PC, and syncing with PC->HH direction)" << endl;
-#endif
-				fDatabase->deleteRecord(*it);
-				fLocalDatabase->deleteRecord(*it);
-			}
-		}
-	}
-	TQTimer::singleShot( 0, this, TQT_SLOT( slotCleanup() ) );
-}
-
-
-void RecordConduit::slotCleanup()
-{
-	FUNCTIONSETUP;
-
-	// Set the appInfoBlock, just in case the category labels changed
-	_setAppInfo();
-	doPostSync();
-	if(fDatabase)
-	{
-		fDatabase->resetSyncFlags();
-		fDatabase->cleanup();
-	}
-	if(fLocalDatabase)
-	{
-		fLocalDatabase->resetSyncFlags();
-		fLocalDatabase->cleanup();
-	}
-	KPILOT_DELETE( fDatabase );
-	KPILOT_DELETE( fLocalDatabase );
-	// TODO: do something if saving fails!
-	mPCData->saveData();
-	mPCData->cleanup();
-	emit syncDone(this);
-}
-
-
-/** Return the list of category names on the handheld
- */
-const TQStringList RecordConduit::categories() const
-{
-	TQStringList cats;
-	for ( unsigned int j = 0; j < Pilot::CATEGORY_COUNT; j++ ) {
-		TQString catName( category( j ) );
-		if ( !catName.isEmpty() ) cats << catName;
-	}
-	return cats;
-}
-int RecordConduit::findFlags() const
-{
-	return eqFlagsAlmostAll;
-}
-
-
-bool RecordConduit::isDeleted( const PilotAppCategory *palmEntry )
-{
-	if ( !palmEntry )
-		return true;
-	if ( palmEntry->isDeleted() && !palmEntry->isArchived() )
-		return true;
-	if ( palmEntry->isArchived() )
-		return !archiveDeleted();
-	return false;
-}
-bool RecordConduit::isArchived( const PilotAppCategory *palmEntry )
-{
-	if ( palmEntry && palmEntry->isArchived() )
-		return archiveDeleted();
-	else
-		return false;
-}
-
-
-
-
-/*********************************************************************
-                L O A D I N G   T H E   D A T A
- *********************************************************************/
-
-
-
-bool RecordConduit::_prepare()
-{
-	FUNCTIONSETUP;
-
-	readConfig();
-	mSyncedIds.clear();
-	mPCData = initializePCData();
-
-	return mPCData && doPrepare();
-}
-
-
-void RecordConduit::_getAppInfo()
-{
-	FUNCTIONSETUP;
-	// get the address application header information
-	unsigned char *buffer = new unsigned char[Pilot::MAX_APPINFO_SIZE];
-	int appLen=fDatabase->readAppBlock(buffer, Pilot::MAX_APPINFO_SIZE);
-
-	doUnpackAppInfo( buffer, appLen );
-	delete[] buffer;
-	buffer = 0;
-}
-
-void RecordConduit::_setAppInfo()
-{
-	FUNCTIONSETUP;
-	// get the address application header information
-	int appLen = 0;
-	unsigned char *buffer = doPackAppInfo( &appLen );
-	if ( buffer )
-	{	if (fDatabase)
-			fDatabase->writeAppBlock( buffer, appLen );
-		if (fLocalDatabase)
-			fLocalDatabase->writeAppBlock( buffer, appLen );
-		delete[] buffer;
-	}
-}
-
-
-int RecordConduit::compareStr( const TQString & str1, const TQString & str2 )
-{
-//	FUNCTIONSETUP;
-	if ( str1.isEmpty() && str2.isEmpty() )
-		return 0;
-	else
-		return str1.compare( str2 );
-}
-
-
-/**
- * _getCat returns the id of the category from the given categories list.
- * If the address has no categories on the PC, TQString::null is returned.
- * If the current category exists in the list of cats, it is returned
- * Otherwise the first cat in the list that exists on the HH is returned
- * If none of the categories exists on the palm, TQString::null is returned
- */
-TQString RecordConduit::getCatForHH( const TQStringList cats, const TQString curr ) const
-{
-	FUNCTIONSETUP;
-	if ( cats.size() < 1 )
-		return TQString::null;
-	if ( cats.contains( curr ) )
-		return curr;
-	for ( TQStringList::ConstIterator it = cats.begin(); it != cats.end(); ++it)
-	{
-		for ( unsigned int j = 0; j < Pilot::CATEGORY_COUNT; j++ )
-		{
-			TQString catnm( category( j ) );
-			if ( !(*it).isEmpty() && ( (*it)==catnm ) )
-			{
-				return catnm;
-			}
-		}
-	}
-	// If we have a free label, return the first possible cat
-	TQString lastCat( category( Pilot::CATEGORY_COUNT-1 ) );
-	return ( lastCat.isEmpty() ) ? ( cats.first() ) : ( TQString::null );
-}
-
-void RecordConduit::setCategory(PCEntry * pcEntry, TQString cat)
-{
-	if ( !cat.isEmpty() && cat!=category( 0 ) )
-		pcEntry->insertCategory(cat);
-}
-
-
-
-
-
-
-/*********************************************************************
-              G E N E R A L   S Y N C   F U N C T I O N
-         These functions modify the Handheld and the addressbook
- *********************************************************************/
-
-
-
-bool RecordConduit::syncEntry( PCEntry *pcEntry, PilotAppCategory*backupEntry,
-	PilotAppCategory*palmEntry)
-{
-	FUNCTIONSETUP;
-
-	if ( getSyncDirection() == SyncAction::eCopyPCToHH )
-	{
-		if ( pcEntry->isEmpty() )
-		{
-			return pcDeleteEntry( pcEntry, backupEntry, palmEntry );
-		}
-		else
-		{
-			return pcCopyToPalm( pcEntry, backupEntry, palmEntry );
-		}
-	}
-
-	if ( getSyncDirection() == SyncAction::eCopyHHToPC )
-	{
-		if (!palmEntry)
-			return pcDeleteEntry(pcEntry, backupEntry, palmEntry);
-		else
-			return palmCopyToPC(pcEntry, backupEntry, palmEntry);
-	}
-
-	if ( !backupEntry || isFirstSync() )
-	{
-		/*
-		Resolution matrix (0..does not exist, E..exists, D..deleted flag set, A..archived):
-		  HH    PC  | Resolution
-		  ------------------------------------------------------------
-		   0     A  |  -
-		   0     E  |  PC -> HH, reset ID if not set correctly
-		   D     0  |  delete (error, should never occur!!!)
-		   D     E  |  CR (ERROR)
-		   E/A   0  |  HH -> PC
-		   E/A   E/A|  merge/CR
-		 */
-		if  ( !palmEntry && isArchived( pcEntry ) )
-		{
-			return true;
-		}
-		else if ( !palmEntry && !pcEntry->isEmpty() )
-		{
-			// PC->HH
-			bool res = pcCopyToPalm( pcEntry, 0L, 0L );
-			return res;
-		}
-		else if ( !palmEntry && pcEntry->isEmpty() )
-		{
-			// everything's empty -> ERROR
-			return false;
-		}
-		else if ( ( isDeleted( palmEntry ) || isArchived( palmEntry ) ) && pcEntry->isEmpty())
-		{
-			if ( isArchived( palmEntry ) )
-				return palmCopyToPC( pcEntry, 0L, palmEntry );
-			else
-				// this happens if you add a record on the handheld and delete it again before you do the next sync
-				return pcDeleteEntry( pcEntry, 0L, palmEntry );
-		}
-		else if ( ( isDeleted(palmEntry) || isArchived( palmEntry ) ) && !pcEntry->isEmpty() )
-		{
-			// CR (ERROR)
-			return smartMergeEntry( pcEntry, 0L, palmEntry );
-		}
-		else if ( pcEntry->isEmpty() )
-		{
-			// HH->PC
-			return palmCopyToPC( pcEntry, 0L, palmEntry );
-		}
-		else
-		{
-			// Conflict Resolution
-			return smartMergeEntry( pcEntry, 0L, palmEntry );
-		}
-	} // !backupEntry
-	else
-	{
-		/*
-		Resolution matrix:
-		  1) if HH.(empty| (deleted &! archived) ) -> { if (PC==B) -> delete, else -> CR }
-		     if HH.archived -> {if (PC==B) -> copyToPC, else -> CR }
-		     if PC.empty -> { if (HH==B) -> delete, else -> CR }
-		     if PC.archived -> {if (HH==B) -> delete on HH, else CR }
-		  2) if PC==HH -> { update B, update ID of PC if needed }
-		  3) if PC==B -> { HH!=PC, thus HH modified, so copy HH->PC }
-		     if HH==B -> { PC!=HH, thus PC modified, so copy PC->HH }
-		  4) else: all three PCEntrys are different -> CR
-		*/
-
-		if ( !palmEntry || isDeleted(palmEntry) )
-		{
-			if ( _equal( backupEntry, pcEntry ) || pcEntry->isEmpty() )
-			{
-				return pcDeleteEntry( pcEntry, backupEntry, 0L );
-			}
-			else
-			{
-				return smartMergeEntry( pcEntry, backupEntry, 0L );
-			}
-		}
-		else if ( pcEntry->isEmpty() )
-		{
-			if (*palmEntry == *backupEntry)
-			{
-				return pcDeleteEntry( pcEntry, backupEntry, palmEntry );
-			}
-			else
-			{
-				return smartMergeEntry( pcEntry, backupEntry, palmEntry );
-			}
-		}
-		else if ( _equal( palmEntry, pcEntry ) )
-		{
-			// update Backup, update ID of PC if neededd
-			return backupSaveEntry( palmEntry );
-		}
-		else if ( _equal( backupEntry, pcEntry ) )
-		{
-#ifdef DEBUG
-			DEBUGKPILOT << "Flags: " << palmEntry->getAttrib() << ", isDeleted=" <<
-				isDeleted( palmEntry ) << ", isArchived=" << isArchived( palmEntry )
-				<< endl;
-#endif
-			if ( isDeleted( palmEntry ) )
-			{
-				return pcDeleteEntry( pcEntry, backupEntry, palmEntry );
-			}
-			else
-			{
-				return palmCopyToPC( pcEntry, backupEntry, palmEntry );
-			}
-		}
-		else if ( *palmEntry == *backupEntry )
-		{
-			return pcCopyToPalm( pcEntry, backupEntry, palmEntry );
-		}
-		else
-		{
-			// CR, since all are different
-			return smartMergeEntry( pcEntry, backupEntry, palmEntry );
-		}
-	} // backupEntry
-	return false;
-}
-
-bool RecordConduit::pcCopyToPalm( PCEntry *pcEntry, PilotAppCategory *backupEntry,
-		PilotAppCategory*palmEntry )
-{
-	FUNCTIONSETUP;
-
-	if ( pcEntry->isEmpty() ) return false;
-	PilotAppCategory *hhEntry = palmEntry;
-	bool hhEntryCreated = false;
-	if ( !hhEntry )
-	{
-		hhEntry = createPalmEntry( 0 );
-		hhEntryCreated=true;
-	}
-	_copy( hhEntry, pcEntry );
-#ifdef DEBUG
-	DEBUGKPILOT << "palmEntry->id=" << hhEntry->id() << ", pcEntry.ID=" <<
-		pcEntry->uid() << endl;
-#endif
-
-	if( palmSaveEntry( hhEntry, pcEntry ) )
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << "Entry palmEntry->id=" <<
-		hhEntry->id() << "saved to palm, now updating pcEntry->uid()=" << pcEntry->uid() << endl;
-#endif
-		pcSaveEntry( pcEntry, backupEntry, hhEntry );
-	}
-	if ( hhEntryCreated ) KPILOT_DELETE( hhEntry );
-	return true;
-}
-
-
-
-
-bool RecordConduit::palmCopyToPC( PCEntry *pcEntry, PilotAppCategory *backupEntry,
-		PilotAppCategory *palmEntry )
-{
-	FUNCTIONSETUP;
-	if ( !palmEntry )
-	{
-		return false;
-	}
-	_copy( pcEntry, palmEntry );
-	pcSaveEntry( pcEntry, backupEntry, palmEntry );
-	backupSaveEntry( palmEntry );
-	return true;
-}
-
-
-
-/*********************************************************************
-                 l o w - l e v e l   f u n c t i o n s   f o r
-                   adding / removing palm/pc records
- *********************************************************************/
-
-
-
-bool RecordConduit::palmSaveEntry( PilotAppCategory *palmEntry, PCEntry *pcEntry )
-{
-	FUNCTIONSETUP;
-
-#ifdef DEBUG
-	DEBUGKPILOT << "Saving to pilot " << palmEntry->id() << endl;
-#endif
-
-	PilotRecord *pilotRec = palmEntry->pack();
-	recordid_t pilotId = fDatabase->writeRecord(pilotRec);
-#ifdef DEBUG
-	DEBUGKPILOT << "PilotRec nach writeRecord (" << pilotId <<
-		": ID=" << pilotRec->id() << endl;
-#endif
-	fLocalDatabase->writeRecord( pilotRec );
-	KPILOT_DELETE( pilotRec );
-
-	// pilotId == 0 if using local db, so don't overwrite the valid id
-	if ( pilotId != 0 )
-	{
-		palmEntry->setID( pilotId );
-		if ( !mSyncedIds.contains( pilotId ) )
-		{
-			mSyncedIds.append( pilotId );
-		}
-	}
-
-	recordid_t hhId( pcEntry->recid() );
-	if ( hhId != pilotId )
-	{
-		pcEntry->setRecid( pilotId );
-		return true;
-	}
-
-	return false;
-}
-
-
-
-bool RecordConduit::backupSaveEntry( PilotAppCategory *backup )
-{
-	FUNCTIONSETUP;
-	if ( !backup ) return false;
-
-
-#ifdef DEBUG
-//	showPilotAppCategory( backup );
-#endif
-	PilotRecord *pilotRec = backup->pack();
-	fLocalDatabase->writeRecord( pilotRec );
-	KPILOT_DELETE( pilotRec );
-	return true;
-}
-
-
-
-bool RecordConduit::pcSaveEntry( PCEntry *pcEntry, PilotAppCategory *,
-	PilotAppCategory * )
-{
-	FUNCTIONSETUP;
-
-#ifdef DEBUG
-	DEBUGKPILOT << "Before _savepcEntry, pcEntry->uid()=" <<
-		pcEntry->uid() << endl;
-#endif
-	if ( pcEntry->recid() != 0 )
-	{
-		mEntryMap.insert( pcEntry->recid(), pcEntry->uid() );
-	}
-
-	mPCData->updateEntry( pcEntry );
-	return true;
-}
-
-
-
-bool RecordConduit::pcDeleteEntry( PCEntry *pcEntry, PilotAppCategory *backupEntry,
-	PilotAppCategory *palmEntry )
-{
-	FUNCTIONSETUP;
-
-	if ( palmEntry )
-	{
-		if ( !mSyncedIds.contains( palmEntry->id() ) )
-		{
-			mSyncedIds.append(palmEntry->id());
-		}
-		palmEntry->makeDeleted();
-		PilotRecord *pilotRec = palmEntry->pack();
-		pilotRec->setDeleted();
-		mPalmIndex--;
-		fDatabase->writeRecord( pilotRec );
-		fLocalDatabase->writeRecord( pilotRec );
-		mSyncedIds.append( pilotRec->id() );
-		KPILOT_DELETE( pilotRec );
-	}
-	else if ( backupEntry )
-	{
-		if ( !mSyncedIds.contains( backupEntry->id() ) )
-		{
-			mSyncedIds.append( backupEntry->id() );
-		}
-		backupEntry->makeDeleted();
-		PilotRecord *pilotRec = backupEntry->pack();
-		pilotRec->setDeleted();
-		mPalmIndex--;
-		fLocalDatabase->writeRecord( pilotRec );
-		mSyncedIds.append( pilotRec->id() );
-		KPILOT_DELETE( pilotRec );
-	}
-	if ( !pcEntry->isEmpty() )
-	{
-#ifdef DEBUG
-		DEBUGKPILOT << fname << " removing " << pcEntry->uid() << endl;
-#endif
-		mPCData->removeEntry( pcEntry );
-	}
-	return true;
-}
-
-
-
-/*********************************************************************
-                   C O P Y   R E C O R D S
- *********************************************************************/
-
-
-
-
-
-/*********************************************************************
- C O N F L I C T   R E S O L U T I O N   a n d   M E R G I N G
- *********************************************************************/
-
-
-
-
-// TODO: right now entries are equal if both first/last name and organization are
-//  equal. This rules out two entries for the same person(e.g. real home and weekend home)
-//  or two persons with the same name where you don't know the organization.!!!
-RecordConduit::PCEntry *RecordConduit::findMatch( PilotAppCategory *palmEntry ) const
-{
-	FUNCTIONSETUP;
-	if ( !palmEntry )
-		return 0;
-
-	// TODO: also search with the pilotID
-	// first, use the pilotID to UID map to find the appropriate record
-	if( !isFirstSync() && ( palmEntry->id() > 0) )
-	{
-		TQString id( mEntryMap[palmEntry->id()] );
-#ifdef DEBUG
-		DEBUGKPILOT << fname << ": PilotRecord has id " << palmEntry->id() << ", mapped to " << id << endl;
-#endif
-		if( !id.isEmpty() )
-		{
-			PCEntry *res = mPCData->findByUid( id );
-			if ( !res && !res->isEmpty() ) return res;
-			KPILOT_DELETE( res );
-#ifdef DEBUG
-			DEBUGKPILOT << fname << ": PilotRecord has id " << palmEntry->id() <<
-				", but could not be found on the PC side" << endl;
-#endif
-		}
-	}
-
-	for ( PCData::Iterator iter = mPCData->begin(); !mPCData->atEnd( iter ); ++iter )
-	{
-		PCEntry *abEntry = *iter;
-		recordid_t rid( abEntry->recid() );
-		if ( rid>0 )
-		{
-			if ( rid == palmEntry->id() )
-				return abEntry;// yes, we found it
-			// skip this PCEntry, as it has a different corresponding address on the handheld
-			//if ( mAllIds.contains( rid ) ) continue;
-		}
-
-		if ( _equal( palmEntry, abEntry, eqFlagsAlmostAll ) )
-		{
-			return abEntry;
-		}
-		KPILOT_DELETE( abEntry );
-	}
-#ifdef DEBUG
-	DEBUGKPILOT << fname << ": Could not find any entry matching Palm record with id " << TQString::number( palmEntry->id() ) << endl;
-#endif
-	return 0;
-}
-
-#endif
-
-
-
-
-#include "recordConduit.moc"
-
diff --git a/kpilot/lib/recordConduit.h b/kpilot/lib/recordConduit.h
deleted file mode 100644
index 743e326d..00000000
--- a/kpilot/lib/recordConduit.h
+++ /dev/null
@@ -1,181 +0,0 @@
-#ifndef _KPILOT_RECORDCONDUIT_H
-#define _KPILOT_RECORDCONDUIT_H
-/* record-conduit.h                           KPilot
-**
-** Copyright (C) 2005 by Adriaan de Groot
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <tqtimer.h>
-#include <klocale.h>
-
-#include "plugin.h"
-#include "pilot.h"
-#include "pilotDatabase.h"
-#include "kpilotdevicelink.h"
-
-class KPilotDeviceLink;
-
-/** @file
-*
-* This file defines a generic syncing framework for Palm Pilot oriented data.
-* It is a lot like KitchenSync's Syncees and such. Basically, we define a
-* generic container for data on the PC side and give that container an API
-* for searching for a specific handheld record. Syncing consists of iterating
-* through the handheld's records and looking up the PC data for each record,
-* and then syncing.
-*
-*/
-
-/** An intermediate class that introduces the slots we need for our sync
-* implementation. This is here _only_ because mixing moc with template
-* classes sounds really scary.
-*/
-
-class RecordConduitBase : public ConduitAction
-{
-Q_OBJECT
-public:
-	/** Constructor. The TQStringList @p a sets flags for the ConduitAction.
-	*/
-	RecordConduitBase(KPilotDeviceLink *o,
-		const char *n,
-		const TQStringList a = TQStringList()) :
-		ConduitAction(o,n,a),
-		fTimer(0L)
-	{
-	} ;
-	/** Destructor. */
-	virtual ~RecordConduitBase()
-	{
-		// delete fTimer; // Timer is a child object
-	} ;
-
-	/** Return values for the processing functions. Each should return
-	* NotDone if it needs to be called again (e.g. to process another record),
-	* Done if it is finished and something else should be done, and
-	* Error if the sync cannot be completed.
-	*/
-	enum SyncProgress { NotDone=0, Done=1, Error=2 } ;
-
-	/** Returns a human-readable name for the progress indicator @p s */
-	static TQString name(SyncProgress s);
-
-	/** State of the conduit's sync. This is changed by process(). */
-	enum States { Initialize, PalmToPC, PCToPalm, Cleanup } ;
-
-	static TQString name(States s);
-
-protected:
-	/** Function called at the beginning of a sync to load data from the PC.
-	* @return Done when the load has finished.
-	* @see process
-	*/
-	virtual SyncProgress loadPC() = 0;
-
-	/** Function called repeatedly to fetch the next modified entry from the Palm and
-	* sync it with the PC by looking up the record, and calling the syncer for it.
-	*
-	* @return Dome when there are no more modified records on the Palm
-	* @see process()
-	*/
-	virtual SyncProgress palmRecToPC() = 0;
-
-	/** Function called repeatedly to fetch the next modified entry from the PC and
-	* sync it with the Palm by looking up the record and calling the syncer for it.
-	*
-	* @return Done when there are no more modified records on the PC
-	* @see process()
-	*/
-	virtual SyncProgress pcRecToPalm() = 0;
-
-	/** Function called at the end of this conduit's sync, which should reset DB flags
-	* and write changed config data out to disk.
-	*
-	* @return Done when the cleanup is complete.
-	* @see process()
-	*/
-	virtual SyncProgress cleanup() = 0;
-
-protected slots:
-	/** Slot used for the implementation of a state machine: calls each of the
-	* relevant other slots (above) as needed until they return true.
-	*/
-	void process();
-
-protected:
-	virtual bool exec();
-
-private:
-	/** Timer to signal the process() slot. Used to keep the UI responsive. */
-	TQTimer *fTimer;
-
-	States fState;
-
-	Pilot::RecordIDList fIDList;
-	Pilot::RecordIDList::Iterator fIDListIterator;
-
-	TQString fDBName;
-} ;
-
-template <class PCEntry, class PCContainer, class HHEntry, class HHAppInfo, class Syncer>
-class RecordConduit : public RecordConduitBase
-{
-public:
-	/** Construct a record conduit on a given device link. */
-	RecordConduit(
-		KPilotDeviceLink *o /**< Connection to HH */,
-		const char *n /**< Name for TQObject */,
-		const TQStringList a = TQStringList() /**< Flags */) :
-		RecordConduitBase(o,n,a)
-	{
-	} ;
-	virtual ~RecordConduit()
-	{
-	} ;
-
-	virtual SyncProgress loadPC()
-	{
-		return Done;
-	} ;
-
-	virtual SyncProgress palmRecToPC()
-	{
-		return Done;
-	}
-
-	virtual SyncProgress pcRecToPalm()
-	{
-		return Done;
-	}
-
-	virtual SyncProgress cleanup()
-	{
-		return Done;
-	}
-} ;
-
-
-#endif
-
diff --git a/kpilot/lib/syncAction.cc b/kpilot/lib/syncAction.cc
deleted file mode 100644
index d9f53955..00000000
--- a/kpilot/lib/syncAction.cc
+++ /dev/null
@@ -1,512 +0,0 @@
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-** Copyright (C) 2001 by Waldo Bastian (code in questionYesNo)
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <time.h>
-
-#include <pi-socket.h>
-#include <pi-dlp.h>
-
-#include <tqtimer.h>
-#include <tqvbox.h>
-#include <tqlayout.h>
-#include <tqcheckbox.h>
-#include <tqlabel.h>
-#include <tqmessagebox.h>
-#include <tqdir.h>
-#include <tqfile.h>
-#include <tqfileinfo.h>
-#include <tqtl.h>
-#include <tqstyle.h>
-
-#include <kdialogbase.h>
-#include <kglobal.h>
-#include <kstandarddirs.h>
-#include <kconfig.h>
-#include <kmessagebox.h>
-
-#include "syncAction.moc"
-#include "kpilotlibSettings.h"
-
-SyncAction::SyncAction(KPilotLink  *p,
-	const char *name) :
-	TQObject(p, name),
-	fHandle(p),
-	fParent(0L)
-{
-	FUNCTIONSETUP;
-}
-
-SyncAction::SyncAction(KPilotLink *p,
-	TQWidget * visibleparent,
-	const char *name) :
-	TQObject(p, name),
-	fHandle(p),
-	fParent(visibleparent)
-{
-	FUNCTIONSETUP;
-}
-
-SyncAction::~SyncAction()
-{
-}
-
-/* virtual */ TQString SyncAction::statusString() const
-{
-	FUNCTIONSETUP;
-	TQString s = CSL1("status=");
-
-	s.append(TQString::number(status()));
-	return s;
-}
-
-/* slot */ void SyncAction::execConduit()
-{
-	FUNCTIONSETUP;
-
-	DEBUGKPILOT << fname << ": Exec " << name() << endl;
-
-	bool r = this->exec();
-
-	DEBUGKPILOT << fname << ": Exec " << name()
-		<< (r ? " is running" : " failed to start") << endl;
-
-	if (!r)
-	{
-		emit logError(i18n("The conduit %1 could not be executed.")
-			.arg(TQString::fromLatin1(name())));
-		delayDone();
-	}
-}
-
-/* slot */ void SyncAction::delayedDoneSlot()
-{
-	emit syncDone(this);
-}
-
-bool SyncAction::delayDone()
-{
-	TQTimer::singleShot(0,this,TQT_SLOT(delayedDoneSlot()));
-	return true;
-}
-
-static struct
-{
-	SyncAction::SyncMode::Mode mode;
-	const char *name;
-} maps[] =
-{
-	{ SyncAction::SyncMode::eHotSync, "--hotsync" },
-	{ SyncAction::SyncMode::eFullSync, "--full" },
-	{ SyncAction::SyncMode::eCopyPCToHH, "--copyPCToHH" },
-	{ SyncAction::SyncMode::eCopyHHToPC, "--copyHHToPC" },
-	{ SyncAction::SyncMode::eBackup, "--backup" },
-	{ SyncAction::SyncMode::eRestore, "--restore" },
-	{ SyncAction::SyncMode::eFullSync, "--fullsync" },
-	{ SyncAction::SyncMode::eHotSync, (const char *)0 }
-}
-;
-
-SyncAction::SyncMode::SyncMode(const TQStringList &args) :
-	fMode(eHotSync),
-	fTest(args.contains("--test")),
-	fLocal(args.contains("--local"))
-{
-	int i = 0;
-	while(maps[i].name)
-	{
-		if (args.contains(TQString::fromLatin1(maps[i].name)))
-		{
-			fMode = maps[i].mode;
-			break;
-		}
-		i++;
-	}
-
-	if (!maps[i].name)
-	{
-		WARNINGKPILOT << "No mode set by arguments ("
-			<< args.join(",") << ") defaulting to HotSync." << endl;
-	}
-}
-
-SyncAction::SyncMode::SyncMode(Mode m, bool test, bool local) :
-	fMode(m),
-	fTest(test),
-	fLocal(local)
-{
-	if ( ((int)m<(int)eHotSync) || ((int)m>(int)eRestore) )
-	{
-		WARNINGKPILOT << "Mode value " << (int)m << " is illegal"
-			", defaulting to HotSync." << endl;
-		fMode = eHotSync;
-	}
-}
-
-TQStringList SyncAction::SyncMode::list() const
-{
-	FUNCTIONSETUPL(3);
-
-	TQStringList l;
-	int i=0;
-
-	while(maps[i].name)
-	{
-		if ( fMode == maps[i].mode )
-		{
-			l.append(TQString::fromLatin1(maps[i].name));
-			break;
-		}
-		i++;
-	}
-	if ( !maps[i].name )
-	{
-		WARNINGKPILOT << "Mode " << fMode << " does not have a name." << endl;
-		l.append(TQString::fromLatin1(maps[0].name));
-	}
-
-	if (isTest()) l.append(CSL1("--test"));
-	if (isLocal()) l.append(CSL1("--local"));
-	return l;
-}
-
-/* static */ TQString SyncAction::SyncMode::name(SyncAction::SyncMode::Mode e)
-{
-	switch(e)
-	{
-	case eHotSync : return i18n("HotSync");
-	case eFullSync : return i18n("Full Synchronization");
-	case eCopyPCToHH : return i18n("Copy PC to Handheld");
-	case eCopyHHToPC : return i18n("Copy Handheld to PC");
-	case eBackup : return i18n("Backup");
-	case eRestore : return i18n("Restore From Backup");
-	}
-	return CSL1("<unknown>");
-}
-
-TQString SyncAction::SyncMode::name() const
-{
-	TQString s = name(fMode);
-	if (isTest())
-	{
-
-		s.append(CSL1(" [%1]").arg(i18n("Test Sync")));
-	}
-	if (isLocal())
-	{
-		s.append(CSL1(" [%1]").arg(i18n("Local Sync")));
-	}
-	return s;
-}
-
-bool SyncAction::SyncMode::setMode(int mode)
-{
-	// Resets test and local flags too
-	fTest = fLocal = false;
-
-	if ( (mode>0) && (mode<=eRestore) )
-	{
-		fMode = (SyncAction::SyncMode::Mode) mode;
-		return true;
-	}
-	else
-	{
-		WARNINGKPILOT << "Bad sync mode " << mode << " requested." << endl ;
-		fMode = eHotSync;
-		return false;
-	}
-}
-
-bool SyncAction::SyncMode::setMode(SyncAction::SyncMode::Mode m)
-{
-	int i=0;
-	while ( maps[i].name )
-	{
-		if ( maps[i].mode == m )
-		{
-			fMode = m;
-			return true;
-		}
-		i++;
-	}
-
-	WARNINGKPILOT << "Bad sync mode " << m << " requested." << endl ;
-	fMode = eHotSync;
-	return false;
-}
-
-void SyncAction::startTickle(unsigned timeout)
-{
-	FUNCTIONSETUP;
-
-	if (!deviceLink())
-	{
-		WARNINGKPILOT << "Trying to tickle without a device." << endl;
-	}
-	else
-	{
-		connect(deviceLink(),TQT_SIGNAL(timeout()),this,TQT_SIGNAL(timeout()));
-		deviceLink()->startTickle(timeout);
-	}
-}
-
-void SyncAction::stopTickle()
-{
-	FUNCTIONSETUP;
-	if (!deviceLink())
-	{
-		WARNINGKPILOT << "Trying to tickle without a device." << endl;
-	}
-	else
-	{
-		disconnect(deviceLink(),TQT_SIGNAL(timeout()),this,TQT_SIGNAL(timeout()));
-		deviceLink()->stopTickle();
-	}
-}
-
-
-int SyncAction::questionYesNo(const TQString & text,
-	const TQString & caption,
-	const TQString & key,
-	unsigned timeout,
-	const TQString & yes,
-	const TQString &no )
-{
-	FUNCTIONSETUP;
-
-	bool checkboxReturn = false;
-	int r;
-	KMessageBox::ButtonCode result;
-	if (!key.isEmpty())
-	{
-		if (!KMessageBox::shouldBeShownYesNo(key,result))
-		{
-			return result;
-		}
-	}
-
-	KDialogBase *dialog =
-		new KDialogBase(caption.isNull()? i18n("Question") : caption,
-		KDialogBase::Yes | KDialogBase::No,
-		KDialogBase::Yes, KDialogBase::No,
-		fParent, "questionYesNo", true, true,
-		yes.isEmpty() ? KStdGuiItem::yes() : yes,
-		no.isEmpty() ? KStdGuiItem::no() : no);
-
-	if ( (timeout > 0) && ( deviceLink() ) )
-	{
-		TQObject::connect(deviceLink(), TQT_SIGNAL(timeout()),
-			dialog, TQT_SLOT(slotCancel()));
-		startTickle(timeout);
-	}
-
-#if KDE_IS_VERSION(3,3,0)
-	r = (KMessageBox::ButtonCode) KMessageBox::createKMessageBox(dialog,
-		TQMessageBox::Question,
-		text,
-		TQStringList(),
-		(key.isEmpty() ? TQString::null : i18n("&Do not ask again")),
-		&checkboxReturn,
-		0);
-
-#else
-	// The following code is taken from KDialogBase.cc,
-	// part of the KDE 2.2 libraries. Copyright 2001
-	// by Waldo Bastian.
-	//
-	//
-	TQVBox *topcontents = new TQVBox(dialog);
-
-	topcontents->setSpacing(KDialog::spacingHint() * 2);
-	topcontents->setMargin(KDialog::marginHint() * 2);
-
-	TQWidget *contents = new TQWidget(topcontents);
-	TQHBoxLayout *lay = new TQHBoxLayout(contents);
-
-	lay->setSpacing(KDialog::spacingHint() * 2);
-
-	lay->addStretch(1);
-	TQLabel *label1 = new TQLabel( contents);
-	label1->setPixmap(TQMessageBox::standardIcon(TQMessageBox::Information));
-	lay->add( label1 );
-	TQLabel *label2 = new TQLabel( text, contents);
-	label2->setMinimumSize(label2->sizeHint());
-	lay->add(label2);
-	lay->addStretch(1);
-
-	TQSize extraSize = TQSize(50, 30);
-
-	TQCheckBox *checkbox = 0L;
-	if (!key.isEmpty())
-	{
-		checkbox = new TQCheckBox(i18n("Do not ask again"),topcontents);
-		extraSize = TQSize(50,0);
-	}
-
-	dialog->setMainWidget(topcontents);
-	dialog->enableButtonSeparator(false);
-	dialog->incInitialSize(extraSize);
-
-	r = dialog->exec();
-	if (checkbox)
-	{
-		checkboxReturn = checkbox->isChecked();
-	}
-#endif
-
-	switch(r)
-	{
-	case KDialogBase::Yes : result=KMessageBox::Yes ; break;
-	case KDialogBase::No  : result=KMessageBox::No; break;
-	case KDialogBase::Cancel : result=KMessageBox::Cancel; break;
-	default : break;
-	}
-
-	stopTickle();
-
-	if (!key.isEmpty() && checkboxReturn)
-	{
-		KMessageBox::saveDontShowAgainYesNo(key,result);
-	}
-
-	return result;
-}
-
-
-int SyncAction::questionYesNoCancel(const TQString & text,
-	const TQString & caption,
-	const TQString & key,
-	unsigned timeout,
-	const TQString &yes,
-	const TQString &no)
-{
-	FUNCTIONSETUP;
-
-	bool checkboxReturn = false;
-	int r;
-	KMessageBox::ButtonCode result;
-
-	if (!key.isEmpty())
-	{
-		if (!KMessageBox::shouldBeShownYesNo(key,result))
-		{
-			if (result != KMessageBox::Cancel)
-			{
-				return result;
-			}
-		}
-	}
-
-	KDialogBase *dialog =
-		new KDialogBase(caption.isNull()? i18n("Question") : caption,
-		KDialogBase::Yes | KDialogBase::No | KDialogBase::Cancel,
-		KDialogBase::Yes, KDialogBase::Cancel,
-		fParent, "questionYesNoCancel", true, true,
-		(yes.isEmpty() ? KStdGuiItem::yes() : yes),
-		(no.isEmpty() ? KStdGuiItem::no() : no),
-		KStdGuiItem::cancel());
-
-	if ( (timeout > 0) && (deviceLink()) )
-	{
-		TQObject::connect(deviceLink(), TQT_SIGNAL(timeout()),
-			dialog, TQT_SLOT(slotCancel()));
-		startTickle(timeout);
-	}
-
-#if KDE_IS_VERSION(3,3,0)
-	r = KMessageBox::createKMessageBox(dialog,
-		TQMessageBox::Question,
-		text,
-		TQStringList(),
-		(key.isEmpty() ? TQString::null : i18n("&Do not ask again")),
-		&checkboxReturn,
-		0);
-#else
-	// The following code is taken from KDialogBase.cc,
-	// part of the KDE 2.2 libraries. Copyright 2001
-	// by Waldo Bastian.
-	//
-	//
-	TQVBox *topcontents = new TQVBox(dialog);
-
-	topcontents->setSpacing(KDialog::spacingHint() * 2);
-	topcontents->setMargin(KDialog::marginHint() * 2);
-
-	TQWidget *contents = new TQWidget(topcontents);
-	TQHBoxLayout *lay = new TQHBoxLayout(contents);
-
-	lay->setSpacing(KDialog::spacingHint() * 2);
-
-	lay->addStretch(1);
-	TQLabel *label1 = new TQLabel( contents);
-	label1->setPixmap(TQMessageBox::standardIcon(TQMessageBox::Information));
-	lay->add( label1 );
-	TQLabel *label2 = new TQLabel( text, contents);
-	label2->setMinimumSize(label2->sizeHint());
-	lay->add(label2);
-	lay->addStretch(1);
-
-	TQSize extraSize = TQSize(50, 30);
-
-	TQCheckBox *checkbox = 0L;
-	if (!key.isEmpty())
-	{
-		checkbox = new TQCheckBox(i18n("Do not ask again"),topcontents);
-		extraSize = TQSize(50,0);
-	}
-
-	dialog->setMainWidget(topcontents);
-	dialog->enableButtonSeparator(false);
-	dialog->incInitialSize(extraSize);
-
-	r = dialog->exec();
-	if (checkbox)
-	{
-		checkboxReturn = checkbox->isChecked();
-	}
-#endif
-
-	switch(r)
-	{
-	case KDialogBase::Yes : result=KMessageBox::Yes ; break;
-	case KDialogBase::No  : result=KMessageBox::No; break;
-	case KDialogBase::Cancel : result=KMessageBox::Cancel; break;
-	default : break;
-	}
-	stopTickle();
-
-	if (!key.isEmpty() && checkboxReturn)
-	{
-		KMessageBox::saveDontShowAgainYesNo(key,result);
-	}
-
-	return result;
-}
-
diff --git a/kpilot/lib/syncAction.h b/kpilot/lib/syncAction.h
deleted file mode 100644
index d17993fb..00000000
--- a/kpilot/lib/syncAction.h
+++ /dev/null
@@ -1,410 +0,0 @@
-#ifndef _KPILOT_SYNCACTION_H
-#define _KPILOT_SYNCACTION_H
-/* KPilot
-**
-** Copyright (C) 1998-2001 by Dan Pilone
-** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
-** Copyright (C) 2006 Adriaan de Groot <groot@kde.org>
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <time.h>
-
-#include <pi-dlp.h>
-
-#include <tqobject.h>
-#include <tqstring.h>
-#include <tqstringlist.h>
-
-#include "kpilotlink.h"
-
-/** @file
-* SyncAction
-*/
-
-class TQTimer;
-class KPilotUser;
-class SyncAction;
-
-class KDE_EXPORT SyncAction : public QObject
-{
-Q_OBJECT
-
-public:
-	SyncAction(KPilotLink *p,
-		const char *name=0L);
-	SyncAction(KPilotLink *p,
-		TQWidget *visibleparent,
-		const char *name=0L);
-	~SyncAction();
-
-	typedef enum { Error=-1 } Status;
-
-	/** A syncaction has a status, which can be expressed as an
-	*   integer. Subclasses are expected to define their own status
-	*   values as needed.
-	*/
-	int status() const
-	{
-		return fActionStatus;
-	}
-	/** Return a human-readable representation of the status. */
-	virtual TQString statusString() const;
-
-protected:
-	/**
-	* This function starts the actual processing done
-	* by the conduit. It should return false if the
-	* processing cannot be initiated, f.ex. because
-	* some parameters were not set or a needed library
-	* is missing. This will be reported to the user.
-	* It should return true if processing is started
-	* normally. If processing starts normally, it is
-	* the _conduit's_ responsibility to eventually
-	* emit syncDone(); if processing does not start
-	* normally (ie. exec() returns false) then the
-	* environment will deal with syncDone().
-	*/
-	virtual bool exec() = 0;
-
-public slots:
-	/**
-	* This just calls exec() and deals with the
-	* return code.
-	*/
-	void execConduit();
-
-signals:
-	void syncDone(SyncAction *);
-	void logMessage(const TQString &);
-	void logError(const TQString &);
-	void logProgress(const TQString &,int);
-
-protected slots:
-	/** This slot emits syncDone(), and does nothing else. This
-	*   is safe, since the method returns immediately after the
-	*   emit -- even if syncDone() causes the SyncAction to be deleted.
-	*/
-	void delayedDoneSlot();
-
-protected:
-	/**
-	* It might not be safe to emit syncDone() from exec().
-	* So instead, call delayDone() to wait for the main event
-	* loop to return if you manage to do all processing
-	* immediately.
-	*
-	* delayDone() returns true, so that return delayDone();
-	* is a sensible final statement in exec().
-	*/
-	bool delayDone();
-
-public:
-	/** Public API for adding a sync log entry, see the implementation
-	*   in KPilotLink::addSyncLogEntry().
-	* @param e   Message to add to the sync log
-	* @param log If @c true, also add the entry to the log in KPilot
-	* @note Having messages appear on the handheld but not in KPilot
-	*       should be a @em very rare occurrence.
-	*/
-	void addSyncLogEntry(const TQString &e,bool log=true)
-	{
-		if (deviceLink())
-		{
-			deviceLink()->addSyncLogEntry(e,log);
-		}
-	}
-	/** Public API for adding a message to the log in KPilot.
-	*   Adds @p msg to the synclog maintained on the PC.
-	*/
-	void addLogMessage( const TQString &msg )
-	{
-		emit logMessage( msg );
-	}
-	/** Log an error message in KPilot (the PC side of things). */
-	void addLogError( const TQString &msg )
-	{
-		emit logError( msg );
-	}
-	/** Log progress in KPilot (the PC side of things). */
-	void addLogProgress( const TQString &msg, int prog )
-	{
-		emit logProgress( msg, prog );
-	}
-protected:
-	/** Connection to the device. @todo make private. */
-	KPilotLink *fHandle;
-	int fActionStatus;
-
-	/** Returns a pointer to the connection to the device. */
-	inline KPilotLink *deviceLink() const
-	{
-		return fHandle;
-	}
-
-	/** Returns the file descriptor for the device link -- that is,
-	* the raw handle to the OS's connection to the device. Use with care.
-	* May return -1 if there is no device.
-	*/
-	int pilotSocket() const
-	{
-		return deviceLink() ? deviceLink()->pilotSocket() : -1 ;
-	}
-
-	/** Tells the handheld device that someone is talking to it now.
-	* Useful (repeatedly) to inform the user of what is going on.
-	* May return < 0 on error (or if there is no device attached).
-	*/
-	int openConduit()
-	{
-		return deviceLink() ? deviceLink()->openConduit() : -1;
-	}
-public:
-	/**
-	* This class encapsulates the different sync modes that
-	* can be used, and enforces a little discipline in changing
-	* the mode and messing around in general. It replaces a
-	* simple enum by not much more, but it makes things like
-	* local test backups less likely to happen.
-	*
-	* Note that this could all be packed into a bitfield (5 bits needed)
-	* but that makes for messy code in the end.
-	*/
-	class SyncMode
-	{
-	public:
-		/** Available modes for the sync. */
-		enum Mode {
-			eHotSync=1,
-			eFullSync=2,
-			eCopyPCToHH=3,
-			eCopyHHToPC=4,
-			eBackup=5,
-			eRestore=6
-		} ;
-
-		/** Create a mode with the given Mode @p m and
-		* the mix-ins @p test and @p local, which
-		* determine whether the sync should actually change
-		* anything at all (test mode) and whether the HH is
-		* to be simulated by local databases.
-		*/
-		SyncMode(Mode m, bool test=false, bool local=false);
-
-		/** Create a mode by parsing the string list. This
-		* is used mostly by the conduit proxies, which use
-		* a string list to pass aparameters to the shared
-		* library loader.
-		*/
-		SyncMode(const TQStringList &l);
-
-		/** Returns the kind of sync; this is just incomplete
-		* information, since a test hot sync is very different from
-		* a non-test one. */
-		Mode mode() const
-		{
-			return fMode;
-		}
-
-		/** Sets a mode from an integer @p mode, if possible.
-		* If the @p mode is illegal, return false and set the
-		* mode to Hot Sync. As a side effect, options test and local
-		* are reset to false.
-		*/
-		bool setMode(int);
-
-		/** Sets a mode from a @p mode, if possible. This leaves
-		* the options unchanged, so as to reward properly-typed programming.
-		*/
-		bool setMode(Mode m);
-
-		/** Sets options. Returns false if the combination of mode
-		* and the options is impossible. */
-		bool setOptions(bool test, bool local)
-		{
-			fTest=test;
-			fLocal=local;
-			return true;
-		}
-
-		/** Shorthand to test for a specific mode enum. This disregards
-		*   the mixings local and test.
-		*/
-		bool operator ==(const Mode &m) const
-		{
-			return mode() == m;
-		}
-		/** Longhand comparison. Compares two modes for the same
-		*   mode enum and mixins local and test.
-		*/
-		bool operator ==(const SyncMode &m) const
-		{
-			return ( mode() == m.mode() ) &&
-				( isTest() == m.isTest() ) &&
-				( isLocal() == m.isLocal() );
-		} ;
-
-		/** Accessor for the test part of the mode. Test syncs should
-		*   never actually modify data anywhere.
-		*/
-		bool isTest() const
-		{
-			return fTest;
-		}
-
-		/** Accessor for the local part of the mode. Local syncs use a
-		*   local database instead of one on the device link.
-		*/
-		bool isLocal() const
-		{
-			return fLocal;
-		}
-
-		bool isFullSync() const
-		{
-			return	( fMode==eFullSync  ) ||
-				( fMode==eCopyPCToHH) ||
-				( fMode==eCopyHHToPC) ;
-		} ;
-		bool isFirstSync() const
-		{
-			return ( fMode==eCopyHHToPC ) || ( fMode==eCopyPCToHH ) ;
-		};
-
-		/** Classify every mode as either a sync (two-way) or copy (one-way) mode. */
-		bool isSync() const
-		{
-			return ( fMode==eFullSync ) ||
-				( fMode == eHotSync );
-		} ;
-
-		/** Classify every mode as either a sync (two-way) or copy (one-way) mode. */
-		bool isCopy() const
-		{
-			return ( fMode==eBackup ) ||
-				( fMode==eRestore ) ||
-				( fMode==eCopyPCToHH ) ||
-				( fMode==eCopyHHToPC );
-		} ;
-
-		/**
-		* Returns a standard name for each of the sync modes.
-		*/
-		static TQString name(Mode);
-
-		/**
-		* Returns a (human readable) name for this particular mode,
-		* including extra information about test and local mode.
-		*/
-		TQString name() const;
-
-		/**
-		* Returns a TQStringList that, when passed to the constructor
-		* of SyncMode, will re-create it. Used to pass modes into
-		* shared library factories.
-		*/
-		TQStringList list() const;
-
-	private:
-		Mode fMode;
-		bool fTest;
-		bool fLocal;
-	};
-
-
-	enum ConflictResolution
-	{
-		eUseGlobalSetting=-1,
-		eAskUser=0,
-		eDoNothing,
-		eHHOverrides,
-		ePCOverrides,
-		ePreviousSyncOverrides,
-		eDuplicate,
-		eDelete,
-		eCROffset=-1
-	};
-
-	/**
-	 * This MUST stay in sync with the combobox in
-	 * kpilotConfigDialog_backup.ui.  If it does not, you need to
-	 * either change this enum or the combobox.
-	 */
-	enum BackupFrequency
-	{
-		eEveryHotSync=0,
-		eOnRequestOnly
-	};
-
-protected:
-	/**
-	* Call startTickle() some time before showing a dialog to the
-	* user (we're assuming a local event loop here) so that while
-	* the dialog is up and the user is thinking, the pilot stays
-	* awake. Afterwards, call stopTickle().
-	*
-	* The parameter to startTickle indicates the timeout, in
-	* seconds, before signal timeout is emitted. You can connect
-	* to that, again, to take down the user interface part if the
-	* user isn't reacting.
-	*/
-	void startTickle(unsigned count=0);
-	void stopTickle();
-signals:
-	void timeout();
-
-
-
-
-protected:
-	TQWidget *fParent;
-
-	/**
-	* Ask a yes-no question of the user. This has a timeout so that
-	* you don't wait forever for inattentive users. It's much like
-	* KMessageBox::questionYesNo(), but with this extra timeout-on-
-	* no-answer feature. Returns a KDialogBase::ButtonCode value - Yes,No or
-	* Cancel on timeout. If there is a key set and the user indicates not to ask again,
-	* the selected answer (Yes or No) is remembered for future reference.
-	*
-	* @p caption Message Box caption, uses "Question" if null.
-	* @p key     Key for the "Don't ask again" code.
-	* @p timeout Timeout, in seconds.
-	*/
-	int questionYesNo(const TQString &question ,
-		const TQString &caption = TQString::null,
-		const TQString &key = TQString::null,
-		unsigned timeout = 20,
-		const TQString &yes = TQString::null,
-		const TQString &no = TQString::null );
-	int questionYesNoCancel(const TQString &question ,
-		const TQString &caption = TQString::null,
-		const TQString &key = TQString::null,
-		unsigned timeout = 20,
-		const TQString &yes = TQString::null,
-		const TQString &no = TQString::null ) ;
-};
-
-
-#endif
diff --git a/kpilot/tests/CMakeLists.txt b/kpilot/tests/CMakeLists.txt
deleted file mode 100644
index b38883c9..00000000
--- a/kpilot/tests/CMakeLists.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-link_directories(${CMAKE_BINARY_DIR}/lib ${CMAKE_CURRENT_BINARY_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_BINARY_DIR}/lib)
-
-# Tests don't need to go into toplevel/bin, they are fine in the current dir.
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-
-# This can be used for finding data files in the source dir
-add_definitions( -DKDESRCDIR=\\"${CMAKE_CURRENT_SOURCE_DIR}\\" )
-
-
-set(testconstants_SRCS testconstants.cc)
-kde3_add_executable(testconstants ${testconstants_SRCS})
-target_link_libraries(testconstants kpilot ${QT_LIBRARIES})
-add_test(testconstants ${EXECUTABLE_OUTPUT_PATH}/testconstants)
-
-set(testcategories_SRCS testcategories.cc)
-kde3_add_executable(testcategories ${testcategories_SRCS})
-target_link_libraries(testcategories kpilot ${QT_LIBRARIES})
-add_test(testcategories ${EXECUTABLE_OUTPUT_PATH}/testcategories)
-
-set(testaddresses_SRCS testaddress.cc)
-kde3_add_executable(testaddresses ${testaddresses_SRCS})
-target_link_libraries(testaddresses kpilot ${QT_LIBRARIES})
-add_test(testaddresses ${EXECUTABLE_OUTPUT_PATH}/testaddresses)
-
-set(testdatebook_SRCS testdatebook.cc)
-kde3_add_executable(testdatebook ${testdatebook_SRCS})
-target_link_libraries(testdatebook kpilot ${QT_LIBRARIES})
-add_test(testdatebook ${EXECUTABLE_OUTPUT_PATH}/testdatebook)
-
-set(testidmapper_SRCS testidmapper.cc)
-kde3_add_executable(testidmapper ${testidmapper_SRCS})
-target_link_libraries(testidmapper kpilot ${QT_LIBRARIES})
-add_test(testidmapper ${EXECUTABLE_OUTPUT_PATH}/testidmapper)
-
-if (HAVE_CALENDARLOCAL_H)
-	set(importdatebook_SRCS importdatebook.cc)
-	set(exportdatebook_SRCS exportdatebook.cc)
-	set(mergecalendars_SRCS mergecalendars.cc)
-	kde3_add_executable(importdatebook ${importdatebook_SRCS})
-	kde3_add_executable(exportdatebook ${exportdatebook_SRCS})
-	kde3_add_executable(mergecalendars ${mergecalendars_SRCS})
-	target_link_libraries(importdatebook kpilot ${QT_LIBRARIES} kcal)
-	target_link_libraries(exportdatebook kpilot ${QT_LIBRARIES} kcal)
-	target_link_libraries(mergecalendars ${QT_LIBRARIES} kcal)
-	add_test(importdatebook ${EXECUTABLE_OUTPUT_PATH}/importdatebook)
-	add_test(exportdatebook ${EXECUTABLE_OUTPUT_PATH}/exportdatebook)
-	add_test(mergecalendars ${EXECUTABLE_OUTPUT_PATH}/mergecalendars)
-endif (HAVE_CALENDARLOCAL_H)
-
-set(importaddresses_SRCS importaddresses.cc)
-kde3_add_executable(importaddresses ${importaddresses_SRCS})
-target_link_libraries(importaddresses kpilot ${QT_LIBRARIES} kabc kabc_file)
-add_test(importaddresses ${EXECUTABLE_OUTPUT_PATH}/importaddresses)
-
diff --git a/kpilot/tests/conduits/vcalconduit/exampletest.cc b/kpilot/tests/conduits/vcalconduit/exampletest.cc
deleted file mode 100644
index b16a6c3e..00000000
--- a/kpilot/tests/conduits/vcalconduit/exampletest.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "options.h"
-#include "config.h"
-
-#include "exampletest.h"
-
-CPPUNIT_TEST_SUITE_REGISTRATION( VCalConduitTest );
-
-
-void VCalConduitTest::setUp()
-{
-	device = TQString("testdevice");
-	link = new KPilotLocalLink(0, "localLink");
-	syncMode = SyncAction::SyncMode::eHotSync;
-}
-
-
-void VCalConduitTest::tearDown()
-{
-	delete link;
-}
-
-
-void VCalConduitTest::testConstructor()
-{
-	CPPUNIT_ASSERT( true == true );
-}
diff --git a/kpilot/tests/conduits/vcalconduit/exampletest.h b/kpilot/tests/conduits/vcalconduit/exampletest.h
deleted file mode 100644
index f98c14c5..00000000
--- a/kpilot/tests/conduits/vcalconduit/exampletest.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef EXAMPLETEST_H
-#define EXAMPLETEST_H
-
-#include <cppunit/extensions/HelperMacros.h>
-#include <tqstring.h>
-
-#include "kpilotlocallink.h"
-#include "syncAction.h"
-
-class VCalConduitTest : public CppUnit::TestFixture
-{
-  CPPUNIT_TEST_SUITE( VCalConduitTest );
-  CPPUNIT_TEST( testConstructor );
-  CPPUNIT_TEST_SUITE_END();
-
-private:
-	TQString device;
-	KPilotLocalLink *link;
-	SyncAction::SyncMode::Mode syncMode;
-
-public:
-  void setUp();
-  void tearDown();
-
-  void testConstructor();
-};
-
-#endif
diff --git a/kpilot/tests/data/AddressDB.pdb b/kpilot/tests/data/AddressDB.pdb
deleted file mode 100644
index cad6363b..00000000
--- a/kpilot/tests/data/AddressDB.pdb
+++ /dev/null
diff --git a/kpilot/tests/data/MailDB.pdb b/kpilot/tests/data/MailDB.pdb
deleted file mode 100644
index 33ca4737..00000000
--- a/kpilot/tests/data/MailDB.pdb
+++ /dev/null
diff --git a/kpilot/tests/data/MemoDB.pdb b/kpilot/tests/data/MemoDB.pdb
deleted file mode 100644
index 94097b10..00000000
--- a/kpilot/tests/data/MemoDB.pdb
+++ /dev/null
diff --git a/kpilot/tests/data/ToDoDB.pdb b/kpilot/tests/data/ToDoDB.pdb
deleted file mode 100644
index fd4027f8..00000000
--- a/kpilot/tests/data/ToDoDB.pdb
+++ /dev/null
diff --git a/kpilot/tests/data/bogus.pdb b/kpilot/tests/data/bogus.pdb
deleted file mode 100644
index f90aef1d..00000000
--- a/kpilot/tests/data/bogus.pdb
+++ /dev/null
@@ -1,367 +0,0 @@
-/* This file is part of the KDE libraries
-   Copyright (c) 2000 The KDE Project
-
-   unsetenv() taken from the GNU C Library.
-   Copyright (C) 1992,1995-1999,2000-2002 Free Software Foundation, Inc.
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License version 2 as published by the Free Software Foundation.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with this library; see the file COPYING.LIB.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-
-#include <config.h>
-
-#define KDE_open open
-#define KDE_mkdir mkdir 
-
-#ifndef HAVE_SETENV
-
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
- int setenv(const char *name, const char *value, int overwrite) {
-    int i;
-    char * a;
-
-    if (!overwrite && getenv(name)) return 0;
-
-    i = strlen(name) + strlen(value) + 2;
-    a = (char*)malloc(i);
-    if (!a) return 1;
-
-    strcpy(a, name);
-    strcat(a, "=");
-    strcat(a, value);
-
-    return putenv(a);
-}
-#endif /* !HAVE_SETENV */
-
-#ifndef HAVE_UNSETENV
-
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-
-#ifndef environ
-extern char ** environ;
-#endif
-
- void unsetenv (name)
-     const char *name;
-{
-  size_t len;
-  char **ep;
-
-  if (name == NULL || *name == '\0' || strchr (name, '=') != NULL)
-    {
-      errno = EINVAL;
-      return;
-    }
-
-  len = strlen (name);
-
-  ep = environ;
-  while (*ep != NULL)
-    if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
-      {
-	/* Found it.  Remove this pointer by moving later ones back.  */
-	char **dp = ep;
-
-	do
-	  dp[0] = dp[1];
-	while (*dp++);
-	/* Continue the loop in case NAME appears again.  */
-      }
-    else
-      ++ep;
-
-}
-
-#endif /* !HAVE_UNSETENV */
-
-#ifndef HAVE_USLEEP
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if defined(HAVE_SYS_TIME_H)
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
-#ifdef __cplusplus  /* this is supposed to be a C source file but still.. */
-extern "C" {
-#endif
-
-void usleep(unsigned int usec) {
-        struct timeval _usleep_tv;
-        _usleep_tv.tv_sec = usec/1000000;
-        _usleep_tv.tv_usec = usec%1000000;
-        select(0,0,0,0,&_usleep_tv);
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !HAVE_USLEEP */
-
-#ifndef HAVE_RANDOM
-long int random()
-{
-    return lrand48();
-}
-
-void srandom(unsigned int seed)
-{
-    srand48(seed);
-}
-#endif
-
-#ifndef HAVE_SETEUID
-int seteuid(uid_t euid)
-{
-    setreuid(-1, euid); /* Well, if you have neither you are in trouble :) */
-}
-#endif
-
-#ifndef HAVE_MKSTEMPS
-#include <sys/types.h>
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#include <fcntl.h>
-#include <string.h>
-#include <strings.h>
-#include <stdlib.h>
-
-/* this is based on code taken from the GNU libc, distributed under the LGPL license */
-
-/* Generate a unique temporary file name from TEMPLATE.
-
-   TEMPLATE has the form:
-
-   <path>/ccXXXXXX<suffix>
-
-   SUFFIX_LEN tells us how long <suffix> is (it can be zero length).
-
-   The last six characters of TEMPLATE before <suffix> must be "XXXXXX";
-   they are replaced with a string that makes the filename unique.
-
-   Returns a file descriptor open on the file for reading and writing.  */
-
- int mkstemps (char* _template, int suffix_len)
-{
-  static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-  char *XXXXXX;
-  int len;
-  int count;
-  int value;
-
-  len = strlen (_template);
-
-  if ((int) len < 6 + suffix_len || strncmp (&_template[len - 6 - suffix_len], "XXXXXX", 6))
-      return -1;
-
-  XXXXXX = &_template[len - 6 - suffix_len];
-
-  value = rand();
-  for (count = 0; count < 256; ++count)
-  {
-      int v = value;
-      int fd;
-
-      /* Fill in the random bits.  */
-      XXXXXX[0] = letters[v % 62];
-      v /= 62;
-      XXXXXX[1] = letters[v % 62];
-      v /= 62;
-      XXXXXX[2] = letters[v % 62];
-      v /= 62;
-      XXXXXX[3] = letters[v % 62];
-      v /= 62;
-      XXXXXX[4] = letters[v % 62];
-      v /= 62;
-      XXXXXX[5] = letters[v % 62];
-
-      fd = KDE_open (_template, O_RDWR|O_CREAT|O_EXCL, 0600);
-      if (fd >= 0)
-	/* The file does not exist.  */
-	return fd;
-
-      /* This is a random value.  It is only necessary that the next
-	 TMP_MAX values generated by adding 7777 to VALUE are different
-	 with (module 2^32).  */
-      value += 7777;
-    }
-  /* We return the null string if we can't find a unique file name.  */
-  _template[0] = '\0';
-  return -1;
-}
-
-#endif /* !HAVE_MKSTEMPS */
-
-#ifndef HAVE_MKSTEMP
- int mkstemp (char* _template)
-{
-  return mkstemps( _template, 0 );
-}
-#endif
-
-#ifndef HAVE_MKDTEMP
-
-#ifndef HAVE_MKSTEMPS
-#include <sys/types.h>
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#endif
-
-/* Generate a unique temporary directory name from TEMPLATE.
-
-   TEMPLATE has the form:
-
-   <path>/ccXXXXXX
-
-
-   The last six characters of TEMPLATE must be "XXXXXX";
-   they are replaced with a string that makes the filename unique.
-
-   Returns a file descriptor open on the file for reading and writing.  */
-
- char* mkdtemp (char* _template)
-{
-  static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-  char *XXXXXX;
-  int len;
-  int count;
-  int value;
-
-  len = strlen (_template);
-
-  if ((int) len < 6 || strncmp (&_template[len - 6], "XXXXXX", 6))
-      return 0;
-
-  XXXXXX = &_template[len - 6];
-
-  value = rand();
-  for (count = 0; count < 256; ++count)
-  {
-      int v = value;
-
-      /* Fill in the random bits.  */
-      XXXXXX[0] = letters[v % 62];
-      v /= 62;
-      XXXXXX[1] = letters[v % 62];
-      v /= 62;
-      XXXXXX[2] = letters[v % 62];
-      v /= 62;
-      XXXXXX[3] = letters[v % 62];
-      v /= 62;
-      XXXXXX[4] = letters[v % 62];
-      v /= 62;
-      XXXXXX[5] = letters[v % 62];
-
-      /* This is a random value.  It is only necessary that the next
-	 TMP_MAX values generated by adding 7777 to VALUE are different
-	 with (module 2^32).  */
-      value += 7777;
-
-      if (!KDE_mkdir(_template,0700))
-	return _template;	
-    }
-    return 0;
-}
-#endif /* !HAVE_MKDTEMP */
-
-#ifndef HAVE_REVOKE
-#include <errno.h>
-#ifndef ENOTSUP
-#define ENOTSUP 134 /* Not supported */
-#endif
- int revoke(const char *tty)
-{
-        errno = ENOTSUP;
-        return -1;
-}
-#endif
-
-#ifndef HAVE_STRLCPY
- unsigned long strlcpy(char* d, const char* s, unsigned long bufsize)
-{
-    unsigned long len, ret = strlen(s);
-
-    if (ret >= bufsize) {
-        if (bufsize) {
-            len = bufsize - 1;
-            memcpy(d, s, len);
-            d[len] = '\0';
-        }
-    } else
-	memcpy(d, s, ret + 1);
-	
-    return ret;
-}
-#endif
-
-#ifndef HAVE_STRLCAT
- unsigned long strlcat(char* d, const char* s, unsigned long bufsize)
-{
-    char *cp;
-    unsigned long ret, len1, len2 = strlen(s);
-
-    cp = (char *)memchr (d, '\0', bufsize);
-    if (!cp)
-	return bufsize + len2;
-    len1 = cp - d;
-    ret = len1 + len2;
-    if (ret >= bufsize) {
-        len2 = bufsize - len1 - 1;
-        memcpy(cp, s, len2);
-        cp[len2] = '\0';
-    } else
-        memcpy(cp, s, len2 + 1);
-
-    return ret;
-}
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
diff --git a/kpilot/tests/exportdatebook.cc b/kpilot/tests/exportdatebook.cc
deleted file mode 100644
index d4cf8c53..00000000
--- a/kpilot/tests/exportdatebook.cc
+++ /dev/null
@@ -1,136 +0,0 @@
-/* testaddresses			KPilot
-**
-** Copyright (C) 2007 by Jason 'vanRijn' Kasper <vR@movingparts.net)
-**
-** Test the functions related to address database handling.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kconfigskeleton.h>
-
-#include <libkcal/calendar.h>
-#include <libkcal/calendarlocal.h>
-
-#include "pilot.h"
-#include "pilotDateEntry.h"
-#include "pilotLocalDatabase.h"
-#include "../conduits/vcalconduit/kcalRecord.cc"
-#include "../conduits/vcalconduit/vcalRecord.cc"
-
-static const KCmdLineOptions options[] =
-{
-	{"verbose", "Verbose output", 0},
-	{"data-dir <path>","Set data directory", "."},
-	{"vcal-file <path>","Set vcal file", 0},
-	KCmdLineLastOption
-};
-
-
-
-int main(int argc, char **argv)
-{
-	FUNCTIONSETUP;
-
-	KApplication::disableAutoDcopRegistration();
-
-	KAboutData aboutData("exportdatebook","Emport Date Book","0.1");
-	KCmdLineArgs::init(argc,argv,&aboutData);
-	KCmdLineArgs::addCmdLineOptions( options );
-
-	KApplication app( false, false );
-
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-
-	debug_level= (args->isSet("verbose")) ? 4 : 0;
-
-	TQString datadir = args->getOption("data-dir");
-	TQString vcalfile = args->getOption("vcal-file");
-
-	if (datadir.isEmpty())
-	{
-		WARNINGKPILOT << "! Must provide a data-directory." << endl;
-	}
-	if (vcalfile.isEmpty())
-	{
-		WARNINGKPILOT << "! Must provide a vcal-file to write to." << endl;
-	}
-	if (datadir.isEmpty() || vcalfile.isEmpty())
-	{
-		return 1;
-	}
-
-	/*
-	KConfig korgcfg( locate( "config", CSL1("korganizerrc") ) );
-
-	// this part taken from adcalendarbase.cpp:
-	korgcfg.setGroup( "Time & Date" );
-	TQString tz(korgcfg.readEntry( "TimeZoneId" ) );
-
-	DEBUGKPILOT << fname << ": KOrganizer's time zone = " << tz << endl;
-
-	KCal::CalendarLocal *calendar = new KCal::CalendarLocal( tz );
-	*/
-	KCal::CalendarLocal *calendar = new KCal::CalendarLocal( TQString() );
-
-	if (!calendar)
-	{
-		WARNINGKPILOT << "! Can't create calendar object." << endl;
-		return 1;
-	}
-
-	Pilot::setupPilotCodec( CSL1("Latin1") );
-
-	PilotLocalDatabase db( datadir, "DatebookDB" );
-
-	PilotDateInfo *fAppointmentAppInfo = new PilotDateInfo( &db );
-
-	int currentRecord = 0;
-	PilotRecord *pilotRec = 0;
-	PilotDateEntry *d = 0;
-
-	while ((pilotRec = db.readRecordByIndex(currentRecord++)) != NULL)
-	{
-		d = new PilotDateEntry(pilotRec);
-
-		KCal::Event*event = new KCal::Event;
-
-		KCalSync::setEvent(event, d,*fAppointmentAppInfo->categoryInfo());
-
-		event->setSyncStatus( KCal::Incidence::SYNCNONE );
-
-		calendar->addEvent(event);
-
-	}
-
-	calendar->save(vcalfile);
-
-	return 0;
-}
-
diff --git a/kpilot/tests/importaddresses.cc b/kpilot/tests/importaddresses.cc
deleted file mode 100644
index 61cc513a..00000000
--- a/kpilot/tests/importaddresses.cc
+++ /dev/null
@@ -1,128 +0,0 @@
-/* importaddresses			KPilot
-**
-** Copyright (C) 2006 by Adriaan de Groot <groot@kde.org)
-**
-** Create an address database (for the handheld) from PC data.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
-
-#include <kabc/addressbook.h>
-#include <kabc/resourcefile.h>
-
-#include "pilot.h"
-#include "pilotLocalDatabase.h"
-#include "pilotAddress.h"
-#include "../conduits/abbrowserconduit/kabcRecord.h"
-#include "../conduits/abbrowserconduit/kabcRecord.cc"
-
-static const KCmdLineOptions options[] =
-{
-	{"verbose", "Verbose output", 0},
-	{"data-dir <path>","Set data directory", "."},
-	{"address-file <path>","Set addressbook file", 0},
-	KCmdLineLastOption
-};
-
-
-
-int main(int argc, char **argv)
-{
-	KAboutData aboutData("importaddresses","Import Address Book","0.1");
-	KCmdLineArgs::init(argc,argv,&aboutData);
-	KCmdLineArgs::addCmdLineOptions( options );
-
-	//  KApplication app( false, false );
-	KApplication app;
-
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-
-#ifdef DEBUG
-	debug_level= (args->isSet("verbose")) ? 4 : 0;
-#endif
-	TQString datadir = args->getOption("data-dir");
-	TQString addressfile = args->getOption("address-file");
-
-	if (datadir.isEmpty())
-	{
-		kdWarning() << "! Must provide a data-directory." << endl;
-	}
-	if (addressfile.isEmpty())
-	{
-		kdWarning() << "! Must provide an address-file to read." << endl;
-	}
-	if (datadir.isEmpty() || addressfile.isEmpty())
-	{
-		return 1;
-	}
-
-	KABC::ResourceFile *file = new KABC::ResourceFile( addressfile );
-	KABC::AddressBook book;
-	book.addResource( file );
-	if (!book.load())
-	{
-		kdWarning() << "! Failed to load the address-file <" << addressfile << ">" << endl;
-		return 1;
-	}
-
-	Pilot::setupPilotCodec( CSL1("Latin1") );
-
-	PilotLocalDatabase db( datadir, "AddressDB" );
-	db.createDatabase( 0xdead, 0xbeef );
-	PilotAddressInfo info(0L);
-	info.resetToDefault();
-	info.writeTo(&db);
-
-	KABCSync::Settings settings;
-
-	kdDebug() << "# Printing address book." << endl;
-	unsigned int count = 1;
-	KABC::AddressBook::ConstIterator it = book.begin();
-	while (it != book.end())
-	{
-		const KABC::Addressee &a = *it;
-		kdDebug() << "# Entry #" << count << endl;
-		kdDebug() << "#  " << a.name() << endl;
-		kdDebug() << "#  " << a.formattedName() << endl;
-		PilotAddress *p = new PilotAddress();
-		KABCSync::copy(*p,a,info,settings);
-		PilotRecord *r = p->pack();
-		if (r)
-		{
-			db.writeRecord(r);
-			delete r;
-		}
-		delete p;
-		++it;
-		++count;
-	}
-
-	return 0;
-}
diff --git a/kpilot/tests/importdatebook.cc b/kpilot/tests/importdatebook.cc
deleted file mode 100644
index ebbb7012..00000000
--- a/kpilot/tests/importdatebook.cc
+++ /dev/null
@@ -1,131 +0,0 @@
-/* testaddresses			KPilot
-**
-** Copyright (C) 2006 by Adriaan de Groot <groot@kde.org)
-**
-** Test the functions related to address database handling.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
-
-#include <libkcal/calendar.h>
-#include <libkcal/calendarlocal.h>
-
-#include "pilot.h"
-#include "pilotDateEntry.h"
-#include "pilotLocalDatabase.h"
-#include "../conduits/vcalconduit/kcalRecord.cc"
-#include "../conduits/vcalconduit/vcalRecord.cc"
-
-static const KCmdLineOptions options[] =
-{
-	{"verbose", "Verbose output", 0},
-	{"data-dir <path>","Set data directory", "."},
-	{"vcal-file <path>","Set vcal file", 0},
-	KCmdLineLastOption
-};
-
-
-
-int main(int argc, char **argv)
-{
-	KApplication::disableAutoDcopRegistration();
-
-	KAboutData aboutData("importdatebook","Import Date Book","0.1");
-	KCmdLineArgs::init(argc,argv,&aboutData);
-	KCmdLineArgs::addCmdLineOptions( options );
-
-	KApplication app( false, false );
-
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-
-	debug_level= (args->isSet("verbose")) ? 4 : 0;
-
-	TQString datadir = args->getOption("data-dir");
-	TQString vcalfile = args->getOption("vcal-file");
-
-	if (datadir.isEmpty())
-	{
-		WARNINGKPILOT << "! Must provide a data-directory." << endl;
-	}
-	if (vcalfile.isEmpty())
-	{
-		WARNINGKPILOT << "! Must provide a vcal-file to read." << endl;
-	}
-	if (datadir.isEmpty() || vcalfile.isEmpty())
-	{
-		return 1;
-	}
-
-	DEBUGKPILOT << "Using vcal-file: [" << vcalfile 
-		<< "], creating DatebookDB in: [" << datadir
-		<< "]" << endl;
-
-	KCal::CalendarLocal *calendar = new KCal::CalendarLocal( TQString::fromLatin1("UTC") );
-	if (!calendar || !calendar->load( vcalfile ))
-	{
-		return 1;
-	}
-
-	DEBUGKPILOT << "Opened calendar with: [" 
-		<< calendar->incidences().count() << "] incidences." << endl;
-
-	Pilot::setupPilotCodec( CSL1("Latin1") );
-
-	PilotLocalDatabase db( datadir, "DatebookDB" );
-	db.createDatabase( 0xdead, 0xbeef );
-	PilotDateInfo appInfo(0L);
-	appInfo.resetToDefault();
-	appInfo.writeTo(&db);
-
-	KCal::Event::List events = calendar->events();
-
-	for (KCal::Event::List::ConstIterator i = events.begin();
-		i != events.end(); ++i)
-	{
-		PilotDateEntry * d = new PilotDateEntry();
-
-		const KCal::Event *e = *i;
-		DEBUGKPILOT << "event: [" << e->summary() << "]" << endl;
-
-		if (KCalSync::setDateEntry(d,e,*appInfo.categoryInfo()))
-		{
-DEBUGKPILOT << "got here." << endl;
-			PilotRecord *r = d->pack();
-			if (r)
-			{
-				db.writeRecord(r);
-				delete r;
-			}
-		}
-	}
-
-	return 0;
-}
-
diff --git a/kpilot/tests/main.cc b/kpilot/tests/main.cc
deleted file mode 100644
index c6ddd23c..00000000
--- a/kpilot/tests/main.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <cppunit/ui/text/TestRunner.h>
-
-int main( int argc, char **argv)
-{
-	CppUnit::TestFactoryRegistry &registry =
-		CppUnit::TestFactoryRegistry::getRegistry();
-
-	CppUnit::TextUi::TestRunner runner;
-	runner.addTest( registry.makeTest() );
-
-	// Run the tests.
-	bool wasSucessful = runner.run();
-
-	// Return error code 1 if the one of test failed.
-	return wasSucessful ? 0 : 1;
-}
diff --git a/kpilot/tests/mergecalendars.cc b/kpilot/tests/mergecalendars.cc
deleted file mode 100644
index 898eb8c0..00000000
--- a/kpilot/tests/mergecalendars.cc
+++ /dev/null
@@ -1,228 +0,0 @@
-/* mergecalendars			KPilot
-**
-** Copyright (C) 2007 by Jason 'vanRijn' Kasper <vR@movingparts.net)
-**
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kconfigskeleton.h>
-
-#include <libkcal/calendar.h>
-#include <libkcal/calendarlocal.h>
-
-#include "options.h"
-
-static const KCmdLineOptions options[] =
-{
-	{"korgfile <path>","KOrganizer master file", 0},
-	{"newfile <path>","Calendar file to merge into korganizer", 0},
-	{"category <string>","Category to remove from 'korgfile' and to add to events in 'newfile' for synch purposes", 0},
-	{"verbose", "Verbose debugging", 0},
-	KCmdLineLastOption
-};
-
-
-
-int main(int argc, char **argv)
-{
-
-	KApplication::disableAutoDcopRegistration();
-
-	KAboutData aboutData("mergecalendars","Merge libkcal Calendars","0.1");
-	KCmdLineArgs::init(argc,argv,&aboutData);
-	KCmdLineArgs::addCmdLineOptions( options );
-
-	KApplication app( false, false );
-
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-
-	int debug_level= (args->isSet("verbose")) ? 4 : 0;
-
-	TQString korgfile = args->getOption("korgfile");
-	TQString newfile = args->getOption("newfile");
-	TQString category = args->getOption("category");
-
-	if (korgfile.isEmpty())
-	{
-		WARNINGKPILOT << "! Must provide a korganizer file." << endl;
-	}
-	if (newfile.isEmpty())
-	{
-		WARNINGKPILOT << "! Must provide a newfile file." << endl;
-	}
-	if (category.isEmpty())
-	{
-		WARNINGKPILOT << "! Must provide a category to use." << endl;
-	}
-	if (korgfile.isEmpty() || newfile.isEmpty() || category.isEmpty())
-	{
-		return 1;
-	}
-
-	TQString korgsave = TQString("%1.updated").arg(korgfile);
-	TQString newfilesave = TQString("%1.updated").arg(newfile);
-
-	DEBUGKPILOT << "Using korgfile: [" << korgfile 
-		<< "]" << endl;
-	DEBUGKPILOT << "Using newfile: [" << newfile
-		<< "]" << endl;
-	DEBUGKPILOT << "Will save korgfile to: [" << korgsave 
-		<< "]" << endl;
-	DEBUGKPILOT << "Will save newfile to: [" << newfilesave
-		<< "]" << endl << endl;
-
-	KCal::CalendarLocal *calkorg = new KCal::CalendarLocal( TQString::fromLatin1("UTC") );
-	KCal::CalendarLocal *calnew = new KCal::CalendarLocal( TQString::fromLatin1("UTC") );
-	if (!calkorg || !calnew)
-	{
-		WARNINGKPILOT << "Unable to create base calendar objects." << endl;
-		return 1;
-	}
-
-	if (!calkorg->load(korgfile) || !calnew->load(newfile))
-	{
-		WARNINGKPILOT << "Unable to load calendar files." << endl;
-		return 1;
-	}
-
-	int numkorgstart = calkorg->incidences().count();
-	int numnewstart = calnew->incidences().count();
-
-	DEBUGKPILOT << "  - Opened korganizer calendar with: [" 
-		<< numkorgstart << "] incidences." << endl;
-	DEBUGKPILOT << "  - Opened newfile calendar with: [" 
-		<< numnewstart << "] incidences." << endl;
-
-	KCal::Event::List korgEvents;
-	KCal::Event::List::ConstIterator korgIt;
-	korgEvents = calkorg->events();
-	korgEvents.setAutoDelete(false);
-
-	KCal::Event::List newEvents;
-	KCal::Event::List::ConstIterator newIt;
-	newEvents = calnew->events();
-	newEvents.setAutoDelete(false);
-
-	DEBUGKPILOT << "Looking for previous pilot ids for exchange events..." << endl;
-
-	// iterate through all events and try to find a korganizer event
-	// that matches up with this external event's UID
-	unsigned int numkorgpilotids = 0;
-	KCal::Event *ev = 0;
-	for (newIt = newEvents.begin(); newIt != newEvents.end(); ++newIt ) 
-	{
-		ev = *newIt;
-		TQString uid = ev->uid();
-		if (debug_level)
-			DEBUGKPILOT << "  - Looking at event: [" 
-			<< ev->summary() << "], uid: ["
-			<< uid << "]" << endl;
-
-		KCal::Event * evkorg = calkorg->event(uid);
-		if ( evkorg && (evkorg->pilotId() > 0) )
-		{
-			unsigned long pilotId = evkorg->pilotId();
-
-			if (debug_level)
-				DEBUGKPILOT << "Found korg event for uid: ["
-				<< uid << "], pilotId: [" 
-				<< pilotId << "]" << endl;
-
-			ev->setPilotId(pilotId);
-			ev->setSyncStatus(KCal::Incidence::SYNCMOD);
-
-			++numkorgpilotids;
-		}
-	}
-
-	DEBUGKPILOT << "Matched: [" << numkorgpilotids << "] events."<< endl;
-
-	DEBUGKPILOT << "Now searching for previous events of category: [" << category << "] in korganizer's calendar." << endl;
-
-	// iterate through all events and try to find a korganizer event
-	// that matches up with this external event's UID
-	unsigned int numkorgremoved = 0;
-
-	TQString categoryToken = category;
-
-	// careful iterating and removing...
-	KCal::Event *next = 0;
-
-	korgIt = korgEvents.begin();
-	for ( ev = *korgIt; ev != 0; ev = next )
-	{
-		if (++korgIt == korgEvents.end())
-		{
-			next = 0;
-		}
-		else
-		{
-			next = *korgIt;
-		}
-
-		if (ev->categoriesStr().contains(categoryToken))
-		{
-			if (debug_level)
-				DEBUGKPILOT << "  - Found matching event: [" 
-				<< ev->summary() << "], uid: ["
-				<< ev->uid() << "]. Removing." << endl;
-
-			korgEvents.remove(ev);
-			calkorg->deleteEvent(ev);
-
-			++numkorgremoved;
-		}
-	}
-
-	DEBUGKPILOT << "  - Found: [" << numkorgremoved
-		<< "] prior: [" << categoryToken 
-		<< "] category events." << endl;
-	
-	DEBUGKPILOT << "Merging new events into korganizer calendar..." 
-		<< endl;
-
-	for (newIt = newEvents.begin(); newIt != newEvents.end(); ++newIt ) 
-	{
-		ev = *newIt;
-		ev->setCategories(category);
-		korgEvents.append(ev);
-		calkorg->addEvent(ev);
-	}
-
-	DEBUGKPILOT << "Ended up with: [" << korgEvents.count() 
-		<< "] events in korganizer calendar." << endl;
-
-	DEBUGKPILOT << "Saving updated korganizer file..." << endl;
-	calkorg->save(korgsave);
-
-	DEBUGKPILOT << "Saving updated newfile file..." << endl;
-	calnew->save(newfilesave);
-
-	return 0;
-}
-
diff --git a/kpilot/tests/testactions.cc b/kpilot/tests/testactions.cc
deleted file mode 100644
index 51cb2368..00000000
--- a/kpilot/tests/testactions.cc
+++ /dev/null
@@ -1,92 +0,0 @@
-/* testactions			KPilot
-**
-** Copyright (C) 2005 by Adriaan de Groot <groot@kde.org)
-**
-** Test the functions related to sync actions.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-#include "syncAction.h"
-
-bool run_modes(bool test, bool local)
-{
-	bool ok = true;
-
-	kdDebug() << "***\n*** Sync Modes ("
-		<< ( test ? "" : "no")
-		<< "test, "
-		<< ( local ? "" : "no")
-		<< "local)\n***\n";
-
-
-	for (int m = (int)SyncAction::SyncMode::eHotSync;
-		m <= (int) SyncAction::SyncMode::eRestore ;
-		m++)
-	{
-		SyncAction::SyncMode mode((SyncAction::SyncMode::Mode)m,test,local);
-		kdDebug() << "* " << mode.name() << endl;
-		SyncAction::SyncMode mode2(mode.list());
-		if (!(mode==mode2)) {
-			kdDebug() << "E " << "Modes mismatch [" << mode.name() << "] ["
-				<< mode2.name() << "]" << endl;
-			ok = false;
-		}
-	}
-
-	return ok;
-}
-
-bool single_mode(int m, bool test, bool local)
-{
-	SyncAction::SyncMode mode((SyncAction::SyncMode::Mode)m,test,local);
-
-	kdDebug() << "* " << m << " " << test << " " << local << endl;
-
-	if ((mode.mode() == m) && (mode.isTest() == test) && (mode.isLocal() == local))
-	{
-		return true;
-	}
-	else
-	{
-		kdDebug() << "E " << "Modes mismatch " << m << " " << test << " " << local
-			<< "[" << mode.name() << "]" << endl;
-		return false;
-	}
-}
-
-int main(int argc, char **argv)
-{
-	if (!run_modes(false,false)) return 1;
-	if (!run_modes(false,true)) return 1;
-	if (!run_modes(true,false)) return 1;
-	if (!run_modes(true,true)) return 1;
-
-	kdDebug() << "***\n*** Sync Modes - misc\n***\n";
-	if (!single_mode(3,false,false)) return 1;
-	if (!single_mode(1,true,true)) return 1;
-
-	return 0;
-}
-
-
diff --git a/kpilot/tests/testaddress.cc b/kpilot/tests/testaddress.cc
deleted file mode 100644
index 5da0c447..00000000
--- a/kpilot/tests/testaddress.cc
+++ /dev/null
@@ -1,106 +0,0 @@
-/* testaddresses			KPilot
-**
-** Copyright (C) 2006 by Adriaan de Groot <groot@kde.org)
-**
-** Test the functions related to address database handling.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
-
-#include "pilot.h"
-#include "pilotAddress.h"
-#include "pilotLocalDatabase.h"
-
-static const KCmdLineOptions options[] =
-{
-	{"verbose", "Verbose output", 0},
-	{"data-dir <path>","Set data directory", "."},
-	KCmdLineLastOption
-};
-
-
-
-int main(int argc, char **argv)
-{
-	KApplication::disableAutoDcopRegistration();
-
-	KAboutData aboutData("testaddress","Test Addresses","0.1");
-	KCmdLineArgs::init(argc,argv,&aboutData);
-	KCmdLineArgs::addCmdLineOptions( options );
-
-	KApplication app( false, false );
-
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-
-#ifdef DEBUG
-	debug_level= (args->isSet("verbose")) ? 4 : 0;
-#endif
-	TQString datadir = args->getOption("data-dir");
-
-	DEBUGKPILOT << "### testaddresses\n#\n#" << endl;
-
-	Pilot::setupPilotCodec( CSL1("Latin1") );
-
-	PilotLocalDatabase db( datadir, "AddressDB" );
-	PilotAddressInfo appinfo( &db );
-
-	appinfo.dump();
-
-	for (unsigned int i=0; i<db.recordCount(); ++i)
-	{
-		PilotRecord *r = db.readRecordByIndex( i );
-
-		if (r)
-		{
-			DEBUGKPILOT << "# Record @" << (void *)r << " ID=" << r->id() << endl;
-			PilotAddress a( r );
-			DEBUGKPILOT << "# Text Representation:" << endl << a.getTextRepresentation(&appinfo,Qt::PlainText) << endl;
-			DEBUGKPILOT << "# Category#" << a.category() << endl;
-			DEBUGKPILOT << "# Category Label " << appinfo.categoryName(a.category()) << endl;
-			DEBUGKPILOT << "# ID " << a.id() << endl;
-
-			// With the given address database, where all the
-			// categories are already filled, this should fail
-			// (and give a useful error message).
-			//
-			a.setCategory( appinfo.findCategory(CSL1("Fake Cat")) );
-			DEBUGKPILOT << "# Category#" << a.category() << endl;
-			DEBUGKPILOT << "# Category Label " << appinfo.categoryName(a.category()) << endl;
-			// This category exists, so it should succeed
-			//
-			a.setCategory( appinfo.findCategory(CSL1("Business")) );
-			DEBUGKPILOT << "# Category#" << a.category() << endl;
-			DEBUGKPILOT << "# Category Label " << appinfo.categoryName(a.category()) << endl;
-		}
-	}
-
-	return 0;
-}
-
diff --git a/kpilot/tests/testcategories.cc b/kpilot/tests/testcategories.cc
deleted file mode 100644
index aefb8b94..00000000
--- a/kpilot/tests/testcategories.cc
+++ /dev/null
@@ -1,215 +0,0 @@
-/* testcategories			KPilot
-**
-** Copyright (C) 2005 by Adriaan de Groot <groot@kde.org)
-**
-** Test the functions related to category handling.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
-
-#include "pilotLocalDatabase.h"
-#include "pilotRecord.h"
-#include "pilotAppInfo.h"
-
-// Name of a bogus broken DB
-#define BOGUS_NAME "bogus"
-
-// Name of an actual DB
-#define MEMO_NAME "MemoDB"
-
-TQStringList categories( const PilotAppInfoBase *appinfo )
-{
-	TQStringList cats;
-
-	for (unsigned int i=0; i<Pilot::CATEGORY_COUNT; i++)
-	{
-		TQString cat = appinfo->categoryName(i);
-		if (!cat.isEmpty())
-		{
-			TQString s = CSL1("(%1:%2)").arg(i).arg(cat);
-			cats.append(s);
-		}
-	}
-
-	return cats;
-}
-
-TQStringList listCategories( const TQString &dir, const char *dbname )
-{
-	TQStringList cats;
-	PilotLocalDatabase *database = new PilotLocalDatabase( dir, dbname );
-	if (!database->isOpen()) return cats;
-
-	PilotAppInfoBase *appinfo = new PilotAppInfoBase( database );
-	appinfo->dump();
-
-	cats = categories( appinfo );
-
-	delete appinfo;
-	delete database;
-	return cats;
-}
-
-void badAppInfoCreation()
-{
-	FUNCTIONSETUP;
-	PilotAppInfoBase *appinfo = new PilotAppInfoBase( 0L );
-	appinfo->dump();
-	KPILOT_DELETE( appinfo ) ;
-
-	PilotLocalDatabase *database = new PilotLocalDatabase( BOGUS_NAME );
-	appinfo = new PilotAppInfoBase( database );
-	appinfo->dump();
-	KPILOT_DELETE( appinfo );
-}
-
-void categoryNames( const TQString &dir )
-{
-	PilotLocalDatabase *database = new PilotLocalDatabase( dir, MEMO_NAME );
-	if (!database->isOpen())
-	{
-		WARNINGKPILOT << "Can not open database '" << MEMO_NAME << "'" << endl;
-		return;
-	}
-
-	PilotAppInfoBase *appinfo = new PilotAppInfoBase( database );
-	appinfo->dump();
-
-	DEBUGKPILOT << "# Done dumping" << endl;
-
-	if (!appinfo->categoryInfo())
-	{
-		WARNINGKPILOT << "Could not read required database" << endl;
-		return;
-	}
-
-	const char *funnyname = "OneTwoThreeFourFiveSixSevenEight";
-	const int funnyname_length = strlen(funnyname);
-
-	if (funnyname_length < 20)
-	{
-		WARNINGKPILOT << "String of example category names is too short." << endl;
-		return;
-	}
-
-	DEBUGKPILOT << "# Updating category names with various lengths." << endl;
-	DEBUGKPILOT << "# Expect three truncation errors and two bad category numbers." << endl;
-	for (unsigned int i=0; i<Pilot::CATEGORY_COUNT+2; i++)
-	{
-		TQString name = TQString::fromLatin1(funnyname+funnyname_length-i-3);
-		if (!appinfo->setCategoryName(i,name))
-		{
-			WARNINGKPILOT << "Failed to set category " << i << " name to <" << name << ">" << endl;
-		}
-		else
-		{
-			TQString categoryname = appinfo->categoryName(i);
-			if (categoryname != name)
-			{
-				WARNINGKPILOT << "Category name " << i
-					<< " set to <" << name
-					<< "> and returns <"
-					<< categoryname << ">" << endl;
-			}
-		}
-	}
-
-	DEBUGKPILOT << "# Final categories\n#   " << categories( appinfo ).join("\n#   ") << endl;
-}
-
-static const KCmdLineOptions options[] =
-{
-	{"verbose", "Verbose output", 0},
-	{"data-dir <path>","Set data directory", "."},
-	KCmdLineLastOption
-};
-
-
-int main(int argc, char **argv)
-{
-	KApplication::disableAutoDcopRegistration();
-
-	KAboutData aboutData("testcategories","Test Categories","0.1");
-	KCmdLineArgs::init(argc,argv,&aboutData);
-	KCmdLineArgs::addCmdLineOptions( options );
-
-	KApplication app( false, false );
-
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-
-#ifdef DEBUG
-	debug_level= (args->isSet("verbose")) ? 4 : 0;
-#endif
-
-	Q_UNUSED(argc);
-	Q_UNUSED(argv);
-
-	static const char *files[] = {
-		MEMO_NAME,
-		"AddressDB",
-		"MailDB",
-		"ToDoDB",
-		0L
-	};
-
-	TQString datadir = args->getOption("data-dir");
-
-	DEBUGKPILOT << "### testcategories\n#\n#" << endl;
-	DEBUGKPILOT << "# Listing categories from database files.\n#" << endl;
-
-	Pilot::setupPilotCodec( CSL1("Latin1") );
-
-	// Include arbitrary break-off point, in case
-	for (unsigned int i = 0; i<sizeof(files)/sizeof(const char *) ; i++)
-	{
-		if (!files[i])
-		{
-			break;
-		}
-		DEBUGKPILOT << "# Categories (" << files[i] << "): " << endl;
-		DEBUGKPILOT << "#   " << listCategories( datadir, files[i] ).join("\n#   ") << "\n#\n";
-	}
-	// Should bail, not crash
-	DEBUGKPILOT << "# Categories (nonexistent): " << endl;
-	(void) listCategories( datadir, "nonexistent" );
-
-	DEBUGKPILOT << "# Categories (bogus): " << endl;
-	(void) listCategories( datadir, BOGUS_NAME );
-
-	DEBUGKPILOT << "#\n# Trying to pass broken pointers to category functions.\n# Four errors are expected.\n#" << endl;
-	badAppInfoCreation();
-
-	DEBUGKPILOT << "#\n# Checking category names." << endl;
-	categoryNames( datadir );
-
-	DEBUGKPILOT << "# OK.\n" << endl;
-	return 0;
-}
-
diff --git a/kpilot/tests/testconstants.cc b/kpilot/tests/testconstants.cc
deleted file mode 100644
index 06e9fafa..00000000
--- a/kpilot/tests/testconstants.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-/* testconstants KPilot
-**
-** Copyright (C) 2005 by Adriaan de Groot <groot@kde.org)
-**
-** Checks that various data structures are sized properly.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include "pilot.h"
-#include "pilotAppInfo.h"
-
-#include <pi-appinfo.h>
-
-int main(int, char **)
-{
-#ifdef DEBUG
-	debug_level = 1;
-#endif
-	PilotAppInfoBase info;
-
-
-	DEBUGKPILOT << "### testconstants\n#" << endl;
-	DEBUGKPILOT << "# Sizes of structures\n#" << endl;
-	DEBUGKPILOT << "#     AppInfoBase: " << sizeof(PilotAppInfoBase) << endl;
-	DEBUGKPILOT << "#    CategoryInfo: " << sizeof(info.categoryInfo()) << endl;
-	DEBUGKPILOT << "#    CategoryInfo: " << sizeof(*info.categoryInfo()) << endl;
-	DEBUGKPILOT << "#  Category names: " << sizeof(info.categoryInfo()->name) << endl;
-	DEBUGKPILOT << "# Single category: " << sizeof(info.categoryInfo()->name[0]) << endl;
-
-	DEBUGKPILOT << "#\n# Sanity checking structure sizes\n#" << endl;
-	if ( sizeof(info.categoryInfo()->name[0]) != Pilot::CATEGORY_SIZE )
-	{
-		WARNINGKPILOT << "! Category names are not 16 bytes." << endl;
-		return 1;
-	}
-	if ( sizeof(info.categoryInfo()->name) / sizeof(info.categoryInfo()->name[0]) != Pilot::CATEGORY_COUNT )
-	{
-		WARNINGKPILOT << "! There are not " << Pilot::CATEGORY_COUNT << " categories available." << endl;
-		return 1;
-	}
-
-	DEBUGKPILOT << "# OK.\n" << endl;
-	return 0;
-}
-
-
diff --git a/kpilot/tests/testdatabase.cc b/kpilot/tests/testdatabase.cc
deleted file mode 100644
index 02b43c6b..00000000
--- a/kpilot/tests/testdatabase.cc
+++ /dev/null
@@ -1,316 +0,0 @@
-/* testdatabase			KPilot
-**
-** Copyright (C) 2005 by Adriaan de Groot <groot@kde.org)
-**
-** Test the functions related to local databases.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
-
-#include "pilotLocalDatabase.h"
-#include "pilotRecord.h"
-#include "pilotMemo.h"
-
-
-/* Return values for the various check* functions. They
-   return OK if all is OK; ERR is for generic errors.
-   ERR_NO_EXIST is returned if something (usually a database
-   or other file) doesn't exist that should. The latter
-   error might be ignored.
-*/
-#define OK           (0)
-#define ERR          (1)
-#define ERR_NO_EXIST (2)
-
-
-/* Data about the records in a database. The id field is
-   interpreted specially for the first and last entries.
-*/
-typedef struct { int id,size; } recordInfo;
-
-/* Use END in the last recordInfo struct describing a database
-   to indicate you expect the database to end there. Use NO_EXIST
-   as the ID in the first struct to indicate that the database
-   is expected _not_ to exist.
-*/
-#define NO_EXIST   (-2)
-#define END        (-1)
-
-/* These tables of data are taken from various databases I have
-   (but which I cannot commit to SVN due to license issues).
-   The aesop listing is from an eBook of Aesop's fables.
-   The way to create these tables is to use a third-party
-   tool such as par to read the database:
-
-   ./par l /tmp/Aesop.pdb | awk '{print "{",$3,",",$4,"},";}'
-
-*/
-recordInfo nonexistent[] = {
-	{ NO_EXIST, 0 }
-} ;
-
-recordInfo aesop[] = {
-{ 7307264 , 214 },
-{ 7307265 , 1564 },
-{ 7307266 , 1575 },
-{ 7307267 , 2214 },
-{ 7307268 , 2276 },
-{ 7307269 , 2148 },
-{ 7307270 , 2194 },
-{ 7307271 , 2178 },
-{ 7307272 , 2220 },
-{ 7307273 , 2216 },
-{ 7307274 , 2181 },
-{ 7307275 , 2183 },
-{ 7307276 , 2197 },
-{ 7307277 , 2010 },
-{ 7307278 , 2198 },
-{ 7307279 , 2196 },
-{ 7307280 , 2243 },
-{ 7307281 , 2211 },
-{ 7307282 , 2274 },
-{ 7307283 , 364 },
-{ 7307284 , 49124 },
-	{ END, 0 }
-} ;
-
-int checkDatabase(const char *path, recordInfo *info)
-{
-	FUNCTIONSETUP;
-
-	PilotLocalDatabase db(TQString::fromLatin1(path));
-	if (!db.isOpen())
-	{
-		kdDebug() << "No database " << path << endl;
-		if ( info[0].id == NO_EXIST )
-		{
-			kdDebug() << "This was expected" << endl;
-			return OK;
-		}
-		else
-		{
-			return ERR_NO_EXIST;
-		}
-	}
-
-	if ( info[0].id == NO_EXIST )
-	{
-		kdDebug() << "Database not expected" << endl;
-		return ERR;
-	}
-
-	int fail = 0;
-	int index = 0;
-	PilotRecord *r;
-	while( (r = db.readRecordByIndex(index) ) )
-	{
-		kdDebug() << "[" << index << "] id=" << r->id() << " size=" << r->size() << endl;
-		if ( ((recordid_t)info[index].id) != r->id() )
-		{
-			kdDebug() << "* Bad ID (expected" << r->id() << ")" << endl;
-			fail++;
-		}
-		else if ( info[index].size != r->size() )
-		{
-			kdDebug() << "* Bad size (expected " << info[index].size << ")" << endl;
-			fail++;
-		}
-		index++;
-	}
-	if ( info[index].id != END )
-	{
-		kdDebug() << "* End wasn't expected yet." << endl;
-		r++;
-	}
-
-	if (fail)
-	{
-		kdDebug() << "* " << fail << " failures." << endl;
-		return ERR;
-	}
-	return OK;
-}
-
-const char *categoryNames[4] =
-{
-	"aardvarks",
-	"toolongToBeaCategoryName",
-	"personal",
-	"impersonal"
-} ;
-
-TQStringList listCategories()
-{
-	TQStringList cats;
-	PilotLocalDatabase *l = new PilotLocalDatabase("./data/MemoDB");
-	PilotMemoInfo *m = new PilotMemoInfo(l);
-
-	if (!l->isOpen()) return cats;
-
-	cats.append(CSL1("Unfiled"));
-	m->dump();
-
-	for (int i=0; i<20; i++)
-	{
-		PilotRecord *r = l->readRecordByIndex(i);
-		kdDebug() << "Read record " << (void *)r << " with id=" << r->id() << endl;
-		if (!r) break;
-	}
-
-	for (int i=0; i<4; i++)
-	{
-		TQString s = m->category(i);
-		kdDebug() << "Category " << i << ": " << (s.isEmpty() ? CSL1("<empty>") : s) << endl;
-		cats.append(s);
-/*
-		if (i<((sizeof(categoryNames) / sizeof(categoryNames[0]))))
-			m->setCategoryName(i,TQString::fromLatin1(categoryNames[i]));
-*/
-	}
-
-	m->write(l);
-
-	delete m;
-	delete l;
-
-	return cats;
-}
-
-int checkCategories()
-{
-	TQStringList l = listCategories();
-	TQStringList m = listCategories();
-
-	if (l.isEmpty() || m.isEmpty()) return ERR;
-	if (l!=m) return ERR;
-	return OK;
-}
-
-int checkMemo()
-{
-	PilotLocalDatabase *l = new PilotLocalDatabase("./data/MemoDB");
-	if (!l->isOpen()) return ERR_NO_EXIST;
-
-	PilotMemoInfo *m = new PilotMemoInfo(l);
-	m->dump();
-
-	TQString c = m->category(1);
-	if (c != CSL1("Business"))
-	{
-		kdDebug() << "* Category 1 is not 'Business' but " << c << endl;
-		return ERR;
-	}
-
-	m->setCategoryName(2,CSL1("Aardvark"));
-	m->dump();
-
-	c = m->category(2);
-	if (c != CSL1("Aardvark"))
-	{
-		kdDebug() << "* Category 2 is not 'Aardvark' but " << c << endl;
-		return ERR;
-	}
-
-
-	delete m;
-	delete l;
-	return OK;
-}
-
-static const KCmdLineOptions options[] =
-{
-  {"verbose", "Verbose output", 0},
-  KCmdLineLastOption
-};
-
-
-int main(int argc, char **argv)
-{
-	KApplication::disableAutoDcopRegistration();
-
-	KAboutData aboutData("testdatabase","Test Databases","0.1");
-	KCmdLineArgs::init(argc,argv,&aboutData);
-	KCmdLineArgs::addCmdLineOptions( options );
-
-	KApplication app( false, false );
-
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-
-	Q_UNUSED(args)
-
-	int r = 0;
-	int i = 0;
-#ifdef DEBUG
-	debug_level=4;
-#endif
-
-	Q_UNUSED(argc);
-	Q_UNUSED(argv);
-
-#define ALLOW_NO_EXIST (1)
-	static struct { const char *path; recordInfo *info; int flags; } 
-		tests[] =
-	{
-		{ "/tmp/nonexistant/nonexistent", nonexistent,0 },
-		{ "/tmp/Aesop", aesop, ALLOW_NO_EXIST },
-		{ 0L, 0L, 0 }
-	} ;
-
-	while ( tests[i].path )
-	{
-		kdDebug() << "*** Test " << i << endl;
-		int ret = checkDatabase( tests[i].path, tests[i].info );
-		if ( ret )
-		{
-			if ( (ret==ERR_NO_EXIST) && 
-				(tests[i].flags & ALLOW_NO_EXIST) )
-			{
-				kdDebug() << "* Test database doesn't exist, ignored." << endl;
-			}
-			else
-			{
-				r++;
-			}
-		}
-		i++;
-	}
-
-	kdDebug() << "*** Test " << i << endl;
-	if (checkMemo()) r++;
-	i++;
-
-	if (r)
-	{
-		kdDebug() << "***\n*** Failed " << r << " tests." << endl;
-		return 1;
-	}
-	return 0;
-}
-
diff --git a/kpilot/tests/testdatebook.cc b/kpilot/tests/testdatebook.cc
deleted file mode 100644
index 8e6cc556..00000000
--- a/kpilot/tests/testdatebook.cc
+++ /dev/null
@@ -1,95 +0,0 @@
-/* testaddresses			KPilot
-**
-** Copyright (C) 2006 by Adriaan de Groot <groot@kde.org)
-**
-** Test the functions related to address database handling.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "options.h"
-
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kdebug.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
-
-#include "pilot.h"
-#include "pilotDateEntry.h"
-#include "pilotLocalDatabase.h"
-
-static const KCmdLineOptions options[] =
-{
-	{"verbose", "Verbose output", 0},
-	{"data-dir <path>","Set data directory", "."},
-	KCmdLineLastOption
-};
-
-
-
-int main(int argc, char **argv)
-{
-	KApplication::disableAutoDcopRegistration();
-
-	KAboutData aboutData("testdatebook","Test Date Book","0.1");
-	KCmdLineArgs::init(argc,argv,&aboutData);
-	KCmdLineArgs::addCmdLineOptions( options );
-
-	KApplication app( false, false );
-
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-
-#ifdef DEBUG
-	debug_level= (args->isSet("verbose")) ? 4 : 0;
-#endif
-	TQString datadir = args->getOption("data-dir");
-
-	DEBUGKPILOT << "### testdatebook\n#\n#" << endl;
-
-	Pilot::setupPilotCodec( CSL1("Latin1") );
-
-	PilotLocalDatabase db( datadir, "DatebookDB" );
-	PilotDateInfo appinfo( &db );
-
-	for (unsigned int i=0; i<db.recordCount(); ++i)
-	{
-		PilotRecord *r = db.readRecordByIndex( i );
-
-		if (r)
-		{
-			DEBUGKPILOT << "# Record @" << (void *)r << " ID=" << r->id() << endl;
-			PilotDateEntry a( r );
-			DEBUGKPILOT << "# Text Representation:" << endl << a.getTextRepresentation(Qt::PlainText) << endl;
-			DEBUGKPILOT << "# Category#" << a.category() << endl;
-			DEBUGKPILOT << "# Category Label " << appinfo.categoryName(a.category()) << endl;
-			DEBUGKPILOT << "# ID " << a.id() << endl;
-			int cat = appinfo.findCategory( CSL1("Fake Cat") );
-			a.setCategory( cat );
-			DEBUGKPILOT << "# Category#" << a.category() << endl;
-			DEBUGKPILOT << "# Category Label " << appinfo.categoryName(a.category()) << endl;
-		}
-	}
-
-	return 0;
-}
-
diff --git a/kpilot/tests/testidmapper.cc b/kpilot/tests/testidmapper.cc
deleted file mode 100644
index 8d60afc5..00000000
--- a/kpilot/tests/testidmapper.cc
+++ /dev/null
@@ -1,314 +0,0 @@
-/* testactions			KPilot
-**
-** Copyright (C) 2005 by Adriaan de Groot <groot@kde.org)
-**
-** Test the functions related to sync actions.
-*/
-
-/*
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU Lesser General Public License as published by
-** the Free Software Foundation; either version 2.1 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public License
-** along with this program in a file called COPYING; if not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-** MA 02110-1301, USA.
-*/
-
-/*
-** Bug reports and questions can be sent to kde-pim@kde.org
-*/
-
-#include "idmapper.h"
-#include "options.h"
-
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-
-#include <tqdir.h>
-#include <tqfile.h>
-
-#define TESTFILE "Testing/mapping.xml"
-#define CONDUIT CSL1("knotes")
-
-/**
- * If the file does not exist it should be created by the idmapper.
- */
-bool test1()
-{
-	FUNCTIONSETUP;
-
-	IDMapper *mapper = new IDMapper( TESTFILE );
-
-	delete mapper;
-	mapper = 0l;
-
-	TQFile f( TESTFILE );
-	bool result = f.exists();
-	
-	if( result )
-	{
-		DEBUGKPILOT << fname << ": passed" << endl;
-	}
-	else
-	{
-		DEBUGKPILOT << fname << ": failed" << endl;
-	}
-	
-	return result;
-}
-
-/**
- * Test if a uid gets added when it's registered.
- */
-bool test2()
-{
-	FUNCTIONSETUP;
-
-	IDMapper *mapper = new IDMapper( TESTFILE );
-	mapper->registerPCObjectId( CONDUIT, CSL1("testuid-1") );
-
-	delete mapper;
-	mapper = 0l;
-	
-	// Creating a new mapper ensures that the file is readed. So we know if this
-	// test passess that the data is saved and readed from the xml file correctly.
-	mapper = new IDMapper( TESTFILE );
-
-	bool result1 = ( mapper->getPCObjectIds( CONDUIT ).size() == 1 );
-	bool result2 = false;
-	
-	if( result1 )
-		result2 = ( mapper->getPCObjectIds( CONDUIT ).first() == "testuid-1" );
-	
-	
-	if( result1 && result2 )
-	{
-		DEBUGKPILOT << fname << ": passed" << endl;
-	}
-	else
-	{
-		DEBUGKPILOT << fname << ": " << result1 << " " << result2 << endl;
-		DEBUGKPILOT << fname << ": failed" << endl;
-	}
-	
-	delete mapper;
-	mapper = 0l;
-	
-	return (result1 && result2);
-}
-
-/**
- * Set the pid for uid "testuid-1". getHHObjectIds should return 1 item now and
- * that should be the same as the one which is set.
- */
-bool test3()
-{
-	FUNCTIONSETUP;
-
-	IDMapper *mapper = new IDMapper( TESTFILE );
-	mapper->setHHObjectId( CONDUIT, "testuid-1", 100 );
-
-	delete mapper;
-	mapper = 0l;
-
-	// Creating a new mapper ensures that the file is readed. So we know if this
-	// test passess that the data is saved and readed from the xml file correctly.
-	mapper = new IDMapper( TESTFILE );
-
-	bool result1 = ( mapper->getHHObjectIds( CONDUIT ).size() == 1 );
-	bool result2 = false;
-	
-	if( result1 )
-		result2 = ( mapper->getHHObjectIds( CONDUIT ).first() == 100 );
-	
-	
-	if( result1 && result2 )
-	{
-		DEBUGKPILOT << fname << ": passed" << endl;
-	}
-	else
-	{
-		DEBUGKPILOT << fname << ": " << result1 << " " << result2 << endl;
-		DEBUGKPILOT << fname << ": failed" << endl;
-	}
-	
-	delete mapper;
-	mapper = 0l;
-	
-	return (result1 && result2);
-}
-
-/**
- * Test if a pid is stored correctly when it's registered.
- */
-bool test4()
-{
-	FUNCTIONSETUP;
-
-	IDMapper *mapper = new IDMapper( TESTFILE );
-	mapper->registerHHObjectId( CONDUIT, 150 );
-
-	delete mapper;
-	mapper = 0l;
-	
-	// Creating a new mapper ensures that the file is readed. So we know if this
-	// test passess that the data is saved and readed from the xml file correctly.
-	mapper = new IDMapper( TESTFILE );
-
-	// We have two pids registered at this moment
-	bool result1 = ( mapper->getHHObjectIds( CONDUIT ).size() == 2 );
-	bool result2 = false;
-	
-	// This prevents the test from chrashing when getHHObjectIds.size is 0.
-	if( result1 )
-		result2 = ( mapper->getHHObjectIds( CONDUIT ).contains( 150 ) );
-	
-	if( result1 && result2 )
-	{
-		DEBUGKPILOT << fname << ": passed" << endl;
-	}
-	else
-	{
-		DEBUGKPILOT << fname << ": " << result1 << " " << result2 << endl;
-		DEBUGKPILOT << fname << ": failed" << endl;
-	}
-	
-	delete mapper;
-	mapper = 0l;
-	
-	return (result1 && result2);
-}
-
-/**
- * Set the uid for pid 150. getPcObjectIds should return 2 items now and
- * it should contain the one which is just set.
- */
-bool test5()
-{
-	FUNCTIONSETUP;
-
-	IDMapper *mapper = new IDMapper( TESTFILE );
-	mapper->setPCObjectId( CONDUIT, 150, "testuid-2" );
-
-	delete mapper;
-	mapper = 0l;
-
-	// Creating a new mapper ensures that the file is readed. So we know if this
-	// test passess that the data is saved and readed from the xml file correctly.
-	mapper = new IDMapper( TESTFILE );
-
-	bool result1 = ( mapper->getPCObjectIds( CONDUIT ).size() == 2 );
-	bool result2 = false;
-	
-	if( result1 )
-		result2 = ( mapper->getPCObjectIds( CONDUIT ).contains( "testuid-2" ) );
-	
-	
-	if( result1 && result2 )
-	{
-		DEBUGKPILOT << fname << ": passed" << endl;
-	}
-	else
-	{
-		DEBUGKPILOT << fname << ": " << result1 << " " << result2 << endl;
-		DEBUGKPILOT << fname << ": failed" << endl;
-	}
-	
-	delete mapper;
-	mapper = 0l;
-	
-	return (result1 && result2);
-}
-
-
-/**
- * Test for the hasPCId function.
- */
-bool test6()
-{
-	FUNCTIONSETUP;
-
-	IDMapper *mapper = new IDMapper( TESTFILE );
-
-	// Should be true (PCId is set to "testuid-2").
-	bool result = mapper->hasPCId( CONDUIT, 150 );
-
-	delete mapper;
-	mapper = 0l;
-	
-	if( result )
-	{
-		DEBUGKPILOT << fname << ": passed" << endl;
-	}
-	else
-	{
-		DEBUGKPILOT << fname << ": failed" << endl;
-	}
-	
-	return result;
-}
-
-/**
- * Test for the hasHHId function.
- */
-bool test7()
-{
-	FUNCTIONSETUP;
-
-	IDMapper *mapper = new IDMapper( TESTFILE );
-
-	// Should be true (HHId is set to "150").
-	bool result = mapper->hasHHId( CONDUIT, "testuid-2" );
-
-	delete mapper;
-	mapper = 0l;
-	
-	if( result )
-	{
-		DEBUGKPILOT << fname << ": passed" << endl;
-	}
-	else
-	{
-		DEBUGKPILOT << fname << ": failed" << endl;
-	}
-	
-	return result;
-}
-
-int main(int argc, char **argv)
-{
-	KApplication::disableAutoDcopRegistration();
-	KAboutData aboutData("testidmapper","Test IDMapper","0.1");
-	KCmdLineArgs::init(argc,argv,&aboutData);
-
-	KApplication app( false, false );
-
-	// Remove file from previous test run
-	TQDir test( "Testing" );
-	if( !test.exists() ) {
-		TQDir current;
-		current.mkdir( "Testing" );
-	}
-	
-	TQFile f( TESTFILE );
-	if( f.exists() )
-		TQFile::remove( TESTFILE );
-
-	if( test1() && test2() && test3() && 
-			test4() && test5() && test6() &&
-			test7() )
-		return 0;
-	else
-		return 1;
-}
-
-
diff --git a/kresources/birthdays/resourcekabc.cpp b/kresources/birthdays/resourcekabc.cpp
index 65830782..b52a0982 100644
--- a/kresources/birthdays/resourcekabc.cpp
+++ b/kresources/birthdays/resourcekabc.cpp
@@ -67,7 +67,7 @@ extern "C"
 }
 
 ResourceKABC::ResourceKABC( const KConfig* config )
-  : ResourceCalendar( config ), mCalendar( TQString::fromLatin1( "UTC" ) ),
+  : ResourceCalendar( config ), mCalendar( TQString::tqfromLatin1( "UTC" ) ),
     mAlarmDays( 0 ), mAlarm( true ), mUseCategories( false )
 {
   if ( config ) {
@@ -80,7 +80,7 @@ ResourceKABC::ResourceKABC( const KConfig* config )
 }
 
 ResourceKABC::ResourceKABC()
-  : ResourceCalendar( 0 ), mCalendar( TQString::fromLatin1( "UTC" ) ),
+  : ResourceCalendar( 0 ), mCalendar( TQString::tqfromLatin1( "UTC" ) ),
     mAlarmDays( 0 ), mAlarm( true ), mUseCategories( false )
 {
   init();
@@ -151,7 +151,7 @@ bool ResourceKABC::doLoad()
       bool hasCategory = false;
       TQStringList categories = (*it).categories();
       for ( strIt = mCategories.begin(); strIt != endStrIt; ++strIt )
-        if ( categories.contains( *strIt ) ) {
+        if ( categories.tqcontains( *strIt ) ) {
           hasCategory = true;
           break;
         }
diff --git a/kresources/birthdays/resourcekabcconfig.cpp b/kresources/birthdays/resourcekabcconfig.cpp
index 2f7671dc..ec33aaba 100644
--- a/kresources/birthdays/resourcekabcconfig.cpp
+++ b/kresources/birthdays/resourcekabcconfig.cpp
@@ -92,7 +92,7 @@ void ResourceKABCConfig::loadSettings( KRES::Resource *resource )
     const TQStringList categories = res->categories();
     TQListViewItemIterator it( mCategoryView );
     while ( it.current() ) {
-      if ( categories.contains( it.current()->text( 0 ) ) ) {
+      if ( categories.tqcontains( it.current()->text( 0 ) ) ) {
         TQCheckListItem *item = static_cast<TQCheckListItem*>( it.current() );
         item->setOn( true );
       }
diff --git a/kresources/blogging/resourcebloggingsettings.ui b/kresources/blogging/resourcebloggingsettings.ui
index 6dbb64b0..15f2ab9b 100644
--- a/kresources/blogging/resourcebloggingsettings.ui
+++ b/kresources/blogging/resourcebloggingsettings.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>ResourceBloggingSettings</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -19,7 +19,7 @@
         </property>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>layout12</cstring>
+                <cstring>tqlayout12</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -291,7 +291,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>84</height>
@@ -313,7 +313,7 @@
     <tabstop>mOpenCategory</tabstop>
     <tabstop>mCloseCategory</tabstop>
 </tabstops>
-<layoutdefaults spacing="5" margin="5"/>
+<tqlayoutdefaults spacing="5" margin="5"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kresources/caldav/config.cpp b/kresources/caldav/config.cpp
index 84a4798c..578fd1bb 100644
--- a/kresources/caldav/config.cpp
+++ b/kresources/caldav/config.cpp
@@ -190,7 +190,7 @@ void ResourceCalDavConfig::setupUI() {
     label->hide();
     mPassword->hide();
 
-    // combining layouts
+    // combining tqlayouts
     vertical->addLayout(mainLayout);
     vertical->addLayout(horizontal);
 }
diff --git a/kresources/caldav/configwidgets.cpp b/kresources/caldav/configwidgets.cpp
index b5ef0f49..594edd00 100644
--- a/kresources/caldav/configwidgets.cpp
+++ b/kresources/caldav/configwidgets.cpp
@@ -114,7 +114,7 @@ CalDavReloadConfig::CalDavReloadConfig( TQWidget *parent )
   d->mIntervalSpin->setEnabled( false );
 
   groupBox->setColumnLayout(1, Qt::Vertical);
-  TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout());
+  TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout());
   vbox->addWidget(intervalRadio);
   vbox->addWidget(intervalBox);
   vbox->addWidget(automaticReloadOnStartup);
@@ -207,7 +207,7 @@ CalDavSaveConfig::CalDavSaveConfig( TQWidget *parent )
   intervalBox->hide();
 
   groupBox->setColumnLayout(1, Qt::Vertical);
-  TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout());
+  TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout());
   vbox->addWidget(delay);
   vbox->addWidget(every);
   vbox->addWidget(intervalRadio);
diff --git a/kresources/caldav/preferences.cpp b/kresources/caldav/preferences.cpp
index 6eb87e45..5259d987 100644
--- a/kresources/caldav/preferences.cpp
+++ b/kresources/caldav/preferences.cpp
@@ -220,14 +220,14 @@ TQString CalDavPrefs::getFullUrl() {
 
     firstAt = safeURL.find("@") + 1;
     while (safeURL.find("@", firstAt) != -1) {
-        safeURL.replace(safeURL.find("@", firstAt), 1, "%40");
+        safeURL.tqreplace(safeURL.find("@", firstAt), 1, "%40");
     }
 
     // Unencode the username, as Zimbra stupidly rejects the %40
-    safeURL.replace("%40", "@");
+    safeURL.tqreplace("%40", "@");
 
     // Encode any spaces, as libcaldav stupidly fails otherwise
-    safeURL.replace(" ", "%20");
+    safeURL.tqreplace(" ", "%20");
 
     return safeURL;
 }
@@ -247,14 +247,14 @@ TQString CalDavPrefs::getFullTasksUrl() {
 
     firstAt = safeURL.find("@") + 1;
     while (safeURL.find("@", firstAt) != -1) {
-        safeURL.replace(safeURL.find("@", firstAt), 1, "%40");
+        safeURL.tqreplace(safeURL.find("@", firstAt), 1, "%40");
     }
 
     // Unencode the username, as Zimbra stupidly rejects the %40
-    safeURL.replace("%40", "@");
+    safeURL.tqreplace("%40", "@");
 
     // Encode any spaces, as libcaldav stupidly fails otherwise
-    safeURL.replace(" ", "%20");
+    safeURL.tqreplace(" ", "%20");
 
     return safeURL;
 }
@@ -274,14 +274,14 @@ TQString CalDavPrefs::getFullJournalsUrl() {
 
     firstAt = safeURL.find("@") + 1;
     while (safeURL.find("@", firstAt) != -1) {
-        safeURL.replace(safeURL.find("@", firstAt), 1, "%40");
+        safeURL.tqreplace(safeURL.find("@", firstAt), 1, "%40");
     }
 
     // Unencode the username, as Zimbra stupidly rejects the %40
-    safeURL.replace("%40", "@");
+    safeURL.tqreplace("%40", "@");
 
     // Encode any spaces, as libcaldav stupidly fails otherwise
-    safeURL.replace(" ", "%20");
+    safeURL.tqreplace(" ", "%20");
 
     return safeURL;
 }
diff --git a/kresources/caldav/resource.cpp b/kresources/caldav/resource.cpp
index f6ad5475..4293fb5a 100644
--- a/kresources/caldav/resource.cpp
+++ b/kresources/caldav/resource.cpp
@@ -105,7 +105,7 @@ ResourceCalDav::~ResourceCalDav() {
     while ((mWriter->running() == true) || (mWritingQueue.isEmpty() == false) || !mWritingQueueReady) {
         readLockout = true;
         sleep(1);
-        qApp->processEvents(TQEventLoop::ExcludeUserInput);
+        tqApp->processEvents(TQEventLoop::ExcludeUserInput);
     }
 
     if (mWriter) {
@@ -338,7 +338,7 @@ void ResourceCalDav::loadingQueuePop() {
     mLoader->setParent(this);
     mLoader->setType(0);
 
-    TQDateTime dt(TQDate::currentDate());
+    TQDateTime dt(TQDate::tqcurrentDate());
     mLoader->setRange(dt.addDays(-CACHE_DAYS), dt.addDays(CACHE_DAYS));
     //mLoader->setGetAll();
 
@@ -403,8 +403,8 @@ void ResourceCalDav::loadFinished() {
             // TODO: I don't know why, but some schedules on http://caldav-test.ioda.net/ (I used it for testing)
             // have some lines separated by single \r rather than \n or \r\n.
             // ICalFormat fails to parse that.
-            data.replace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
-            data.replace('\r', '\n');
+            data.tqreplace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
+            data.tqreplace('\r', '\n');
 
             log("trying to parse...");
             if (parseData(data)) {
@@ -451,8 +451,8 @@ void ResourceCalDav::loadFinished() {
             // TODO: I don't know why, but some schedules on http://caldav-test.ioda.net/ (I used it for testing)
             // have some lines separated by single \r rather than \n or \r\n.
             // ICalFormat fails to parse that.
-            tasksData.replace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
-            tasksData.replace('\r', '\n');
+            tasksData.tqreplace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
+            tasksData.tqreplace('\r', '\n');
 
             log("trying to parse...");
             if (parseTasksData(tasksData)) {
@@ -499,8 +499,8 @@ void ResourceCalDav::loadFinished() {
             // TODO: I don't know why, but some schedules on http://caldav-test.ioda.net/ (I used it for testing)
             // have some lines separated by single \r rather than \n or \r\n.
             // ICalFormat fails to parse that.
-            journalsData.replace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
-            journalsData.replace('\r', '\n');
+            journalsData.tqreplace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
+            journalsData.tqreplace('\r', '\n');
 
             log("trying to parse...");
             if (parseJournalsData(journalsData)) {
@@ -744,9 +744,9 @@ TQString ResourceCalDav::getICalString(const Incidence::List& inc) {
     int nextPos = data.findRev("\n", data.find(":", uidPos));
     TQString uidField = data.mid(uidPos, nextPos-uidPos);
     data.remove(uidPos, nextPos-uidPos);
-    uidField.replace("\n", "");
-    uidField.replace("\r", "");
-    uidField.replace(" ", "");
+    uidField.tqreplace("\n", "");
+    uidField.tqreplace("\r", "");
+    uidField.tqreplace(" ", "");
     data.insert(uidPos, uidField);
     return data;
 }
@@ -888,11 +888,11 @@ bool ResourceCalDav::startWriting(const TQString& url, const TQString& tasksUrl,
         t->journalsAdded = "";
         t->journalsChanged = "";
         t->journalsDeleted = "";
-        if (getICalString(currentIncidence).contains("BEGIN:VEVENT") > 0)
+        if (getICalString(currentIncidence).tqcontains("BEGIN:VEVENT") > 0)
           t->added = getICalString(currentIncidence);
-        else if (getICalString(currentIncidence).contains("BEGIN:VTODO") > 0)
+        else if (getICalString(currentIncidence).tqcontains("BEGIN:VTODO") > 0)
           t->tasksAdded = getICalString(currentIncidence);
-        else if (getICalString(currentIncidence).contains("BEGIN:VJOURNAL") > 0)
+        else if (getICalString(currentIncidence).tqcontains("BEGIN:VJOURNAL") > 0)
           t->journalsAdded = getICalString(currentIncidence);
 
         writingQueuePush(t);
@@ -916,11 +916,11 @@ bool ResourceCalDav::startWriting(const TQString& url, const TQString& tasksUrl,
         t->journalsChanged = "";
         t->journalsDeleted = "";
 
-        if (getICalString(currentIncidence).contains("BEGIN:VEVENT") > 0)
+        if (getICalString(currentIncidence).tqcontains("BEGIN:VEVENT") > 0)
           t->changed = getICalString(currentIncidence);
-        else if (getICalString(currentIncidence).contains("BEGIN:VTODO") > 0)
+        else if (getICalString(currentIncidence).tqcontains("BEGIN:VTODO") > 0)
           t->tasksChanged = getICalString(currentIncidence);
-        else if (getICalString(currentIncidence).contains("BEGIN:VJOURNAL") > 0)
+        else if (getICalString(currentIncidence).tqcontains("BEGIN:VJOURNAL") > 0)
           t->journalsChanged = getICalString(currentIncidence);
 
         writingQueuePush(t);
@@ -944,11 +944,11 @@ bool ResourceCalDav::startWriting(const TQString& url, const TQString& tasksUrl,
         t->journalsChanged = "";
         t->journalsDeleted = "";
 
-        if (getICalString(currentIncidence).contains("BEGIN:VEVENT") > 0)
+        if (getICalString(currentIncidence).tqcontains("BEGIN:VEVENT") > 0)
           t->deleted = getICalString(currentIncidence);
-        else if (getICalString(currentIncidence).contains("BEGIN:VTODO") > 0)
+        else if (getICalString(currentIncidence).tqcontains("BEGIN:VTODO") > 0)
           t->tasksDeleted = getICalString(currentIncidence);
-        else if (getICalString(currentIncidence).contains("BEGIN:VJOURNALS") > 0)
+        else if (getICalString(currentIncidence).tqcontains("BEGIN:VJOURNALS") > 0)
           t->journalsDeleted = getICalString(currentIncidence);
 
         writingQueuePush(t);
diff --git a/kresources/carddav/config.cpp b/kresources/carddav/config.cpp
index fb1ade76..e8d7e25a 100644
--- a/kresources/carddav/config.cpp
+++ b/kresources/carddav/config.cpp
@@ -158,7 +158,7 @@ void ResourceCardDavConfig::setupUI() {
     label->hide();
     mPassword->hide();
 
-    // combining layouts
+    // combining tqlayouts
     vertical->addLayout(mainLayout);
     vertical->addLayout(horizontal);
 }
diff --git a/kresources/carddav/configwidgets.cpp b/kresources/carddav/configwidgets.cpp
index 90da1831..fbec299a 100644
--- a/kresources/carddav/configwidgets.cpp
+++ b/kresources/carddav/configwidgets.cpp
@@ -113,7 +113,7 @@ CardDavReloadConfig::CardDavReloadConfig( TQWidget *parent )
   d->mIntervalSpin->setEnabled( false );
 
   groupBox->setColumnLayout(1, Qt::Vertical);
-  TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout());
+  TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout());
   vbox->addWidget(intervalRadio);
   vbox->addWidget(intervalBox);
   vbox->addWidget(automaticReloadOnStartup);
@@ -206,7 +206,7 @@ CardDavSaveConfig::CardDavSaveConfig( TQWidget *parent )
   intervalBox->hide();
 
   groupBox->setColumnLayout(1, Qt::Vertical);
-  TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout());
+  TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout());
   vbox->addWidget(delay);
   vbox->addWidget(every);
   vbox->addWidget(intervalRadio);
diff --git a/kresources/carddav/preferences.cpp b/kresources/carddav/preferences.cpp
index cf2cdbc5..61d17e30 100644
--- a/kresources/carddav/preferences.cpp
+++ b/kresources/carddav/preferences.cpp
@@ -223,14 +223,14 @@ TQString CardDavPrefs::getFullUrl() {
 
     firstAt = safeURL.find("@") + 1;
     while (safeURL.find("@", firstAt) != -1) {
-        safeURL.replace(safeURL.find("@", firstAt), 1, "%40");
+        safeURL.tqreplace(safeURL.find("@", firstAt), 1, "%40");
     }
 
     // Unencode the username, as Zimbra stupidly rejects the %40
-    safeURL.replace("%40", "@");
+    safeURL.tqreplace("%40", "@");
 
     // Encode any spaces, as libcarddav stupidly fails otherwise
-    safeURL.replace(" ", "%20");
+    safeURL.tqreplace(" ", "%20");
 
     return safeURL;
 }
diff --git a/kresources/carddav/resource.cpp b/kresources/carddav/resource.cpp
index a5172d9e..53bbf034 100644
--- a/kresources/carddav/resource.cpp
+++ b/kresources/carddav/resource.cpp
@@ -105,7 +105,7 @@ ResourceCardDav::~ResourceCardDav() {
     while ((mWriter->running() == true) || (mWritingQueue.isEmpty() == false) || !mWritingQueueReady) {
         readLockout = true;
         sleep(1);
-        qApp->processEvents(TQEventLoop::ExcludeUserInput);
+        tqApp->processEvents(TQEventLoop::ExcludeUserInput);
     }
 
     if (mWriter) {
@@ -394,8 +394,8 @@ void ResourceCardDav::loadFinished() {
         TQString data = loader->data();
 
         if (!data.isNull() && !data.isEmpty()) {
-            data.replace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
-            data.replace('\r', '\n');
+            data.tqreplace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
+            data.tqreplace('\r', '\n');
 
             log("trying to parse...");
             if (parseData(data)) {
diff --git a/kresources/carddav/writer.cpp b/kresources/carddav/writer.cpp
index 7141bf30..837fca66 100644
--- a/kresources/carddav/writer.cpp
+++ b/kresources/carddav/writer.cpp
@@ -58,7 +58,7 @@ int CardDavWriter::runJob(runtime_info* RT) {
             res = pushObjects(mChanged, carddav_modify_object_by_uri, OK, RT);
         if (OK == res) {
             kdDebug() << "pushing deleted objects";
-            while (mDeleted.contains("BEGIN:VCARD", TRUE) > 0) {
+            while (mDeleted.tqcontains("BEGIN:VCARD", TRUE) > 0) {
                 int endLocation = mDeleted.find("END:VCARD", 0, TRUE);
                 TQString deletedCurSeq = mDeleted.mid(0, endLocation+9);
                 mDeleted = mDeleted.remove(0, endLocation+9);
@@ -82,7 +82,7 @@ int CardDavWriter::runJob(runtime_info* RT) {
                 res = pushObjects(mChanged, carddav_add_object, OK, RT);
             if (OK == res) {
                 kdDebug() << "pushing deleted objects";
-                while (mDeleted.contains("BEGIN:VCARD", TRUE) > 0) {
+                while (mDeleted.tqcontains("BEGIN:VCARD", TRUE) > 0) {
                     int endLocation = mDeleted.find("END:VCARD", 0, TRUE);
                     TQString deletedCurSeq = mDeleted.mid(0, endLocation+9);
                     mDeleted = mDeleted.remove(0, endLocation+9);
diff --git a/kresources/egroupware/debugdialog.cpp b/kresources/egroupware/debugdialog.cpp
index 9d45dab7..1660c85e 100644
--- a/kresources/egroupware/debugdialog.cpp
+++ b/kresources/egroupware/debugdialog.cpp
@@ -38,10 +38,10 @@ DebugDialog::DebugDialog()
                 User1 | User2 | Ok, Ok, true )
 {
   TQWidget *page = plainPage();
-  TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() );
 
   mView = new KTextBrowser( page );
-  layout->addWidget( mView );
+  tqlayout->addWidget( mView );
 
   setButtonText( User1, "Save As..." );
   setButtonText( User2, "Clear" );
@@ -109,9 +109,9 @@ void DebugDialog::slotUser2()
 void DebugDialog::addText( const TQString &text, Type type )
 {
   TQString htmlCode( text );
-  htmlCode.replace( "<", "&lt;" );
-  htmlCode.replace( ">", "&gt;" );
-  htmlCode.replace( "\n", "<br>" );
+  htmlCode.tqreplace( "<", "&lt;" );
+  htmlCode.tqreplace( ">", "&gt;" );
+  htmlCode.tqreplace( "\n", "<br>" );
 
   mMessages.append( text );
   if ( type == Input )
diff --git a/kresources/egroupware/kcal_resourcexmlrpc.cpp b/kresources/egroupware/kcal_resourcexmlrpc.cpp
index 9072b166..15864a37 100644
--- a/kresources/egroupware/kcal_resourcexmlrpc.cpp
+++ b/kresources/egroupware/kcal_resourcexmlrpc.cpp
@@ -239,8 +239,8 @@ bool ResourceXMLRPC::doLoad()
   mTodoStateMapper.load();
 
   TQMap<TQString, TQVariant> args, columns;
-  args.insert( "start", TQDateTime( TQDate::currentDate().addDays( -12 ) ) );
-  args.insert( "end", TQDateTime( TQDate::currentDate().addDays( 2000 ) ) );
+  args.insert( "start", TQDateTime( TQDate::tqcurrentDate().addDays( -12 ) ) );
+  args.insert( "end", TQDateTime( TQDate::tqcurrentDate().addDays( 2000 ) ) );
 
   mServer->call( SearchEventsCommand, args,
                  this, TQT_SLOT( listEventsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
diff --git a/kresources/egroupware/knotes_resourcexmlrpc.cpp b/kresources/egroupware/knotes_resourcexmlrpc.cpp
index 774115d2..6446a833 100644
--- a/kresources/egroupware/knotes_resourcexmlrpc.cpp
+++ b/kresources/egroupware/knotes_resourcexmlrpc.cpp
@@ -50,7 +50,7 @@ static const TQString DeleteNoteCommand = "infolog.boinfolog.delete";
 static const TQString LoadNoteCategoriesCommand = "infolog.boinfolog.categories";
 
 ResourceXMLRPC::ResourceXMLRPC( const KConfig* config )
-  : ResourceNotes( config ),  mCalendar( TQString::fromLatin1("UTC") ),
+  : ResourceNotes( config ),  mCalendar( TQString::tqfromLatin1("UTC") ),
     mServer( 0 )
 {
   init();
@@ -65,7 +65,7 @@ ResourceXMLRPC::ResourceXMLRPC( const KConfig* config )
 }
 
 ResourceXMLRPC::ResourceXMLRPC( )
-  : ResourceNotes( 0 ), mCalendar( TQString::fromLatin1("UTC") ),
+  : ResourceNotes( 0 ), mCalendar( TQString::tqfromLatin1("UTC") ),
     mServer( 0 )
 {
   init();
diff --git a/kresources/egroupware/todostatemapper.cpp b/kresources/egroupware/todostatemapper.cpp
index e983c3c9..5c8fcf84 100644
--- a/kresources/egroupware/todostatemapper.cpp
+++ b/kresources/egroupware/todostatemapper.cpp
@@ -139,7 +139,7 @@ int TodoStateMapper::toLocal( const TQString &remoteState )
     return 100;
   else {
     TQString number( remoteState );
-    number.replace( "%", "" );
+    number.tqreplace( "%", "" );
     return number.toInt();
   }
 }
diff --git a/kresources/egroupware/xmlrpciface.cpp b/kresources/egroupware/xmlrpciface.cpp
index 2d91edbd..68bade03 100644
--- a/kresources/egroupware/xmlrpciface.cpp
+++ b/kresources/egroupware/xmlrpciface.cpp
@@ -202,10 +202,10 @@ TQString Query::marshal( const TQVariant &arg ) const
       case TQVariant::CString:
         {
         TQString result = arg.toString();
-        result = result.replace( "&", "&amp;" );
-        result = result.replace( "\"", "&quot;" );
-        result = result.replace( "<", "&lt;" );
-        result = result.replace( ">", "&gt;" );
+        result = result.tqreplace( "&", "&amp;" );
+        result = result.tqreplace( "\"", "&quot;" );
+        result = result.tqreplace( "<", "&lt;" );
+        result = result.tqreplace( ">", "&gt;" );
         return "<value><string>" + result + "</string></value>\r\n";
         }
       case TQVariant::Int:
diff --git a/kresources/exchange/dateset.cpp b/kresources/exchange/dateset.cpp
index a2372c87..2fed82af 100644
--- a/kresources/exchange/dateset.cpp
+++ b/kresources/exchange/dateset.cpp
@@ -155,24 +155,24 @@ void DateSet::remove( TQDate const& from, TQDate const& to )
   }
 }
 
-bool DateSet::contains( TQDate const& date )
+bool DateSet::tqcontains( TQDate const& date )
 {
   if (mDates->isEmpty()) {
     return false;
   } 
 
   uint i = find( date );
-//  kdDebug() << "contains looking for " << date.toString() << " at range " << i << endl;
+//  kdDebug() << "tqcontains looking for " << date.toString() << " at range " << i << endl;
   if ( i == mDates->count() )
     return false;
 
   QPair<TQDate,TQDate>* item = mDates->at( i );
-  // kdDebug() << "contains looking at range " << item->first.toString() << " -- " << item->second.toString() << endl;
+  // kdDebug() << "tqcontains looking at range " << item->first.toString() << " -- " << item->second.toString() << endl;
   return ( item->first <= date );
 }
 
 // returns true if and only if the whole range is in the set
-bool DateSet::contains( TQDate const& from, TQDate const& to )
+bool DateSet::tqcontains( TQDate const& from, TQDate const& to )
 {
   if (mDates->isEmpty()) {
     return false;
diff --git a/kresources/exchange/dateset.h b/kresources/exchange/dateset.h
index 989d774c..d4e9a9fe 100644
--- a/kresources/exchange/dateset.h
+++ b/kresources/exchange/dateset.h
@@ -34,8 +34,8 @@ class DateRange {
     DateRange( TQDate const& from, TQDate const& to )
 	    : mFrom( from ), mTo( to ) { }
     bool operator< ( const DateRange& r ) { return mFrom < r.from(); }
-    bool contains( TQDate const& d ) { return ( mFrom <= d && d <= mTo ); }
-    bool contains( TQDate const& from, TQDate const& to ) { return ( mFrom <= from && to <= mTo ); }
+    bool tqcontains( TQDate const& d ) { return ( mFrom <= d && d <= mTo ); }
+    bool tqcontains( TQDate const& from, TQDate const& to ) { return ( mFrom <= from && to <= mTo ); }
 
     TQDate from() { return mFrom; }
     TQDate to() { return mTo; }
@@ -68,9 +68,9 @@ class DateSet {
     void remove( TQDate const& date );
     void remove( TQDate const& from, TQDate const& to );
     
-    bool contains( TQDate const& date );
+    bool tqcontains( TQDate const& date );
     // returns true if and only if the whole range is in the set
-    bool contains( TQDate const& from, TQDate const& to );
+    bool tqcontains( TQDate const& from, TQDate const& to );
 
     int find( TQDate const &date );
     void print();
diff --git a/kresources/exchange/resourceexchange.cpp b/kresources/exchange/resourceexchange.cpp
index 82c0ab07..ec203b9c 100644
--- a/kresources/exchange/resourceexchange.cpp
+++ b/kresources/exchange/resourceexchange.cpp
@@ -78,7 +78,7 @@ ResourceExchange::ResourceExchange( const KConfig *config )
 {
   mLock = new KABC::LockNull( true );
 
-  mTimeZoneId = TQString::fromLatin1( "UTC" );
+  mTimeZoneId = TQString::tqfromLatin1( "UTC" );
 
   kdDebug() << "Creating ResourceExchange" << endl;
   if (config ) {
@@ -139,7 +139,7 @@ bool ResourceExchange::doOpen()
   mMonitor->addWatch( mAccount->calendarURL(), ExchangeMonitor::UpdateNewMember, 1 );
 #endif
 
-  TQWidgetList* widgets = TQApplication::topLevelWidgets();
+  TQWidgetList* widgets = TQApplication::tqtopLevelWidgets();
   if ( !widgets->isEmpty() )
     mClient->setWindow( widgets->first() );
   delete widgets;
@@ -477,11 +477,11 @@ Event::List ResourceExchange::rawEventsForDate( const TQDate &qd,
   if (!mCache) return Event::List();
   // If the events for this date are not in the cache, or if they are old,
   // get them again
-  TQDateTime now = TQDateTime::currentDateTime();
+  TQDateTime now = TQDateTime::tqcurrentDateTime();
   // kdDebug() << "Now is " << now.toString() << endl;
   // kdDebug() << "mDates: " << mDates << endl;
   TQDate start = TQDate( qd.year(), qd.month(), 1 ); // First day of month
-  if ( mDates && ( !mDates->contains( start ) ||
+  if ( mDates && ( !mDates->tqcontains( start ) ||
                    (*mCacheDates)[start].secsTo( now ) > mCachedSeconds ) ) {
     TQDate end = start.addMonths( 1 ).addDays( -1 ); // Last day of month
     // Get events that occur in this period from the cache
diff --git a/kresources/groupdav/groupdavglobals.cpp b/kresources/groupdav/groupdavglobals.cpp
index 17b6f443..10716000 100644
--- a/kresources/groupdav/groupdavglobals.cpp
+++ b/kresources/groupdav/groupdavglobals.cpp
@@ -230,7 +230,7 @@ bool GroupDavGlobals::interpretCalendarDownloadItemsJob( KCal::CalendarAdaptor *
 kdDebug(5800) << "GroupDavGlobals::interpretCalendarDownloadItemsJob, iCalendar=" << endl;
 kdDebug(5800) << jobData << endl;
   if ( !adaptor || !job ) return false;
-  KCal::CalendarLocal calendar( TQString::fromLatin1("UTC") );
+  KCal::CalendarLocal calendar( TQString::tqfromLatin1("UTC") );
   KCal::ICalFormat ical;
   calendar.setTimeZoneId( adaptor->resource()->timeZoneId() );
   KCal::Incidence::List incidences;
diff --git a/kresources/groupwise/groupwisesettingswidgetbase.ui b/kresources/groupwise/groupwisesettingswidgetbase.ui
index d8054494..eee04f6f 100644
--- a/kresources/groupwise/groupwisesettingswidgetbase.ui
+++ b/kresources/groupwise/groupwisesettingswidgetbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>GroupWiseSettingsWidgetBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -73,7 +73,7 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/kresources/groupwise/kabc_resourcegroupwise.cpp b/kresources/groupwise/kabc_resourcegroupwise.cpp
index 9aa33ac7..7c87508e 100644
--- a/kresources/groupwise/kabc_resourcegroupwise.cpp
+++ b/kresources/groupwise/kabc_resourcegroupwise.cpp
@@ -347,7 +347,7 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType )
   }
 
   mJob = KIO::get( url, false, false );  // TODO: make the GW jobs call finished if the URL 
-                                         // contains no address book IDs
+                                         // tqcontains no address book IDs
   kdDebug() << "  Job address: " << mJob << endl;
   connect( mJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
            TQT_SLOT( slotReadJobData( KIO::Job *, const TQByteArray & ) ) );
@@ -558,7 +558,7 @@ void ResourceGroupwise::slotUpdateJobData( KIO::Job *job, const TQByteArray &dat
           if ( !local.isEmpty() )
           {
             idMapper().removeRemoteId( remote );
-            KABC::Addressee addrToDelete = findByUid( local );
+            KABC::Addressee addrToDelete = tqfindByUid( local );
             removeAddressee( addrToDelete );
           }
         }
@@ -708,7 +708,7 @@ KURL ResourceGroupwise::createAccessUrl( BookType bookType, AccessMode mode, uns
 
   if ( mode == Update && lastSequenceNumber > 0 && lastPORebuildTime > 0 )
   {
-    query += TQString::fromLatin1( "&update=true&lastSeqNo=%1&PORebuildTime=%2" ).arg( lastSequenceNumber ).arg( lastPORebuildTime );;
+    query += TQString::tqfromLatin1( "&update=true&lastSeqNo=%1&PORebuildTime=%2" ).arg( lastSequenceNumber ).arg( lastPORebuildTime );;
   }
   url.setQuery( query );
   return url;
@@ -732,9 +732,9 @@ void ResourceGroupwise::storeDeltaInfo()
 
 bool ResourceGroupwise::appIsWhiteListedForSAB()
 {
-  if ( !mPrefs->systemAddressBookWhiteList().contains( qApp->argv()[ 0 ] ) )
+  if ( !mPrefs->systemAddressBookWhiteList().tqcontains( tqApp->argv()[ 0 ] ) )
   {
-    kdDebug() << "Application " << qApp->argv()[ 0 ] << " is _blacklisted_ to load the SAB" << endl;
+    kdDebug() << "Application " << tqApp->argv()[ 0 ] << " is _blacklisted_ to load the SAB" << endl;
     return false;
   }
   return true;
diff --git a/kresources/groupwise/kcal_resourcegroupwise.cpp b/kresources/groupwise/kcal_resourcegroupwise.cpp
index 678ad63e..3f8c08ef 100644
--- a/kresources/groupwise/kcal_resourcegroupwise.cpp
+++ b/kresources/groupwise/kcal_resourcegroupwise.cpp
@@ -186,7 +186,7 @@ void ResourceGroupwise::slotJobResult( KIO::Job *job )
     clearCache();
 
     // FIXME: This does not take into account the time zone!
-    CalendarLocal calendar( TQString::fromLatin1("UTC") );
+    CalendarLocal calendar( TQString::tqfromLatin1("UTC") );
     ICalFormat ical;
     if ( !ical.fromString( &calendar, mJobData ) ) {
       loadError( i18n("Error parsing calendar data.") );
diff --git a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp
index 04e1affd..f9e28008 100644
--- a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp
+++ b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp
@@ -124,7 +124,7 @@ void ResourceGroupwiseConfig::slotViewUserSettings()
     if ( s )
     {
       KDialogBase * dialog = new KDialogBase( ::qt_cast<TQWidget*>(parent() ), "gwsettingswidget", true, i18n( "GroupWise Settings" ) );
-//       TQVBoxLayout * layout = new TQVBoxLayout( dialog );
+//       TQVBoxLayout * tqlayout = new TQVBoxLayout( dialog );
       GroupWiseSettingsWidget * settingsWidget = new GroupWiseSettingsWidget( dialog );
       dialog->setMainWidget( settingsWidget );
       // populate dialog
diff --git a/kresources/groupwise/kioslave/groupwise.cpp b/kresources/groupwise/kioslave/groupwise.cpp
index 44178fe6..c535e568 100644
--- a/kresources/groupwise/kioslave/groupwise.cpp
+++ b/kresources/groupwise/kioslave/groupwise.cpp
@@ -106,12 +106,12 @@ void Groupwise::get( const KURL &url )
   TQString path = url.path();
   debugMessage( "Path: " + path );
 
-  if ( path.contains( "/freebusy" ) ) {
+  if ( path.tqcontains( "/freebusy" ) ) {
     getFreeBusy( url );
-  } else if ( path.contains( "/calendar" ) ) {
+  } else if ( path.tqcontains( "/calendar" ) ) {
     getCalendar( url );
-  } else if ( path.contains( "/addressbook" ) ) {
-    if ( url.query().contains( "update=true" ) )
+  } else if ( path.tqcontains( "/addressbook" ) ) {
+    if ( url.query().tqcontains( "update=true" ) )
       updateAddressbook( url );
     else
       getAddressbook( url );
@@ -169,8 +169,8 @@ void Groupwise::getFreeBusy( const KURL &url )
 
     // Sanitise local Nuernberg email addresses
     kdDebug() << "Email before sanitizing: " << email << endl;
-    email = email.replace(TQRegExp("\\.EMEA5-1\\.EMEA5" ), "" );
-    email = email.replace(TQRegExp("\\.Suse.INTERNET" ), "" );
+    email = email.tqreplace(TQRegExp("\\.EMEA5-1\\.EMEA5" ), "" );
+    email = email.tqreplace(TQRegExp("\\.Suse.INTERNET" ), "" );
     kdDebug() << "Email after sanitizing: " << email << endl;
 
     TQString u = soapUrl( url );
@@ -190,8 +190,8 @@ void Groupwise::getFreeBusy( const KURL &url )
       GroupwiseServer server( u, user, pass, 0 );
 
       // FIXME: Read range from configuration or URL parameters.
-      TQDate start = TQDate::currentDate().addDays( -3 );
-      TQDate end = TQDate::currentDate().addDays( 60 );
+      TQDate start = TQDate::tqcurrentDate().addDays( -3 );
+      TQDate end = TQDate::tqcurrentDate().addDays( 60 );
 
       fb->setDtStart( start );
       fb->setDtEnd( end );
@@ -241,7 +241,7 @@ void Groupwise::getCalendar( const KURL &url )
 
   GroupwiseServer server( u, user, pass, 0 );
 
-  KCal::CalendarLocal calendar( TQString::fromLatin1("UTC"));
+  KCal::CalendarLocal calendar( TQString::tqfromLatin1("UTC"));
 
   kdDebug() << "Login" << endl;
   if ( !server.login() ) {
diff --git a/kresources/groupwise/soap/contactconverter.cpp b/kresources/groupwise/soap/contactconverter.cpp
index 2abb8f45..f0f02bca 100644
--- a/kresources/groupwise/soap/contactconverter.cpp
+++ b/kresources/groupwise/soap/contactconverter.cpp
@@ -402,8 +402,8 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
       // TODO: map protocol to KDE's set of known protocol names (need to know the set of services in use elsewhere)
       if ( protocol == "nov" )
         protocol = "groupwise";
-      addr.insertCustom( TQString::fromLatin1("messaging/%1").arg( protocol ),
-                          TQString::fromLatin1( "All" ),
+      addr.insertCustom( TQString::tqfromLatin1("messaging/%1").arg( protocol ),
+                          TQString::tqfromLatin1( "All" ),
                           addresses.join( TQChar( 0xE000 ) ) );
     }
   }
@@ -573,7 +573,7 @@ ngwt__ImAddressList* ContactConverter::convertImAddresses( const KABC::Addressee
   std::vector<class ngwt__ImAddress*> *list = soap_new_std__vectorTemplateOfPointerTongwt__ImAddress( soap(), -1 );
 
   // for each custom
-  // if it contains IM addresses
+  // if it tqcontains IM addresses
   // extract each one and add it to imList
 
   const TQStringList customs = addr.customs();
@@ -583,7 +583,7 @@ ngwt__ImAddressList* ContactConverter::convertImAddresses( const KABC::Addressee
     TQString app, name, value;
     splitField( *it, app, name, value );
 
-    if ( app.startsWith( TQString::fromLatin1( "messaging/" ) ) && name == TQString::fromLatin1( "All" ) ) {
+    if ( app.startsWith( TQString::tqfromLatin1( "messaging/" ) ) && name == TQString::tqfromLatin1( "All" ) ) {
       // get the protocol for this field
       TQString protocol = app.section( '/', 1, 1 );
       if ( !protocol.isEmpty() ) {
diff --git a/kresources/groupwise/soap/groupwiseserver.cpp b/kresources/groupwise/soap/groupwiseserver.cpp
index 28c73b68..ac62a364 100644
--- a/kresources/groupwise/soap/groupwiseserver.cpp
+++ b/kresources/groupwise/soap/groupwiseserver.cpp
@@ -129,7 +129,7 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *,
   if (rc != 0 ) {
     kdError() << "gSoapOpen: lookup of " << host << " failed " << rc << endl;
     TQString errorMessage;
-    errorMessage = TQString::fromLatin1( strerror( errno ) );
+    errorMessage = TQString::tqfromLatin1( strerror( errno ) );
     perror( 0 );
     soap->error = SOAP_TCP_ERROR;
     mErrorText = i18n("Connect failed: %1.").arg( errorMessage );
@@ -141,13 +141,13 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *,
     kdError() << "gSoapOpen: connect failed " << rc << endl;
     TQString errorMessage;
     if ( rc == -1 ) {
-      errorMessage = TQString::fromLatin1( strerror( errno ) );
+      errorMessage = TQString::tqfromLatin1( strerror( errno ) );
       perror( 0 );
     }
 	//set the soap struct's error here!
     else {
       if ( rc == -3 )
-        errorMessage = TQString::fromLatin1( "Connection timed out.  Check host and port number" );
+        errorMessage = TQString::tqfromLatin1( "Connection timed out.  Check host and port number" );
     }
     mErrorText = i18n("Connect failed: %1.").arg( errorMessage );
     soap->error =SOAP_TCP_ERROR;
@@ -208,7 +208,7 @@ int GroupwiseServer::gSoapSendCallback( struct soap * soap, const char *s, size_
     ret = m_sock->writeBlock( s, n );
     if ( ret < 0 ) {
       kdError() << "Send failed: " << strerror( m_sock->systemError() )
-        << " " << m_sock->socketStatus() << " " << m_sock->fd() << endl;
+        << " " << m_sock->sockeStatus() << " " << m_sock->fd() << endl;
       soap->error = SOAP_TCP_ERROR;
       return SOAP_TCP_ERROR;
     }
@@ -217,7 +217,7 @@ int GroupwiseServer::gSoapSendCallback( struct soap * soap, const char *s, size_
 
   if ( n !=0 ) {
     kdError() << "Send failed: " << strerror( m_sock->systemError() )
-      << " " << m_sock->socketStatus() << " " << m_sock->fd() << endl;
+      << " " << m_sock->sockeStatus() << " " << m_sock->fd() << endl;
     soap->error = SOAP_TCP_ERROR;
   }
 
@@ -246,7 +246,7 @@ size_t GroupwiseServer::gSoapReceiveCallback( struct soap *soap, char *s,
   long ret = m_sock->readBlock( s, n );
   if ( ret < 0 ) {
     kdError() << "Receive failed: " << strerror( m_sock->systemError() )
-      << " " << m_sock->socketStatus() << " " << m_sock->fd() << endl;
+      << " " << m_sock->sockeStatus() << " " << m_sock->fd() << endl;
   } else {
     if ( getenv("DEBUG_GW_RESOURCE") ) {
       qDebug("*************************");
@@ -518,7 +518,7 @@ void GroupwiseServer::dumpCalendarFolder( const std::string &id )
   itemsRequest.container = soap_new_std__string( mSoap, -1 );
   *(itemsRequest.container) = id;
   std::string *str = soap_new_std__string( mSoap, -1 );
-  str->append( "recipients message recipientStatus" );
+  str->append( "recipients message recipienStatus" );
   itemsRequest.view = str;
 
   itemsRequest.filter = 0;
diff --git a/kresources/groupwise/soap/gwconverter.cpp b/kresources/groupwise/soap/gwconverter.cpp
index ba64cff9..f51f16b7 100644
--- a/kresources/groupwise/soap/gwconverter.cpp
+++ b/kresources/groupwise/soap/gwconverter.cpp
@@ -111,7 +111,7 @@ std::string* GWConverter::qDateToString( const TQDate &date )
 TQDate GWConverter::stringToQDate( std::string* str )
 {
   //NB this ISODate may become unnecessary, if GW stops sending in yyyy-mm-dd format again
-  return TQDate::fromString( TQString::fromLatin1( str->c_str() ), Qt::ISODate );
+  return TQDate::fromString( TQString::tqfromLatin1( str->c_str() ), Qt::ISODate );
 }
 
 TQDateTime GWConverter::charToQDateTime( const char *str )
diff --git a/kresources/groupwise/soap/gwjobs.cpp b/kresources/groupwise/soap/gwjobs.cpp
index 43d5d58d..d093497c 100644
--- a/kresources/groupwise/soap/gwjobs.cpp
+++ b/kresources/groupwise/soap/gwjobs.cpp
@@ -160,7 +160,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id )
 
         TQString remoteUid = converter.stringToQString( (*it)->id );
 
-        KABC::Addressee oldAddressee = mResource->findByUid( mResource->idMapper().localId( remoteUid ) );
+        KABC::Addressee oldAddressee = mResource->tqfindByUid( mResource->idMapper().localId( remoteUid ) );
         if ( oldAddressee.isEmpty() ) // new addressee
           mResource->idMapper().setRemoteId( addr.uid(), remoteUid );
         else {
@@ -438,7 +438,7 @@ void ReadCalendarJob::run()
   // perform consistency checks
   kdDebug() << "Total count of items of all types in folders we read: " << totalItems << endl;
   kdDebug() << "Folders we read contained " << totals.appointments << " appointments, " << totals.notes << " notes, and " << totals.tasks << " tasks." << endl;
-  kdDebug() << "Local calendar now contains " << mCalendar->rawEvents().count() << " events and " << mCalendar->rawJournals().count() << " journals, and " << mCalendar->rawTodos().count() << " todos." << endl;
+  kdDebug() << "Local calendar now tqcontains " << mCalendar->rawEvents().count() << " events and " << mCalendar->rawJournals().count() << " journals, and " << mCalendar->rawTodos().count() << " todos." << endl;
   if ( totals.appointments == mCalendar->rawEvents().count() )
     kdDebug() << "All events accounted for." << endl;
   else
@@ -465,7 +465,7 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts
 
   itemsRequest.container = id;
   std::string *str = soap_new_std__string( mSoap, -1 );
-  str->append( "startDate endDate subject alarm allDayEvent place timezone iCalId recipients message recipientStatus recurrenceKey" );
+  str->append( "startDate endDate subject alarm allDayEvent place timezone iCalId recipients message recipienStatus recurrenceKey" );
   itemsRequest.view = str;
   itemsRequest.filter = 0;
   itemsRequest.items = 0;
@@ -475,8 +475,8 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts
   ngwt__Filter *filter = soap_new_ngwm__Filter( mSoap, -1 );
   ngwt__FilterEntry *filterEntry = soap_new_ngwm__FilterEntry( mSoap, -1 );
   filterEntry->op = gte;
-  filterEntry->field = TQString::fromLatin1( "startDate" ).utf8();
-  filterEntry->value = TQDateTime::currentDateTime().toString( "yyyyMMddThhmmZ" ).utf8();
+  filterEntry->field = TQString::tqfromLatin1( "startDate" ).utf8();
+  filterEntry->value = TQDateTime::tqcurrentDateTime().toString( "yyyyMMddThhmmZ" ).utf8();
 
   filter->element = filterEntry;
 
@@ -525,7 +525,7 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts
   cursorRequest.container = id;
 #if 1
   cursorRequest.view = soap_new_std__string( mSoap, -1 );
-  cursorRequest.view->append( "default message recipients attachments recipientStatus peek completed status" /*"container status source security distribution acceptLevel startDate endDate subject alarm allDayEvent place timezone iCalId recipients message recurrenceKey"*/ );
+  cursorRequest.view->append( "default message recipients attachments recipienStatus peek completed status" /*"container status source security distribution acceptLevel startDate endDate subject alarm allDayEvent place timezone iCalId recipients message recurrenceKey"*/ );
 
 #else
   cursorRequest.view = 0;
diff --git a/kresources/groupwise/soap/incidenceconverter.cpp b/kresources/groupwise/soap/incidenceconverter.cpp
index 5e5e4c40..a6a171b8 100644
--- a/kresources/groupwise/soap/incidenceconverter.cpp
+++ b/kresources/groupwise/soap/incidenceconverter.cpp
@@ -470,7 +470,7 @@ void IncidenceConverter::setAttendees( KCal::Incidence *incidence,
   KCal::Attendee::List::ConstIterator it;
   for( it = attendees.begin(); it != attendees.end(); ++it ) {
     if ( !to.isEmpty() )
-      to += TQString::fromLatin1( ";  %1" ).arg( (*it)->name() );
+      to += TQString::tqfromLatin1( ";  %1" ).arg( (*it)->name() );
     kdDebug() << "IncidenceConverter::setAttendees(), adding " << (*it)->fullName()
       << endl;
     TQString uuid;
@@ -489,7 +489,7 @@ ngwt__Recipient *IncidenceConverter::createRecipient( const TQString &name,
 {
   ngwt__Recipient *recipient = soap_new_ngwt__Recipient( soap(), -1 );
 
-  recipient->recipientStatus = 0;
+  recipient->recipienStatus = 0;
   if ( !uuid.isEmpty() ) recipient->uuid = qStringToString( uuid );
   else recipient->uuid = 0;
   if ( !name.isEmpty() ) {
@@ -635,7 +635,7 @@ void IncidenceConverter::getAttendees( ngwt__CalendarItem *item, KCal::Incidence
       // set our status
       if ( emailsMatch( stringToQString(recipient->email), mFromEmail ) )
         if ( item->status->accepted )
-          attendee->setStatus( ( *item->status->accepted ) ? KCal::Attendee::Accepted : KCal::Attendee::NeedsAction );
+          attendee->seStatus( ( *item->status->accepted ) ? KCal::Attendee::Accepted : KCal::Attendee::NeedsAction );
         else 
           kdDebug() << "---- found ourselves, but not accepted" << endl;
       else
diff --git a/kresources/groupwise/soap/ksslsocket.cpp b/kresources/groupwise/soap/ksslsocket.cpp
index 653a5531..e1e48831 100644
--- a/kresources/groupwise/soap/ksslsocket.cpp
+++ b/kresources/groupwise/soap/ksslsocket.cpp
@@ -82,12 +82,12 @@ KSSLSocket::~KSSLSocket()
 	delete d;
 }
 
-Q_LONG KSSLSocket::readBlock( char* data, Q_ULONG maxLen )
+TQ_LONG KSSLSocket::readBlock( char* data, TQ_ULONG maxLen )
 {
 	return d->kssl->read( data, maxLen );
 }
 
-Q_LONG KSSLSocket::writeBlock( const char* data, Q_ULONG len )
+TQ_LONG KSSLSocket::writeBlock( const char* data, TQ_ULONG len )
 {
 //  kdDebug() << "KSSLSocket::writeBlock() " << (void*)this  << endl;
 //  kdDebug() << "  d->kssl: " << (void*)d->kssl << endl;
@@ -109,7 +109,7 @@ void KSSLSocket::slotConnected()
 			d->kssl->reInitialize();
 		}
 		d->kssl->setPeerHost(host());
-//        kdDebug() << "SOCKET STATUS: " << socketStatus() << endl;
+//        kdDebug() << "SOCKET STATUS: " << sockeStatus() << endl;
 		int rc = d->kssl->connect( sockfd );
                 if ( rc <= 0 ) {
                   kdError() << "Error connecting KSSL: " << rc << endl;
@@ -150,12 +150,12 @@ void KSSLSocket::setMetaData( const TQString &key, const TQVariant &data )
 
 bool KSSLSocket::hasMetaData( const TQString &key )
 {
-	return d->metaData.contains(key);
+	return d->metaData.tqcontains(key);
 }
 
 TQString KSSLSocket::metaData( const TQString &key )
 {
-	if( d->metaData.contains(key) )
+	if( d->metaData.tqcontains(key) )
 		return d->metaData[key];
 	return TQString::null;
 }
diff --git a/kresources/groupwise/soap/ksslsocket.h b/kresources/groupwise/soap/ksslsocket.h
index d58b4191..854cf8f4 100644
--- a/kresources/groupwise/soap/ksslsocket.h
+++ b/kresources/groupwise/soap/ksslsocket.h
@@ -33,8 +33,8 @@ class KSSLSocket : public KExtendedSocket
 		KSSLSocket();
 		~KSSLSocket();
 
-		Q_LONG readBlock( char* data, Q_ULONG maxLen );
-		Q_LONG writeBlock( const char* data, Q_ULONG len );
+		TQ_LONG readBlock( char* data, TQ_ULONG maxLen );
+		TQ_LONG writeBlock( const char* data, TQ_ULONG len );
 
 	signals:
 		void sslFailure();
diff --git a/kresources/groupwise/soap/soapC.cpp b/kresources/groupwise/soap/soapC.cpp
index 4d140cae..f426729b 100644
--- a/kresources/groupwise/soap/soapC.cpp
+++ b/kresources/groupwise/soap/soapC.cpp
@@ -672,8 +672,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_ngwt__RecurrenceRule(soap, NULL, NULL, "ngwt:RecurrenceRule");
 	case SOAP_TYPE_ngwt__RecurrenceDateType:
 		return soap_in_ngwt__RecurrenceDateType(soap, NULL, NULL, "ngwt:RecurrenceDateType");
-	case SOAP_TYPE_ngwt__RecipientStatus:
-		return soap_in_ngwt__RecipientStatus(soap, NULL, NULL, "ngwt:RecipientStatus");
+	case SOAP_TYPE_ngwt__RecipienStatus:
+		return soap_in_ngwt__RecipienStatus(soap, NULL, NULL, "ngwt:RecipienStatus");
 	case SOAP_TYPE_ngwt__RecipientList:
 		return soap_in_ngwt__RecipientList(soap, NULL, NULL, "ngwt:RecipientList");
 	case SOAP_TYPE_ngwt__Recipient:
@@ -838,8 +838,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_ngwt__ContactFolder(soap, NULL, NULL, "ngwt:ContactFolder");
 	case SOAP_TYPE_ngwt__Contact:
 		return soap_in_ngwt__Contact(soap, NULL, NULL, "ngwt:Contact");
-	case SOAP_TYPE_ngwt__CommentStatus:
-		return soap_in_ngwt__CommentStatus(soap, NULL, NULL, "ngwt:CommentStatus");
+	case SOAP_TYPE_ngwt__CommenStatus:
+		return soap_in_ngwt__CommenStatus(soap, NULL, NULL, "ngwt:CommenStatus");
 	case SOAP_TYPE_ngwt__CategoryRefList:
 		return soap_in_ngwt__CategoryRefList(soap, NULL, NULL, "ngwt:CategoryRefList");
 	case SOAP_TYPE_ngwt__CategoryList:
@@ -1290,8 +1290,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_PointerTongwt__ItemStatus(soap, NULL, NULL, "ngwt:ItemStatus");
 	case SOAP_TYPE_PointerTongwt__DeltaSyncType:
 		return soap_in_PointerTongwt__DeltaSyncType(soap, NULL, NULL, "ngwt:DeltaSyncType");
-	case SOAP_TYPE_PointerTongwt__RecipientStatus:
-		return soap_in_PointerTongwt__RecipientStatus(soap, NULL, NULL, "ngwt:RecipientStatus");
+	case SOAP_TYPE_PointerTongwt__RecipienStatus:
+		return soap_in_PointerTongwt__RecipienStatus(soap, NULL, NULL, "ngwt:RecipienStatus");
 	case SOAP_TYPE_PointerTongwt__FreeBusyBlockList:
 		return soap_in_PointerTongwt__FreeBusyBlockList(soap, NULL, NULL, "ngwt:FreeBusyBlockList");
 	case SOAP_TYPE_PointerTongwt__CalendarFolderAttribute:
@@ -1454,8 +1454,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_PointerTongwt__DelegateeStatus(soap, NULL, NULL, "ngwt:DelegateeStatus");
 	case SOAP_TYPE_PointerTongwt__DelegatedStatus:
 		return soap_in_PointerTongwt__DelegatedStatus(soap, NULL, NULL, "ngwt:DelegatedStatus");
-	case SOAP_TYPE_PointerTongwt__CommentStatus:
-		return soap_in_PointerTongwt__CommentStatus(soap, NULL, NULL, "ngwt:CommentStatus");
+	case SOAP_TYPE_PointerTongwt__CommenStatus:
+		return soap_in_PointerTongwt__CommenStatus(soap, NULL, NULL, "ngwt:CommenStatus");
 	case SOAP_TYPE_PointerTongwt__TransferFailedStatus:
 		return soap_in_PointerTongwt__TransferFailedStatus(soap, NULL, NULL, "ngwt:TransferFailedStatus");
 	case SOAP_TYPE_PointerTongwt__Recipient:
@@ -2664,9 +2664,9 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		{	*type = SOAP_TYPE_ngwt__RecurrenceDateType;
 			return soap_in_ngwt__RecurrenceDateType(soap, NULL, NULL, NULL);
 		}
-		if (!soap_match_tag(soap, t, "ngwt:RecipientStatus"))
-		{	*type = SOAP_TYPE_ngwt__RecipientStatus;
-			return soap_in_ngwt__RecipientStatus(soap, NULL, NULL, NULL);
+		if (!soap_match_tag(soap, t, "ngwt:RecipienStatus"))
+		{	*type = SOAP_TYPE_ngwt__RecipienStatus;
+			return soap_in_ngwt__RecipienStatus(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:RecipientList"))
 		{	*type = SOAP_TYPE_ngwt__RecipientList;
@@ -2996,9 +2996,9 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		{	*type = SOAP_TYPE_ngwt__Contact;
 			return soap_in_ngwt__Contact(soap, NULL, NULL, NULL);
 		}
-		if (!soap_match_tag(soap, t, "ngwt:CommentStatus"))
-		{	*type = SOAP_TYPE_ngwt__CommentStatus;
-			return soap_in_ngwt__CommentStatus(soap, NULL, NULL, NULL);
+		if (!soap_match_tag(soap, t, "ngwt:CommenStatus"))
+		{	*type = SOAP_TYPE_ngwt__CommenStatus;
+			return soap_in_ngwt__CommenStatus(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:CategoryRefList"))
 		{	*type = SOAP_TYPE_ngwt__CategoryRefList;
@@ -3726,8 +3726,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return ((ngwt__RecurrenceRule *)ptr)->soap_out(soap, tag, id, "ngwt:RecurrenceRule");
 	case SOAP_TYPE_ngwt__RecurrenceDateType:
 		return ((ngwt__RecurrenceDateType *)ptr)->soap_out(soap, tag, id, "ngwt:RecurrenceDateType");
-	case SOAP_TYPE_ngwt__RecipientStatus:
-		return ((ngwt__RecipientStatus *)ptr)->soap_out(soap, tag, id, "ngwt:RecipientStatus");
+	case SOAP_TYPE_ngwt__RecipienStatus:
+		return ((ngwt__RecipienStatus *)ptr)->soap_out(soap, tag, id, "ngwt:RecipienStatus");
 	case SOAP_TYPE_ngwt__RecipientList:
 		return ((ngwt__RecipientList *)ptr)->soap_out(soap, tag, id, "ngwt:RecipientList");
 	case SOAP_TYPE_ngwt__Recipient:
@@ -3892,8 +3892,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return ((ngwt__ContactFolder *)ptr)->soap_out(soap, tag, id, "ngwt:ContactFolder");
 	case SOAP_TYPE_ngwt__Contact:
 		return ((ngwt__Contact *)ptr)->soap_out(soap, tag, id, "ngwt:Contact");
-	case SOAP_TYPE_ngwt__CommentStatus:
-		return ((ngwt__CommentStatus *)ptr)->soap_out(soap, tag, id, "ngwt:CommentStatus");
+	case SOAP_TYPE_ngwt__CommenStatus:
+		return ((ngwt__CommenStatus *)ptr)->soap_out(soap, tag, id, "ngwt:CommenStatus");
 	case SOAP_TYPE_ngwt__CategoryRefList:
 		return ((ngwt__CategoryRefList *)ptr)->soap_out(soap, tag, id, "ngwt:CategoryRefList");
 	case SOAP_TYPE_ngwt__CategoryList:
@@ -4344,8 +4344,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return soap_out_PointerTongwt__ItemStatus(soap, tag, id, (ngwt__ItemStatus *const*)ptr, "ngwt:ItemStatus");
 	case SOAP_TYPE_PointerTongwt__DeltaSyncType:
 		return soap_out_PointerTongwt__DeltaSyncType(soap, tag, id, (enum ngwt__DeltaSyncType *const*)ptr, "ngwt:DeltaSyncType");
-	case SOAP_TYPE_PointerTongwt__RecipientStatus:
-		return soap_out_PointerTongwt__RecipientStatus(soap, tag, id, (ngwt__RecipientStatus *const*)ptr, "ngwt:RecipientStatus");
+	case SOAP_TYPE_PointerTongwt__RecipienStatus:
+		return soap_out_PointerTongwt__RecipienStatus(soap, tag, id, (ngwt__RecipienStatus *const*)ptr, "ngwt:RecipienStatus");
 	case SOAP_TYPE_PointerTongwt__FreeBusyBlockList:
 		return soap_out_PointerTongwt__FreeBusyBlockList(soap, tag, id, (ngwt__FreeBusyBlockList *const*)ptr, "ngwt:FreeBusyBlockList");
 	case SOAP_TYPE_PointerTongwt__CalendarFolderAttribute:
@@ -4508,8 +4508,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return soap_out_PointerTongwt__DelegateeStatus(soap, tag, id, (ngwt__DelegateeStatus *const*)ptr, "ngwt:DelegateeStatus");
 	case SOAP_TYPE_PointerTongwt__DelegatedStatus:
 		return soap_out_PointerTongwt__DelegatedStatus(soap, tag, id, (ngwt__DelegatedStatus *const*)ptr, "ngwt:DelegatedStatus");
-	case SOAP_TYPE_PointerTongwt__CommentStatus:
-		return soap_out_PointerTongwt__CommentStatus(soap, tag, id, (ngwt__CommentStatus *const*)ptr, "ngwt:CommentStatus");
+	case SOAP_TYPE_PointerTongwt__CommenStatus:
+		return soap_out_PointerTongwt__CommenStatus(soap, tag, id, (ngwt__CommenStatus *const*)ptr, "ngwt:CommenStatus");
 	case SOAP_TYPE_PointerTongwt__TransferFailedStatus:
 		return soap_out_PointerTongwt__TransferFailedStatus(soap, tag, id, (ngwt__TransferFailedStatus *const*)ptr, "ngwt:TransferFailedStatus");
 	case SOAP_TYPE_PointerTongwt__Recipient:
@@ -5268,8 +5268,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_ngwt__RecurrenceDateType:
 		((ngwt__RecurrenceDateType *)ptr)->soap_serialize(soap);
 		break;
-	case SOAP_TYPE_ngwt__RecipientStatus:
-		((ngwt__RecipientStatus *)ptr)->soap_serialize(soap);
+	case SOAP_TYPE_ngwt__RecipienStatus:
+		((ngwt__RecipienStatus *)ptr)->soap_serialize(soap);
 		break;
 	case SOAP_TYPE_ngwt__RecipientList:
 		((ngwt__RecipientList *)ptr)->soap_serialize(soap);
@@ -5517,8 +5517,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_ngwt__Contact:
 		((ngwt__Contact *)ptr)->soap_serialize(soap);
 		break;
-	case SOAP_TYPE_ngwt__CommentStatus:
-		((ngwt__CommentStatus *)ptr)->soap_serialize(soap);
+	case SOAP_TYPE_ngwt__CommenStatus:
+		((ngwt__CommenStatus *)ptr)->soap_serialize(soap);
 		break;
 	case SOAP_TYPE_ngwt__CategoryRefList:
 		((ngwt__CategoryRefList *)ptr)->soap_serialize(soap);
@@ -6444,8 +6444,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_PointerTongwt__DeltaSyncType:
 		soap_serialize_PointerTongwt__DeltaSyncType(soap, (enum ngwt__DeltaSyncType *const*)ptr);
 		break;
-	case SOAP_TYPE_PointerTongwt__RecipientStatus:
-		soap_serialize_PointerTongwt__RecipientStatus(soap, (ngwt__RecipientStatus *const*)ptr);
+	case SOAP_TYPE_PointerTongwt__RecipienStatus:
+		soap_serialize_PointerTongwt__RecipienStatus(soap, (ngwt__RecipienStatus *const*)ptr);
 		break;
 	case SOAP_TYPE_PointerTongwt__FreeBusyBlockList:
 		soap_serialize_PointerTongwt__FreeBusyBlockList(soap, (ngwt__FreeBusyBlockList *const*)ptr);
@@ -6690,8 +6690,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_PointerTongwt__DelegatedStatus:
 		soap_serialize_PointerTongwt__DelegatedStatus(soap, (ngwt__DelegatedStatus *const*)ptr);
 		break;
-	case SOAP_TYPE_PointerTongwt__CommentStatus:
-		soap_serialize_PointerTongwt__CommentStatus(soap, (ngwt__CommentStatus *const*)ptr);
+	case SOAP_TYPE_PointerTongwt__CommenStatus:
+		soap_serialize_PointerTongwt__CommenStatus(soap, (ngwt__CommenStatus *const*)ptr);
 		break;
 	case SOAP_TYPE_PointerTongwt__TransferFailedStatus:
 		soap_serialize_PointerTongwt__TransferFailedStatus(soap, (ngwt__TransferFailedStatus *const*)ptr);
@@ -6986,8 +6986,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_instantiate(struct soap *soap, int t, const ch
 		return (void*)soap_instantiate_ngwt__QueryTarget(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__RecipientList:
 		return (void*)soap_instantiate_ngwt__RecipientList(soap, -1, type, arrayType, n);
-	case SOAP_TYPE_ngwt__RecipientStatus:
-		return (void*)soap_instantiate_ngwt__RecipientStatus(soap, -1, type, arrayType, n);
+	case SOAP_TYPE_ngwt__RecipienStatus:
+		return (void*)soap_instantiate_ngwt__RecipienStatus(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__RecurrenceDateType:
 		return (void*)soap_instantiate_ngwt__RecurrenceDateType(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__RecurrenceRule:
@@ -7400,8 +7400,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_instantiate(struct soap *soap, int t, const ch
 		return (void*)soap_instantiate_ngwt__Alarm(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__Category:
 		return (void*)soap_instantiate_ngwt__Category(soap, -1, type, arrayType, n);
-	case SOAP_TYPE_ngwt__CommentStatus:
-		return (void*)soap_instantiate_ngwt__CommentStatus(soap, -1, type, arrayType, n);
+	case SOAP_TYPE_ngwt__CommenStatus:
+		return (void*)soap_instantiate_ngwt__CommenStatus(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__ContainerItem:
 		return (void*)soap_instantiate_ngwt__ContainerItem(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__ContainerRef:
@@ -8005,11 +8005,11 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_fdelete(struct soap_clist *p)
 		else
 			delete[] (ngwt__RecipientList*)p->ptr;
 		break;
-	case SOAP_TYPE_ngwt__RecipientStatus:
+	case SOAP_TYPE_ngwt__RecipienStatus:
 		if (p->size < 0)
-			delete (ngwt__RecipientStatus*)p->ptr;
+			delete (ngwt__RecipienStatus*)p->ptr;
 		else
-			delete[] (ngwt__RecipientStatus*)p->ptr;
+			delete[] (ngwt__RecipienStatus*)p->ptr;
 		break;
 	case SOAP_TYPE_ngwt__RecurrenceDateType:
 		if (p->size < 0)
@@ -9247,11 +9247,11 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_fdelete(struct soap_clist *p)
 		else
 			delete[] (ngwt__Category*)p->ptr;
 		break;
-	case SOAP_TYPE_ngwt__CommentStatus:
+	case SOAP_TYPE_ngwt__CommenStatus:
 		if (p->size < 0)
-			delete (ngwt__CommentStatus*)p->ptr;
+			delete (ngwt__CommenStatus*)p->ptr;
 		else
-			delete[] (ngwt__CommentStatus*)p->ptr;
+			delete[] (ngwt__CommenStatus*)p->ptr;
 		break;
 	case SOAP_TYPE_ngwt__ContainerItem:
 		if (p->size < 0)
@@ -10751,7 +10751,7 @@ static const struct soap_code_map soap_codes_ngwe__Field[] =
 	{ (long)PhoneNumber_, "PhoneNumber" },
 	{ (long)Place_, "Place" },
 	{ (long)PostalAddress_, "PostalAddress" },
-	{ (long)RecipientStatus_, "RecipientStatus" },
+	{ (long)RecipienStatus_, "RecipienStatus" },
 	{ (long)Rights_, "Rights" },
 	{ (long)Security_, "Security" },
 	{ (long)SendPriority_, "SendPriority" },
@@ -11148,7 +11148,7 @@ static const struct soap_code_map soap_codes_ngwt__VersionEventType[] =
 	{ (long)created, "created" },
 	{ (long)deleteVersion, "deleteVersion" },
 	{ (long)endAccess, "endAccess" },
-	{ (long)resetStatus, "resetStatus" },
+	{ (long)reseStatus, "reseStatus" },
 	{ (long)restore, "restore" },
 	{ (long)retrieve, "retrieve" },
 	{ (long)securityModified, "securityModified" },
@@ -12992,8 +12992,8 @@ static const struct soap_code_map soap_codes_ngwt__FilterOp[] =
 	{ (long)lt, "lt" },
 	{ (long)gte, "gte" },
 	{ (long)lte, "lte" },
-	{ (long)contains, "contains" },
-	{ (long)containsWord, "containsWord" },
+	{ (long)tqcontains, "tqcontains" },
+	{ (long)tqcontainsWord, "tqcontainsWord" },
 	{ (long)begins, "begins" },
 	{ (long)exists, "exists" },
 	{ (long)notExist, "notExist" },
@@ -14261,7 +14261,7 @@ static const struct soap_code_map soap_codes_ngwe__FieldList[] =
 	{ (long)PhoneNumber, "PhoneNumber" },
 	{ (long)Place, "Place" },
 	{ (long)PostalAddress, "PostalAddress" },
-	{ (long)RecipientStatus, "RecipientStatus" },
+	{ (long)RecipienStatus, "RecipienStatus" },
 	{ (long)Rights, "Rights" },
 	{ (long)Security, "Security" },
 	{ (long)SendPriority, "SendPriority" },
@@ -14299,7 +14299,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwe__FieldList(struct soap *soap, const char
 			case 262144: soap_send(soap, "PhoneNumber "); break;
 			case 524288: soap_send(soap, "Place "); break;
 			case 1048576: soap_send(soap, "PostalAddress "); break;
-			case 2097152: soap_send(soap, "RecipientStatus "); break;
+			case 2097152: soap_send(soap, "RecipienStatus "); break;
 			case 4194304: soap_send(soap, "Rights "); break;
 			case 8388608: soap_send(soap, "Security "); break;
 			case 16777216: soap_send(soap, "SendPriority "); break;
@@ -14376,8 +14376,8 @@ SOAP_FMAC3 enum ngwe__FieldList * SOAP_FMAC4 soap_in_ngwe__FieldList(struct soap
 				i |= (LONG64)Place;
 			else if (!strcmp(s, "PostalAddress"))
 				i |= (LONG64)PostalAddress;
-			else if (!strcmp(s, "RecipientStatus"))
-				i |= (LONG64)RecipientStatus;
+			else if (!strcmp(s, "RecipienStatus"))
+				i |= (LONG64)RecipienStatus;
 			else if (!strcmp(s, "Rights"))
 				i |= (LONG64)Rights;
 			else if (!strcmp(s, "Security"))
@@ -41405,51 +41405,51 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__TrustedApplication(struct soap *soap,
 void ngwt__TransferFailedStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->delivered, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->delivered);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->undeliverable, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->undeliverable);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferred, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->transferred);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferDelayed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->transferDelayed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedStatus);
-	soap_serialize_PointerTongwt__TransferFailedStatus(soap, &((ngwt__RecipientStatus*)this)->transferFailed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->downloaded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->downloaded);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->retractRequested, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->retractRequested);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->retracted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->retracted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->opened, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->opened);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->deleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->deleted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->undeleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->undeleted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->purged, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->purged);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommentStatus);
-	soap_serialize_PointerTongwt__CommentStatus(soap, &((ngwt__RecipientStatus*)this)->accepted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommentStatus);
-	soap_serialize_PointerTongwt__CommentStatus(soap, &((ngwt__RecipientStatus*)this)->declined);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->replied, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->replied);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->forwarded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->forwarded);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->shared, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->shared);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->started, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->started);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->completed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->completed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->incomplete, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->incomplete);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedStatus);
-	soap_serialize_PointerTongwt__DelegatedStatus(soap, &((ngwt__RecipientStatus*)this)->delegated);
-	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipientStatus*)this)->delegateeStatus);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delivered, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->delivered);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeliverable, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferred, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferred);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferDelayed, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedStatus);
+	soap_serialize_PointerTongwt__TransferFailedStatus(soap, &((ngwt__RecipienStatus*)this)->transferFailed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloaded, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloaded);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retractRequested, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retracted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retracted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->opened, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->opened);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->deleted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->deleted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeleted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeleted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->purged, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->purged);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommenStatus);
+	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->accepted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommenStatus);
+	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->declined);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->replied, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->replied);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->forwarded, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->forwarded);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->shared, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->shared);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->started, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->started);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->completed, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->completed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->incomplete, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->incomplete);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedStatus);
+	soap_serialize_PointerTongwt__DelegatedStatus(soap, &((ngwt__RecipienStatus*)this)->delegated);
+	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus);
 	/* transient soap skipped */
 }
 
@@ -41457,29 +41457,29 @@ void ngwt__TransferFailedStatus::soap_default(struct soap *soap)
 {
 	this->soap = soap;
 	((ngwt__TransferFailedStatus*)this)->FailureReason = NULL;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->delivered);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->undeliverable);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->transferred);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->transferDelayed);
-	((ngwt__RecipientStatus*)this)->transferFailed = NULL;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->downloaded);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->retractRequested);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->retracted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->opened);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->deleted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->undeleted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->purged);
-	((ngwt__RecipientStatus*)this)->accepted = NULL;
-	((ngwt__RecipientStatus*)this)->declined = NULL;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->replied);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->forwarded);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->shared);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->started);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->completed);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->incomplete);
-	((ngwt__RecipientStatus*)this)->delegated = NULL;
-	soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipientStatus*)this)->delegateeStatus);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->delivered);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferred);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed);
+	((ngwt__RecipienStatus*)this)->transferFailed = NULL;
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloaded);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retracted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->opened);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->deleted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeleted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->purged);
+	((ngwt__RecipienStatus*)this)->accepted = NULL;
+	((ngwt__RecipienStatus*)this)->declined = NULL;
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->replied);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->forwarded);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->shared);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->started);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->completed);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->incomplete);
+	((ngwt__RecipienStatus*)this)->delegated = NULL;
+	soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus);
 	/* transient soap skipped */
 }
 
@@ -41501,29 +41501,29 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__TransferFailedStatus(struct soap *soap,
 	if (((ngwt__TransferFailedStatus *)a)->FailureReason)
 		soap_set_attr(soap, "FailureReason", ((ngwt__TransferFailedStatus *)a)->FailureReason->c_str());
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__TransferFailedStatus), "ngwt:TransferFailedStatus");
-	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipientStatus*)a)->delivered), "");
-	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipientStatus*)a)->undeliverable), "");
-	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipientStatus*)a)->transferred), "");
-	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipientStatus*)a)->transferDelayed), "");
-	soap_out_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipientStatus*)a)->transferFailed), "");
-	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipientStatus*)a)->downloaded), "");
-	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipientStatus*)a)->downloadedByThirdParty), "");
-	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipientStatus*)a)->retractRequested), "");
-	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipientStatus*)a)->retracted), "");
-	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipientStatus*)a)->opened), "");
-	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipientStatus*)a)->deleted), "");
-	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipientStatus*)a)->undeleted), "");
-	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipientStatus*)a)->purged), "");
-	soap_out_PointerTongwt__CommentStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipientStatus*)a)->accepted), "");
-	soap_out_PointerTongwt__CommentStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipientStatus*)a)->declined), "");
-	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipientStatus*)a)->replied), "");
-	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipientStatus*)a)->forwarded), "");
-	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipientStatus*)a)->shared), "");
-	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipientStatus*)a)->started), "");
-	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipientStatus*)a)->completed), "");
-	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipientStatus*)a)->incomplete), "");
-	soap_out_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipientStatus*)a)->delegated), "");
-	soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipientStatus*)a)->delegateeStatus), "");
+	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipienStatus*)a)->delivered), "");
+	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipienStatus*)a)->undeliverable), "");
+	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipienStatus*)a)->transferred), "");
+	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipienStatus*)a)->transferDelayed), "");
+	soap_out_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipienStatus*)a)->transferFailed), "");
+	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipienStatus*)a)->downloaded), "");
+	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), "");
+	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipienStatus*)a)->retractRequested), "");
+	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipienStatus*)a)->retracted), "");
+	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipienStatus*)a)->opened), "");
+	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipienStatus*)a)->deleted), "");
+	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipienStatus*)a)->undeleted), "");
+	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipienStatus*)a)->purged), "");
+	soap_out_PointerTongwt__CommenStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipienStatus*)a)->accepted), "");
+	soap_out_PointerTongwt__CommenStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipienStatus*)a)->declined), "");
+	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipienStatus*)a)->replied), "");
+	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipienStatus*)a)->forwarded), "");
+	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipienStatus*)a)->shared), "");
+	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipienStatus*)a)->started), "");
+	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipienStatus*)a)->completed), "");
+	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipienStatus*)a)->incomplete), "");
+	soap_out_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipienStatus*)a)->delegated), "");
+	soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipienStatus*)a)->delegateeStatus), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -41581,117 +41581,117 @@ SOAP_FMAC3 ngwt__TransferFailedStatus * SOAP_FMAC4 soap_in_ngwt__TransferFailedS
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_delivered2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipientStatus*)a)->delivered), ""))
+				if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipienStatus*)a)->delivered), ""))
 				{	soap_flag_delivered2 = 0;
 					continue;
 				}
 			if (soap_flag_undeliverable2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipientStatus*)a)->undeliverable), ""))
+				if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipienStatus*)a)->undeliverable), ""))
 				{	soap_flag_undeliverable2 = 0;
 					continue;
 				}
 			if (soap_flag_transferred2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipientStatus*)a)->transferred), ""))
+				if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipienStatus*)a)->transferred), ""))
 				{	soap_flag_transferred2 = 0;
 					continue;
 				}
 			if (soap_flag_transferDelayed2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipientStatus*)a)->transferDelayed), ""))
+				if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipienStatus*)a)->transferDelayed), ""))
 				{	soap_flag_transferDelayed2 = 0;
 					continue;
 				}
 			if (soap_flag_transferFailed2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipientStatus*)a)->transferFailed), "ngwt:TransferFailedStatus"))
+				if (soap_in_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipienStatus*)a)->transferFailed), "ngwt:TransferFailedStatus"))
 				{	soap_flag_transferFailed2 = 0;
 					continue;
 				}
 			if (soap_flag_downloaded2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipientStatus*)a)->downloaded), ""))
+				if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipienStatus*)a)->downloaded), ""))
 				{	soap_flag_downloaded2 = 0;
 					continue;
 				}
 			if (soap_flag_downloadedByThirdParty2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipientStatus*)a)->downloadedByThirdParty), ""))
+				if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), ""))
 				{	soap_flag_downloadedByThirdParty2 = 0;
 					continue;
 				}
 			if (soap_flag_retractRequested2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipientStatus*)a)->retractRequested), ""))
+				if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipienStatus*)a)->retractRequested), ""))
 				{	soap_flag_retractRequested2 = 0;
 					continue;
 				}
 			if (soap_flag_retracted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipientStatus*)a)->retracted), ""))
+				if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipienStatus*)a)->retracted), ""))
 				{	soap_flag_retracted2 = 0;
 					continue;
 				}
 			if (soap_flag_opened2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipientStatus*)a)->opened), ""))
+				if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipienStatus*)a)->opened), ""))
 				{	soap_flag_opened2 = 0;
 					continue;
 				}
 			if (soap_flag_deleted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipientStatus*)a)->deleted), ""))
+				if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipienStatus*)a)->deleted), ""))
 				{	soap_flag_deleted2 = 0;
 					continue;
 				}
 			if (soap_flag_undeleted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipientStatus*)a)->undeleted), ""))
+				if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipienStatus*)a)->undeleted), ""))
 				{	soap_flag_undeleted2 = 0;
 					continue;
 				}
 			if (soap_flag_purged2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipientStatus*)a)->purged), ""))
+				if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipienStatus*)a)->purged), ""))
 				{	soap_flag_purged2 = 0;
 					continue;
 				}
 			if (soap_flag_accepted2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__CommentStatus(soap, "ngwt:accepted", &(((ngwt__RecipientStatus*)a)->accepted), "ngwt:CommentStatus"))
+				if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:accepted", &(((ngwt__RecipienStatus*)a)->accepted), "ngwt:CommenStatus"))
 				{	soap_flag_accepted2 = 0;
 					continue;
 				}
 			if (soap_flag_declined2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__CommentStatus(soap, "ngwt:declined", &(((ngwt__RecipientStatus*)a)->declined), "ngwt:CommentStatus"))
+				if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:declined", &(((ngwt__RecipienStatus*)a)->declined), "ngwt:CommenStatus"))
 				{	soap_flag_declined2 = 0;
 					continue;
 				}
 			if (soap_flag_replied2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipientStatus*)a)->replied), ""))
+				if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipienStatus*)a)->replied), ""))
 				{	soap_flag_replied2 = 0;
 					continue;
 				}
 			if (soap_flag_forwarded2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipientStatus*)a)->forwarded), ""))
+				if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipienStatus*)a)->forwarded), ""))
 				{	soap_flag_forwarded2 = 0;
 					continue;
 				}
 			if (soap_flag_shared2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipientStatus*)a)->shared), ""))
+				if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipienStatus*)a)->shared), ""))
 				{	soap_flag_shared2 = 0;
 					continue;
 				}
 			if (soap_flag_started2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipientStatus*)a)->started), ""))
+				if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipienStatus*)a)->started), ""))
 				{	soap_flag_started2 = 0;
 					continue;
 				}
 			if (soap_flag_completed2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipientStatus*)a)->completed), ""))
+				if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipienStatus*)a)->completed), ""))
 				{	soap_flag_completed2 = 0;
 					continue;
 				}
 			if (soap_flag_incomplete2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipientStatus*)a)->incomplete), ""))
+				if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipienStatus*)a)->incomplete), ""))
 				{	soap_flag_incomplete2 = 0;
 					continue;
 				}
 			if (soap_flag_delegated2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", &(((ngwt__RecipientStatus*)a)->delegated), "ngwt:DelegatedStatus"))
+				if (soap_in_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", &(((ngwt__RecipienStatus*)a)->delegated), "ngwt:DelegatedStatus"))
 				{	soap_flag_delegated2 = 0;
 					continue;
 				}
 			if (soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipientStatus*)a)->delegateeStatus), "ngwt:DelegateeStatus"))
+				if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipienStatus*)a)->delegateeStatus), "ngwt:DelegateeStatus"))
 					continue;
 			/* transient soap skipped */
 			if (soap->error == SOAP_TAG_MISMATCH)
@@ -47486,159 +47486,159 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecurrenceDateType(struct soap *soap,
 	*(ngwt__RecurrenceDateType*)p = *(ngwt__RecurrenceDateType*)q;
 }
 
-void ngwt__RecipientStatus::soap_serialize(struct soap *soap) const
+void ngwt__RecipienStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->delivered, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->delivered);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->undeliverable, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->undeliverable);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferred, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->transferred);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferDelayed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->transferDelayed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedStatus);
-	soap_serialize_PointerTongwt__TransferFailedStatus(soap, &((ngwt__RecipientStatus*)this)->transferFailed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->downloaded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->downloaded);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->retractRequested, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->retractRequested);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->retracted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->retracted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->opened, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->opened);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->deleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->deleted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->undeleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->undeleted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->purged, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->purged);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommentStatus);
-	soap_serialize_PointerTongwt__CommentStatus(soap, &((ngwt__RecipientStatus*)this)->accepted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommentStatus);
-	soap_serialize_PointerTongwt__CommentStatus(soap, &((ngwt__RecipientStatus*)this)->declined);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->replied, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->replied);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->forwarded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->forwarded);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->shared, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->shared);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->started, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->started);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->completed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->completed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->incomplete, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->incomplete);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedStatus);
-	soap_serialize_PointerTongwt__DelegatedStatus(soap, &((ngwt__RecipientStatus*)this)->delegated);
-	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipientStatus*)this)->delegateeStatus);
-	/* transient soap skipped */
-}
-
-void ngwt__RecipientStatus::soap_default(struct soap *soap)
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delivered, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->delivered);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeliverable, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferred, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferred);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferDelayed, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedStatus);
+	soap_serialize_PointerTongwt__TransferFailedStatus(soap, &((ngwt__RecipienStatus*)this)->transferFailed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloaded, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloaded);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retractRequested, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retracted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retracted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->opened, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->opened);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->deleted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->deleted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeleted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeleted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->purged, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->purged);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommenStatus);
+	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->accepted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommenStatus);
+	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->declined);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->replied, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->replied);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->forwarded, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->forwarded);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->shared, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->shared);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->started, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->started);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->completed, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->completed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->incomplete, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->incomplete);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedStatus);
+	soap_serialize_PointerTongwt__DelegatedStatus(soap, &((ngwt__RecipienStatus*)this)->delegated);
+	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus);
+	/* transient soap skipped */
+}
+
+void ngwt__RecipienStatus::soap_default(struct soap *soap)
 {
 	this->soap = soap;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->delivered);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->undeliverable);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->transferred);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->transferDelayed);
-	((ngwt__RecipientStatus*)this)->transferFailed = NULL;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->downloaded);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->retractRequested);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->retracted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->opened);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->deleted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->undeleted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->purged);
-	((ngwt__RecipientStatus*)this)->accepted = NULL;
-	((ngwt__RecipientStatus*)this)->declined = NULL;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->replied);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->forwarded);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->shared);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->started);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->completed);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->incomplete);
-	((ngwt__RecipientStatus*)this)->delegated = NULL;
-	soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipientStatus*)this)->delegateeStatus);
-	/* transient soap skipped */
-}
-
-int ngwt__RecipientStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
-{
-	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__RecipientStatus);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->delivered);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferred);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed);
+	((ngwt__RecipienStatus*)this)->transferFailed = NULL;
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloaded);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retracted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->opened);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->deleted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeleted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->purged);
+	((ngwt__RecipienStatus*)this)->accepted = NULL;
+	((ngwt__RecipienStatus*)this)->declined = NULL;
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->replied);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->forwarded);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->shared);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->started);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->completed);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->incomplete);
+	((ngwt__RecipienStatus*)this)->delegated = NULL;
+	soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus);
+	/* transient soap skipped */
+}
+
+int ngwt__RecipienStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
+{
+	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__RecipienStatus);
 	if (this->soap_out(soap, tag, id, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-int ngwt__RecipientStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
+int ngwt__RecipienStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
 {
-	return soap_out_ngwt__RecipientStatus(soap, tag, id, this, type);
+	return soap_out_ngwt__RecipienStatus(soap, tag, id, this, type);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__RecipientStatus(struct soap *soap, const char *tag, int id, const ngwt__RecipientStatus *a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__RecipienStatus(struct soap *soap, const char *tag, int id, const ngwt__RecipienStatus *a, const char *type)
 {
-	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__RecipientStatus), type);
-	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipientStatus*)a)->delivered), "");
-	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipientStatus*)a)->undeliverable), "");
-	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipientStatus*)a)->transferred), "");
-	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipientStatus*)a)->transferDelayed), "");
-	soap_out_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipientStatus*)a)->transferFailed), "");
-	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipientStatus*)a)->downloaded), "");
-	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipientStatus*)a)->downloadedByThirdParty), "");
-	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipientStatus*)a)->retractRequested), "");
-	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipientStatus*)a)->retracted), "");
-	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipientStatus*)a)->opened), "");
-	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipientStatus*)a)->deleted), "");
-	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipientStatus*)a)->undeleted), "");
-	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipientStatus*)a)->purged), "");
-	soap_out_PointerTongwt__CommentStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipientStatus*)a)->accepted), "");
-	soap_out_PointerTongwt__CommentStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipientStatus*)a)->declined), "");
-	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipientStatus*)a)->replied), "");
-	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipientStatus*)a)->forwarded), "");
-	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipientStatus*)a)->shared), "");
-	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipientStatus*)a)->started), "");
-	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipientStatus*)a)->completed), "");
-	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipientStatus*)a)->incomplete), "");
-	soap_out_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipientStatus*)a)->delegated), "");
-	soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipientStatus*)a)->delegateeStatus), "");
+	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__RecipienStatus), type);
+	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipienStatus*)a)->delivered), "");
+	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipienStatus*)a)->undeliverable), "");
+	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipienStatus*)a)->transferred), "");
+	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipienStatus*)a)->transferDelayed), "");
+	soap_out_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipienStatus*)a)->transferFailed), "");
+	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipienStatus*)a)->downloaded), "");
+	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), "");
+	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipienStatus*)a)->retractRequested), "");
+	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipienStatus*)a)->retracted), "");
+	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipienStatus*)a)->opened), "");
+	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipienStatus*)a)->deleted), "");
+	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipienStatus*)a)->undeleted), "");
+	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipienStatus*)a)->purged), "");
+	soap_out_PointerTongwt__CommenStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipienStatus*)a)->accepted), "");
+	soap_out_PointerTongwt__CommenStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipienStatus*)a)->declined), "");
+	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipienStatus*)a)->replied), "");
+	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipienStatus*)a)->forwarded), "");
+	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipienStatus*)a)->shared), "");
+	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipienStatus*)a)->started), "");
+	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipienStatus*)a)->completed), "");
+	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipienStatus*)a)->incomplete), "");
+	soap_out_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipienStatus*)a)->delegated), "");
+	soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipienStatus*)a)->delegateeStatus), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
 }
 
-void *ngwt__RecipientStatus::soap_get(struct soap *soap, const char *tag, const char *type)
+void *ngwt__RecipienStatus::soap_get(struct soap *soap, const char *tag, const char *type)
 {
-	return soap_get_ngwt__RecipientStatus(soap, this, tag, type);
+	return soap_get_ngwt__RecipienStatus(soap, this, tag, type);
 }
 
-SOAP_FMAC3 ngwt__RecipientStatus * SOAP_FMAC4 soap_get_ngwt__RecipientStatus(struct soap *soap, ngwt__RecipientStatus *p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__RecipienStatus * SOAP_FMAC4 soap_get_ngwt__RecipienStatus(struct soap *soap, ngwt__RecipienStatus *p, const char *tag, const char *type)
 {
-	if ((p = soap_in_ngwt__RecipientStatus(soap, tag, p, type)))
+	if ((p = soap_in_ngwt__RecipienStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-void *ngwt__RecipientStatus::soap_in(struct soap *soap, const char *tag, const char *type)
-{	return soap_in_ngwt__RecipientStatus(soap, tag, this, type);
+void *ngwt__RecipienStatus::soap_in(struct soap *soap, const char *tag, const char *type)
+{	return soap_in_ngwt__RecipienStatus(soap, tag, this, type);
 }
 
-SOAP_FMAC3 ngwt__RecipientStatus * SOAP_FMAC4 soap_in_ngwt__RecipientStatus(struct soap *soap, const char *tag, ngwt__RecipientStatus *a, const char *type)
+SOAP_FMAC3 ngwt__RecipienStatus * SOAP_FMAC4 soap_in_ngwt__RecipienStatus(struct soap *soap, const char *tag, ngwt__RecipienStatus *a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 0))
 		return NULL;
-	a = (ngwt__RecipientStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__RecipientStatus, sizeof(ngwt__RecipientStatus), soap->type, soap->arrayType);
+	a = (ngwt__RecipienStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__RecipienStatus, sizeof(ngwt__RecipienStatus), soap->type, soap->arrayType);
 	if (!a)
 		return NULL;
 	if (soap->alloced)
 	{	a->soap_default(soap);
-		if (soap->clist->type != SOAP_TYPE_ngwt__RecipientStatus)
+		if (soap->clist->type != SOAP_TYPE_ngwt__RecipienStatus)
 		{	soap_revert(soap);
 			*soap->id = '\0';
-			return (ngwt__RecipientStatus *)a->soap_in(soap, tag, type);
+			return (ngwt__RecipienStatus *)a->soap_in(soap, tag, type);
 		}
 	}
 	short soap_flag_delivered1 = 1, soap_flag_undeliverable1 = 1, soap_flag_transferred1 = 1, soap_flag_transferDelayed1 = 1, soap_flag_transferFailed1 = 1, soap_flag_downloaded1 = 1, soap_flag_downloadedByThirdParty1 = 1, soap_flag_retractRequested1 = 1, soap_flag_retracted1 = 1, soap_flag_opened1 = 1, soap_flag_deleted1 = 1, soap_flag_undeleted1 = 1, soap_flag_purged1 = 1, soap_flag_accepted1 = 1, soap_flag_declined1 = 1, soap_flag_replied1 = 1, soap_flag_forwarded1 = 1, soap_flag_shared1 = 1, soap_flag_started1 = 1, soap_flag_completed1 = 1, soap_flag_incomplete1 = 1, soap_flag_delegated1 = 1;
@@ -47647,117 +47647,117 @@ SOAP_FMAC3 ngwt__RecipientStatus * SOAP_FMAC4 soap_in_ngwt__RecipientStatus(stru
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_delivered1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipientStatus*)a)->delivered), ""))
+				if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipienStatus*)a)->delivered), ""))
 				{	soap_flag_delivered1 = 0;
 					continue;
 				}
 			if (soap_flag_undeliverable1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipientStatus*)a)->undeliverable), ""))
+				if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipienStatus*)a)->undeliverable), ""))
 				{	soap_flag_undeliverable1 = 0;
 					continue;
 				}
 			if (soap_flag_transferred1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipientStatus*)a)->transferred), ""))
+				if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipienStatus*)a)->transferred), ""))
 				{	soap_flag_transferred1 = 0;
 					continue;
 				}
 			if (soap_flag_transferDelayed1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipientStatus*)a)->transferDelayed), ""))
+				if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipienStatus*)a)->transferDelayed), ""))
 				{	soap_flag_transferDelayed1 = 0;
 					continue;
 				}
 			if (soap_flag_transferFailed1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipientStatus*)a)->transferFailed), "ngwt:TransferFailedStatus"))
+				if (soap_in_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipienStatus*)a)->transferFailed), "ngwt:TransferFailedStatus"))
 				{	soap_flag_transferFailed1 = 0;
 					continue;
 				}
 			if (soap_flag_downloaded1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipientStatus*)a)->downloaded), ""))
+				if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipienStatus*)a)->downloaded), ""))
 				{	soap_flag_downloaded1 = 0;
 					continue;
 				}
 			if (soap_flag_downloadedByThirdParty1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipientStatus*)a)->downloadedByThirdParty), ""))
+				if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), ""))
 				{	soap_flag_downloadedByThirdParty1 = 0;
 					continue;
 				}
 			if (soap_flag_retractRequested1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipientStatus*)a)->retractRequested), ""))
+				if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipienStatus*)a)->retractRequested), ""))
 				{	soap_flag_retractRequested1 = 0;
 					continue;
 				}
 			if (soap_flag_retracted1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipientStatus*)a)->retracted), ""))
+				if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipienStatus*)a)->retracted), ""))
 				{	soap_flag_retracted1 = 0;
 					continue;
 				}
 			if (soap_flag_opened1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipientStatus*)a)->opened), ""))
+				if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipienStatus*)a)->opened), ""))
 				{	soap_flag_opened1 = 0;
 					continue;
 				}
 			if (soap_flag_deleted1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipientStatus*)a)->deleted), ""))
+				if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipienStatus*)a)->deleted), ""))
 				{	soap_flag_deleted1 = 0;
 					continue;
 				}
 			if (soap_flag_undeleted1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipientStatus*)a)->undeleted), ""))
+				if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipienStatus*)a)->undeleted), ""))
 				{	soap_flag_undeleted1 = 0;
 					continue;
 				}
 			if (soap_flag_purged1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipientStatus*)a)->purged), ""))
+				if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipienStatus*)a)->purged), ""))
 				{	soap_flag_purged1 = 0;
 					continue;
 				}
 			if (soap_flag_accepted1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__CommentStatus(soap, "ngwt:accepted", &(((ngwt__RecipientStatus*)a)->accepted), "ngwt:CommentStatus"))
+				if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:accepted", &(((ngwt__RecipienStatus*)a)->accepted), "ngwt:CommenStatus"))
 				{	soap_flag_accepted1 = 0;
 					continue;
 				}
 			if (soap_flag_declined1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__CommentStatus(soap, "ngwt:declined", &(((ngwt__RecipientStatus*)a)->declined), "ngwt:CommentStatus"))
+				if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:declined", &(((ngwt__RecipienStatus*)a)->declined), "ngwt:CommenStatus"))
 				{	soap_flag_declined1 = 0;
 					continue;
 				}
 			if (soap_flag_replied1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipientStatus*)a)->replied), ""))
+				if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipienStatus*)a)->replied), ""))
 				{	soap_flag_replied1 = 0;
 					continue;
 				}
 			if (soap_flag_forwarded1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipientStatus*)a)->forwarded), ""))
+				if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipienStatus*)a)->forwarded), ""))
 				{	soap_flag_forwarded1 = 0;
 					continue;
 				}
 			if (soap_flag_shared1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipientStatus*)a)->shared), ""))
+				if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipienStatus*)a)->shared), ""))
 				{	soap_flag_shared1 = 0;
 					continue;
 				}
 			if (soap_flag_started1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipientStatus*)a)->started), ""))
+				if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipienStatus*)a)->started), ""))
 				{	soap_flag_started1 = 0;
 					continue;
 				}
 			if (soap_flag_completed1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipientStatus*)a)->completed), ""))
+				if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipienStatus*)a)->completed), ""))
 				{	soap_flag_completed1 = 0;
 					continue;
 				}
 			if (soap_flag_incomplete1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipientStatus*)a)->incomplete), ""))
+				if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipienStatus*)a)->incomplete), ""))
 				{	soap_flag_incomplete1 = 0;
 					continue;
 				}
 			if (soap_flag_delegated1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", &(((ngwt__RecipientStatus*)a)->delegated), "ngwt:DelegatedStatus"))
+				if (soap_in_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", &(((ngwt__RecipienStatus*)a)->delegated), "ngwt:DelegatedStatus"))
 				{	soap_flag_delegated1 = 0;
 					continue;
 				}
 			if (soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipientStatus*)a)->delegateeStatus), "ngwt:DelegateeStatus"))
+				if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipienStatus*)a)->delegateeStatus), "ngwt:DelegateeStatus"))
 					continue;
 			/* transient soap skipped */
 			if (soap->error == SOAP_TAG_MISMATCH)
@@ -47771,25 +47771,25 @@ SOAP_FMAC3 ngwt__RecipientStatus * SOAP_FMAC4 soap_in_ngwt__RecipientStatus(stru
 			return NULL;
 	}
 	else
-	{	a = (ngwt__RecipientStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__RecipientStatus, 0, sizeof(ngwt__RecipientStatus), 0, soap_copy_ngwt__RecipientStatus);
+	{	a = (ngwt__RecipienStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__RecipienStatus, 0, sizeof(ngwt__RecipienStatus), 0, soap_copy_ngwt__RecipienStatus);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
 	return a;
 }
 
-SOAP_FMAC5 ngwt__RecipientStatus * SOAP_FMAC6 soap_new_ngwt__RecipientStatus(struct soap *soap, int n)
-{	return soap_instantiate_ngwt__RecipientStatus(soap, n, NULL, NULL, NULL);
+SOAP_FMAC5 ngwt__RecipienStatus * SOAP_FMAC6 soap_new_ngwt__RecipienStatus(struct soap *soap, int n)
+{	return soap_instantiate_ngwt__RecipienStatus(soap, n, NULL, NULL, NULL);
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecipientStatus(struct soap *soap, ngwt__RecipientStatus *p)
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecipienStatus(struct soap *soap, ngwt__RecipienStatus *p)
 {	soap_delete(soap, p);
 }
 
-SOAP_FMAC5 ngwt__RecipientStatus * SOAP_FMAC6 soap_instantiate_ngwt__RecipientStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+SOAP_FMAC5 ngwt__RecipienStatus * SOAP_FMAC6 soap_instantiate_ngwt__RecipienStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__RecipientStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__RecipientStatus, n, soap_fdelete);
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__RecipienStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__RecipienStatus, n, soap_fdelete);
 	if (!cp)
 		return NULL;
 	if (type && !soap_match_tag(soap, type, "ngwt:DelegateeStatus"))
@@ -47829,26 +47829,26 @@ SOAP_FMAC5 ngwt__RecipientStatus * SOAP_FMAC6 soap_instantiate_ngwt__RecipientSt
 		return (ngwt__TransferFailedStatus*)cp->ptr;
 	}
 	if (n < 0)
-	{	cp->ptr = (void*)new ngwt__RecipientStatus;
+	{	cp->ptr = (void*)new ngwt__RecipienStatus;
 		if (size)
-			*size = sizeof(ngwt__RecipientStatus);
-		((ngwt__RecipientStatus*)cp->ptr)->soap = soap;
+			*size = sizeof(ngwt__RecipienStatus);
+		((ngwt__RecipienStatus*)cp->ptr)->soap = soap;
 	}
 	else
-	{	cp->ptr = (void*)new ngwt__RecipientStatus[n];
+	{	cp->ptr = (void*)new ngwt__RecipienStatus[n];
 		if (size)
-			*size = n * sizeof(ngwt__RecipientStatus);
+			*size = n * sizeof(ngwt__RecipienStatus);
 		for (int i = 0; i < n; i++)
-			((ngwt__RecipientStatus*)cp->ptr)[i].soap = soap;
+			((ngwt__RecipienStatus*)cp->ptr)[i].soap = soap;
 	}
 		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-	return (ngwt__RecipientStatus*)cp->ptr;
+	return (ngwt__RecipienStatus*)cp->ptr;
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecipientStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecipienStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__RecipientStatus %p -> %p\n", q, p));
-	*(ngwt__RecipientStatus*)p = *(ngwt__RecipientStatus*)q;
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__RecipienStatus %p -> %p\n", q, p));
+	*(ngwt__RecipienStatus*)p = *(ngwt__RecipienStatus*)q;
 }
 
 void ngwt__RecipientList::soap_serialize(struct soap *soap) const
@@ -47986,8 +47986,8 @@ void ngwt__Recipient::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((ngwt__Recipient*)this)->distType, SOAP_TYPE_ngwt__DistributionType);
 	soap_embedded(soap, &((ngwt__Recipient*)this)->recipType, SOAP_TYPE_ngwt__RecipientType);
-	soap_embedded(soap, &((ngwt__Recipient*)this)->recipientStatus, SOAP_TYPE_PointerTongwt__RecipientStatus);
-	soap_serialize_PointerTongwt__RecipientStatus(soap, &((ngwt__Recipient*)this)->recipientStatus);
+	soap_embedded(soap, &((ngwt__Recipient*)this)->recipienStatus, SOAP_TYPE_PointerTongwt__RecipienStatus);
+	soap_serialize_PointerTongwt__RecipienStatus(soap, &((ngwt__Recipient*)this)->recipienStatus);
 	soap_embedded(soap, &((ngwt__Recipient*)this)->acceptLevel, SOAP_TYPE_PointerTongwt__AcceptLevel);
 	soap_serialize_PointerTongwt__AcceptLevel(soap, &((ngwt__Recipient*)this)->acceptLevel);
 	soap_embedded(soap, &((ngwt__NameAndEmail*)this)->displayName, SOAP_TYPE_PointerTostd__string);
@@ -48004,7 +48004,7 @@ void ngwt__Recipient::soap_default(struct soap *soap)
 	this->soap = soap;
 	((ngwt__Recipient*)this)->distType = (enum ngwt__DistributionType)0;
 	((ngwt__Recipient*)this)->recipType = (enum ngwt__RecipientType)0;
-	((ngwt__Recipient*)this)->recipientStatus = NULL;
+	((ngwt__Recipient*)this)->recipienStatus = NULL;
 	((ngwt__Recipient*)this)->acceptLevel = NULL;
 	((ngwt__NameAndEmail*)this)->displayName = NULL;
 	((ngwt__NameAndEmail*)this)->email = NULL;
@@ -48034,7 +48034,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Recipient(struct soap *soap, const char
 	/* transient soap skipped */
 	soap_out_ngwt__DistributionType(soap, "ngwt:distType", -1, &(((ngwt__Recipient*)a)->distType), "");
 	soap_out_ngwt__RecipientType(soap, "ngwt:recipType", -1, &(((ngwt__Recipient*)a)->recipType), "");
-	soap_out_PointerTongwt__RecipientStatus(soap, "ngwt:recipientStatus", -1, &(((ngwt__Recipient*)a)->recipientStatus), "");
+	soap_out_PointerTongwt__RecipienStatus(soap, "ngwt:recipienStatus", -1, &(((ngwt__Recipient*)a)->recipienStatus), "");
 	soap_out_PointerTongwt__AcceptLevel(soap, "ngwt:acceptLevel", -1, &(((ngwt__Recipient*)a)->acceptLevel), "");
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -48071,7 +48071,7 @@ SOAP_FMAC3 ngwt__Recipient * SOAP_FMAC4 soap_in_ngwt__Recipient(struct soap *soa
 			return (ngwt__Recipient *)a->soap_in(soap, tag, type);
 		}
 	}
-	short soap_flag_displayName2 = 1, soap_flag_email2 = 1, soap_flag_uuid2 = 1, soap_flag_distType1 = 1, soap_flag_recipType1 = 1, soap_flag_recipientStatus1 = 1, soap_flag_acceptLevel1 = 1;
+	short soap_flag_displayName2 = 1, soap_flag_email2 = 1, soap_flag_uuid2 = 1, soap_flag_distType1 = 1, soap_flag_recipType1 = 1, soap_flag_recipienStatus1 = 1, soap_flag_acceptLevel1 = 1;
 	if (soap->body && !*soap->href)
 	{
 		for (;;)
@@ -48102,9 +48102,9 @@ SOAP_FMAC3 ngwt__Recipient * SOAP_FMAC4 soap_in_ngwt__Recipient(struct soap *soa
 				{	soap_flag_recipType1 = 0;
 					continue;
 				}
-			if (soap_flag_recipientStatus1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__RecipientStatus(soap, "ngwt:recipientStatus", &(((ngwt__Recipient*)a)->recipientStatus), "ngwt:RecipientStatus"))
-				{	soap_flag_recipientStatus1 = 0;
+			if (soap_flag_recipienStatus1 && soap->error == SOAP_TAG_MISMATCH)
+				if (soap_in_PointerTongwt__RecipienStatus(soap, "ngwt:recipienStatus", &(((ngwt__Recipient*)a)->recipienStatus), "ngwt:RecipienStatus"))
+				{	soap_flag_recipienStatus1 = 0;
 					continue;
 				}
 			if (soap_flag_acceptLevel1 && soap->error == SOAP_TAG_MISMATCH)
@@ -61043,51 +61043,51 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DeltaInfo(struct soap *soap, int st,
 void ngwt__DelegateeStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->delivered, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->delivered);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->undeliverable, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->undeliverable);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferred, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->transferred);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferDelayed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->transferDelayed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedStatus);
-	soap_serialize_PointerTongwt__TransferFailedStatus(soap, &((ngwt__RecipientStatus*)this)->transferFailed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->downloaded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->downloaded);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->retractRequested, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->retractRequested);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->retracted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->retracted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->opened, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->opened);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->deleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->deleted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->undeleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->undeleted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->purged, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->purged);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommentStatus);
-	soap_serialize_PointerTongwt__CommentStatus(soap, &((ngwt__RecipientStatus*)this)->accepted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommentStatus);
-	soap_serialize_PointerTongwt__CommentStatus(soap, &((ngwt__RecipientStatus*)this)->declined);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->replied, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->replied);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->forwarded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->forwarded);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->shared, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->shared);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->started, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->started);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->completed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->completed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->incomplete, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->incomplete);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedStatus);
-	soap_serialize_PointerTongwt__DelegatedStatus(soap, &((ngwt__RecipientStatus*)this)->delegated);
-	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipientStatus*)this)->delegateeStatus);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delivered, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->delivered);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeliverable, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferred, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferred);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferDelayed, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedStatus);
+	soap_serialize_PointerTongwt__TransferFailedStatus(soap, &((ngwt__RecipienStatus*)this)->transferFailed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloaded, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloaded);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retractRequested, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retracted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retracted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->opened, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->opened);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->deleted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->deleted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeleted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeleted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->purged, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->purged);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommenStatus);
+	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->accepted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommenStatus);
+	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->declined);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->replied, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->replied);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->forwarded, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->forwarded);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->shared, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->shared);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->started, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->started);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->completed, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->completed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->incomplete, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->incomplete);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedStatus);
+	soap_serialize_PointerTongwt__DelegatedStatus(soap, &((ngwt__RecipienStatus*)this)->delegated);
+	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus);
 	/* transient soap skipped */
 }
 
@@ -61095,29 +61095,29 @@ void ngwt__DelegateeStatus::soap_default(struct soap *soap)
 {
 	this->soap = soap;
 	((ngwt__DelegateeStatus*)this)->userid = NULL;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->delivered);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->undeliverable);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->transferred);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->transferDelayed);
-	((ngwt__RecipientStatus*)this)->transferFailed = NULL;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->downloaded);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->retractRequested);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->retracted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->opened);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->deleted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->undeleted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->purged);
-	((ngwt__RecipientStatus*)this)->accepted = NULL;
-	((ngwt__RecipientStatus*)this)->declined = NULL;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->replied);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->forwarded);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->shared);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->started);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->completed);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->incomplete);
-	((ngwt__RecipientStatus*)this)->delegated = NULL;
-	soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipientStatus*)this)->delegateeStatus);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->delivered);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferred);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed);
+	((ngwt__RecipienStatus*)this)->transferFailed = NULL;
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloaded);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retracted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->opened);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->deleted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeleted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->purged);
+	((ngwt__RecipienStatus*)this)->accepted = NULL;
+	((ngwt__RecipienStatus*)this)->declined = NULL;
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->replied);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->forwarded);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->shared);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->started);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->completed);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->incomplete);
+	((ngwt__RecipienStatus*)this)->delegated = NULL;
+	soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus);
 	/* transient soap skipped */
 }
 
@@ -61139,29 +61139,29 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegateeStatus(struct soap *soap, cons
 	if (((ngwt__DelegateeStatus *)a)->userid)
 		soap_set_attr(soap, "userid", ((ngwt__DelegateeStatus *)a)->userid->c_str());
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__DelegateeStatus), "ngwt:DelegateeStatus");
-	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipientStatus*)a)->delivered), "");
-	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipientStatus*)a)->undeliverable), "");
-	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipientStatus*)a)->transferred), "");
-	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipientStatus*)a)->transferDelayed), "");
-	soap_out_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipientStatus*)a)->transferFailed), "");
-	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipientStatus*)a)->downloaded), "");
-	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipientStatus*)a)->downloadedByThirdParty), "");
-	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipientStatus*)a)->retractRequested), "");
-	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipientStatus*)a)->retracted), "");
-	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipientStatus*)a)->opened), "");
-	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipientStatus*)a)->deleted), "");
-	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipientStatus*)a)->undeleted), "");
-	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipientStatus*)a)->purged), "");
-	soap_out_PointerTongwt__CommentStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipientStatus*)a)->accepted), "");
-	soap_out_PointerTongwt__CommentStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipientStatus*)a)->declined), "");
-	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipientStatus*)a)->replied), "");
-	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipientStatus*)a)->forwarded), "");
-	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipientStatus*)a)->shared), "");
-	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipientStatus*)a)->started), "");
-	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipientStatus*)a)->completed), "");
-	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipientStatus*)a)->incomplete), "");
-	soap_out_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipientStatus*)a)->delegated), "");
-	soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipientStatus*)a)->delegateeStatus), "");
+	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipienStatus*)a)->delivered), "");
+	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipienStatus*)a)->undeliverable), "");
+	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipienStatus*)a)->transferred), "");
+	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipienStatus*)a)->transferDelayed), "");
+	soap_out_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipienStatus*)a)->transferFailed), "");
+	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipienStatus*)a)->downloaded), "");
+	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), "");
+	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipienStatus*)a)->retractRequested), "");
+	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipienStatus*)a)->retracted), "");
+	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipienStatus*)a)->opened), "");
+	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipienStatus*)a)->deleted), "");
+	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipienStatus*)a)->undeleted), "");
+	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipienStatus*)a)->purged), "");
+	soap_out_PointerTongwt__CommenStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipienStatus*)a)->accepted), "");
+	soap_out_PointerTongwt__CommenStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipienStatus*)a)->declined), "");
+	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipienStatus*)a)->replied), "");
+	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipienStatus*)a)->forwarded), "");
+	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipienStatus*)a)->shared), "");
+	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipienStatus*)a)->started), "");
+	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipienStatus*)a)->completed), "");
+	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipienStatus*)a)->incomplete), "");
+	soap_out_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipienStatus*)a)->delegated), "");
+	soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipienStatus*)a)->delegateeStatus), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -61219,117 +61219,117 @@ SOAP_FMAC3 ngwt__DelegateeStatus * SOAP_FMAC4 soap_in_ngwt__DelegateeStatus(stru
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_delivered2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipientStatus*)a)->delivered), ""))
+				if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipienStatus*)a)->delivered), ""))
 				{	soap_flag_delivered2 = 0;
 					continue;
 				}
 			if (soap_flag_undeliverable2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipientStatus*)a)->undeliverable), ""))
+				if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipienStatus*)a)->undeliverable), ""))
 				{	soap_flag_undeliverable2 = 0;
 					continue;
 				}
 			if (soap_flag_transferred2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipientStatus*)a)->transferred), ""))
+				if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipienStatus*)a)->transferred), ""))
 				{	soap_flag_transferred2 = 0;
 					continue;
 				}
 			if (soap_flag_transferDelayed2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipientStatus*)a)->transferDelayed), ""))
+				if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipienStatus*)a)->transferDelayed), ""))
 				{	soap_flag_transferDelayed2 = 0;
 					continue;
 				}
 			if (soap_flag_transferFailed2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipientStatus*)a)->transferFailed), "ngwt:TransferFailedStatus"))
+				if (soap_in_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipienStatus*)a)->transferFailed), "ngwt:TransferFailedStatus"))
 				{	soap_flag_transferFailed2 = 0;
 					continue;
 				}
 			if (soap_flag_downloaded2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipientStatus*)a)->downloaded), ""))
+				if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipienStatus*)a)->downloaded), ""))
 				{	soap_flag_downloaded2 = 0;
 					continue;
 				}
 			if (soap_flag_downloadedByThirdParty2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipientStatus*)a)->downloadedByThirdParty), ""))
+				if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), ""))
 				{	soap_flag_downloadedByThirdParty2 = 0;
 					continue;
 				}
 			if (soap_flag_retractRequested2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipientStatus*)a)->retractRequested), ""))
+				if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipienStatus*)a)->retractRequested), ""))
 				{	soap_flag_retractRequested2 = 0;
 					continue;
 				}
 			if (soap_flag_retracted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipientStatus*)a)->retracted), ""))
+				if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipienStatus*)a)->retracted), ""))
 				{	soap_flag_retracted2 = 0;
 					continue;
 				}
 			if (soap_flag_opened2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipientStatus*)a)->opened), ""))
+				if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipienStatus*)a)->opened), ""))
 				{	soap_flag_opened2 = 0;
 					continue;
 				}
 			if (soap_flag_deleted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipientStatus*)a)->deleted), ""))
+				if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipienStatus*)a)->deleted), ""))
 				{	soap_flag_deleted2 = 0;
 					continue;
 				}
 			if (soap_flag_undeleted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipientStatus*)a)->undeleted), ""))
+				if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipienStatus*)a)->undeleted), ""))
 				{	soap_flag_undeleted2 = 0;
 					continue;
 				}
 			if (soap_flag_purged2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipientStatus*)a)->purged), ""))
+				if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipienStatus*)a)->purged), ""))
 				{	soap_flag_purged2 = 0;
 					continue;
 				}
 			if (soap_flag_accepted2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__CommentStatus(soap, "ngwt:accepted", &(((ngwt__RecipientStatus*)a)->accepted), "ngwt:CommentStatus"))
+				if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:accepted", &(((ngwt__RecipienStatus*)a)->accepted), "ngwt:CommenStatus"))
 				{	soap_flag_accepted2 = 0;
 					continue;
 				}
 			if (soap_flag_declined2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__CommentStatus(soap, "ngwt:declined", &(((ngwt__RecipientStatus*)a)->declined), "ngwt:CommentStatus"))
+				if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:declined", &(((ngwt__RecipienStatus*)a)->declined), "ngwt:CommenStatus"))
 				{	soap_flag_declined2 = 0;
 					continue;
 				}
 			if (soap_flag_replied2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipientStatus*)a)->replied), ""))
+				if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipienStatus*)a)->replied), ""))
 				{	soap_flag_replied2 = 0;
 					continue;
 				}
 			if (soap_flag_forwarded2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipientStatus*)a)->forwarded), ""))
+				if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipienStatus*)a)->forwarded), ""))
 				{	soap_flag_forwarded2 = 0;
 					continue;
 				}
 			if (soap_flag_shared2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipientStatus*)a)->shared), ""))
+				if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipienStatus*)a)->shared), ""))
 				{	soap_flag_shared2 = 0;
 					continue;
 				}
 			if (soap_flag_started2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipientStatus*)a)->started), ""))
+				if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipienStatus*)a)->started), ""))
 				{	soap_flag_started2 = 0;
 					continue;
 				}
 			if (soap_flag_completed2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipientStatus*)a)->completed), ""))
+				if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipienStatus*)a)->completed), ""))
 				{	soap_flag_completed2 = 0;
 					continue;
 				}
 			if (soap_flag_incomplete2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipientStatus*)a)->incomplete), ""))
+				if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipienStatus*)a)->incomplete), ""))
 				{	soap_flag_incomplete2 = 0;
 					continue;
 				}
 			if (soap_flag_delegated2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", &(((ngwt__RecipientStatus*)a)->delegated), "ngwt:DelegatedStatus"))
+				if (soap_in_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", &(((ngwt__RecipienStatus*)a)->delegated), "ngwt:DelegatedStatus"))
 				{	soap_flag_delegated2 = 0;
 					continue;
 				}
 			if (soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipientStatus*)a)->delegateeStatus), "ngwt:DelegateeStatus"))
+				if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipienStatus*)a)->delegateeStatus), "ngwt:DelegateeStatus"))
 					continue;
 			/* transient soap skipped */
 			if (soap->error == SOAP_TAG_MISMATCH)
@@ -61390,8 +61390,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegateeStatus(struct soap *soap, in
 void ngwt__DelegatedStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__DelegatedStatus*)this)->__item, SOAP_TYPE_PointerTongwt__CommentStatus);
-	soap_serialize_PointerTongwt__CommentStatus(soap, &((ngwt__DelegatedStatus*)this)->__item);
+	soap_embedded(soap, &((ngwt__DelegatedStatus*)this)->__item, SOAP_TYPE_PointerTongwt__CommenStatus);
+	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__DelegatedStatus*)this)->__item);
 	/* transient soap skipped */
 }
 
@@ -61420,7 +61420,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegatedStatus(struct soap *soap, cons
 {
 	if (((ngwt__DelegatedStatus *)a)->userid)
 		soap_set_attr(soap, "userid", ((ngwt__DelegatedStatus *)a)->userid->c_str());
-	soap_out_PointerTongwt__CommentStatus(soap, tag, id, &(((ngwt__DelegatedStatus*)a)->__item), "");
+	soap_out_PointerTongwt__CommenStatus(soap, tag, id, &(((ngwt__DelegatedStatus*)a)->__item), "");
 	return SOAP_OK;
 }
 
@@ -61469,7 +61469,7 @@ SOAP_FMAC3 ngwt__DelegatedStatus * SOAP_FMAC4 soap_in_ngwt__DelegatedStatus(stru
 		}
 		}
 	}
-	if (!soap_in_PointerTongwt__CommentStatus(soap, tag, &(((ngwt__DelegatedStatus*)a)->__item), "ngwt:DelegatedStatus"))
+	if (!soap_in_PointerTongwt__CommenStatus(soap, tag, &(((ngwt__DelegatedStatus*)a)->__item), "ngwt:DelegatedStatus"))
 		return NULL;
 	return a;
 }
@@ -63703,76 +63703,76 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__Contact(struct soap *soap, int st, in
 	*(ngwt__Contact*)p = *(ngwt__Contact*)q;
 }
 
-void ngwt__CommentStatus::soap_serialize(struct soap *soap) const
+void ngwt__CommenStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__CommentStatus*)this)->__item, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__CommentStatus*)this)->__item);
+	soap_embedded(soap, &((ngwt__CommenStatus*)this)->__item, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__CommenStatus*)this)->__item);
 	/* transient soap skipped */
 }
 
-void ngwt__CommentStatus::soap_default(struct soap *soap)
+void ngwt__CommenStatus::soap_default(struct soap *soap)
 {
 	this->soap = soap;
-	soap_default_string(soap, &((ngwt__CommentStatus*)this)->__item);
-	((ngwt__CommentStatus*)this)->comment = NULL;
+	soap_default_string(soap, &((ngwt__CommenStatus*)this)->__item);
+	((ngwt__CommenStatus*)this)->comment = NULL;
 	/* transient soap skipped */
 }
 
-int ngwt__CommentStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
+int ngwt__CommenStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
 {
-	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__CommentStatus);
+	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__CommenStatus);
 	if (this->soap_out(soap, tag, id, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-int ngwt__CommentStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
+int ngwt__CommenStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
 {
-	return soap_out_ngwt__CommentStatus(soap, tag, id, this, type);
+	return soap_out_ngwt__CommenStatus(soap, tag, id, this, type);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__CommentStatus(struct soap *soap, const char *tag, int id, const ngwt__CommentStatus *a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__CommenStatus(struct soap *soap, const char *tag, int id, const ngwt__CommenStatus *a, const char *type)
 {
-	if (((ngwt__CommentStatus *)a)->comment)
-		soap_set_attr(soap, "comment", ((ngwt__CommentStatus *)a)->comment->c_str());
-	soap_out_string(soap, tag, id, &(((ngwt__CommentStatus*)a)->__item), "");
+	if (((ngwt__CommenStatus *)a)->comment)
+		soap_set_attr(soap, "comment", ((ngwt__CommenStatus *)a)->comment->c_str());
+	soap_out_string(soap, tag, id, &(((ngwt__CommenStatus*)a)->__item), "");
 	return SOAP_OK;
 }
 
-void *ngwt__CommentStatus::soap_get(struct soap *soap, const char *tag, const char *type)
+void *ngwt__CommenStatus::soap_get(struct soap *soap, const char *tag, const char *type)
 {
-	return soap_get_ngwt__CommentStatus(soap, this, tag, type);
+	return soap_get_ngwt__CommenStatus(soap, this, tag, type);
 }
 
-SOAP_FMAC3 ngwt__CommentStatus * SOAP_FMAC4 soap_get_ngwt__CommentStatus(struct soap *soap, ngwt__CommentStatus *p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__CommenStatus * SOAP_FMAC4 soap_get_ngwt__CommenStatus(struct soap *soap, ngwt__CommenStatus *p, const char *tag, const char *type)
 {
-	if ((p = soap_in_ngwt__CommentStatus(soap, tag, p, type)))
+	if ((p = soap_in_ngwt__CommenStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-void *ngwt__CommentStatus::soap_in(struct soap *soap, const char *tag, const char *type)
-{	return soap_in_ngwt__CommentStatus(soap, tag, this, type);
+void *ngwt__CommenStatus::soap_in(struct soap *soap, const char *tag, const char *type)
+{	return soap_in_ngwt__CommenStatus(soap, tag, this, type);
 }
 
-SOAP_FMAC3 ngwt__CommentStatus * SOAP_FMAC4 soap_in_ngwt__CommentStatus(struct soap *soap, const char *tag, ngwt__CommentStatus *a, const char *type)
+SOAP_FMAC3 ngwt__CommenStatus * SOAP_FMAC4 soap_in_ngwt__CommenStatus(struct soap *soap, const char *tag, ngwt__CommenStatus *a, const char *type)
 {
 	if (soap_peek_element(soap))
 		return NULL;
-	if (!(a = (ngwt__CommentStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__CommentStatus, sizeof(ngwt__CommentStatus), soap->type, soap->arrayType)))
+	if (!(a = (ngwt__CommenStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__CommenStatus, sizeof(ngwt__CommenStatus), soap->type, soap->arrayType)))
 	{	soap->error = SOAP_TAG_MISMATCH;
 		return NULL;
 	}
 	*soap->id = '\0';
 	if (soap->alloced)
 	{	a->soap_default(soap);
-		if (soap->clist->type != SOAP_TYPE_ngwt__CommentStatus)
-			return (ngwt__CommentStatus *)a->soap_in(soap, tag, type);
+		if (soap->clist->type != SOAP_TYPE_ngwt__CommenStatus)
+			return (ngwt__CommenStatus *)a->soap_in(soap, tag, type);
 	}
 	{	const char *t = soap_attr_value(soap, "comment", 0);
 		if (t)
-		{	if (!(((ngwt__CommentStatus *)a)->comment = (std::string *)soap_malloc(soap, sizeof(std::string))))
+		{	if (!(((ngwt__CommenStatus *)a)->comment = (std::string *)soap_malloc(soap, sizeof(std::string))))
 			{	soap->error = SOAP_EOM;
 				return NULL;
 			}
@@ -63780,51 +63780,51 @@ SOAP_FMAC3 ngwt__CommentStatus * SOAP_FMAC4 soap_in_ngwt__CommentStatus(struct s
 		if (soap_s2string(soap, t, &s))
 			return NULL;
 		if (s)
-		{	((ngwt__CommentStatus *)a)->comment = soap_new_std__string(soap, -1);
-			((ngwt__CommentStatus *)a)->comment->assign(s);
+		{	((ngwt__CommenStatus *)a)->comment = soap_new_std__string(soap, -1);
+			((ngwt__CommenStatus *)a)->comment->assign(s);
 		}
 		}
 	}
-	if (!soap_in_string(soap, tag, &(((ngwt__CommentStatus*)a)->__item), "ngwt:CommentStatus"))
+	if (!soap_in_string(soap, tag, &(((ngwt__CommenStatus*)a)->__item), "ngwt:CommenStatus"))
 		return NULL;
 	return a;
 }
 
-SOAP_FMAC5 ngwt__CommentStatus * SOAP_FMAC6 soap_new_ngwt__CommentStatus(struct soap *soap, int n)
-{	return soap_instantiate_ngwt__CommentStatus(soap, n, NULL, NULL, NULL);
+SOAP_FMAC5 ngwt__CommenStatus * SOAP_FMAC6 soap_new_ngwt__CommenStatus(struct soap *soap, int n)
+{	return soap_instantiate_ngwt__CommenStatus(soap, n, NULL, NULL, NULL);
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__CommentStatus(struct soap *soap, ngwt__CommentStatus *p)
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__CommenStatus(struct soap *soap, ngwt__CommenStatus *p)
 {	soap_delete(soap, p);
 }
 
-SOAP_FMAC5 ngwt__CommentStatus * SOAP_FMAC6 soap_instantiate_ngwt__CommentStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+SOAP_FMAC5 ngwt__CommenStatus * SOAP_FMAC6 soap_instantiate_ngwt__CommenStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__CommentStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__CommentStatus, n, soap_fdelete);
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__CommenStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__CommenStatus, n, soap_fdelete);
 	if (!cp)
 		return NULL;
 	if (n < 0)
-	{	cp->ptr = (void*)new ngwt__CommentStatus;
+	{	cp->ptr = (void*)new ngwt__CommenStatus;
 		if (size)
-			*size = sizeof(ngwt__CommentStatus);
-		((ngwt__CommentStatus*)cp->ptr)->soap = soap;
+			*size = sizeof(ngwt__CommenStatus);
+		((ngwt__CommenStatus*)cp->ptr)->soap = soap;
 	}
 	else
-	{	cp->ptr = (void*)new ngwt__CommentStatus[n];
+	{	cp->ptr = (void*)new ngwt__CommenStatus[n];
 		if (size)
-			*size = n * sizeof(ngwt__CommentStatus);
+			*size = n * sizeof(ngwt__CommenStatus);
 		for (int i = 0; i < n; i++)
-			((ngwt__CommentStatus*)cp->ptr)[i].soap = soap;
+			((ngwt__CommenStatus*)cp->ptr)[i].soap = soap;
 	}
 		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-	return (ngwt__CommentStatus*)cp->ptr;
+	return (ngwt__CommenStatus*)cp->ptr;
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__CommentStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__CommenStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__CommentStatus %p -> %p\n", q, p));
-	*(ngwt__CommentStatus*)p = *(ngwt__CommentStatus*)q;
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__CommenStatus %p -> %p\n", q, p));
+	*(ngwt__CommenStatus*)p = *(ngwt__CommenStatus*)q;
 }
 
 void ngwt__CategoryRefList::soap_serialize(struct soap *soap) const
@@ -84797,53 +84797,53 @@ SOAP_FMAC3 enum ngwt__DeltaSyncType ** SOAP_FMAC4 soap_in_PointerTongwt__DeltaSy
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__RecipientStatus(struct soap *soap, ngwt__RecipientStatus *const*a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__RecipienStatus(struct soap *soap, ngwt__RecipienStatus *const*a)
 {
-	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__RecipientStatus))
+	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__RecipienStatus))
 		(*a)->soap_serialize(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__RecipientStatus(struct soap *soap, ngwt__RecipientStatus *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__RecipienStatus(struct soap *soap, ngwt__RecipienStatus *const*a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__RecipientStatus);
-	if (soap_out_PointerTongwt__RecipientStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__RecipienStatus);
+	if (soap_out_PointerTongwt__RecipienStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__RecipientStatus(struct soap *soap, const char *tag, int id, ngwt__RecipientStatus *const*a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__RecipienStatus(struct soap *soap, const char *tag, int id, ngwt__RecipienStatus *const*a, const char *type)
 {
-	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__RecipientStatus);
+	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__RecipienStatus);
 	if (id < 0)
 		return soap->error;
 	return (*a)->soap_out(soap, tag, id, type);
 }
 
-SOAP_FMAC3 ngwt__RecipientStatus ** SOAP_FMAC4 soap_get_PointerTongwt__RecipientStatus(struct soap *soap, ngwt__RecipientStatus **p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__RecipienStatus ** SOAP_FMAC4 soap_get_PointerTongwt__RecipienStatus(struct soap *soap, ngwt__RecipienStatus **p, const char *tag, const char *type)
 {
-	if ((p = soap_in_PointerTongwt__RecipientStatus(soap, tag, p, type)))
+	if ((p = soap_in_PointerTongwt__RecipienStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 ngwt__RecipientStatus ** SOAP_FMAC4 soap_in_PointerTongwt__RecipientStatus(struct soap *soap, const char *tag, ngwt__RecipientStatus **a, const char *type)
+SOAP_FMAC3 ngwt__RecipienStatus ** SOAP_FMAC4 soap_in_PointerTongwt__RecipienStatus(struct soap *soap, const char *tag, ngwt__RecipienStatus **a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 1))
 		return NULL;
 	if (!a)
-		if (!(a = (ngwt__RecipientStatus **)soap_malloc(soap, sizeof(ngwt__RecipientStatus *))))
+		if (!(a = (ngwt__RecipienStatus **)soap_malloc(soap, sizeof(ngwt__RecipienStatus *))))
 			return NULL;
 	*a = NULL;
 	if (!soap->null && *soap->href != '#')
 	{	soap_revert(soap);
-		if (!(*a = (ngwt__RecipientStatus *)soap_instantiate_ngwt__RecipientStatus(soap, -1, soap->type, soap->arrayType, NULL)))
+		if (!(*a = (ngwt__RecipienStatus *)soap_instantiate_ngwt__RecipienStatus(soap, -1, soap->type, soap->arrayType, NULL)))
 			return NULL;
 		(*a)->soap_default(soap);
 		if (!(*a)->soap_in(soap, tag, NULL))
 			return NULL;
 	}
 	else
-	{	a = (ngwt__RecipientStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__RecipientStatus, sizeof(ngwt__RecipientStatus), 0);
+	{	a = (ngwt__RecipienStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__RecipienStatus, sizeof(ngwt__RecipienStatus), 0);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
@@ -89073,53 +89073,53 @@ SOAP_FMAC3 ngwt__DelegatedStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegatedS
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__CommentStatus(struct soap *soap, ngwt__CommentStatus *const*a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__CommenStatus(struct soap *soap, ngwt__CommenStatus *const*a)
 {
-	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__CommentStatus))
+	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__CommenStatus))
 		(*a)->soap_serialize(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__CommentStatus(struct soap *soap, ngwt__CommentStatus *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__CommenStatus(struct soap *soap, ngwt__CommenStatus *const*a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__CommentStatus);
-	if (soap_out_PointerTongwt__CommentStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__CommenStatus);
+	if (soap_out_PointerTongwt__CommenStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__CommentStatus(struct soap *soap, const char *tag, int id, ngwt__CommentStatus *const*a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__CommenStatus(struct soap *soap, const char *tag, int id, ngwt__CommenStatus *const*a, const char *type)
 {
-	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__CommentStatus);
+	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__CommenStatus);
 	if (id < 0)
 		return soap->error;
 	return (*a)->soap_out(soap, tag, id, type);
 }
 
-SOAP_FMAC3 ngwt__CommentStatus ** SOAP_FMAC4 soap_get_PointerTongwt__CommentStatus(struct soap *soap, ngwt__CommentStatus **p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__CommenStatus ** SOAP_FMAC4 soap_get_PointerTongwt__CommenStatus(struct soap *soap, ngwt__CommenStatus **p, const char *tag, const char *type)
 {
-	if ((p = soap_in_PointerTongwt__CommentStatus(soap, tag, p, type)))
+	if ((p = soap_in_PointerTongwt__CommenStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 ngwt__CommentStatus ** SOAP_FMAC4 soap_in_PointerTongwt__CommentStatus(struct soap *soap, const char *tag, ngwt__CommentStatus **a, const char *type)
+SOAP_FMAC3 ngwt__CommenStatus ** SOAP_FMAC4 soap_in_PointerTongwt__CommenStatus(struct soap *soap, const char *tag, ngwt__CommenStatus **a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 1))
 		return NULL;
 	if (!a)
-		if (!(a = (ngwt__CommentStatus **)soap_malloc(soap, sizeof(ngwt__CommentStatus *))))
+		if (!(a = (ngwt__CommenStatus **)soap_malloc(soap, sizeof(ngwt__CommenStatus *))))
 			return NULL;
 	*a = NULL;
 	if (!soap->null && *soap->href != '#')
 	{	soap_revert(soap);
-		if (!(*a = (ngwt__CommentStatus *)soap_instantiate_ngwt__CommentStatus(soap, -1, soap->type, soap->arrayType, NULL)))
+		if (!(*a = (ngwt__CommenStatus *)soap_instantiate_ngwt__CommenStatus(soap, -1, soap->type, soap->arrayType, NULL)))
 			return NULL;
 		(*a)->soap_default(soap);
 		if (!(*a)->soap_in(soap, tag, NULL))
 			return NULL;
 	}
 	else
-	{	a = (ngwt__CommentStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__CommentStatus, sizeof(ngwt__CommentStatus), 0);
+	{	a = (ngwt__CommenStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__CommenStatus, sizeof(ngwt__CommenStatus), 0);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
diff --git a/kresources/groupwise/soap/soapH.h b/kresources/groupwise/soap/soapH.h
index 41b9a0ff..75055459 100644
--- a/kresources/groupwise/soap/soapH.h
+++ b/kresources/groupwise/soap/soapH.h
@@ -3302,17 +3302,17 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecurrenceDateType(struct soap*, ng
 SOAP_FMAC5 ngwt__RecurrenceDateType * SOAP_FMAC6 soap_instantiate_ngwt__RecurrenceDateType(struct soap*, int, const char*, const char*, size_t*);
 SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecurrenceDateType(struct soap*, int, int, void*, const void*, size_t);
 
-#ifndef SOAP_TYPE_ngwt__RecipientStatus
-#define SOAP_TYPE_ngwt__RecipientStatus (123)
+#ifndef SOAP_TYPE_ngwt__RecipienStatus
+#define SOAP_TYPE_ngwt__RecipienStatus (123)
 #endif
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__RecipientStatus(struct soap*, const char*, int, const ngwt__RecipientStatus *, const char*);
-SOAP_FMAC3 ngwt__RecipientStatus * SOAP_FMAC4 soap_get_ngwt__RecipientStatus(struct soap*, ngwt__RecipientStatus *, const char*, const char*);
-SOAP_FMAC3 ngwt__RecipientStatus * SOAP_FMAC4 soap_in_ngwt__RecipientStatus(struct soap*, const char*, ngwt__RecipientStatus *, const char*);
-SOAP_FMAC5 ngwt__RecipientStatus * SOAP_FMAC6 soap_new_ngwt__RecipientStatus(struct soap*, int);
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecipientStatus(struct soap*, ngwt__RecipientStatus*);
-SOAP_FMAC5 ngwt__RecipientStatus * SOAP_FMAC6 soap_instantiate_ngwt__RecipientStatus(struct soap*, int, const char*, const char*, size_t*);
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecipientStatus(struct soap*, int, int, void*, const void*, size_t);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__RecipienStatus(struct soap*, const char*, int, const ngwt__RecipienStatus *, const char*);
+SOAP_FMAC3 ngwt__RecipienStatus * SOAP_FMAC4 soap_get_ngwt__RecipienStatus(struct soap*, ngwt__RecipienStatus *, const char*, const char*);
+SOAP_FMAC3 ngwt__RecipienStatus * SOAP_FMAC4 soap_in_ngwt__RecipienStatus(struct soap*, const char*, ngwt__RecipienStatus *, const char*);
+SOAP_FMAC5 ngwt__RecipienStatus * SOAP_FMAC6 soap_new_ngwt__RecipienStatus(struct soap*, int);
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecipienStatus(struct soap*, ngwt__RecipienStatus*);
+SOAP_FMAC5 ngwt__RecipienStatus * SOAP_FMAC6 soap_instantiate_ngwt__RecipienStatus(struct soap*, int, const char*, const char*, size_t*);
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecipienStatus(struct soap*, int, int, void*, const void*, size_t);
 
 #ifndef SOAP_TYPE_ngwt__RecipientList
 #define SOAP_TYPE_ngwt__RecipientList (122)
@@ -4298,17 +4298,17 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__Contact(struct soap*, ngwt__Contact
 SOAP_FMAC5 ngwt__Contact * SOAP_FMAC6 soap_instantiate_ngwt__Contact(struct soap*, int, const char*, const char*, size_t*);
 SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__Contact(struct soap*, int, int, void*, const void*, size_t);
 
-#ifndef SOAP_TYPE_ngwt__CommentStatus
-#define SOAP_TYPE_ngwt__CommentStatus (40)
+#ifndef SOAP_TYPE_ngwt__CommenStatus
+#define SOAP_TYPE_ngwt__CommenStatus (40)
 #endif
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__CommentStatus(struct soap*, const char*, int, const ngwt__CommentStatus *, const char*);
-SOAP_FMAC3 ngwt__CommentStatus * SOAP_FMAC4 soap_get_ngwt__CommentStatus(struct soap*, ngwt__CommentStatus *, const char*, const char*);
-SOAP_FMAC3 ngwt__CommentStatus * SOAP_FMAC4 soap_in_ngwt__CommentStatus(struct soap*, const char*, ngwt__CommentStatus *, const char*);
-SOAP_FMAC5 ngwt__CommentStatus * SOAP_FMAC6 soap_new_ngwt__CommentStatus(struct soap*, int);
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__CommentStatus(struct soap*, ngwt__CommentStatus*);
-SOAP_FMAC5 ngwt__CommentStatus * SOAP_FMAC6 soap_instantiate_ngwt__CommentStatus(struct soap*, int, const char*, const char*, size_t*);
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__CommentStatus(struct soap*, int, int, void*, const void*, size_t);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__CommenStatus(struct soap*, const char*, int, const ngwt__CommenStatus *, const char*);
+SOAP_FMAC3 ngwt__CommenStatus * SOAP_FMAC4 soap_get_ngwt__CommenStatus(struct soap*, ngwt__CommenStatus *, const char*, const char*);
+SOAP_FMAC3 ngwt__CommenStatus * SOAP_FMAC4 soap_in_ngwt__CommenStatus(struct soap*, const char*, ngwt__CommenStatus *, const char*);
+SOAP_FMAC5 ngwt__CommenStatus * SOAP_FMAC6 soap_new_ngwt__CommenStatus(struct soap*, int);
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__CommenStatus(struct soap*, ngwt__CommenStatus*);
+SOAP_FMAC5 ngwt__CommenStatus * SOAP_FMAC6 soap_instantiate_ngwt__CommenStatus(struct soap*, int, const char*, const char*, size_t*);
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__CommenStatus(struct soap*, int, int, void*, const void*, size_t);
 
 #ifndef SOAP_TYPE_ngwt__CategoryRefList
 #define SOAP_TYPE_ngwt__CategoryRefList (39)
@@ -7344,14 +7344,14 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DeltaSyncType(struct soap*, co
 SOAP_FMAC3 enum ngwt__DeltaSyncType ** SOAP_FMAC4 soap_get_PointerTongwt__DeltaSyncType(struct soap*, enum ngwt__DeltaSyncType **, const char*, const char*);
 SOAP_FMAC3 enum ngwt__DeltaSyncType ** SOAP_FMAC4 soap_in_PointerTongwt__DeltaSyncType(struct soap*, const char*, enum ngwt__DeltaSyncType **, const char*);
 
-#ifndef SOAP_TYPE_PointerTongwt__RecipientStatus
-#define SOAP_TYPE_PointerTongwt__RecipientStatus (570)
+#ifndef SOAP_TYPE_PointerTongwt__RecipienStatus
+#define SOAP_TYPE_PointerTongwt__RecipienStatus (570)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__RecipientStatus(struct soap*, ngwt__RecipientStatus *const*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__RecipientStatus(struct soap*, ngwt__RecipientStatus *const*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__RecipientStatus(struct soap*, const char *, int, ngwt__RecipientStatus *const*, const char *);
-SOAP_FMAC3 ngwt__RecipientStatus ** SOAP_FMAC4 soap_get_PointerTongwt__RecipientStatus(struct soap*, ngwt__RecipientStatus **, const char*, const char*);
-SOAP_FMAC3 ngwt__RecipientStatus ** SOAP_FMAC4 soap_in_PointerTongwt__RecipientStatus(struct soap*, const char*, ngwt__RecipientStatus **, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__RecipienStatus(struct soap*, ngwt__RecipienStatus *const*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__RecipienStatus(struct soap*, ngwt__RecipienStatus *const*, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__RecipienStatus(struct soap*, const char *, int, ngwt__RecipienStatus *const*, const char *);
+SOAP_FMAC3 ngwt__RecipienStatus ** SOAP_FMAC4 soap_get_PointerTongwt__RecipienStatus(struct soap*, ngwt__RecipienStatus **, const char*, const char*);
+SOAP_FMAC3 ngwt__RecipienStatus ** SOAP_FMAC4 soap_in_PointerTongwt__RecipienStatus(struct soap*, const char*, ngwt__RecipienStatus **, const char*);
 
 #ifndef SOAP_TYPE_PointerTongwt__FreeBusyBlockList
 #define SOAP_TYPE_PointerTongwt__FreeBusyBlockList (569)
@@ -8082,14 +8082,14 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegatedStatus(struct soap*,
 SOAP_FMAC3 ngwt__DelegatedStatus ** SOAP_FMAC4 soap_get_PointerTongwt__DelegatedStatus(struct soap*, ngwt__DelegatedStatus **, const char*, const char*);
 SOAP_FMAC3 ngwt__DelegatedStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegatedStatus(struct soap*, const char*, ngwt__DelegatedStatus **, const char*);
 
-#ifndef SOAP_TYPE_PointerTongwt__CommentStatus
-#define SOAP_TYPE_PointerTongwt__CommentStatus (472)
+#ifndef SOAP_TYPE_PointerTongwt__CommenStatus
+#define SOAP_TYPE_PointerTongwt__CommenStatus (472)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__CommentStatus(struct soap*, ngwt__CommentStatus *const*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__CommentStatus(struct soap*, ngwt__CommentStatus *const*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__CommentStatus(struct soap*, const char *, int, ngwt__CommentStatus *const*, const char *);
-SOAP_FMAC3 ngwt__CommentStatus ** SOAP_FMAC4 soap_get_PointerTongwt__CommentStatus(struct soap*, ngwt__CommentStatus **, const char*, const char*);
-SOAP_FMAC3 ngwt__CommentStatus ** SOAP_FMAC4 soap_in_PointerTongwt__CommentStatus(struct soap*, const char*, ngwt__CommentStatus **, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__CommenStatus(struct soap*, ngwt__CommenStatus *const*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__CommenStatus(struct soap*, ngwt__CommenStatus *const*, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__CommenStatus(struct soap*, const char *, int, ngwt__CommenStatus *const*, const char *);
+SOAP_FMAC3 ngwt__CommenStatus ** SOAP_FMAC4 soap_get_PointerTongwt__CommenStatus(struct soap*, ngwt__CommenStatus **, const char*, const char*);
+SOAP_FMAC3 ngwt__CommenStatus ** SOAP_FMAC4 soap_in_PointerTongwt__CommenStatus(struct soap*, const char*, ngwt__CommenStatus **, const char*);
 
 #ifndef SOAP_TYPE_PointerTongwt__TransferFailedStatus
 #define SOAP_TYPE_PointerTongwt__TransferFailedStatus (471)
diff --git a/kresources/groupwise/soap/soapStub.h b/kresources/groupwise/soap/soapStub.h
index d7f3d6bc..a5977c1c 100644
--- a/kresources/groupwise/soap/soapStub.h
+++ b/kresources/groupwise/soap/soapStub.h
@@ -18,25 +18,25 @@
 
 #ifndef SOAP_TYPE_ngwt__ItemSourceList
 #define SOAP_TYPE_ngwt__ItemSourceList (336)
-/* Bitmask ngwt:ItemSourceList */
+/* Bitqmask ngwt:ItemSourceList */
 enum ngwt__ItemSourceList {received = 1, sent = 2, draft = 4, personal = 8};
 #endif
 
 #ifndef SOAP_TYPE_ngwt__MessageTypeList
 #define SOAP_TYPE_ngwt__MessageTypeList (337)
-/* Bitmask ngwt:MessageTypeList */
+/* Bitqmask ngwt:MessageTypeList */
 enum ngwt__MessageTypeList {Appointment = 1, CalendarItem = 2, DocumentReference = 4, Mail = 8, Note = 16, PhoneMessage = 32, Task = 64};
 #endif
 
 #ifndef SOAP_TYPE_ngwe__FieldList
 #define SOAP_TYPE_ngwe__FieldList (339)
-/* Bitmask ngwe:FieldList */
-enum ngwe__FieldList {AcceptLevel = 1, Alarm = 2, AllDayEvent = 4, Attachment = 8, Category = 16, Classification = 32, Contact = 64, DueDate = 128, Duration = 256, EmailAddress = 512, ExpirationDate = 1024, Hidden = 2048, IMAddress = 4096, MessageBody = 8192, Name = 16384, Organization = 32768, Owner = 65536, PersonalSubject = 131072, PhoneNumber = 262144, Place = 524288, PostalAddress = 1048576, RecipientStatus = 2097152, Rights = 4194304, Security = 8388608, SendPriority = 16777216, StartDate = 33554432, Subject = 67108864, TaskCategory = 134217728, TaskPriority = 268435456};
+/* Bitqmask ngwe:FieldList */
+enum ngwe__FieldList {AcceptLevel = 1, Alarm = 2, AllDayEvent = 4, Attachment = 8, Category = 16, Classification = 32, Contact = 64, DueDate = 128, Duration = 256, EmailAddress = 512, ExpirationDate = 1024, Hidden = 2048, IMAddress = 4096, MessageBody = 8192, Name = 16384, Organization = 32768, Owner = 65536, PersonalSubject = 131072, PhoneNumber = 262144, Place = 524288, PostalAddress = 1048576, RecipienStatus = 2097152, Rights = 4194304, Security = 8388608, SendPriority = 16777216, StartDate = 33554432, Subject = 67108864, TaskCategory = 134217728, TaskPriority = 268435456};
 #endif
 
 #ifndef SOAP_TYPE_ngwe__ItemTypeList
 #define SOAP_TYPE_ngwe__ItemTypeList (340)
-/* Bitmask ngwe:ItemTypeList */
+/* Bitqmask ngwe:ItemTypeList */
 enum ngwe__ItemTypeList {AddressBookItem = 1, Appointment_ = 2, CalendarItem_ = 4, Contact_ = 8, Group = 16, Mail_ = 32, Note_ = 64, Organization_ = 128, PhoneMessage_ = 256, Resource = 512, Task_ = 1024, DocumentRef = 2048};
 #endif
 
@@ -115,7 +115,7 @@ enum ngwt__FilterDate {Today = 0, Tomorrow = 1, ThisMonth = 2, ThisWeek = 3, Thi
 #ifndef SOAP_TYPE_ngwt__FilterOp
 #define SOAP_TYPE_ngwt__FilterOp (357)
 /* ngwt:FilterOp */
-enum ngwt__FilterOp {and_ = 0, or_ = 1, not_ = 2, eq = 3, ne = 4, gt = 5, lt = 6, gte = 7, lte = 8, contains = 9, containsWord = 10, begins = 11, exists = 12, notExist = 13, isOf = 14, isNotOf = 15, fieldEqual = 16, fieldGTE = 17, fieldGT = 18, fieldLTE = 19, fieldLT = 20, fieldNE = 21, fieldDateEqual = 22};
+enum ngwt__FilterOp {and_ = 0, or_ = 1, not_ = 2, eq = 3, ne = 4, gt = 5, lt = 6, gte = 7, lte = 8, tqcontains = 9, tqcontainsWord = 10, begins = 11, exists = 12, notExist = 13, isOf = 14, isNotOf = 15, fieldEqual = 16, fieldGTE = 17, fieldGT = 18, fieldLTE = 19, fieldLT = 20, fieldNE = 21, fieldDateEqual = 22};
 #endif
 
 #ifndef SOAP_TYPE_ngwt__FolderACLStatus
@@ -241,7 +241,7 @@ enum ngwt__StatusTrackingOptions {None = 0, Delivered = 1, DeliveredAndOpened =
 #ifndef SOAP_TYPE_ngwt__VersionEventType
 #define SOAP_TYPE_ngwt__VersionEventType (384)
 /* ngwt:VersionEventType */
-enum ngwt__VersionEventType {archive_ = 0, checkIn = 1, checkOut = 2, copyIn = 3, copyOut = 4, copyVersion = 5, created = 6, deleteVersion = 7, endAccess = 8, resetStatus = 9, restore = 10, retrieve = 11, securityModified = 12, versionDownloaded = 13, viewed = 14, unknown = 15};
+enum ngwt__VersionEventType {archive_ = 0, checkIn = 1, checkOut = 2, copyIn = 3, copyOut = 4, copyVersion = 5, created = 6, deleteVersion = 7, endAccess = 8, reseStatus = 9, restore = 10, retrieve = 11, securityModified = 12, versionDownloaded = 13, viewed = 14, unknown = 15};
 #endif
 
 #ifndef SOAP_TYPE_ngwt__VersionStatus
@@ -265,7 +265,7 @@ enum ngwe__EventType {AddressBookAdd = 0, AddressBookDelete = 1, AddressBookModi
 #ifndef SOAP_TYPE_ngwe__Field
 #define SOAP_TYPE_ngwe__Field (389)
 /* ngwe:Field */
-enum ngwe__Field {AcceptLevel_ = 0, Alarm_ = 1, AllDayEvent_ = 2, Attachment_ = 3, Category__ = 4, Classification_ = 5, Contact___ = 6, DueDate_ = 7, Duration_ = 8, EmailAddress_ = 9, ExpirationDate_ = 10, Hidden_ = 11, IMAddress_ = 12, MessageBody_ = 13, Name_ = 14, Organization___ = 15, Owner_ = 16, PersonalSubject_ = 17, PhoneNumber_ = 18, Place_ = 19, PostalAddress_ = 20, RecipientStatus_ = 21, Rights_ = 22, Security_ = 23, SendPriority_ = 24, StartDate_ = 25, Subject_ = 26, TaskCategory_ = 27, TaskPriority_ = 28};
+enum ngwe__Field {AcceptLevel_ = 0, Alarm_ = 1, AllDayEvent_ = 2, Attachment_ = 3, Category__ = 4, Classification_ = 5, Contact___ = 6, DueDate_ = 7, Duration_ = 8, EmailAddress_ = 9, ExpirationDate_ = 10, Hidden_ = 11, IMAddress_ = 12, MessageBody_ = 13, Name_ = 14, Organization___ = 15, Owner_ = 16, PersonalSubject_ = 17, PhoneNumber_ = 18, Place_ = 19, PostalAddress_ = 20, RecipienStatus_ = 21, Rights_ = 22, Security_ = 23, SendPriority_ = 24, StartDate_ = 25, Subject_ = 26, TaskCategory_ = 27, TaskPriority_ = 28};
 #endif
 
 #ifndef SOAP_TYPE_ngwe__ItemType
@@ -1764,10 +1764,10 @@ public:
 };
 #endif
 
-#ifndef SOAP_TYPE_ngwt__RecipientStatus
-#define SOAP_TYPE_ngwt__RecipientStatus (123)
-/* ngwt:RecipientStatus */
-class SOAP_CMAC ngwt__RecipientStatus
+#ifndef SOAP_TYPE_ngwt__RecipienStatus
+#define SOAP_TYPE_ngwt__RecipienStatus (123)
+/* ngwt:RecipienStatus */
+class SOAP_CMAC ngwt__RecipienStatus
 {
 public:
 	char *delivered;	/* optional element of type xsd:string */
@@ -1783,8 +1783,8 @@ public:
 	char *deleted;	/* optional element of type xsd:string */
 	char *undeleted;	/* optional element of type xsd:string */
 	char *purged;	/* optional element of type xsd:string */
-	class ngwt__CommentStatus *accepted;	/* optional element of type ngwt:CommentStatus */
-	ngwt__CommentStatus *declined;	/* optional element of type ngwt:CommentStatus */
+	class ngwt__CommenStatus *accepted;	/* optional element of type ngwt:CommenStatus */
+	ngwt__CommenStatus *declined;	/* optional element of type ngwt:CommenStatus */
 	char *replied;	/* optional element of type xsd:string */
 	char *forwarded;	/* optional element of type xsd:string */
 	char *shared;	/* optional element of type xsd:string */
@@ -1795,15 +1795,15 @@ public:
 	std::vector<class ngwt__DelegateeStatus * >delegateeStatus;	/* optional element of type ngwt:DelegateeStatus */
 	struct soap *soap;	/* transient */
 public:
-	virtual int soap_type() const { return 123; } /* = unique id SOAP_TYPE_ngwt__RecipientStatus */
+	virtual int soap_type() const { return 123; } /* = unique id SOAP_TYPE_ngwt__RecipienStatus */
 	virtual void soap_default(struct soap*);
 	virtual void soap_serialize(struct soap*) const;
 	virtual int soap_put(struct soap*, const char*, const char*) const;
 	virtual int soap_out(struct soap*, const char*, int, const char*) const;
 	virtual void *soap_get(struct soap*, const char*, const char*);
 	virtual void *soap_in(struct soap*, const char*, const char*);
-	         ngwt__RecipientStatus() { }
-	virtual ~ngwt__RecipientStatus() { }
+	         ngwt__RecipienStatus() { }
+	virtual ~ngwt__RecipienStatus() { }
 };
 #endif
 
@@ -6386,25 +6386,25 @@ public:
 };
 #endif
 
-#ifndef SOAP_TYPE_ngwt__CommentStatus
-#define SOAP_TYPE_ngwt__CommentStatus (40)
-/* Primitive ngwt:CommentStatus schema type: */
-class SOAP_CMAC ngwt__CommentStatus
+#ifndef SOAP_TYPE_ngwt__CommenStatus
+#define SOAP_TYPE_ngwt__CommenStatus (40)
+/* Primitive ngwt:CommenStatus schema type: */
+class SOAP_CMAC ngwt__CommenStatus
 {
 public:
 	char *__item;
 	std::string *comment;	/* optional attribute */
 	struct soap *soap;	/* transient */
 public:
-	virtual int soap_type() const { return 40; } /* = unique id SOAP_TYPE_ngwt__CommentStatus */
+	virtual int soap_type() const { return 40; } /* = unique id SOAP_TYPE_ngwt__CommenStatus */
 	virtual void soap_default(struct soap*);
 	virtual void soap_serialize(struct soap*) const;
 	virtual int soap_put(struct soap*, const char*, const char*) const;
 	virtual int soap_out(struct soap*, const char*, int, const char*) const;
 	virtual void *soap_get(struct soap*, const char*, const char*);
 	virtual void *soap_in(struct soap*, const char*, const char*);
-	         ngwt__CommentStatus() { }
-	virtual ~ngwt__CommentStatus() { }
+	         ngwt__CommenStatus() { }
+	virtual ~ngwt__CommenStatus() { }
 };
 #endif
 
@@ -6460,7 +6460,7 @@ public:
 class SOAP_CMAC ngwt__DelegatedStatus
 {
 public:
-	ngwt__CommentStatus *__item;
+	ngwt__CommenStatus *__item;
 	std::string *userid;	/* optional attribute */
 	struct soap *soap;	/* transient */
 public:
@@ -6479,7 +6479,7 @@ public:
 #ifndef SOAP_TYPE_ngwt__DelegateeStatus
 #define SOAP_TYPE_ngwt__DelegateeStatus (53)
 /* ngwt:DelegateeStatus */
-class SOAP_CMAC ngwt__DelegateeStatus : public ngwt__RecipientStatus
+class SOAP_CMAC ngwt__DelegateeStatus : public ngwt__RecipienStatus
 {
 public:
 	std::string *userid;	/* optional attribute */
@@ -6774,7 +6774,7 @@ class SOAP_CMAC ngwt__Recipient : public ngwt__NameAndEmail
 public:
 	enum ngwt__DistributionType distType;	/* optional element of type ngwt:DistributionType */
 	enum ngwt__RecipientType recipType;	/* optional element of type ngwt:RecipientType */
-	ngwt__RecipientStatus *recipientStatus;	/* optional element of type ngwt:RecipientStatus */
+	ngwt__RecipienStatus *recipienStatus;	/* optional element of type ngwt:RecipienStatus */
 	enum ngwt__AcceptLevel *acceptLevel;	/* optional element of type ngwt:AcceptLevel */
 public:
 	virtual int soap_type() const { return 121; } /* = unique id SOAP_TYPE_ngwt__Recipient */
@@ -6792,7 +6792,7 @@ public:
 #ifndef SOAP_TYPE_ngwt__TransferFailedStatus
 #define SOAP_TYPE_ngwt__TransferFailedStatus (154)
 /* ngwt:TransferFailedStatus */
-class SOAP_CMAC ngwt__TransferFailedStatus : public ngwt__RecipientStatus
+class SOAP_CMAC ngwt__TransferFailedStatus : public ngwt__RecipienStatus
 {
 public:
 	std::string *FailureReason;	/* optional attribute */
diff --git a/kresources/groupwise/soap/stdsoap2.cpp b/kresources/groupwise/soap/stdsoap2.cpp
index 0a0f3c58..17538768 100644
--- a/kresources/groupwise/soap/stdsoap2.cpp
+++ b/kresources/groupwise/soap/stdsoap2.cpp
@@ -3316,7 +3316,7 @@ again:
     { short v;
       unsigned int k = soap->omode; /* make sure we only parse HTTP */
       size_t n = soap->count; /* save the content length */
-      soap->omode &= ~SOAP_ENC; /* mask IO and ENC */
+      soap->omode &= ~SOAP_ENC; /* tqmask IO and ENC */
       soap->omode |= SOAP_IO_BUFFER;
       soap_begin_send(soap);
       DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Connecting to proxy server\n"));
@@ -3337,7 +3337,7 @@ again:
         return SOAP_INVALID_SOCKET;
       soap->omode = k;
       k = soap->imode;
-      soap->imode &= ~SOAP_ENC; /* mask IO and ENC */
+      soap->imode &= ~SOAP_ENC; /* tqmask IO and ENC */
       v = soap->version; /* preserve */
       if (soap_begin_recv(soap))
         return SOAP_INVALID_SOCKET;
@@ -6957,7 +6957,7 @@ SOAP_FMAC2
 soap_string_out(struct soap *soap, const char *s, int flag)
 { register const char *t;
   register soap_wchar c;
-  register soap_wchar mask = 0xFFFFFF80UL;
+  register soap_wchar tqmask = 0xFFFFFF80UL;
 #ifdef WITH_DOM
   if ((soap->mode & SOAP_XML_DOM) && soap->dom)
   { soap->dom->data = soap_strdup(soap, s); /* check EOM */
@@ -6965,7 +6965,7 @@ soap_string_out(struct soap *soap, const char *s, int flag)
   }
 #endif
   if (soap->mode & SOAP_C_UTFSTRING)
-    mask = 0;
+    tqmask = 0;
   t = s;
   while ((c = *t++))
   { switch (c)
@@ -7028,7 +7028,7 @@ soap_string_out(struct soap *soap, const char *s, int flag)
       }
 #endif
 #endif
-      if (c & mask)
+      if (c & tqmask)
       { if (soap_send_raw(soap, s, t - s - 1) || soap_pututf8(soap, (unsigned char)c))
           return soap->error;
         s = t;
diff --git a/kresources/groupwise/soap/stdsoap2.h b/kresources/groupwise/soap/stdsoap2.h
index af603d80..fb801fb8 100644
--- a/kresources/groupwise/soap/stdsoap2.h
+++ b/kresources/groupwise/soap/stdsoap2.h
@@ -896,7 +896,7 @@ extern const struct soap_double_nan { unsigned int n1, n2; } soap_double_nan;
 
 typedef soap_int32 soap_mode;
 
-#define SOAP_IO			0x00000003	/* IO mask */
+#define SOAP_IO			0x00000003	/* IO tqmask */
 #define SOAP_IO_FLUSH		0x00000000	/* flush output immediately, no buffering */
 #define SOAP_IO_BUFFER		0x00000001	/* buffer output in packets of size SOAP_BUFLEN */
 #define SOAP_IO_STORE		0x00000002	/* store entire output to determine length for transport */
@@ -914,7 +914,7 @@ typedef soap_int32 soap_mode;
 #define SOAP_ENC_ZLIB		0x00000400
 #define SOAP_ENC_SSL		0x00000800
 
-#define SOAP_ENC		0x00000FFF	/* IO and ENC mask */
+#define SOAP_ENC		0x00000FFF	/* IO and ENC tqmask */
 
 #define SOAP_XML_STRICT		0x00001000	/* strict validation */
 #define SOAP_XML_CANONICAL	0x00002000	/* C14N canonical XML */
@@ -1350,8 +1350,8 @@ struct soap
   std::ostream *os;
   std::istream *is;
 #else
-  void *os;	/* preserve alignment */
-  void *is;	/* preserve alignment */
+  void *os;	/* preserve tqalignment */
+  void *is;	/* preserve tqalignment */
 #endif
 #ifndef UNDER_CE
   int sendfd;
diff --git a/kresources/kolab/kabc/contact.cpp b/kresources/kolab/kabc/contact.cpp
index 26a91e67..e3032d11 100644
--- a/kresources/kolab/kabc/contact.cpp
+++ b/kresources/kolab/kabc/contact.cpp
@@ -57,7 +57,7 @@ Contact::Contact( const KABC::Addressee* addr )
 }
 
 // loading (xml->addressee)
-Contact::Contact( const TQString& xml, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum )
+Contact::Contact( const TQString& xml, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum )
   : mHasGeo( false )
 {
   load( xml );
@@ -487,7 +487,7 @@ void Contact::saveCustomAttributes( TQDomElement& element ) const
       writeString( element, (*it).name, (*it).value );
     } else {
       // skip writing the freebusyurl as it is a hack we need to remove eventually
-      if ( (*it).name == TQString::fromLatin1( "FreeBusyURL" ) ) {
+      if ( (*it).name == TQString::tqfromLatin1( "FreeBusyURL" ) ) {
         continue;
       }
 
@@ -1110,7 +1110,7 @@ void Contact::setFields( const KABC::Addressee* addressee )
   //    (includes e.g. crypto settings, and extra im addresses)
   TQStringList knownCustoms;
   for ( const char** p = s_knownCustomFields; *p; ++p )
-    knownCustoms << TQString::fromLatin1( *p );
+    knownCustoms << TQString::tqfromLatin1( *p );
   TQStringList customs = addressee->customs();
   for( TQStringList::Iterator it = customs.begin(); it != customs.end(); ++it ) {
     // KABC::Addressee doesn't offer a real way to iterate over customs, other than splitting strings ourselves
@@ -1124,7 +1124,7 @@ void Contact::setFields( const KABC::Addressee* addressee )
     if ( pos == -1 ) continue;
     TQString value = name.mid( pos + 1 );
     name = name.left( pos );
-    if ( !knownCustoms.contains( name ) ) {
+    if ( !knownCustoms.tqcontains( name ) ) {
       //kdDebug() << k_funcinfo << "app=" << app << " name=" << name << " value=" << value << endl;
       Custom c;
       if ( app != "KADDRESSBOOK" ) // that's the default
@@ -1162,8 +1162,8 @@ void Contact::saveTo( KABC::Addressee* addressee )
     for ( ; mit != mDistrListMembers.end(); ++mit ) {
       TQString displayName = (*mit).displayName;
       // fixup the display name DistributionList::assumes neither ',' nor ';' is present
-      displayName.replace( ',', ' ' );
-      displayName.replace( ';', ' ' );
+      displayName.tqreplace( ',', ' ' );
+      displayName.tqreplace( ';', ' ' );
       distrList.insertEntry( displayName, (*mit).email );
     }
     addressee->insertCustom( "KADDRESSBOOK", "DistributionList", distrList.custom( "KADDRESSBOOK", "DistributionList" ) );
@@ -1253,13 +1253,13 @@ void Contact::saveTo( KABC::Addressee* addressee )
   }
 
   for( TQValueList<Custom>::ConstIterator it = mCustomList.begin(); it != mCustomList.end(); ++it ) {
-    TQString app = (*it).app.isEmpty() ? TQString::fromLatin1( "KADDRESSBOOK" ) : (*it).app;
+    TQString app = (*it).app.isEmpty() ? TQString::tqfromLatin1( "KADDRESSBOOK" ) : (*it).app;
     addressee->insertCustom( app, (*it).name, (*it).value );
   }
   //kdDebug(5006) << addressee->customs() << endl;
 }
 
-TQImage Contact::loadPictureFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum )
+TQImage Contact::loadPictureFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum )
 {
   TQImage img;
   KURL url;
@@ -1285,7 +1285,7 @@ TQImage Contact::loadPictureFromAddressee( const KABC::Picture& picture )
   return img;
 }
 
-TQByteArray Kolab::Contact::loadDataFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum )
+TQByteArray Kolab::Contact::loadDataFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum )
 {
   TQByteArray data;
   KURL url;
diff --git a/kresources/kolab/kabc/contact.h b/kresources/kolab/kabc/contact.h
index a9465642..66a7c418 100644
--- a/kresources/kolab/kabc/contact.h
+++ b/kresources/kolab/kabc/contact.h
@@ -69,7 +69,7 @@ public:
   };
 
   explicit Contact( const KABC::Addressee* address );
-  Contact( const TQString& xml, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum );
+  Contact( const TQString& xml, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum );
   ~Contact();
 
   void saveTo( KABC::Addressee* address );
@@ -221,10 +221,10 @@ private:
   void loadDistrListMember( const TQDomElement& element );
   void saveDistrListMembers( TQDomElement& element ) const;
 
-  TQImage loadPictureFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum );
+  TQImage loadPictureFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum );
   TQImage loadPictureFromAddressee( const KABC::Picture& picture );
 
-  TQByteArray loadDataFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum );
+  TQByteArray loadDataFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum );
   TQByteArray loadSoundFromAddressee( const KABC::Sound& sound );
 
   TQString productID() const;
diff --git a/kresources/kolab/kabc/resourcekolab.cpp b/kresources/kolab/kabc/resourcekolab.cpp
index ae8e225f..e9c481bf 100644
--- a/kresources/kolab/kabc/resourcekolab.cpp
+++ b/kresources/kolab/kabc/resourcekolab.cpp
@@ -151,7 +151,7 @@ void KABC::ResourceKolab::releaseSaveTicket( Ticket* ticket )
 
 TQString KABC::ResourceKolab::loadContact( const TQString& contactData,
                                           const TQString& subResource,
-                                          Q_UINT32 sernum,
+                                          TQ_UINT32 sernum,
                                           KMailICalIface::StorageFormat format )
 {
   KABC::Addressee addr;
@@ -215,7 +215,7 @@ bool KABC::ResourceKolab::loadSubResource( const TQString& subResource )
     for ( int indexFormat = 0; indexFormat < 3; ++indexFormat ) {
       const char* mimetype = s_formats[indexFormat].mimetype;
       KMailICalIface::StorageFormat format = s_formats[indexFormat].format;
-      TQMap<Q_UINT32, TQString> lst;
+      TQMap<TQ_UINT32, TQString> lst;
       if ( !kmailIncidences( lst, mimetype, subResource, startIndex, nbMessages ) ) {
         kdError() << "Communication problem in KABC::ResourceKolab::loadSubResource()\n";
         if ( progressId )
@@ -223,7 +223,7 @@ bool KABC::ResourceKolab::loadSubResource( const TQString& subResource )
         return false;
       }
 
-      for( TQMap<Q_UINT32, TQString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
+      for( TQMap<TQ_UINT32, TQString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
         loadContact( it.data(), subResource, it.key(), format );
       }
 
@@ -334,7 +334,7 @@ bool KABC::ResourceKolab::kmailUpdateAddressee( const Addressee& addr )
 {
   const TQString uid = addr.uid();
   TQString subResource;
-  Q_UINT32 sernum;
+  TQ_UINT32 sernum;
   if ( mUidMap.find( uid ) != mUidMap.end() ) {
     subResource = mUidMap[ uid ].resource();
     if ( !subresourceWritable( subResource ) ) {
@@ -416,7 +416,7 @@ void KABC::ResourceKolab::insertAddressee( const Addressee& addr )
   const TQString uid = addr.uid();
   //kdDebug(5650) << k_funcinfo << uid << endl;
   bool ok = false;
-  if ( mUidMap.contains( uid ) ) {
+  if ( mUidMap.tqcontains( uid ) ) {
     mUidsPendingUpdate.append( uid );
   } else {
     mUidsPendingAdding.append( uid );
@@ -453,7 +453,7 @@ void KABC::ResourceKolab::removeAddressee( const Addressee& addr )
  */
 bool KABC::ResourceKolab::fromKMailAddIncidence( const TQString& type,
                                                  const TQString& subResource,
-                                                 Q_UINT32 sernum,
+                                                 TQ_UINT32 sernum,
                                                  int format,
                                                  const TQString& contactXML )
 {
@@ -468,8 +468,8 @@ bool KABC::ResourceKolab::fromKMailAddIncidence( const TQString& type,
   //kdDebug(5650) << k_funcinfo << uid << endl;
 
   // Emit "addressbook changed" if this comes from kmail and not from the GUI
-  if ( !mUidsPendingAdding.contains( uid )
-       && !mUidsPendingUpdate.contains( uid ) ) {
+  if ( !mUidsPendingAdding.tqcontains( uid )
+       && !mUidsPendingUpdate.tqcontains( uid ) ) {
     addressBook()->emitAddressBookChanged();
   } else {
     mUidsPendingAdding.remove( uid );
@@ -490,11 +490,11 @@ void KABC::ResourceKolab::fromKMailDelIncidence( const TQString& type,
   //kdDebug(5650) << k_funcinfo << uid << endl;
 
   // Can't be in both, by contract
-  if ( mUidsPendingDeletion.contains( uid ) ) {
+  if ( mUidsPendingDeletion.tqcontains( uid ) ) {
     mUidsPendingDeletion.remove( uid );
-  } else if ( mUidsPendingUpdate.contains( uid ) ) {
+  } else if ( mUidsPendingUpdate.tqcontains( uid ) ) {
     // It's good to know if was deleted, but we are waiting on a new one to
-    // replace it, so let's just sit tight.
+    // tqreplace it, so let's just sit tight.
   } else {
     // We didn't trigger this, so KMail did, remove the reference to the uid
     mAddrMap.remove( uid );
@@ -523,7 +523,7 @@ void KABC::ResourceKolab::fromKMailAddSubresource( const TQString& type,
 {
   if( type != s_kmailContentsType ) return;
 
-  if ( mSubResources.contains( subResource ) )
+  if ( mSubResources.tqcontains( subResource ) )
     // Already registered
     return;
 
@@ -540,7 +540,7 @@ void KABC::ResourceKolab::fromKMailDelSubresource( const TQString& type,
 {
   if( type != s_kmailContentsType ) return;
 
-  if ( !mSubResources.contains( subResource ) )
+  if ( !mSubResources.tqcontains( subResource ) )
     // Not registered
     return;
 
@@ -575,13 +575,13 @@ void KABC::ResourceKolab::fromKMailDelSubresource( const TQString& type,
 
 
 
-void KABC::ResourceKolab::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+void KABC::ResourceKolab::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                                     const TQString& /* type */,
                                                     const TQString& folder )
 {
   // FIXME
   KMailICalIface::StorageFormat format = KMailICalIface::StorageXML;
-  for( TQMap<Q_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it ) {
+  for( TQMap<TQ_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it ) {
     loadContact( it.data(), folder, it.key(), format );
   }
   if ( !addressBook() ){
@@ -597,7 +597,7 @@ TQStringList KABC::ResourceKolab::subresources() const
 
 bool KABC::ResourceKolab::subresourceActive( const TQString& subresource ) const
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     return mSubResources[ subresource ].active();
   }
 
@@ -609,7 +609,7 @@ bool KABC::ResourceKolab::subresourceActive( const TQString& subresource ) const
 
 bool KABC::ResourceKolab::subresourceWritable( const TQString& subresource ) const
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     return mSubResources[ subresource ].writable();
   }
   return false; //better a safe default
@@ -617,7 +617,7 @@ bool KABC::ResourceKolab::subresourceWritable( const TQString& subresource ) con
 
 int KABC::ResourceKolab::subresourceCompletionWeight( const TQString& subresource ) const
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     return mSubResources[ subresource ].completionWeight();
   }
 
@@ -628,7 +628,7 @@ int KABC::ResourceKolab::subresourceCompletionWeight( const TQString& subresourc
 
 TQString KABC::ResourceKolab::subresourceLabel( const TQString& subresource ) const
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     return mSubResources[ subresource ].label();
   }
 
@@ -638,7 +638,7 @@ TQString KABC::ResourceKolab::subresourceLabel( const TQString& subresource ) co
 
 void KABC::ResourceKolab::setSubresourceCompletionWeight( const TQString& subresource, int completionWeight )
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     mSubResources[ subresource ].setCompletionWeight( completionWeight );
   } else {
     kdDebug(5650) << "setSubresourceCompletionWeight: subresource " << subresource << " not found" << endl;
@@ -657,7 +657,7 @@ TQMap<TQString, TQString> KABC::ResourceKolab::uidToResourceMap() const
 
 void KABC::ResourceKolab::setSubresourceActive( const TQString &subresource, bool active )
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     mSubResources[ subresource ].setActive( active );
     load();
   } else {
diff --git a/kresources/kolab/kabc/resourcekolab.h b/kresources/kolab/kabc/resourcekolab.h
index 9158375a..2288bf25 100644
--- a/kresources/kolab/kabc/resourcekolab.h
+++ b/kresources/kolab/kabc/resourcekolab.h
@@ -112,12 +112,12 @@ public:
   void fromKMailDelSubresource( const TQString& type, const TQString& id );
 
   bool fromKMailAddIncidence( const TQString& type, const TQString& resource,
-                              Q_UINT32 sernum, int format, const TQString& contact );
+                              TQ_UINT32 sernum, int format, const TQString& contact );
   void fromKMailDelIncidence( const TQString& type, const TQString& resource,
                               const TQString& contact );
   void fromKMailRefresh( const TQString& type, const TQString& resource );
 
-  void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+  void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                  const TQString& type,
                                  const TQString& folder );
 
@@ -158,7 +158,7 @@ protected:
                               const TQString& label, bool writable );
   bool loadSubResource( const TQString& subResource );
   TQString loadContact( const TQString& contactData, const TQString& subResource,
-                       Q_UINT32 sernum, const KMailICalIface::StorageFormat format );
+                       TQ_UINT32 sernum, const KMailICalIface::StorageFormat format );
 
   TQString configFile() const {
     return Kolab::ResourceKolabBase::configFile( "kabc" );
diff --git a/kresources/kolab/kcal/event.cpp b/kresources/kolab/kcal/event.cpp
index e1d58a13..f8309053 100644
--- a/kresources/kolab/kcal/event.cpp
+++ b/kresources/kolab/kcal/event.cpp
@@ -40,7 +40,7 @@ using namespace Kolab;
 
 
 KCal::Event* Event::xmlToEvent( const TQString& xml, const TQString& tz, KCal::ResourceKolab* res,
-                                const TQString& subResource, Q_UINT32 sernum )
+                                const TQString& subResource, TQ_UINT32 sernum )
 {
   Event event( res, subResource, sernum, tz );
   event.load( xml );
@@ -55,7 +55,7 @@ TQString Event::eventToXML( KCal::Event* kcalEvent, const TQString& tz  )
   return event.saveXML();
 }
 
-Event::Event( KCal::ResourceKolab *res, const TQString &subResource, Q_UINT32 sernum,
+Event::Event( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 sernum,
               const TQString& tz, KCal::Event* event )
   : Incidence( res, subResource, sernum, tz ),
   mShowTimeAs( KCal::Event::Opaque ), mHasEndDate( false )
diff --git a/kresources/kolab/kcal/event.h b/kresources/kolab/kcal/event.h
index c45018ad..d9f1069a 100644
--- a/kresources/kolab/kcal/event.h
+++ b/kresources/kolab/kcal/event.h
@@ -54,13 +54,13 @@ public:
   /// Use this to parse an xml string to a event entry
   /// The caller is responsible for deleting the returned event
   static KCal::Event* xmlToEvent( const TQString& xml, const TQString& tz, KCal::ResourceKolab* res = 0,
-                                  const TQString& subResource = TQString::null, Q_UINT32 sernum = 0 );
+                                  const TQString& subResource = TQString::null, TQ_UINT32 sernum = 0 );
 
   /// Use this to get an xml string describing this event entry
   static TQString eventToXML( KCal::Event*, const TQString& tz );
 
   /// Create a event object and
-  explicit Event( KCal::ResourceKolab *res, const TQString &subResource, Q_UINT32 sernum,
+  explicit Event( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 sernum,
                   const TQString& tz, KCal::Event* event = 0 );
   virtual ~Event();
 
diff --git a/kresources/kolab/kcal/incidence.cpp b/kresources/kolab/kcal/incidence.cpp
index de076eb9..060b9b93 100644
--- a/kresources/kolab/kcal/incidence.cpp
+++ b/kresources/kolab/kcal/incidence.cpp
@@ -49,7 +49,7 @@
 using namespace Kolab;
 
 
-Incidence::Incidence( KCal::ResourceKolab *res, const TQString &subResource, Q_UINT32 sernum,
+Incidence::Incidence( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 sernum,
                       const TQString& tz )
   : KolabBase( tz ), mFloatingStatus( Unset ), mHasAlarm( false ),
     mResource( res ),
@@ -175,7 +175,7 @@ bool Incidence::loadAttendeeAttribute( TQDomElement& element,
       TQString tagName = e.tagName();
 
       if ( tagName == "display-name" ) {
-        // Quote the text in case it contains commas or other quotable chars.
+        // Quote the text in case it tqcontains commas or other quotable chars.
         TQString tusername = KPIM::quoteNameIfNecessary( e.text() );
 
         TQString tname, temail;
@@ -559,7 +559,7 @@ bool Incidence::saveAttributes( TQDomElement& element ) const
   saveAttachments( element );
   if ( mHasAlarm ) {
     // Alarms should be minutes before. Libkcal uses event time + alarm time
-    int alarmTime = qRound( -alarm() );
+    int alarmTime = tqRound( -alarm() );
     writeString( element, "alarm", TQString::number( alarmTime ) );
   }
   saveAlarms( element );
@@ -900,7 +900,7 @@ void Incidence::saveTo( KCal::Incidence* incidence )
 
   if ( mHasAlarm && mAlarms.isEmpty() ) {
     KCal::Alarm* alarm = incidence->newAlarm();
-    alarm->setStartOffset( qRound( mAlarm * 60.0 ) );
+    alarm->setStartOffset( tqRound( mAlarm * 60.0 ) );
     alarm->setEnabled( true );
     alarm->setType( KCal::Alarm::Display );
   } else if ( !mAlarms.isEmpty() ) {
diff --git a/kresources/kolab/kcal/incidence.h b/kresources/kolab/kcal/incidence.h
index 582d34c3..b3de2f91 100644
--- a/kresources/kolab/kcal/incidence.h
+++ b/kresources/kolab/kcal/incidence.h
@@ -77,7 +77,7 @@ public:
     TQString delegator;
   };
 
-  explicit Incidence( KCal::ResourceKolab *res, const TQString &subResource, Q_UINT32 sernum,
+  explicit Incidence( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 sernum,
                       const TQString& tz );
   virtual ~Incidence();
 
@@ -167,7 +167,7 @@ protected:
 
   KCal::ResourceKolab *mResource;
   TQString mSubResource;
-  Q_UINT32 mSernum;
+  TQ_UINT32 mSernum;
 };
 
 }
diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/kresources/kolab/kcal/resourcekolab.cpp
index 1f5f486f..5bbae761 100644
--- a/kresources/kolab/kcal/resourcekolab.cpp
+++ b/kresources/kolab/kcal/resourcekolab.cpp
@@ -70,7 +70,7 @@ static const char* incidenceInlineMimeType = "text/calendar";
 
 ResourceKolab::ResourceKolab( const KConfig *config )
   : ResourceCalendar( config ), ResourceKolabBase( "ResourceKolab-libkcal" ),
-    mCalendar( TQString::fromLatin1("UTC") ), mOpen( false ),mResourceChangedTimer( 0,
+    mCalendar( TQString::tqfromLatin1("UTC") ), mOpen( false ),mResourceChangedTimer( 0,
         "mResourceChangedTimer" ), mBatchAddingInProgress( false )
 {
   if ( !config ) {
@@ -170,7 +170,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource,
   const TQString labelTxt = !strcmp(mimetype, "application/x-vnd.kolab.task") ? i18n( "Loading tasks..." )
                            : !strcmp(mimetype, "application/x-vnd.kolab.journal") ? i18n( "Loading journals..." )
                            : i18n( "Loading events..." );
-  const bool useProgress = qApp && qApp->type() != TQApplication::Tty && count > mProgressDialogIncidenceLimit;
+  const bool useProgress = tqApp && tqApp->type() != TQApplication::Tty && count > mProgressDialogIncidenceLimit;
   if ( useProgress )
     (void)::Observer::self(); // ensure kio_uiserver is running
   UIServer_stub uiserver( "kio_uiserver", "UIServer" );
@@ -183,7 +183,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource,
   }
 
   for ( int startIndex = 0; startIndex < count; startIndex += nbMessages ) {
-    TQMap<Q_UINT32, TQString> lst;
+    TQMap<TQ_UINT32, TQString> lst;
     if ( !kmailIncidences( lst, mimetype, subResource, startIndex, nbMessages ) ) {
       kdError(5650) << "Communication problem in ResourceKolab::load()\n";
       if ( progressId )
@@ -193,7 +193,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource,
 
     { // for RAII scoping below
       TemporarySilencer t( this );
-      for( TQMap<Q_UINT32, TQString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
+      for( TQMap<TQ_UINT32, TQString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
         addIncidence( mimetype, it.data(), subResource, it.key() );
       }
     }
@@ -310,7 +310,7 @@ void ResourceKolab::incidenceUpdatedSilent( KCal::IncidenceBase* incidencebase )
   const TQString uid = incidencebase->uid();
   //kdDebug() << k_funcinfo << uid << endl;
 
-  if ( mUidsPendingUpdate.contains( uid ) || mUidsPendingAdding.contains( uid ) ) {
+  if ( mUidsPendingUpdate.tqcontains( uid ) || mUidsPendingAdding.tqcontains( uid ) ) {
     /* We are currently processing this event ( removing and readding or
      * adding it ). If so, ignore this update. Keep the last of these around
      * and process once we hear back from KMail on this event. */
@@ -336,7 +336,7 @@ void ResourceKolab::incidenceUpdatedSilent( KCal::IncidenceBase* incidencebase )
     if ( i ) {
       bool ignoreThisUpdate = false;
 
-      if ( !mLastKnownRevisions.contains( uid ) ) {
+      if ( !mLastKnownRevisions.tqcontains( uid ) ) {
         mLastKnownRevisions[uid] = i->revision();
       }
 
@@ -354,8 +354,8 @@ void ResourceKolab::incidenceUpdatedSilent( KCal::IncidenceBase* incidencebase )
   } // end optimization
 
   TQString subResource;
-  Q_UINT32 sernum = 0;
-  if ( mUidMap.contains( uid ) ) {
+  TQ_UINT32 sernum = 0;
+  if ( mUidMap.tqcontains( uid ) ) {
     subResource = mUidMap[ uid ].resource();
     sernum = mUidMap[ uid ].serialNumber();
     mUidsPendingUpdate.append( uid );
@@ -370,7 +370,7 @@ void ResourceKolab::incidenceUpdated( KCal::IncidenceBase* incidencebase )
   }
 
   incidencebase->setSyncStatusSilent( KCal::Event::SYNCMOD );
-  incidencebase->setLastModified( TQDateTime::currentDateTime() );
+  incidencebase->setLastModified( TQDateTime::tqcurrentDateTime() );
 
   // we should probably update the revision number here,
   // or internally in the Event itself when certain things change.
@@ -378,7 +378,7 @@ void ResourceKolab::incidenceUpdated( KCal::IncidenceBase* incidencebase )
   incidenceUpdatedSilent( incidencebase );
 }
 
-void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subresource, Q_UINT32 sernum )
+void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subresource, TQ_UINT32 sernum )
 {
   if ( !inc ) {
     return;
@@ -441,7 +441,7 @@ void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subre
    mSilent = silent;
 }
 void ResourceKolab::addIncidence( const char* mimetype, const TQString& data,
-                                  const TQString& subResource, Q_UINT32 sernum )
+                                  const TQString& subResource, TQ_UINT32 sernum )
 {
   // This uses pointer comparison, so it only works if we use the static
   // objects defined in the top of the file
@@ -459,7 +459,7 @@ void ResourceKolab::addIncidence( const char* mimetype, const TQString& data,
 
 
 bool ResourceKolab::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const TQString& subresource,
-                                     Q_UINT32 sernum )
+                                     TQ_UINT32 sernum )
 {
   const TQString& type = incidencebase->type();
   const char* mimetype = 0;
@@ -543,7 +543,7 @@ bool ResourceKolab::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const T
   // behold, sernum is an in-parameter
   const bool rc = kmailUpdate( subresource, sernum, data, mimetype, subject, customHeaders, attURLs, attMimeTypes, attNames, deletedAtts );
   // update the serial number
-  if ( mUidMap.contains( incidencebase->uid() ) ) {
+  if ( mUidMap.tqcontains( incidencebase->uid() ) ) {
     mUidMap[ incidencebase->uid() ].setSerialNumber( sernum );
   }
 
@@ -556,7 +556,7 @@ bool ResourceKolab::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const T
 }
 
 bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _subresource,
-                                  Q_UINT32 sernum )
+                                  TQ_UINT32 sernum )
 {
   Q_ASSERT( incidence );
   if ( !incidence ) {
@@ -629,7 +629,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
 
       // Lets not warn the user 100 times that there's no writable resource
       // and not ask 100 times which resource to use
-      if ( !mBatchAddingInProgress || !mLastUsedResources.contains( type ) ) {
+      if ( !mBatchAddingInProgress || !mLastUsedResources.tqcontains( type ) ) {
         subResource = findWritableResource( type, *map, text );
         mLastUsedResources[type] = subResource;
       } else {
@@ -676,7 +676,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
       }
     }
   } else { /* KMail told us */
-    const bool ourOwnUpdate = mUidsPendingUpdate.contains(  uid );
+    const bool ourOwnUpdate = mUidsPendingUpdate.tqcontains(  uid );
     kdDebug( 5650 ) << "addIncidence: ourOwnUpdate " << ourOwnUpdate << endl;
     /* Check if we updated this one, which means kmail deleted and added it.
      * We know the new state, so lets just not do much at all. The old incidence
@@ -692,7 +692,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
        * unless the folder is read-only, in which case the user should not be
        * offered a means of putting mails in a folder she'll later be unable to
        * upload. Skip the incidence, in this case. */
-      if ( mUidMap.contains( uid ) ) {
+      if ( mUidMap.tqcontains( uid ) ) {
         if ( mUidMap[ uid ].resource() == subResource ) {
           if ( (*map)[ subResource ].writable() ) {
             kdDebug( 5650 ) << "lets resolve the conflict " << endl;
@@ -716,7 +716,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
       }
       /* Add to the cache if the add didn't come from KOrganizer, in which case
        * we've already added it, and listen to updates from KOrganizer for it. */
-      if ( !mUidsPendingAdding.contains( uid ) ) {
+      if ( !mUidsPendingAdding.tqcontains( uid ) ) {
         mCalendar.addIncidence( incidence );
         incidence->registerObserver( this );
       }
@@ -733,7 +733,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
     } else {
       /* If the uid was added by KMail, KOrganizer needs to be told, so
        * schedule emitting of the resourceChanged signal. */
-      if ( !mUidsPendingAdding.contains( uid ) ) {
+      if ( !mUidsPendingAdding.tqcontains( uid ) ) {
         if ( !ourOwnUpdate ) mResourceChangedTimer.changeInterval( 100 );
       } else {
         mUidsPendingAdding.remove( uid );
@@ -752,7 +752,7 @@ bool ResourceKolab::addEvent( KCal::Event *event )
 
 bool ResourceKolab::addEvent( KCal::Event *event, const TQString &subResource )
 {
-  if ( mUidMap.contains( event->uid() ) ) {
+  if ( mUidMap.tqcontains( event->uid() ) ) {
     return true; //noop
   } else {
     return addIncidence( event, subResource, 0 );
@@ -760,7 +760,7 @@ bool ResourceKolab::addEvent( KCal::Event *event, const TQString &subResource )
 }
 
 void ResourceKolab::addEvent( const TQString& xml, const TQString& subresource,
-                              Q_UINT32 sernum )
+                              TQ_UINT32 sernum )
 {
   KCal::Event* event = Kolab::Event::xmlToEvent( xml, mCalendar.timeZoneId(), this, subresource, sernum );
   Q_ASSERT( event );
@@ -776,7 +776,7 @@ bool ResourceKolab::deleteIncidence( KCal::Incidence* incidence )
   }
 
   const TQString uid = incidence->uid();
-  if( !mUidMap.contains( uid ) ) return false; // Odd
+  if( !mUidMap.tqcontains( uid ) ) return false; // Odd
   /* The user told us to delete, tell KMail */
   if ( !mSilent ) {
     kmailDeleteIncidence( mUidMap[ uid ].resource(),
@@ -832,7 +832,7 @@ bool ResourceKolab::addTodo( KCal::Todo *todo )
 
 bool ResourceKolab::addTodo( KCal::Todo *todo, const TQString &subResource )
 {
-  if ( mUidMap.contains( todo->uid() ) ) {
+  if ( mUidMap.tqcontains( todo->uid() ) ) {
     return true; //noop
   } else {
     return addIncidence( todo, subResource, 0 );
@@ -840,7 +840,7 @@ bool ResourceKolab::addTodo( KCal::Todo *todo, const TQString &subResource )
 }
 
 void ResourceKolab::addTodo( const TQString& xml, const TQString& subresource,
-                             Q_UINT32 sernum )
+                             TQ_UINT32 sernum )
 {
   KCal::Todo* todo = Kolab::Task::xmlToTask( xml, mCalendar.timeZoneId(), this, subresource, sernum );
   Q_ASSERT( todo );
@@ -876,14 +876,14 @@ bool ResourceKolab::addJournal( KCal::Journal *journal )
 
 bool ResourceKolab::addJournal( KCal::Journal *journal, const TQString &subResource )
 {
-  if ( mUidMap.contains( journal->uid() ) )
+  if ( mUidMap.tqcontains( journal->uid() ) )
     return true; //noop
   else
     return addIncidence( journal, subResource, 0 );
 }
 
 void ResourceKolab::addJournal( const TQString& xml, const TQString& subresource,
-                                Q_UINT32 sernum )
+                                TQ_UINT32 sernum )
 {
   KCal::Journal* journal =
     Kolab::Journal::xmlToJournal( xml, mCalendar.timeZoneId() );
@@ -921,12 +921,12 @@ KCal::Alarm::List ResourceKolab::relevantAlarms( const KCal::Alarm::List &alarms
     KCal::Alarm *a = (*it);
     ++it;
     const TQString &uid = a->parent()->uid();
-     if ( mUidMap.contains( uid ) ) {
+     if ( mUidMap.tqcontains( uid ) ) {
        const TQString &sr = mUidMap[ uid ].resource();
        Kolab::SubResource *subResource = 0;
-       if ( mEventSubResources.contains( sr ) )
+       if ( mEventSubResources.tqcontains( sr ) )
           subResource = &( mEventSubResources[ sr ] );
-       else if ( mTodoSubResources.contains( sr ) )
+       else if ( mTodoSubResources.tqcontains( sr ) )
           subResource = &( mTodoSubResources[ sr ] );
        assert( subResource );
        if ( subResource->alarmRelevant() )
@@ -960,7 +960,7 @@ void ResourceKolab::setTimeZoneId( const TQString& tzid )
 
 bool ResourceKolab::fromKMailAddIncidence( const TQString& type,
                                            const TQString& subResource,
-                                           Q_UINT32 sernum,
+                                           TQ_UINT32 sernum,
                                            int format,
                                            const TQString& data )
 {
@@ -1011,14 +1011,14 @@ void ResourceKolab::fromKMailDelIncidence( const TQString& type,
   // Can't be in both, by contract
   if ( mUidsPendingDeletion.find( uid ) != mUidsPendingDeletion.end() ) {
     mUidsPendingDeletion.remove( mUidsPendingDeletion.find( uid ) );
-  } else if ( mUidsPendingUpdate.contains( uid ) ) {
+  } else if ( mUidsPendingUpdate.tqcontains( uid ) ) {
     // It's good to know if was deleted, but we are waiting on a new one to
-    // replace it, so let's just sit tight.
+    // tqreplace it, so let's just sit tight.
   } else {
     TQString uidToUse;
 
     QPair<TQString, TQString> p( uid, subResource );
-    if ( mOriginalUID2fakeUID.contains( p ) ) {
+    if ( mOriginalUID2fakeUID.tqcontains( p ) ) {
       // Incidence with the same uid in a different folder...
       // use the UID that addIncidence(...) generated
       uidToUse = mOriginalUID2fakeUID[p];
@@ -1073,7 +1073,7 @@ void ResourceKolab::fromKMailAddSubresource( const TQString& type,
     // Not ours
     return;
 
-  if ( map->contains( subResource ) )
+  if ( map->tqcontains( subResource ) )
     // Already registered
     return;
 
@@ -1093,7 +1093,7 @@ void ResourceKolab::fromKMailDelSubresource( const TQString& type,
   ResourceMap* map = subResourceMap( type );
   if ( !map ) // not ours
     return;
-  if ( map->contains( subResource ) )
+  if ( map->tqcontains( subResource ) )
     map->erase( subResource );
   else
     // Not registered
@@ -1122,21 +1122,21 @@ TQStringList ResourceKolab::subresources() const
 const QString
 ResourceKolab::labelForSubresource( const TQString& subresource ) const
 {
-  if ( mEventSubResources.contains( subresource ) )
+  if ( mEventSubResources.tqcontains( subresource ) )
     return mEventSubResources[ subresource ].label();
-  if ( mTodoSubResources.contains( subresource ) )
+  if ( mTodoSubResources.tqcontains( subresource ) )
     return mTodoSubResources[ subresource ].label();
-  if ( mJournalSubResources.contains( subresource ) )
+  if ( mJournalSubResources.tqcontains( subresource ) )
     return mJournalSubResources[ subresource ].label();
   return subresource;
 }
 
-void ResourceKolab::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+void ResourceKolab::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                               const TQString& type,
                                               const TQString& folder )
 {
   TemporarySilencer t( this );
-  for( TQMap<Q_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it )
+  for( TQMap<TQ_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it )
     addIncidence( type.latin1(), it.data(), folder, it.key() );
 }
 
@@ -1146,11 +1146,11 @@ bool ResourceKolab::subresourceActive( const TQString& subresource ) const
   // before it opens the resource :-( Make sure we are open
   const_cast<ResourceKolab*>( this )->doOpen();
 
-  if ( mEventSubResources.contains( subresource ) )
+  if ( mEventSubResources.tqcontains( subresource ) )
     return mEventSubResources[ subresource ].active();
-  if ( mTodoSubResources.contains( subresource ) )
+  if ( mTodoSubResources.tqcontains( subresource ) )
     return mTodoSubResources[ subresource ].active();
-  if ( mJournalSubResources.contains( subresource ) )
+  if ( mJournalSubResources.tqcontains( subresource ) )
     return mJournalSubResources[ subresource ].active();
 
   // Safe default bet:
@@ -1163,15 +1163,15 @@ void ResourceKolab::setSubresourceActive( const TQString &subresource, bool v )
 {
   ResourceMap *map = 0;
   const char* mimeType = 0;
-  if ( mEventSubResources.contains( subresource ) ) {
+  if ( mEventSubResources.tqcontains( subresource ) ) {
      map = &mEventSubResources;
      mimeType = eventAttachmentMimeType;
   }
-  if ( mTodoSubResources.contains( subresource ) ) {
+  if ( mTodoSubResources.tqcontains( subresource ) ) {
      map = &mTodoSubResources;
      mimeType = todoAttachmentMimeType;
   }
-  if ( mJournalSubResources.contains( subresource ) ) {
+  if ( mJournalSubResources.tqcontains( subresource ) ) {
      map = &mJournalSubResources;
      mimeType = journalAttachmentMimeType;
   }
@@ -1194,11 +1194,11 @@ bool ResourceKolab::subresourceWritable( const TQString& subresource ) const
   // before it opens the resource :-( Make sure we are open
   const_cast<ResourceKolab*>( this )->doOpen();
 
-  if ( mEventSubResources.contains( subresource ) )
+  if ( mEventSubResources.tqcontains( subresource ) )
     return mEventSubResources[ subresource ].writable();
-  if ( mTodoSubResources.contains( subresource ) )
+  if ( mTodoSubResources.tqcontains( subresource ) )
     return mTodoSubResources[ subresource ].writable();
-  if ( mJournalSubResources.contains( subresource ) )
+  if ( mJournalSubResources.tqcontains( subresource ) )
     return mJournalSubResources[ subresource ].writable();
 
   return false; //better a safe default
@@ -1236,11 +1236,11 @@ bool ResourceKolab::addSubresource( const TQString& resource, const TQString& pa
    kdDebug(5650) << "KCal Kolab resource - adding subresource: " << resource << endl;
    TQString contentsType = kmailCalendarContentsType;
    if ( !parent.isEmpty() ) {
-     if ( mEventSubResources.contains( parent ) )
+     if ( mEventSubResources.tqcontains( parent ) )
        contentsType = kmailCalendarContentsType;
-     else if ( mTodoSubResources.contains( parent ) )
+     else if ( mTodoSubResources.tqcontains( parent ) )
        contentsType = kmailTodoContentsType;
-     else if ( mJournalSubResources.contains( parent ) )
+     else if ( mJournalSubResources.tqcontains( parent ) )
        contentsType = kmailJournalContentsType;
    } else {
      TQStringList contentTypeChoices;
@@ -1269,10 +1269,10 @@ bool ResourceKolab::removeSubresource( const TQString& resource )
 TQString ResourceKolab::subresourceIdentifier( Incidence *incidence )
 {
   TQString uid = incidence->uid();
-  if ( mUidMap.contains( uid ) )
+  if ( mUidMap.tqcontains( uid ) )
     return mUidMap[ uid ].resource();
   else
-    if ( mNewIncidencesMap.contains( uid ) )
+    if ( mNewIncidencesMap.tqcontains( uid ) )
       return mNewIncidencesMap[ uid ];
     else
       return TQString();
@@ -1311,11 +1311,11 @@ bool ResourceKolab::unloadSubResource( const TQString& subResource )
 
 TQString ResourceKolab::subresourceType( const TQString &resource )
 {
-  if ( mEventSubResources.contains( resource ) )
+  if ( mEventSubResources.tqcontains( resource ) )
     return "event";
-  if ( mTodoSubResources.contains( resource ) )
+  if ( mTodoSubResources.tqcontains( resource ) )
     return "todo";
-  if ( mJournalSubResources.contains( resource ) )
+  if ( mJournalSubResources.tqcontains( resource ) )
     return "journal";
   return TQString();
 }
diff --git a/kresources/kolab/kcal/resourcekolab.h b/kresources/kolab/kcal/resourcekolab.h
index dda5ba32..fd4c3b57 100644
--- a/kresources/kolab/kcal/resourcekolab.h
+++ b/kresources/kolab/kcal/resourcekolab.h
@@ -106,7 +106,7 @@ public:
 
   /// The ResourceKolabBase methods called by KMail
   bool fromKMailAddIncidence( const TQString& type, const TQString& subResource,
-                              Q_UINT32 sernum, int format, const TQString& data );
+                              TQ_UINT32 sernum, int format, const TQString& data );
   void fromKMailDelIncidence( const TQString& type, const TQString& subResource,
                               const TQString& uid );
   void fromKMailRefresh( const TQString& type, const TQString& subResource );
@@ -117,7 +117,7 @@ public:
                                 bool alarmRelevant );
   void fromKMailDelSubresource( const TQString& type, const TQString& subResource );
 
-  void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+  void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                  const TQString& type,
                                  const TQString& folder );
 
@@ -165,23 +165,23 @@ protected:
 
 private:
   void removeIncidences( const TQCString& incidenceType );
-  void resolveConflict( KCal::Incidence*, const TQString& subresource, Q_UINT32 sernum );
+  void resolveConflict( KCal::Incidence*, const TQString& subresource, TQ_UINT32 sernum );
   void addIncidence( const char* mimetype, const TQString& xml,
-                     const TQString& subResource, Q_UINT32 sernum );
+                     const TQString& subResource, TQ_UINT32 sernum );
 
 
   /**
      Caller guarantees i is not null.
    */
   bool addIncidence( KCal::Incidence *i, const TQString& subresource,
-                     Q_UINT32 sernum );
+                     TQ_UINT32 sernum );
 
   void addEvent( const TQString& xml, const TQString& subresource,
-                 Q_UINT32 sernum );
+                 TQ_UINT32 sernum );
   void addTodo( const TQString& xml, const TQString& subresource,
-                Q_UINT32 sernum );
+                TQ_UINT32 sernum );
   void addJournal( const TQString& xml, const TQString& subresource,
-                   Q_UINT32 sernum );
+                   TQ_UINT32 sernum );
 
 
   bool loadAllEvents();
@@ -209,7 +209,7 @@ private:
   Kolab::ResourceMap* subResourceMap( const TQString& contentsType );
 
   bool sendKMailUpdate( KCal::IncidenceBase* incidence, const TQString& _subresource,
-                        Q_UINT32 sernum );
+                        TQ_UINT32 sernum );
 
 
   KCal::CalendarLocal mCalendar;
@@ -223,11 +223,11 @@ private:
   ICalFormat mFormat;
 
   /**
-    This map contains the association between a new added incidence
+    This map tqcontains the association between a new added incidence
     and the subresource it belongs to.
     That's needed to return the correct mapping in subresourceIdentifier().
 
-    We can't trust on mUidMap here, because it contains only non-pending uids.
+    We can't trust on mUidMap here, because it tqcontains only non-pending uids.
    */
   TQMap<TQString, TQString> mNewIncidencesMap;
   int mProgressDialogIncidenceLimit;
diff --git a/kresources/kolab/kcal/task.cpp b/kresources/kolab/kcal/task.cpp
index 36876b7d..33cc50ee 100644
--- a/kresources/kolab/kcal/task.cpp
+++ b/kresources/kolab/kcal/task.cpp
@@ -75,7 +75,7 @@ static int kolabPrioritytoKCal( const int kolabPriority )
 }
 
 KCal::Todo* Task::xmlToTask( const TQString& xml, const TQString& tz, KCal::ResourceKolab *res,
-                             const TQString& subResource, Q_UINT32 sernum )
+                             const TQString& subResource, TQ_UINT32 sernum )
 {
   Task task( res, subResource, sernum, tz );
   task.load( xml );
@@ -90,7 +90,7 @@ TQString Task::taskToXML( KCal::Todo* todo, const TQString& tz )
   return task.saveXML();
 }
 
-Task::Task( KCal::ResourceKolab *res, const TQString &subResource, Q_UINT32 sernum,
+Task::Task( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 sernum,
             const TQString& tz, KCal::Todo* task )
   : Incidence( res, subResource, sernum, tz ),
     mPriority( 5 ), mPercentCompleted( 0 ),
@@ -126,7 +126,7 @@ int Task::percentCompleted() const
   return mPercentCompleted;
 }
 
-void Task::setStatus( KCal::Incidence::Status status )
+void Task::seStatus( KCal::Incidence::Status status )
 {
   mStatus = status;
 }
@@ -234,17 +234,17 @@ bool Task::loadAttribute( TQDomElement& element )
     setPercentCompleted( percent );
   } else if ( tagName == "status" ) {
     if ( element.text() == "in-progress" )
-      setStatus( KCal::Incidence::StatusInProcess );
+      seStatus( KCal::Incidence::StatusInProcess );
     else if ( element.text() == "completed" )
-      setStatus( KCal::Incidence::StatusCompleted );
+      seStatus( KCal::Incidence::StatusCompleted );
     else if ( element.text() == "waiting-on-someone-else" )
-      setStatus( KCal::Incidence::StatusNeedsAction );
+      seStatus( KCal::Incidence::StatusNeedsAction );
     else if ( element.text() == "deferred" )
       // Guessing a status here
-      setStatus( KCal::Incidence::StatusCanceled );
+      seStatus( KCal::Incidence::StatusCanceled );
     else
       // Default
-      setStatus( KCal::Incidence::StatusNone );
+      seStatus( KCal::Incidence::StatusNone );
   } else if ( tagName == "due-date" ) {
     setDueDate( element.text() );
   } else if ( tagName == "parent" ) {
@@ -374,7 +374,7 @@ void Task::setFields( const KCal::Todo* task )
 
   setPriority( task->priority() );
   setPercentCompleted( task->percentComplete() );
-  setStatus( task->status() );
+  seStatus( task->status() );
   setHasStartDate( task->hasStartDate() );
 
   if ( task->hasDueDate() ) {
@@ -447,7 +447,7 @@ void Task::saveTo( KCal::Todo* task )
 
   task->setPriority( priority() );
   task->setPercentComplete( percentCompleted() );
-  task->setStatus( status() );
+  task->seStatus( status() );
   task->setHasStartDate( hasStartDate() );
   task->setHasDueDate( hasDueDate() );
   if ( hasDueDate() )
diff --git a/kresources/kolab/kcal/task.h b/kresources/kolab/kcal/task.h
index f7e7c6d5..6fe318e2 100644
--- a/kresources/kolab/kcal/task.h
+++ b/kresources/kolab/kcal/task.h
@@ -58,12 +58,12 @@ public:
   /// Use this to parse an xml string to a task entry
   /// The caller is responsible for deleting the returned task
   static KCal::Todo* xmlToTask( const TQString& xml, const TQString& tz, KCal::ResourceKolab *res = 0,
-                                const TQString& subResource = TQString::null, Q_UINT32 sernum = 0 );
+                                const TQString& subResource = TQString::null, TQ_UINT32 sernum = 0 );
 
   /// Use this to get an xml string describing this task entry
   static TQString taskToXML( KCal::Todo*, const TQString& tz );
 
-  explicit Task( KCal::ResourceKolab *res, const TQString& subResource, Q_UINT32 sernum,
+  explicit Task( KCal::ResourceKolab *res, const TQString& subResource, TQ_UINT32 sernum,
                  const TQString& tz, KCal::Todo* todo = 0 );
   virtual ~Task();
 
@@ -77,7 +77,7 @@ public:
   virtual void setPercentCompleted( int percent );
   virtual int percentCompleted() const;
 
-  virtual void setStatus( KCal::Incidence::Status status );
+  virtual void seStatus( KCal::Incidence::Status status );
   virtual KCal::Incidence::Status status() const;
 
   virtual void setParent( const TQString& parentUid );
diff --git a/kresources/kolab/knotes/resourcekolab.cpp b/kresources/kolab/knotes/resourcekolab.cpp
index d917d0ac..38f67087 100644
--- a/kresources/kolab/knotes/resourcekolab.cpp
+++ b/kresources/kolab/knotes/resourcekolab.cpp
@@ -52,7 +52,7 @@ static const char* inlineMimeType = "text/calendar";
 
 ResourceKolab::ResourceKolab( const KConfig *config )
   : ResourceNotes( config ), ResourceKolabBase( "ResourceKolab-KNotes" ),
-    mCalendar( TQString::fromLatin1("UTC") )
+    mCalendar( TQString::tqfromLatin1("UTC") )
 {
   if ( !config ) {
     setResourceName( i18n( "Kolab Server" ) );
@@ -105,7 +105,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource,
     return false;
   }
 
-  TQMap<Q_UINT32, TQString> lst;
+  TQMap<TQ_UINT32, TQString> lst;
   if( !kmailIncidences( lst, mimetype, subResource, 0, count ) ) {
     kdError(5500) << "Communication problem in "
                   << "ResourceKolab::getIncidenceList()\n";
@@ -117,7 +117,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource,
   // Populate with the new entries
   const bool silent = mSilent;
   mSilent = true;
-  TQMap<Q_UINT32, TQString>::ConstIterator it;
+  TQMap<TQ_UINT32, TQString>::ConstIterator it;
   for ( it = lst.constBegin(); it != lst.constEnd(); ++it ) {
     KCal::Journal* journal = addNote( it.data(), subResource, it.key(), mimetype );
     if ( !journal )
@@ -164,7 +164,7 @@ bool ResourceKolab::addNote( KCal::Journal* journal )
 }
 
 KCal::Journal* ResourceKolab::addNote( const TQString& data, const TQString& subresource,
-                             Q_UINT32 sernum, const TQString &mimetype )
+                             TQ_UINT32 sernum, const TQString &mimetype )
 {
   KCal::Journal *journal = 0;
 
@@ -178,12 +178,12 @@ KCal::Journal* ResourceKolab::addNote( const TQString& data, const TQString& sub
   Q_ASSERT( journal );
 
   bool addedOk = journal &&
-                 !mUidMap.contains( journal->uid() ) &&
+                 !mUidMap.tqcontains( journal->uid() ) &&
                  addNote( journal, subresource, sernum );
 
   // for debugging
-  if ( journal && mUidMap.contains( journal->uid() ) ) {
-    kdDebug(5500) << "mUidMap already contains " << journal->uid() << endl;
+  if ( journal && mUidMap.tqcontains( journal->uid() ) ) {
+    kdDebug(5500) << "mUidMap already tqcontains " << journal->uid() << endl;
   }
 
   if ( !addedOk ) {
@@ -194,7 +194,7 @@ KCal::Journal* ResourceKolab::addNote( const TQString& data, const TQString& sub
   return journal;
 }
 
-bool ResourceKolab::addNote( KCal::Journal *journal, const TQString &subresource, Q_UINT32 sernum )
+bool ResourceKolab::addNote( KCal::Journal *journal, const TQString &subresource, TQ_UINT32 sernum )
 {
   kdDebug(5500) << "ResourceKolab::addNote( KCal::Journal*, '" << subresource << "', " << sernum << " )\n";
 
@@ -232,7 +232,7 @@ bool ResourceKolab::addNote( KCal::Journal *journal, const TQString &subresource
 bool ResourceKolab::deleteNote( KCal::Journal* journal )
 {
   const TQString uid = journal->uid();
-  if ( !mUidMap.contains( uid ) )
+  if ( !mUidMap.tqcontains( uid ) )
     // Odd
     return false;
 
@@ -270,8 +270,8 @@ KCal::Alarm::List ResourceKolab::alarms( const TQDateTime& from, const TQDateTim
 void ResourceKolab::incidenceUpdated( KCal::IncidenceBase* i )
 {
   TQString subResource;
-  Q_UINT32 sernum;
-  if ( mUidMap.contains( i->uid() ) ) {
+  TQ_UINT32 sernum;
+  if ( mUidMap.tqcontains( i->uid() ) ) {
     subResource = mUidMap[ i->uid() ].resource();
     sernum = mUidMap[ i->uid() ].serialNumber();
   } else { // can this happen?
@@ -293,7 +293,7 @@ void ResourceKolab::incidenceUpdated( KCal::IncidenceBase* i )
  */
 bool ResourceKolab::fromKMailAddIncidence( const TQString& type,
                                            const TQString& subResource,
-                                           Q_UINT32 sernum,
+                                           TQ_UINT32 sernum,
                                            int format,
                                            const TQString& note )
 {
@@ -352,7 +352,7 @@ void ResourceKolab::fromKMailAddSubresource( const TQString& type,
     // Not ours
     return;
 
-  if ( mSubResources.contains( subResource ) )
+  if ( mSubResources.tqcontains( subResource ) )
     // Already registered
     return;
 
@@ -372,7 +372,7 @@ void ResourceKolab::fromKMailDelSubresource( const TQString& type,
     // Not ours
     return;
 
-  if ( !mSubResources.contains( subResource ) )
+  if ( !mSubResources.tqcontains( subResource ) )
     // Not registered
     return;
 
@@ -408,7 +408,7 @@ void ResourceKolab::fromKMailDelSubresource( const TQString& type,
   emit signalSubresourceRemoved( this, type, subResource );
 }
 
-void ResourceKolab::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+void ResourceKolab::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                               const TQString& type,
                                               const TQString& folder )
 {
@@ -422,7 +422,7 @@ void ResourceKolab::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& m
     mimetype = attachmentMimeType;
   else
     mimetype = inlineMimeType;
-  for( TQMap<Q_UINT32, TQString>::ConstIterator it = map.constBegin(); it != map.constEnd(); ++it ) {
+  for( TQMap<TQ_UINT32, TQString>::ConstIterator it = map.constBegin(); it != map.constEnd(); ++it ) {
     KCal::Journal* journal = addNote( it.data(), folder, it.key(), mimetype );
     if ( !journal )
       kdDebug(5500) << "loading note " << it.key() << " failed" << endl;
@@ -440,7 +440,7 @@ TQStringList ResourceKolab::subresources() const
 
 bool ResourceKolab::subresourceActive( const TQString& res ) const
 {
-  if ( mSubResources.contains( res ) ) {
+  if ( mSubResources.tqcontains( res ) ) {
     return mSubResources[ res ].active();
   }
 
@@ -452,7 +452,7 @@ bool ResourceKolab::subresourceActive( const TQString& res ) const
 
 bool ResourceKolab::subresourceWritable( const TQString& res ) const
 {
-  if ( mSubResources.contains( res ) ) {
+  if ( mSubResources.tqcontains( res ) ) {
     return mSubResources[ res ].writable();
   }
 
diff --git a/kresources/kolab/knotes/resourcekolab.h b/kresources/kolab/knotes/resourcekolab.h
index 6ff994cc..cfeeb0eb 100644
--- a/kresources/kolab/knotes/resourcekolab.h
+++ b/kresources/kolab/knotes/resourcekolab.h
@@ -81,7 +81,7 @@ public:
 
   /// The ResourceKolabBase methods called by KMail
   bool fromKMailAddIncidence( const TQString& type, const TQString& resource,
-                              Q_UINT32 sernum, int format, const TQString& note );
+                              TQ_UINT32 sernum, int format, const TQString& note );
   void fromKMailDelIncidence( const TQString& type, const TQString& resource,
                               const TQString& uid );
   void fromKMailRefresh( const TQString& type, const TQString& resource );
@@ -92,7 +92,7 @@ public:
                                 bool alarmRelevant );
   void fromKMailDelSubresource( const TQString& type, const TQString& resource );
 
-  void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+  void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                  const TQString& type,
                                  const TQString& folder );
 
@@ -111,9 +111,9 @@ signals:
 
 private:
   bool addNote( KCal::Journal* journal, const TQString& resource,
-                Q_UINT32 sernum );
+                TQ_UINT32 sernum );
   KCal::Journal* addNote( const TQString& data, const TQString& subresource,
-                          Q_UINT32 sernum, const TQString &mimetype );
+                          TQ_UINT32 sernum, const TQString &mimetype );
 
   bool loadSubResource( const TQString& resource, const TQString& mimetype );
 
diff --git a/kresources/kolab/shared/kmailconnection.cpp b/kresources/kolab/shared/kmailconnection.cpp
index 66674abf..5b2921b9 100644
--- a/kresources/kolab/shared/kmailconnection.cpp
+++ b/kresources/kolab/shared/kmailconnection.cpp
@@ -85,7 +85,7 @@ bool KMailConnection::connectToKMail()
         if ( services[i].find( "anonymous" ) == 0 ) // querying anonymous-XXXXX deadlocks as well, what are those anyway?
           continue; 
         const QCStringList objs = kapp->dcopClient()->remoteObjects( services[i] );
-        if ( objs.contains( dcopObjectId ) ) {
+        if ( objs.tqcontains( dcopObjectId ) ) {
           dcopService = services[i];
           break;
         }
@@ -111,8 +111,8 @@ bool KMailConnection::connectToKMail()
                                                    dcopService, dcopObjectId );
 
     // Attach to the KMail signals
-    if ( !connectKMailSignal( "incidenceAdded(TQString,TQString,Q_UINT32,int,TQString)",
-                              "fromKMailAddIncidence(TQString,TQString,Q_UINT32,int,TQString)" ) )
+    if ( !connectKMailSignal( "incidenceAdded(TQString,TQString,TQ_UINT32,int,TQString)",
+                              "fromKMailAddIncidence(TQString,TQString,TQ_UINT32,int,TQString)" ) )
       kdError(5650) << "DCOP connection to incidenceAdded failed" << endl;
     if ( !connectKMailSignal( "incidenceDeleted(TQString,TQString,TQString)",
                               "fromKMailDelIncidence(TQString,TQString,TQString)" ) )
@@ -126,8 +126,8 @@ bool KMailConnection::connectToKMail()
     if ( !connectKMailSignal( "subresourceDeleted(TQString,TQString)",
                               "fromKMailDelSubresource(TQString,TQString)" ) )
       kdError(5650) << "DCOP connection to subresourceDeleted failed" << endl;
-    if ( !connectKMailSignal( "asyncLoadResult(TQMap<Q_UINT32, TQString>, TQString, TQString)",
-                              "fromKMailAsyncLoadResult(TQMap<Q_UINT32, TQString>, TQString, TQString)" ) )
+    if ( !connectKMailSignal( "asyncLoadResult(TQMap<TQ_UINT32, TQString>, TQString, TQString)",
+                              "fromKMailAsyncLoadResult(TQMap<TQ_UINT32, TQString>, TQString, TQString)" ) )
       kdError(5650) << "DCOP connection to asyncLoadResult failed" << endl;
   }
 
@@ -136,7 +136,7 @@ bool KMailConnection::connectToKMail()
 
 bool KMailConnection::fromKMailAddIncidence( const TQString& type,
                                              const TQString& folder,
-                                             Q_UINT32 sernum,
+                                             TQ_UINT32 sernum,
                                              int format,
                                              const TQString& data )
 {
@@ -184,7 +184,7 @@ void KMailConnection::fromKMailDelSubresource( const TQString& type,
   mResource->fromKMailDelSubresource( type, resource );
 }
 
-void KMailConnection::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+void KMailConnection::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                                 const TQString& type,
                                                 const TQString& folder )
 {
@@ -219,7 +219,7 @@ bool KMailConnection::kmailIncidencesCount( int& count,
   return mKMailIcalIfaceStub->ok();
 }
 
-bool KMailConnection::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
+bool KMailConnection::kmailIncidences( TQMap<TQ_UINT32, TQString>& lst,
                                        const TQString& mimetype,
                                        const TQString& resource,
                                        int startIndex,
@@ -235,7 +235,7 @@ bool KMailConnection::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
 
 bool KMailConnection::kmailGetAttachment( KURL& url,
                                           const TQString& resource,
-                                          Q_UINT32 sernum,
+                                          TQ_UINT32 sernum,
                                           const TQString& filename )
 {
   if ( !connectToKMail() )
@@ -247,7 +247,7 @@ bool KMailConnection::kmailGetAttachment( KURL& url,
 
 bool KMailConnection::kmailAttachmentMimetype( TQString & mimeType,
                                                const TQString & resource,
-                                               Q_UINT32 sernum,
+                                               TQ_UINT32 sernum,
                                                const TQString & filename )
 {
   if ( !connectToKMail() )
@@ -257,7 +257,7 @@ bool KMailConnection::kmailAttachmentMimetype( TQString & mimeType,
 }
 
 bool KMailConnection::kmailListAttachments(TQStringList &list,
-                                            const TQString & resource, Q_UINT32 sernum)
+                                            const TQString & resource, TQ_UINT32 sernum)
 {
   if ( !connectToKMail() )
     return false;
@@ -267,7 +267,7 @@ bool KMailConnection::kmailListAttachments(TQStringList &list,
 }
 
 bool KMailConnection::kmailDeleteIncidence( const TQString& resource,
-                                            Q_UINT32 sernum )
+                                            TQ_UINT32 sernum )
 {
   return connectToKMail()
     && mKMailIcalIfaceStub->deleteIncidenceKolab( resource, sernum )
@@ -275,7 +275,7 @@ bool KMailConnection::kmailDeleteIncidence( const TQString& resource,
 }
 
 bool KMailConnection::kmailUpdate( const TQString& resource,
-                                   Q_UINT32& sernum,
+                                   TQ_UINT32& sernum,
                                    const TQString& subject,
                                    const TQString& plainTextBody,
                                    const TQMap<TQCString, TQString>& customHeaders,
diff --git a/kresources/kolab/shared/kmailconnection.h b/kresources/kolab/shared/kmailconnection.h
index 16b80bfb..3cf5b826 100644
--- a/kresources/kolab/shared/kmailconnection.h
+++ b/kresources/kolab/shared/kmailconnection.h
@@ -55,7 +55,7 @@ class KMailConnection : public TQObject, public DCOPObject {
   // These are the methods called by KMail when the resource changes
 k_dcop:
   bool fromKMailAddIncidence( const TQString& type, const TQString& resource,
-                              Q_UINT32 sernum, int format, const TQString& xml );
+                              TQ_UINT32 sernum, int format, const TQString& xml );
   void fromKMailDelIncidence( const TQString& type, const TQString& resource,
                               const TQString& xml );
   void fromKMailRefresh( const TQString& type, const TQString& resource );
@@ -63,7 +63,7 @@ k_dcop:
                                 const TQString& label, bool writable,
                                 bool alarmRelevant );
   void fromKMailDelSubresource( const TQString& type, const TQString& resource );
-  void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map, const TQString& type,
+  void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map, const TQString& type,
                                  const TQString& folder );
 
 public:
@@ -81,20 +81,20 @@ public:
   bool kmailIncidencesCount( int& count,
                              const TQString& mimetype,
                              const TQString& resource );
-  bool kmailIncidences( TQMap<Q_UINT32, TQString>& lst, const TQString& mimetype,
+  bool kmailIncidences( TQMap<TQ_UINT32, TQString>& lst, const TQString& mimetype,
                         const TQString& resource,
                         int startIndex,
                         int nbMessages );
 
-  bool kmailGetAttachment( KURL& url, const TQString& resource, Q_UINT32 sernum,
+  bool kmailGetAttachment( KURL& url, const TQString& resource, TQ_UINT32 sernum,
                            const TQString& filename );
   bool kmailAttachmentMimetype( TQString &mimeType, const TQString &resource,
-                                Q_UINT32 sernum, const TQString &filename );
+                                TQ_UINT32 sernum, const TQString &filename );
   bool kmailListAttachments( TQStringList &list, const TQString &resource,
-                             Q_UINT32 sernum );
-  bool kmailDeleteIncidence( const TQString& resource, Q_UINT32 sernum );
+                             TQ_UINT32 sernum );
+  bool kmailDeleteIncidence( const TQString& resource, TQ_UINT32 sernum );
   bool kmailUpdate( const TQString& resource,
-                    Q_UINT32& sernum,
+                    TQ_UINT32& sernum,
                     const TQString& subject,
                     const TQString& plainTextBody,
                     const TQMap<TQCString, TQString>& customHeaders,
diff --git a/kresources/kolab/shared/kolabbase.cpp b/kresources/kolab/shared/kolabbase.cpp
index b7f50257..97848107 100644
--- a/kresources/kolab/shared/kolabbase.cpp
+++ b/kresources/kolab/shared/kolabbase.cpp
@@ -44,8 +44,8 @@ using namespace Kolab;
 
 
 KolabBase::KolabBase( const TQString& tz )
-  : mCreationDate( TQDateTime::currentDateTime() ),
-    mLastModified( TQDateTime::currentDateTime() ),
+  : mCreationDate( TQDateTime::tqcurrentDateTime() ),
+    mLastModified( TQDateTime::tqcurrentDateTime() ),
     mSensitivity( Public ), mTimeZoneId( tz ),
     mHasPilotSyncId( false ),  mHasPilotSyncStatus( false )
 {
@@ -94,7 +94,7 @@ void KolabBase::setFields( const KABC::Addressee* addressee )
   kdDebug(5006) << "Creation time string: " << creationString << endl;
   TQDateTime creationDate;
   if ( creationString.isEmpty() ) {
-    creationDate = TQDateTime::currentDateTime();
+    creationDate = TQDateTime::tqcurrentDateTime();
     kdDebug(5006) << "Creation date set to current time\n";
   }
   else {
@@ -103,7 +103,7 @@ void KolabBase::setFields( const KABC::Addressee* addressee )
   }
   TQDateTime modified = addressee->revision();
   if ( !modified.isValid() )
-    modified = TQDateTime::currentDateTime();
+    modified = TQDateTime::tqcurrentDateTime();
   setLastModified( modified );
   if ( modified < creationDate ) {
     // It's not possible that the modification date is earlier than creation
@@ -259,7 +259,7 @@ bool KolabBase::loadEmailAttribute( TQDomElement& element, Email& email )
       const TQString tagName = e.tagName();
 
       if ( tagName == "display-name" ) {
-        // Quote the text in case it contains commas or other quotable chars.
+        // Quote the text in case it tqcontains commas or other quotable chars.
         TQString tusername = KPIM::quoteNameIfNecessary( e.text() );
 
         TQString tname, temail;
diff --git a/kresources/kolab/shared/resourcekolabbase.cpp b/kresources/kolab/shared/resourcekolabbase.cpp
index 2db2117d..26ef00db 100644
--- a/kresources/kolab/shared/resourcekolabbase.cpp
+++ b/kresources/kolab/shared/resourcekolabbase.cpp
@@ -83,7 +83,7 @@ bool ResourceKolabBase::kmailIncidencesCount( int &count,
   return mConnection->kmailIncidencesCount( count, mimetype, resource );
 }
 
-bool ResourceKolabBase::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
+bool ResourceKolabBase::kmailIncidences( TQMap<TQ_UINT32, TQString>& lst,
                                          const TQString& mimetype,
                                          const TQString& resource,
                                          int startIndex,
@@ -93,27 +93,27 @@ bool ResourceKolabBase::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
 }
 
 bool ResourceKolabBase::kmailGetAttachment( KURL& url, const TQString& resource,
-                                            Q_UINT32 sernum,
+                                            TQ_UINT32 sernum,
                                             const TQString& filename ) const
 {
   return mConnection->kmailGetAttachment( url, resource, sernum, filename );
 }
 
 bool ResourceKolabBase::kmailAttachmentMimetype( TQString & mimeType, TQString & resource,
-                                                 Q_UINT32 sernum, const TQString & filename ) const
+                                                 TQ_UINT32 sernum, const TQString & filename ) const
 {
   return mConnection->kmailAttachmentMimetype( mimeType, resource, sernum, filename );
 }
 
 bool ResourceKolabBase::kmailListAttachments( TQStringList &list,
                                               const TQString & resource,
-                                              Q_UINT32 sernum ) const
+                                              TQ_UINT32 sernum ) const
 {
   return mConnection->kmailListAttachments( list, resource, sernum );
 }
 
 bool ResourceKolabBase::kmailDeleteIncidence( const TQString& resource,
-                                              Q_UINT32 sernum )
+                                              TQ_UINT32 sernum )
 {
   return mSilent || mConnection->kmailDeleteIncidence( resource, sernum );
 }
@@ -126,7 +126,7 @@ static TQString plainTextBody()
     " Groupware format.\nFor a list of such email clients please"
     " visit\n%1" );
   const char * url = "http://www.kolab.org/kolab2-clients.html";
-  TQString firstPartTextUntranslated = TQString::fromLatin1( firstPartTextToTranslate ).arg( url );
+  TQString firstPartTextUntranslated = TQString::tqfromLatin1( firstPartTextToTranslate ).arg( url );
   TQString firstPartText = i18n( firstPartTextToTranslate ).arg( url );
   if ( firstPartText != firstPartTextUntranslated ) {
     firstPartText.append("\n\n-----------------------------------------------------\n\n");
@@ -136,7 +136,7 @@ static TQString plainTextBody()
 }
 
 bool ResourceKolabBase::kmailUpdate( const TQString& resource,
-                                     Q_UINT32& sernum,
+                                     TQ_UINT32& sernum,
                                      const TQString& xml,
                                      const TQString& mimetype,
                                      const TQString& subject,
diff --git a/kresources/kolab/shared/resourcekolabbase.h b/kresources/kolab/shared/resourcekolabbase.h
index 1bd8b951..565be267 100644
--- a/kresources/kolab/shared/resourcekolabbase.h
+++ b/kresources/kolab/shared/resourcekolabbase.h
@@ -81,7 +81,7 @@ public:
   // These are the methods called by KMail when the resource changes
   virtual bool fromKMailAddIncidence( const TQString& type,
                                       const TQString& resource,
-                                      Q_UINT32 sernum,
+                                      TQ_UINT32 sernum,
                                       int format,
                                       const TQString& data ) = 0;
   virtual void fromKMailDelIncidence( const TQString& type,
@@ -97,7 +97,7 @@ public:
   virtual void fromKMailDelSubresource( const TQString& type,
                                         const TQString& resource ) = 0;
 
-  virtual void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+  virtual void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                          const TQString& type,
                                          const TQString& folder ) = 0;
 protected:
@@ -119,7 +119,7 @@ protected:
 
   /// Get the mimetype attachments from a chunk of messages from this folder.
   /// Returns a TQMap with serialNumber/attachment pairs.
-  bool kmailIncidences( TQMap<Q_UINT32, TQString>& lst, const TQString& mimetype,
+  bool kmailIncidences( TQMap<TQ_UINT32, TQString>& lst, const TQString& mimetype,
                         const TQString& resource,
                         int startIndex,
                         int nbMessages ) const;
@@ -131,20 +131,20 @@ public: // for Contact
   /// be called by the resource after obtaining the incidence.
   /// The resource must delete the temp file.
   bool kmailGetAttachment( KURL& url, const TQString& resource,
-                           Q_UINT32 sernum,
+                           TQ_UINT32 sernum,
                            const TQString& filename ) const;
 
   /** Get the mimetype of the specified attachment. */
   bool kmailAttachmentMimetype( TQString &mimeType, TQString &resource,
-                                Q_UINT32 sernum, const TQString &filename ) const;
+                                TQ_UINT32 sernum, const TQString &filename ) const;
 
   /// List all attachments of a mail.
   bool kmailListAttachments( TQStringList &list, const TQString &resource,
-                             Q_UINT32 sernum ) const;
+                             TQ_UINT32 sernum ) const;
 
 protected:
   /// Delete an incidence.
-  bool kmailDeleteIncidence( const TQString& resource, Q_UINT32 sernum );
+  bool kmailDeleteIncidence( const TQString& resource, TQ_UINT32 sernum );
 
   KMailICalIface::StorageFormat kmailStorageFormat( const TQString& folder ) const;
 
@@ -152,7 +152,7 @@ protected:
 
   /// Update an incidence. The list of attachments are URLs.
   /// The parameter sernum is updated with the right KMail serial number
-  bool kmailUpdate( const TQString& resource, Q_UINT32& sernum,
+  bool kmailUpdate( const TQString& resource, TQ_UINT32& sernum,
                     const TQString& xml,
                     const TQString& mimetype,
                     const TQString& subject,
diff --git a/kresources/kolab/shared/subresource.cpp b/kresources/kolab/shared/subresource.cpp
index de4048fc..a7ffb8f9 100644
--- a/kresources/kolab/shared/subresource.cpp
+++ b/kresources/kolab/shared/subresource.cpp
@@ -103,7 +103,7 @@ int SubResource::completionWeight() const
   return mCompletionWeight;
 }
 
-StorageReference::StorageReference( const TQString& resource, Q_UINT32 sernum )
+StorageReference::StorageReference( const TQString& resource, TQ_UINT32 sernum )
   : mResource( resource ), mSerialNumber( sernum )
 {
 }
@@ -122,12 +122,12 @@ TQString StorageReference::resource() const
   return mResource;
 }
 
-void StorageReference::setSerialNumber( Q_UINT32 serialNumber )
+void StorageReference::setSerialNumber( TQ_UINT32 serialNumber )
 {
   mSerialNumber = serialNumber;
 }
 
-Q_UINT32 StorageReference::serialNumber() const
+TQ_UINT32 StorageReference::serialNumber() const
 {
   return mSerialNumber;
 }
diff --git a/kresources/kolab/shared/subresource.h b/kresources/kolab/shared/subresource.h
index 87f98e6d..de7a92e9 100644
--- a/kresources/kolab/shared/subresource.h
+++ b/kresources/kolab/shared/subresource.h
@@ -96,18 +96,18 @@ public:
   // Just for QMap
   StorageReference() {}
 
-  StorageReference( const TQString& resource, Q_UINT32 sernum );
+  StorageReference( const TQString& resource, TQ_UINT32 sernum );
   virtual ~StorageReference();
 
   virtual void setResource( const TQString& resource );
   virtual TQString resource() const;
 
-  virtual void setSerialNumber( Q_UINT32 serialNumber );
-  virtual Q_UINT32 serialNumber() const;
+  virtual void setSerialNumber( TQ_UINT32 serialNumber );
+  virtual TQ_UINT32 serialNumber() const;
 
 private:
   TQString mResource;
-  Q_UINT32 mSerialNumber;
+  TQ_UINT32 mSerialNumber;
 };
 
 typedef TQMap<TQString, StorageReference> UidMap;
diff --git a/kresources/lib/addressbookadaptor.cpp b/kresources/lib/addressbookadaptor.cpp
index 80da3942..65ca9629 100644
--- a/kresources/lib/addressbookadaptor.cpp
+++ b/kresources/lib/addressbookadaptor.cpp
@@ -62,7 +62,7 @@ TQString AddressBookAdaptor::mimeType() const
 
 bool AddressBookAdaptor::localItemExists( const TQString &localId )
 {
-  KABC::Addressee a = mResource->findByUid( localId );
+  KABC::Addressee a = mResource->tqfindByUid( localId );
   return !a.isEmpty();
 }
 
@@ -85,7 +85,7 @@ bool AddressBookAdaptor::localItemHasChanged( const TQString &localId )
 
 void AddressBookAdaptor::deleteItem( const TQString &localId )
 {
-  KABC::Addressee a = mResource->findByUid( localId );
+  KABC::Addressee a = mResource->tqfindByUid( localId );
   if ( !a.isEmpty() ) {
     mResource->removeAddressee( a );
     mResource->clearChange( a.uid() );
diff --git a/kresources/lib/folderconfig.cpp b/kresources/lib/folderconfig.cpp
index 25fd7d82..0a530361 100644
--- a/kresources/lib/folderconfig.cpp
+++ b/kresources/lib/folderconfig.cpp
@@ -73,12 +73,12 @@ void FolderConfig::setFolderLister( FolderLister *f )
   
   TQValueList<FolderListView::Property> types;
   TQValueList<FolderLister::ContentType> suptypes( mFolderLister->supportedTypes() );
-  if ( suptypes.contains( FolderLister::Event ) ) types << FolderListView::Event;
-  if ( suptypes.contains( FolderLister::Todo ) ) types << FolderListView::Todo;
-  if ( suptypes.contains( FolderLister::Journal ) ) types << FolderListView::Journal;
-  if ( suptypes.contains( FolderLister::Contact ) ) types << FolderListView::Contact;
-  if ( suptypes.contains( FolderLister::All ) ) types << FolderListView::All;
-  if ( suptypes.contains( FolderLister::Unknown ) ) types << FolderListView::Unknown;
+  if ( suptypes.tqcontains( FolderLister::Event ) ) types << FolderListView::Event;
+  if ( suptypes.tqcontains( FolderLister::Todo ) ) types << FolderListView::Todo;
+  if ( suptypes.tqcontains( FolderLister::Journal ) ) types << FolderListView::Journal;
+  if ( suptypes.tqcontains( FolderLister::Contact ) ) types << FolderListView::Contact;
+  if ( suptypes.tqcontains( FolderLister::All ) ) types << FolderListView::All;
+  if ( suptypes.tqcontains( FolderLister::Unknown ) ) types << FolderListView::Unknown;
 
   mFolderList->setEnabledTypes( types );
   connect( mFolderLister, TQT_SIGNAL( foldersRead() ), TQT_SLOT( updateFolderList() ) );
diff --git a/kresources/lib/folderlister.cpp b/kresources/lib/folderlister.cpp
index cd203463..a39b316a 100644
--- a/kresources/lib/folderlister.cpp
+++ b/kresources/lib/folderlister.cpp
@@ -50,11 +50,11 @@ void FolderLister::setWriteDestinationId( KPIM::FolderLister::ContentType type,
 
 TQString FolderLister::writeDestinationId( KPIM::FolderLister::ContentType type ) const
 {
-  if ( mWriteDestinationId.contains( type ) ) {
+  if ( mWriteDestinationId.tqcontains( type ) ) {
     return mWriteDestinationId[type];
-  } else if ( mWriteDestinationId.contains( KPIM::FolderLister::All ) ) {
+  } else if ( mWriteDestinationId.tqcontains( KPIM::FolderLister::All ) ) {
     return mWriteDestinationId[ KPIM::FolderLister::All ];
-  } else if ( mWriteDestinationId.contains( KPIM::FolderLister::Unknown ) ) {
+  } else if ( mWriteDestinationId.tqcontains( KPIM::FolderLister::Unknown ) ) {
     return mWriteDestinationId[ KPIM::FolderLister::Unknown ];
   } else return TQString::null;
 }
@@ -196,7 +196,7 @@ void FolderLister::writeConfig( GroupwarePrefsBase *newprefs )
 
   TQStringList defaultFolders;
   #define writeDestination(type) \
-    if ( mWriteDestinationId.contains( type ) ) \
+    if ( mWriteDestinationId.tqcontains( type ) ) \
       defaultFolders << mWriteDestinationId[type]; \
     else defaultFolders << TQString::null;
   writeDestination( KPIM::FolderLister::Event );
@@ -262,7 +262,7 @@ void FolderLister::doRetrieveFolder( const KURL &u )
 
   KURL url( u );
   if ( adaptor() ) adaptor()->adaptDownloadUrl( url );
-  if ( mUrls.contains( url ) || mProcessedPathes.contains( url.path(-1) ) ) {
+  if ( mUrls.tqcontains( url ) || mProcessedPathes.tqcontains( url.path(-1) ) ) {
     kdDebug()<<"Item "<<u.path(-1)<<" is already being downloaded "<<endl;
   } else {
 
diff --git a/kresources/lib/folderlistview.cpp b/kresources/lib/folderlistview.cpp
index b29e61c9..d0a11f43 100644
--- a/kresources/lib/folderlistview.cpp
+++ b/kresources/lib/folderlistview.cpp
@@ -54,37 +54,37 @@ void FolderListView::setEnabledTypes( const TQValueList<Property> &types )
 kdDebug() << "FolderListView::setEnabledTypes" << endl;
   for ( int i = 0; i< columns(); ++i ) removeColumn( i );
   mTypes = types;
-  if ( !mTypes.contains( FolderName ) ) mTypes.prepend( FolderName );
+  if ( !mTypes.tqcontains( FolderName ) ) mTypes.prepend( FolderName );
   mColumnMap[FolderName] = addColumn( i18n("Folder") );
   mTypeMap[mColumnMap[FolderName]] = FolderName;
 
 
-  if ( mTypes.contains( Event ) ) {
+  if ( mTypes.tqcontains( Event ) ) {
     mColumnMap[Event] = addColumn( i18n("Short column header meaning default for new events", "Events") );
     mTypeMap[mColumnMap[Event]] = Event;
   } else mColumnMap[Event] = -1;
 
-  if ( mTypes.contains( Todo ) ) {
+  if ( mTypes.tqcontains( Todo ) ) {
     mColumnMap[Todo] = addColumn( i18n("Short column header meaning default for new to-dos", "Todos") );
     mTypeMap[mColumnMap[Todo]] = Todo;
   } else mColumnMap[Todo] = -1;
 
-  if ( mTypes.contains( Journal ) ) {
+  if ( mTypes.tqcontains( Journal ) ) {
     mColumnMap[Journal] = addColumn( i18n("Short column header meaning default for new journals", "Journals") );
     mTypeMap[mColumnMap[Journal]] = Journal;
   } else mColumnMap[Journal] = -1;
 
-  if ( mTypes.contains( Contact ) ) {
+  if ( mTypes.tqcontains( Contact ) ) {
     mColumnMap[Contact] = addColumn( i18n("Short column header meaning default for new contacts", "Contacts") );
     mTypeMap[mColumnMap[Contact]] = Contact;
   } else mColumnMap[Contact] = -1;
 
-  if ( mTypes.contains( All ) ) {
+  if ( mTypes.tqcontains( All ) ) {
     mColumnMap[All] = addColumn( i18n("Short column header meaning default for all items", "All") );
     mTypeMap[mColumnMap[All]] = All;
   } else mColumnMap[All] = -1;
 
-  if ( mTypes.contains( Unknown ) ) {
+  if ( mTypes.tqcontains( Unknown ) ) {
     mColumnMap[Unknown] = addColumn( i18n("Short column header meaning default for unknown new items", "Unknown") );
     mTypeMap[mColumnMap[Unknown]] = Unknown;
   } else mColumnMap[Unknown] = -1;
@@ -103,27 +103,27 @@ void FolderListView::showPopupMenu( FolderListItem *i, const TQPoint &globalPos
   m.setItemChecked( id, i->isOn() );
   m.insertSeparator();
 
-  if ( ( folder.type & KPIM::FolderLister::Event ) && (mTypes.contains( Event ) ) ) {
+  if ( ( folder.type & KPIM::FolderLister::Event ) && (mTypes.tqcontains( Event ) ) ) {
     id = m.insertItem( i18n("Default for New &Events"), this, TQT_SLOT(slotPopupHandler(int)), 0, Event );
     m.setItemChecked( id, i->isDefault( Event ) );
   }
-  if ( ( folder.type & KPIM::FolderLister::Todo ) && (mTypes.contains( Todo ) ) ) {
+  if ( ( folder.type & KPIM::FolderLister::Todo ) && (mTypes.tqcontains( Todo ) ) ) {
     id = m.insertItem( i18n("Default for New &Todos"), this, TQT_SLOT(slotPopupHandler(int)), 0, Todo );
     m.setItemChecked( id, i->isDefault( Todo ) );
   }
-  if ( ( folder.type & KPIM::FolderLister::Journal ) && (mTypes.contains( Journal ) ) ) {
+  if ( ( folder.type & KPIM::FolderLister::Journal ) && (mTypes.tqcontains( Journal ) ) ) {
     id = m.insertItem( i18n("Default for New &Journals"), this, TQT_SLOT(slotPopupHandler(int)), 0, Journal );
     m.setItemChecked( id, i->isDefault( Journal ) );
   }
-  if ( ( folder.type & KPIM::FolderLister::Contact ) && (mTypes.contains( Contact ) ) ) {
+  if ( ( folder.type & KPIM::FolderLister::Contact ) && (mTypes.tqcontains( Contact ) ) ) {
     id = m.insertItem( i18n("Default for New &Contacts"), this, TQT_SLOT(slotPopupHandler(int)), 0, Contact );
     m.setItemChecked( id, i->isDefault( Contact ) );
   }
-  if ( ( folder.type == KPIM::FolderLister::All ) && (mTypes.contains( All ) ) ) {
+  if ( ( folder.type == KPIM::FolderLister::All ) && (mTypes.tqcontains( All ) ) ) {
     id = m.insertItem( i18n("Default for All New &Items"), this, TQT_SLOT(slotPopupHandler(int)), 0, All );
     m.setItemChecked( id, i->isDefault( All ) );
   }
-  if ( ( folder.type == KPIM::FolderLister::Unknown ) && (mTypes.contains( Unknown ) ) ) {
+  if ( ( folder.type == KPIM::FolderLister::Unknown ) && (mTypes.tqcontains( Unknown ) ) ) {
     id = m.insertItem( i18n("Default for &Unknown New Items"), this, TQT_SLOT(slotPopupHandler(int)), 0, Unknown );
     m.setItemChecked( id, i->isDefault( Unknown ) );
   }
@@ -134,7 +134,7 @@ void FolderListView::showPopupMenu( FolderListItem *i, const TQPoint &globalPos
 void FolderListView::showPopupMenu( TQListViewItem *i )
 {
   if ( dynamic_cast<FolderListItem*>(i) )
-    showPopupMenu( (FolderListItem*)i, viewport()->mapToGlobal(itemRect(i).topLeft()) );
+    showPopupMenu( (FolderListItem*)i, viewport()->mapToGlobal(tqitemRect(i).topLeft()) );
 }
 
 void FolderListView::slotPopupHandler( int z )
@@ -152,7 +152,7 @@ void FolderListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint&
     }
     else if ( btn == Qt::LeftButton && c > 0 ) {
       // map pos to item/column and call FolderListItem::activate(col, pos)
-      ((FolderListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) );
+      ((FolderListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, tqitemRect(i).top() ) );
 //     } else {
 //       KListView::slotMousePressed( btn, i, pos, c );
     }
@@ -184,7 +184,7 @@ void FolderListItem::activate( int column, const TQPoint &localPos )
     default:
       return;
   }
-  if ( !TQRect( x, 0, w, BoxSize ).contains( localPos ) )
+  if ( !TQRect( x, 0, w, BoxSize ).tqcontains( localPos ) )
     changeProperty( prop );
 }
 
@@ -242,7 +242,7 @@ void FolderListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int col, i
   if ( !lv ) return;
 
   // use a private color group and set the text/highlighted text colors
-//   TQColorGroup mcg = lv->viewport()->colorGroup();
+//   TQColorGroup mcg = lv->viewport()->tqcolorGroup();
   FolderListView::Property prop( mFolderListView->typeForColumn(col) );
 
   if ( prop == FolderListView::FolderName ) {
@@ -293,4 +293,4 @@ void FolderListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int col, i
 //END
 
 #include "folderlistview.moc"
-// kate: space-indent on; indent-width 2; replace-tabs on;
+// kate: space-indent on; indent-width 2; tqreplace-tabs on;
diff --git a/kresources/lib/folderlistview.h b/kresources/lib/folderlistview.h
index e7b634ef..62766830 100644
--- a/kresources/lib/folderlistview.h
+++ b/kresources/lib/folderlistview.h
@@ -54,8 +54,8 @@ class FolderListView : public KListView
     void emitChanged() { emit changed(); };
     void setEnabledTypes( const TQValueList<Property> &types );
 
-    int columnForType( Property prop ) const { if ( mColumnMap.contains(prop) ) return mColumnMap[prop]; else return -1;}
-    Property typeForColumn( int col ) const { if ( mTypeMap.contains( col ) ) return mTypeMap[col]; else return Unknown; }
+    int columnForType( Property prop ) const { if ( mColumnMap.tqcontains(prop) ) return mColumnMap[prop]; else return -1;}
+    Property typeForColumn( int col ) const { if ( mTypeMap.tqcontains( col ) ) return mTypeMap[col]; else return Unknown; }
 
   private slots:
     /* Display a popupmenu for item i at item position */
@@ -126,4 +126,4 @@ class FolderListItem : public QCheckListItem
 
 #endif
 
-// kate: space-indent on; indent-width 2; replace-tabs on;
+// kate: space-indent on; indent-width 2; tqreplace-tabs on;
diff --git a/kresources/lib/folderselectdialog.cpp b/kresources/lib/folderselectdialog.cpp
index c4d34359..8703c441 100644
--- a/kresources/lib/folderselectdialog.cpp
+++ b/kresources/lib/folderselectdialog.cpp
@@ -42,16 +42,16 @@ FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString&
   : KDialogBase(0, 0, true, caption, Ok|Cancel, Ok, true)
 {
   TQFrame* frame = makeMainWidget();
-  TQVBoxLayout* layout = new TQVBoxLayout( frame, 0, spacingHint() );
+  TQVBoxLayout* tqlayout = new TQVBoxLayout( frame, 0, spacingHint() );
 
   TQLabel* labelWidget = new TQLabel( label, frame );
-  layout->addWidget( labelWidget );
+  tqlayout->addWidget( labelWidget );
 
   mListBox = new KListBox( frame );
   mListBox->insertStringList( list );
   mListBox->setSelected( 0, true );
   mListBox->ensureCurrentVisible();
-  layout->addWidget( mListBox, 10 );
+  tqlayout->addWidget( mListBox, 10 );
 
   connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ),
            TQT_SLOT( slotOk() ) );
@@ -60,7 +60,7 @@ FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString&
 
   mListBox->setFocus();
 
-  layout->addStretch();
+  tqlayout->addStretch();
 
   setMinimumWidth( 320 );
 }
diff --git a/kresources/lib/groupwaredataadaptor.cpp b/kresources/lib/groupwaredataadaptor.cpp
index 033ea81d..53b2ecdb 100644
--- a/kresources/lib/groupwaredataadaptor.cpp
+++ b/kresources/lib/groupwaredataadaptor.cpp
@@ -78,7 +78,7 @@ kdDebug()<<"GroupwareUploadItem::createUploadNewJob, baseurl=" << baseurl.url()
   if ( job ) {
     kdDebug() << "Adding If-None-Match " << endl;
     TQString header;
-    if ( job->outgoingMetaData().contains("customHTTPHeader") ) {
+    if ( job->outgoingMetaData().tqcontains("customHTTPHeader") ) {
       header = job->outgoingMetaData()["customHTTPHeader"];
       header += "\r\n";
     }
@@ -96,7 +96,7 @@ kdDebug()<<"GroupwareUploadItem::createUploadJob" << endl;
   if ( job && adaptor ) {
   kdDebug()<<"Adding If-Match header: " << adaptor->idMapper()->fingerprint( uid() ) << endl;
     TQString header;
-    if ( job->outgoingMetaData().contains("customHTTPHeader") ) {
+    if ( job->outgoingMetaData().tqcontains("customHTTPHeader") ) {
       header = job->outgoingMetaData()["customHTTPHeader"];
       header += "\r\n";
     }
@@ -262,7 +262,7 @@ bool GroupwareDataAdaptor::interpretUploadNewJob( KIO::Job *job, const TQString
 TQString GroupwareDataAdaptor::uidFromJob( KIO::Job *job ) const
 {
 kdDebug()<<"GroupwareDataAdaptor::uidFromJob( "<<job<<")"<<endl;
-  if ( mJobUIDMap.contains( job ) ) {
+  if ( mJobUIDMap.tqcontains( job ) ) {
     kdDebug()<<"  Contained: "<< mJobUIDMap[job] << endl;
     return mJobUIDMap[ job ];
   } else {
diff --git a/kresources/lib/groupwaredataadaptor.h b/kresources/lib/groupwaredataadaptor.h
index 52021a07..95119354 100644
--- a/kresources/lib/groupwaredataadaptor.h
+++ b/kresources/lib/groupwaredataadaptor.h
@@ -240,7 +240,7 @@ Q_OBJECT
     virtual FolderLister::Entry::List defaultFolders();
     virtual TQValueList<FolderLister::ContentType> supportedTypes() = 0;
     virtual bool supports( FolderLister::ContentType type ) {
-      return supportedTypes().contains( type );
+      return supportedTypes().tqcontains( type );
     }
 
 
diff --git a/kresources/lib/groupwaredownloadjob.cpp b/kresources/lib/groupwaredownloadjob.cpp
index 7bfa804a..85f9c9f3 100644
--- a/kresources/lib/groupwaredownloadjob.cpp
+++ b/kresources/lib/groupwaredownloadjob.cpp
@@ -229,9 +229,9 @@ void GroupwareDownloadJob::slotItemToDownload( const KURL &remoteURL,
 {
   KURL url( remoteURL );
   adaptor()->adaptDownloadUrl( url );
-  if ( !mItemsForDownload.contains( url ) &&
-       !mItemsDownloading.contains( url ) &&
-       !mItemsDownloaded.contains( url ) ) {
+  if ( !mItemsForDownload.tqcontains( url ) &&
+       !mItemsDownloading.tqcontains( url ) &&
+       !mItemsDownloaded.tqcontains( url ) ) {
     mItemsForDownload.insert( url, type );
   }
 }
@@ -240,7 +240,7 @@ void GroupwareDownloadJob::slotItemToDownload( const KURL &remoteURL,
 void GroupwareDownloadJob::slotItemOnServer( const KURL &remoteURL )
 {
 kdDebug()<<"GroupwareDownloadJob::slotItemOnServer( " << remoteURL.url() << ")" << endl;
-  if ( !mCurrentlyOnServer.contains( remoteURL ) ) {
+  if ( !mCurrentlyOnServer.tqcontains( remoteURL ) ) {
     mCurrentlyOnServer.append( remoteURL );
   }
 }
@@ -249,9 +249,9 @@ kdDebug()<<"GroupwareDownloadJob::slotItemOnServer( " << remoteURL.url() << ")"
 void GroupwareDownloadJob::slotItemDownloadError( const KURL &remoteURL, const TQString &/*error*/ )
 {
   // TODO: Error handling!
-  if ( mItemsDownloading.contains( remoteURL ) ) {
+  if ( mItemsDownloading.tqcontains( remoteURL ) ) {
     mItemsDownloadError[ remoteURL ] = mItemsDownloading[ remoteURL ];
-  } else if ( mItemsForDownload.contains( remoteURL ) ) {
+  } else if ( mItemsForDownload.tqcontains( remoteURL ) ) {
     mItemsDownloadError[ remoteURL ] = mItemsForDownload[ remoteURL ];
   }
 }
@@ -261,15 +261,15 @@ void GroupwareDownloadJob::slotItemDownloaded( const TQString &localID,
          const KURL &remoteURL, const TQString &fingerprint )
 {
 kdDebug()<<"GroupwareDownloadJob::slotItemDownloaded( " << localID << ", " << remoteURL.url() << ", " << fingerprint << ")" << endl;
-  if ( mItemsForDownload.contains( remoteURL ) ) {
+  if ( mItemsForDownload.tqcontains( remoteURL ) ) {
     mItemsDownloaded[ remoteURL ] = mItemsForDownload[ remoteURL ];
     mItemsForDownload.remove( remoteURL );
   }
-  if ( mItemsDownloading.contains( remoteURL ) ) {
+  if ( mItemsDownloading.tqcontains( remoteURL ) ) {
     mItemsDownloaded[ remoteURL ] = mItemsDownloading[ remoteURL ];
     mItemsDownloading.remove( remoteURL );
   }
-  if ( !mItemsDownloaded.contains( remoteURL ) ) {
+  if ( !mItemsDownloaded.tqcontains( remoteURL ) ) {
     mItemsDownloaded[ remoteURL ] = KPIM::FolderLister::Unknown;
   }
   adaptor()->idMapper()->setRemoteId( localID, remoteURL.path() );
diff --git a/kresources/lib/kcal_resourcegroupwarebase.cpp b/kresources/lib/kcal_resourcegroupwarebase.cpp
index 823943c2..11db0e81 100644
--- a/kresources/lib/kcal_resourcegroupwarebase.cpp
+++ b/kresources/lib/kcal_resourcegroupwarebase.cpp
@@ -219,7 +219,7 @@ void ResourceGroupwareBase::enter_loop()
   TQWidget dummy(0,0,WType_Dialog | WShowModal);
   dummy.setFocusPolicy( TQWidget::NoFocus );
   qt_enter_modal(&dummy);
-  qApp->enter_loop();
+  tqApp->enter_loop();
   qt_leave_modal(&dummy);
 }
 // END:COPIED
@@ -228,7 +228,7 @@ void ResourceGroupwareBase::slotLoginJobResult( KIO::Job *job )
 {
   if ( !adaptor() ) return;
   mLoginFinished = adaptor()->interpretLoginJobResult( job );
-  qApp->exit_loop();
+  tqApp->exit_loop();
 }
 
 void ResourceGroupwareBase::doClose()
@@ -251,7 +251,7 @@ void ResourceGroupwareBase::slotLogoffJobResult( KIO::Job *job )
   if ( !adaptor() ) return;
   adaptor()->interpretLogoffJobResult( job );
   // TODO: Do we really need to block while waiting for the job to return?
-  qApp->exit_loop();
+  tqApp->exit_loop();
 }
 
 bool ResourceGroupwareBase::doLoad()
diff --git a/kresources/newexchange/exchangeconvertercalendar.cpp b/kresources/newexchange/exchangeconvertercalendar.cpp
index be32291b..d2a8d55c 100644
--- a/kresources/newexchange/exchangeconvertercalendar.cpp
+++ b/kresources/newexchange/exchangeconvertercalendar.cpp
@@ -432,7 +432,7 @@ kdDebug()<<"ExchangeConverterCalendar::readIncidence: ERROR: No UID given"<<endl
           continue;
         }
         TQString uid = uidElement.text();
-        if ( ! m_uids.contains( uid ) ) {
+        if ( ! m_uids.tqcontains( uid ) ) {
           m_uids[uid] = 1;
           handleRecurrence(uid);
           successCount++;
diff --git a/kresources/newexchange/exchangeconvertercontact.cpp b/kresources/newexchange/exchangeconvertercontact.cpp
index 732c9db1..88ad3a15 100644
--- a/kresources/newexchange/exchangeconvertercontact.cpp
+++ b/kresources/newexchange/exchangeconvertercontact.cpp
@@ -461,7 +461,7 @@ TQDomDocument ExchangeConverterContact::createWebDAV( Addressee addr )
 
   TQStringList emails = addr.emails();
   TQString prefemail = addr.preferredEmail();
-  if ( emails.contains( prefemail ) )
+  if ( emails.tqcontains( prefemail ) )
     emails.remove( prefemail );
   emails.prepend( prefemail );
   if ( emails.count() > 0 ) {
diff --git a/kresources/scalix/kabc/resourcescalix.cpp b/kresources/scalix/kabc/resourcescalix.cpp
index 31ccdf2c..55b2ed2e 100644
--- a/kresources/scalix/kabc/resourcescalix.cpp
+++ b/kresources/scalix/kabc/resourcescalix.cpp
@@ -155,7 +155,7 @@ void KABC::ResourceScalix::releaseSaveTicket( Ticket* ticket )
 
 TQString KABC::ResourceScalix::loadContact( const TQString& contactData,
                                           const TQString& subResource,
-                                          Q_UINT32 sernum,
+                                          TQ_UINT32 sernum,
                                           KMailICalIface::StorageFormat )
 {
   KABC::Addressee addr = Contact::fromXml( contactData );
@@ -204,7 +204,7 @@ bool KABC::ResourceScalix::loadSubResourceHelper( const TQString& subResource,
   }
 
   for ( int startIndex = 0; startIndex < count; startIndex += nbMessages ) {
-    TQMap<Q_UINT32, TQString> lst;
+    TQMap<TQ_UINT32, TQString> lst;
 
     if ( !kmailIncidences( lst, mimetype, subResource, startIndex, nbMessages ) ) {
       kdError() << "Communication problem in ResourceScalix::load()\n";
@@ -213,7 +213,7 @@ bool KABC::ResourceScalix::loadSubResourceHelper( const TQString& subResource,
       return false;
     }
 
-    for( TQMap<Q_UINT32, TQString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
+    for( TQMap<TQ_UINT32, TQString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
       loadContact( it.data(), subResource, it.key(), format );
     }
     if ( progressId ) {
@@ -316,7 +316,7 @@ bool KABC::ResourceScalix::kmailUpdateAddressee( const Addressee& addr )
 {
   const TQString uid = addr.uid();
   TQString subResource;
-  Q_UINT32 sernum;
+  TQ_UINT32 sernum;
   if ( mUidMap.find( uid ) != mUidMap.end() ) {
     subResource = mUidMap[ uid ].resource();
     if ( !subresourceWritable( subResource ) ) {
@@ -377,7 +377,7 @@ void KABC::ResourceScalix::insertAddressee( const Addressee& addr )
   const TQString uid = addr.uid();
   //kdDebug(5650) << k_funcinfo << uid << endl;
   bool ok = false;
-  if ( mUidMap.contains( uid ) ) {
+  if ( mUidMap.tqcontains( uid ) ) {
     mUidsPendingUpdate.append( uid );
   } else {
     mUidsPendingAdding.append( uid );
@@ -414,7 +414,7 @@ void KABC::ResourceScalix::removeAddressee( const Addressee& addr )
  */
 bool KABC::ResourceScalix::fromKMailAddIncidence( const TQString& type,
                                                  const TQString& subResource,
-                                                 Q_UINT32 sernum,
+                                                 TQ_UINT32 sernum,
                                                  int format,
                                                  const TQString& contactXML )
 {
@@ -429,8 +429,8 @@ bool KABC::ResourceScalix::fromKMailAddIncidence( const TQString& type,
   //kdDebug(5650) << k_funcinfo << uid << endl;
 
   // Emit "addressbook changed" if this comes from kmail and not from the GUI
-  if ( !mUidsPendingAdding.contains( uid )
-       && !mUidsPendingUpdate.contains( uid ) ) {
+  if ( !mUidsPendingAdding.tqcontains( uid )
+       && !mUidsPendingUpdate.tqcontains( uid ) ) {
     addressBook()->emitAddressBookChanged();
   } else {
     mUidsPendingAdding.remove( uid );
@@ -451,11 +451,11 @@ void KABC::ResourceScalix::fromKMailDelIncidence( const TQString& type,
   //kdDebug(5650) << k_funcinfo << uid << endl;
 
   // Can't be in both, by contract
-  if ( mUidsPendingDeletion.contains( uid ) ) {
+  if ( mUidsPendingDeletion.tqcontains( uid ) ) {
     mUidsPendingDeletion.remove( uid );
-  } else if ( mUidsPendingUpdate.contains( uid ) ) {
+  } else if ( mUidsPendingUpdate.tqcontains( uid ) ) {
     // It's good to know if was deleted, but we are waiting on a new one to
-    // replace it, so let's just sit tight.
+    // tqreplace it, so let's just sit tight.
   } else {
     // We didn't trigger this, so KMail did, remove the reference to the uid
     mAddrMap.remove( uid );
@@ -483,7 +483,7 @@ void KABC::ResourceScalix::fromKMailAddSubresource( const TQString& type,
 {
   if( type != s_kmailContentsType ) return;
 
-  if ( mSubResources.contains( subResource ) )
+  if ( mSubResources.tqcontains( subResource ) )
     // Already registered
     return;
 
@@ -500,7 +500,7 @@ void KABC::ResourceScalix::fromKMailDelSubresource( const TQString& type,
 {
   if( type != s_kmailContentsType ) return;
 
-  if ( !mSubResources.contains( subResource ) )
+  if ( !mSubResources.tqcontains( subResource ) )
     // Not registered
     return;
 
@@ -535,13 +535,13 @@ void KABC::ResourceScalix::fromKMailDelSubresource( const TQString& type,
 
 
 
-void KABC::ResourceScalix::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+void KABC::ResourceScalix::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                                     const TQString& /* type */,
                                                     const TQString& folder )
 {
   // FIXME
   KMailICalIface::StorageFormat format = KMailICalIface::StorageXML;
-  for( TQMap<Q_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it ) {
+  for( TQMap<TQ_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it ) {
     loadContact( it.data(), folder, it.key(), format );
   }
   if ( !addressBook() ){
@@ -557,7 +557,7 @@ TQStringList KABC::ResourceScalix::subresources() const
 
 bool KABC::ResourceScalix::subresourceActive( const TQString& subresource ) const
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     return mSubResources[ subresource ].active();
   }
 
@@ -569,7 +569,7 @@ bool KABC::ResourceScalix::subresourceActive( const TQString& subresource ) cons
 
 bool KABC::ResourceScalix::subresourceWritable( const TQString& subresource ) const
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     return mSubResources[ subresource ].writable();
   }
   return false; //better a safe default
@@ -577,7 +577,7 @@ bool KABC::ResourceScalix::subresourceWritable( const TQString& subresource ) co
 
 int KABC::ResourceScalix::subresourceCompletionWeight( const TQString& subresource ) const
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     return mSubResources[ subresource ].completionWeight();
   }
 
@@ -588,7 +588,7 @@ int KABC::ResourceScalix::subresourceCompletionWeight( const TQString& subresour
 
 TQString KABC::ResourceScalix::subresourceLabel( const TQString& subresource ) const
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     return mSubResources[ subresource ].label();
   }
 
@@ -598,7 +598,7 @@ TQString KABC::ResourceScalix::subresourceLabel( const TQString& subresource ) c
 
 void KABC::ResourceScalix::setSubresourceCompletionWeight( const TQString& subresource, int completionWeight )
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     mSubResources[ subresource ].setCompletionWeight( completionWeight );
   } else {
     kdDebug(5650) << "setSubresourceCompletionWeight: subresource " << subresource << " not found" << endl;
@@ -617,7 +617,7 @@ TQMap<TQString, TQString> KABC::ResourceScalix::uidToResourceMap() const
 
 void KABC::ResourceScalix::setSubresourceActive( const TQString &subresource, bool active )
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     mSubResources[ subresource ].setActive( active );
     load();
   } else {
diff --git a/kresources/scalix/kabc/resourcescalix.h b/kresources/scalix/kabc/resourcescalix.h
index 25eca7e4..70eb7c92 100644
--- a/kresources/scalix/kabc/resourcescalix.h
+++ b/kresources/scalix/kabc/resourcescalix.h
@@ -112,12 +112,12 @@ public:
   void fromKMailDelSubresource( const TQString& type, const TQString& id );
 
   bool fromKMailAddIncidence( const TQString& type, const TQString& resource,
-                              Q_UINT32 sernum, int format, const TQString& contact );
+                              TQ_UINT32 sernum, int format, const TQString& contact );
   void fromKMailDelIncidence( const TQString& type, const TQString& resource,
                               const TQString& contact );
   void fromKMailRefresh( const TQString& type, const TQString& resource );
 
-  void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+  void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                  const TQString& type,
                                  const TQString& folder );
 
@@ -153,7 +153,7 @@ protected:
   bool loadSubResource( const TQString& subResource );
   bool loadSubResourceHelper( const TQString& subResource, const char* mimetype, KMailICalIface::StorageFormat format );
   TQString loadContact( const TQString& contactData, const TQString& subResource,
-                       Q_UINT32 sernum, const KMailICalIface::StorageFormat format );
+                       TQ_UINT32 sernum, const KMailICalIface::StorageFormat format );
 
   TQString configFile() const {
     return Scalix::ResourceScalixBase::configFile( "kabc" );
diff --git a/kresources/scalix/kcal/resourcescalix.cpp b/kresources/scalix/kcal/resourcescalix.cpp
index 63e964eb..1d74c570 100644
--- a/kresources/scalix/kcal/resourcescalix.cpp
+++ b/kresources/scalix/kcal/resourcescalix.cpp
@@ -63,7 +63,7 @@ static const char* incidenceInlineMimeType = "text/calendar";
 
 ResourceScalix::ResourceScalix( const KConfig *config )
   : ResourceCalendar( config ), ResourceScalixBase( "ResourceScalix-libkcal" ),
-    mCalendar( TQString::fromLatin1("UTC") ), mOpen( false )
+    mCalendar( TQString::tqfromLatin1("UTC") ), mOpen( false )
 {
   setType( "scalix" );
   connect( &mResourceChangedTimer, TQT_SIGNAL( timeout() ),
@@ -159,7 +159,7 @@ bool ResourceScalix::loadSubResource( const TQString& subResource,
   const TQString labelTxt = !strcmp(mimetype, "application/x-vnd.kolab.task") ? i18n( "Loading tasks..." )
                            : !strcmp(mimetype, "application/x-vnd.kolab.journal") ? i18n( "Loading journals..." )
                            : i18n( "Loading events..." );
-  const bool useProgress = qApp && qApp->type() != TQApplication::Tty && count > mProgressDialogIncidenceLimit;
+  const bool useProgress = tqApp && tqApp->type() != TQApplication::Tty && count > mProgressDialogIncidenceLimit;
   if ( useProgress )
     (void)::Observer::self(); // ensure kio_uiserver is running
   UIServer_stub uiserver( "kio_uiserver", "UIServer" );
@@ -172,7 +172,7 @@ bool ResourceScalix::loadSubResource( const TQString& subResource,
   }
 
   for ( int startIndex = 0; startIndex < count; startIndex += nbMessages ) {
-    TQMap<Q_UINT32, TQString> lst;
+    TQMap<TQ_UINT32, TQString> lst;
     if ( !kmailIncidences( lst, mimetype, subResource, startIndex, nbMessages ) ) {
       kdError(5650) << "Communication problem in ResourceScalix::load()\n";
       if ( progressId )
@@ -182,7 +182,7 @@ bool ResourceScalix::loadSubResource( const TQString& subResource,
 
     { // for RAII scoping below
       TemporarySilencer t( this );
-      for( TQMap<Q_UINT32, TQString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
+      for( TQMap<TQ_UINT32, TQString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
         addIncidence( mimetype, it.data(), subResource, it.key() );
       }
     }
@@ -269,24 +269,24 @@ void ResourceScalix::incidenceUpdated( KCal::IncidenceBase* incidencebase )
 {
   if ( incidencebase->isReadOnly() ) return; // Should not happen (TM)
   incidencebase->setSyncStatus( KCal::Event::SYNCMOD );
-  incidencebase->setLastModified( TQDateTime::currentDateTime() );
+  incidencebase->setLastModified( TQDateTime::tqcurrentDateTime() );
   // we should probably update the revision number here,
   // or internally in the Event itself when certain things change.
   // need to verify with ical documentation.
 
   const TQString uid = incidencebase->uid();
 
-  if ( mUidsPendingUpdate.contains( uid ) || mUidsPendingAdding.contains( uid ) ) {
+  if ( mUidsPendingUpdate.tqcontains( uid ) || mUidsPendingAdding.tqcontains( uid ) ) {
     /* We are currently processing this event ( removing and readding or
      * adding it ). If so, ignore this update. Keep the last of these around
      * and process once we hear back from KMail on this event. */
-    mPendingUpdates.replace( uid, incidencebase );
+    mPendingUpdates.tqreplace( uid, incidencebase );
     return;
   }
 
   TQString subResource;
-  Q_UINT32 sernum = 0;
-  if ( mUidMap.contains( uid ) ) {
+  TQ_UINT32 sernum = 0;
+  if ( mUidMap.tqcontains( uid ) ) {
     subResource = mUidMap[ uid ].resource();
     sernum = mUidMap[ uid ].serialNumber();
     mUidsPendingUpdate.append( uid );
@@ -294,7 +294,7 @@ void ResourceScalix::incidenceUpdated( KCal::IncidenceBase* incidencebase )
   sendKMailUpdate( incidencebase, subResource, sernum );
 }
 
-void ResourceScalix::resolveConflict( KCal::Incidence* inc, const TQString& subresource, Q_UINT32 sernum )
+void ResourceScalix::resolveConflict( KCal::Incidence* inc, const TQString& subresource, TQ_UINT32 sernum )
 {
     if ( ! inc )
         return;
@@ -344,7 +344,7 @@ void ResourceScalix::resolveConflict( KCal::Incidence* inc, const TQString& subr
   }
 }
 void ResourceScalix::addIncidence( const char* mimetype, const TQString& data,
-                                  const TQString& subResource, Q_UINT32 sernum )
+                                  const TQString& subResource, TQ_UINT32 sernum )
 {
   // This uses pointer comparison, so it only works if we use the static
   // objects defined in the top of the file
@@ -354,7 +354,7 @@ void ResourceScalix::addIncidence( const char* mimetype, const TQString& data,
 
 
 bool ResourceScalix::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const TQString& subresource,
-                                     Q_UINT32 sernum )
+                                     TQ_UINT32 sernum )
 {
   const TQString& type = incidencebase->type();
   const char* mimetype = 0;
@@ -390,14 +390,14 @@ bool ResourceScalix::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const
   // behold, sernum is an in-parameter
   const bool rc = kmailUpdate( subresource, sernum, data, mimetype, subject, customHeaders );
   // update the serial number
-  if ( mUidMap.contains( incidencebase->uid() ) ) {
+  if ( mUidMap.tqcontains( incidencebase->uid() ) ) {
     mUidMap[ incidencebase->uid() ].setSerialNumber( sernum );
   }
   return rc;
 }
 
 bool ResourceScalix::addIncidence( KCal::Incidence* incidence, const TQString& _subresource,
-                                  Q_UINT32 sernum )
+                                  TQ_UINT32 sernum )
 {
   Q_ASSERT( incidence );
   if ( !incidence ) return false;
@@ -450,7 +450,7 @@ bool ResourceScalix::addIncidence( KCal::Incidence* incidence, const TQString& _
      * We know the new state, so lets just not do much at all. The old incidence
      * in the calendar remains valid, but the serial number changed, so we need to
      * update that */
-    if ( ourOwnUpdate = mUidsPendingUpdate.contains( uid ) ) {
+    if ( ourOwnUpdate = mUidsPendingUpdate.tqcontains( uid ) ) {
       mUidsPendingUpdate.remove( uid );
       mUidMap.remove( uid );
       mUidMap[ uid ] = StorageReference( subResource, sernum );
@@ -460,7 +460,7 @@ bool ResourceScalix::addIncidence( KCal::Incidence* incidence, const TQString& _
        * unless the folder is read-only, in which case the user should not be
        * offered a means of putting mails in a folder she'll later be unable to
        * upload. Skip the incidence, in this case. */
-      if ( mUidMap.contains( uid )
+      if ( mUidMap.tqcontains( uid )
           && ( mUidMap[ uid ].resource() == subResource ) ) {
         if ( (*map)[ subResource ].writable() ) {
           resolveConflict( incidence, subResource, sernum );
@@ -472,7 +472,7 @@ bool ResourceScalix::addIncidence( KCal::Incidence* incidence, const TQString& _
       }
       /* Add to the cache if the add didn't come from KOrganizer, in which case
        * we've already added it, and listen to updates from KOrganizer for it. */
-      if ( !mUidsPendingAdding.contains( uid ) ) {
+      if ( !mUidsPendingAdding.tqcontains( uid ) ) {
         mCalendar.addIncidence( incidence );
         incidence->registerObserver( this );
       }
@@ -489,7 +489,7 @@ bool ResourceScalix::addIncidence( KCal::Incidence* incidence, const TQString& _
     } else {
       /* If the uid was added by KMail, KOrganizer needs to be told, so
        * schedule emitting of the resourceChanged signal. */
-      if ( !mUidsPendingAdding.contains( uid ) ) {
+      if ( !mUidsPendingAdding.tqcontains( uid ) ) {
         if ( !ourOwnUpdate ) mResourceChangedTimer.changeInterval( 100 );
       } else {
         mUidsPendingAdding.remove( uid );
@@ -504,7 +504,7 @@ bool ResourceScalix::addIncidence( KCal::Incidence* incidence, const TQString& _
 
 bool ResourceScalix::addEvent( KCal::Event* event )
 {
-  if ( mUidMap.contains( event->uid() ) )
+  if ( mUidMap.tqcontains( event->uid() ) )
     return true; //noop
   else
     return addIncidence( event, TQString::null, 0 );
@@ -521,7 +521,7 @@ bool ResourceScalix::deleteIncidence( KCal::Incidence* incidence )
   if ( incidence->isReadOnly() ) return false;
 
   const TQString uid = incidence->uid();
-  if( !mUidMap.contains( uid ) ) return false; // Odd
+  if( !mUidMap.tqcontains( uid ) ) return false; // Odd
   /* The user told us to delete, tell KMail */
   if ( !mSilent ) {
     kmailDeleteIncidence( mUidMap[ uid ].resource(),
@@ -572,7 +572,7 @@ KCal::Event::List ResourceScalix::rawEvents( const TQDate& start,
 
 bool ResourceScalix::addTodo( KCal::Todo* todo )
 {
-  if ( mUidMap.contains( todo->uid() ) )
+  if ( mUidMap.tqcontains( todo->uid() ) )
     return true; //noop
   else
     return addIncidence( todo, TQString::null, 0 );
@@ -606,7 +606,7 @@ KCal::Todo::List ResourceScalix::rawTodosForDate( const TQDate& date )
 
 bool ResourceScalix::addJournal( KCal::Journal* journal )
 {
-  if ( mUidMap.contains( journal->uid() ) )
+  if ( mUidMap.tqcontains( journal->uid() ) )
     return true; //noop
   else
     return addIncidence( journal, TQString::null, 0 );
@@ -657,7 +657,7 @@ void ResourceScalix::setTimeZoneId( const TQString& tzid )
 
 bool ResourceScalix::fromKMailAddIncidence( const TQString& type,
                                            const TQString& subResource,
-                                           Q_UINT32 sernum,
+                                           TQ_UINT32 sernum,
                                            int /*format*/,
                                            const TQString& data )
 {
@@ -689,11 +689,11 @@ void ResourceScalix::fromKMailDelIncidence( const TQString& type,
   if ( !subresourceActive( subResource ) ) return;
 
   // Can't be in both, by contract
-  if ( mUidsPendingDeletion.contains( uid ) ) {
+  if ( mUidsPendingDeletion.tqcontains( uid ) ) {
     mUidsPendingDeletion.remove( uid );
-  } else if ( mUidsPendingUpdate.contains( uid ) ) {
+  } else if ( mUidsPendingUpdate.tqcontains( uid ) ) {
     // It's good to know if was deleted, but we are waiting on a new one to
-    // replace it, so let's just sit tight.
+    // tqreplace it, so let's just sit tight.
   } else {
     // We didn't trigger this, so KMail did, remove the reference to the uid
     KCal::Incidence* incidence = mCalendar.incidence( uid );
@@ -741,7 +741,7 @@ void ResourceScalix::fromKMailAddSubresource( const TQString& type,
     // Not ours
     return;
 
-  if ( map->contains( subResource ) )
+  if ( map->tqcontains( subResource ) )
     // Already registered
     return;
 
@@ -760,7 +760,7 @@ void ResourceScalix::fromKMailDelSubresource( const TQString& type,
   ResourceMap* map = subResourceMap( type );
   if ( !map ) // not ours
     return;
-  if ( map->contains( subResource ) )
+  if ( map->tqcontains( subResource ) )
     map->erase( subResource );
   else
     // Not registered
@@ -807,11 +807,11 @@ TQStringList ResourceScalix::subresources() const
 const QString
 ResourceScalix::labelForSubresource( const TQString& subresource ) const
 {
-  if ( mEventSubResources.contains( subresource ) )
+  if ( mEventSubResources.tqcontains( subresource ) )
     return mEventSubResources[ subresource ].label();
-  if ( mTodoSubResources.contains( subresource ) )
+  if ( mTodoSubResources.tqcontains( subresource ) )
     return mTodoSubResources[ subresource ].label();
-  if ( mJournalSubResources.contains( subresource ) )
+  if ( mJournalSubResources.tqcontains( subresource ) )
     return mJournalSubResources[ subresource ].label();
   return subresource;
 }
@@ -819,21 +819,21 @@ ResourceScalix::labelForSubresource( const TQString& subresource ) const
 TQString ResourceScalix::subresourceIdentifier( Incidence *incidence )
 {
   TQString uid = incidence->uid();
-  if ( mUidMap.contains( uid ) )
+  if ( mUidMap.tqcontains( uid ) )
     return mUidMap[ uid ].resource();
   else
-    if ( mNewIncidencesMap.contains( uid ) )
+    if ( mNewIncidencesMap.tqcontains( uid ) )
       return mNewIncidencesMap[ uid ];
     else
       return TQString();
 }
 
-void ResourceScalix::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+void ResourceScalix::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                               const TQString& type,
                                               const TQString& folder )
 {
   TemporarySilencer t( this );
-  for( TQMap<Q_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it )
+  for( TQMap<TQ_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it )
     addIncidence( type.latin1(), it.data(), folder, it.key() );
 }
 
@@ -843,11 +843,11 @@ bool ResourceScalix::subresourceActive( const TQString& subresource ) const
   // before it opens the resource :-( Make sure we are open
   const_cast<ResourceScalix*>( this )->doOpen();
 
-  if ( mEventSubResources.contains( subresource ) )
+  if ( mEventSubResources.tqcontains( subresource ) )
     return mEventSubResources[ subresource ].active();
-  if ( mTodoSubResources.contains( subresource ) )
+  if ( mTodoSubResources.tqcontains( subresource ) )
     return mTodoSubResources[ subresource ].active();
-  if ( mJournalSubResources.contains( subresource ) )
+  if ( mJournalSubResources.tqcontains( subresource ) )
     return mJournalSubResources[ subresource ].active();
 
   // Safe default bet:
@@ -860,11 +860,11 @@ void ResourceScalix::setSubresourceActive( const TQString &subresource, bool v )
 {
   ResourceMap *map = 0;
 
-  if ( mEventSubResources.contains( subresource ) )
+  if ( mEventSubResources.tqcontains( subresource ) )
      map = &mEventSubResources;
-  if ( mTodoSubResources.contains( subresource ) )
+  if ( mTodoSubResources.tqcontains( subresource ) )
      map = &mTodoSubResources;
-  if ( mJournalSubResources.contains( subresource ) )
+  if ( mJournalSubResources.tqcontains( subresource ) )
      map = &mJournalSubResources;
 
   if ( map && ( ( *map )[ subresource ].active() != v ) ) {
diff --git a/kresources/scalix/kcal/resourcescalix.h b/kresources/scalix/kcal/resourcescalix.h
index 11baa5ec..e00909c7 100644
--- a/kresources/scalix/kcal/resourcescalix.h
+++ b/kresources/scalix/kcal/resourcescalix.h
@@ -105,7 +105,7 @@ public:
 
   /// The ResourceScalixBase methods called by KMail
   bool fromKMailAddIncidence( const TQString& type, const TQString& subResource,
-                              Q_UINT32 sernum, int format, const TQString& data );
+                              TQ_UINT32 sernum, int format, const TQString& data );
   void fromKMailDelIncidence( const TQString& type, const TQString& subResource,
                               const TQString& uid );
   void fromKMailRefresh( const TQString& type, const TQString& subResource );
@@ -115,7 +115,7 @@ public:
                                 const TQString& label, bool writable );
   void fromKMailDelSubresource( const TQString& type, const TQString& subResource );
 
-  void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+  void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                  const TQString& type,
                                  const TQString& folder );
 
@@ -141,20 +141,20 @@ protected slots:
 
 private:
   void removeIncidences( const TQCString& incidenceType );
-  void resolveConflict( KCal::Incidence*, const TQString& subresource, Q_UINT32 sernum );
+  void resolveConflict( KCal::Incidence*, const TQString& subresource, TQ_UINT32 sernum );
 
   void addIncidence( const char* mimetype, const TQString& xml,
-                     const TQString& subResource, Q_UINT32 sernum );
+                     const TQString& subResource, TQ_UINT32 sernum );
 
   bool addIncidence( KCal::Incidence* i, const TQString& subresource,
-                     Q_UINT32 sernum );
+                     TQ_UINT32 sernum );
 /*
   void addEvent( const TQString& xml, const TQString& subresource,
-                 Q_UINT32 sernum );
+                 TQ_UINT32 sernum );
   void addTodo( const TQString& xml, const TQString& subresource,
-                Q_UINT32 sernum );
+                TQ_UINT32 sernum );
   void addJournal( const TQString& xml, const TQString& subresource,
-                   Q_UINT32 sernum );
+                   TQ_UINT32 sernum );
 */
 
   bool loadAllEvents();
@@ -180,7 +180,7 @@ private:
   Scalix::ResourceMap* subResourceMap( const TQString& contentsType );
 
   bool sendKMailUpdate( KCal::IncidenceBase* incidence, const TQString& _subresource,
-                        Q_UINT32 sernum );
+                        TQ_UINT32 sernum );
 
 
   KCal::CalendarLocal mCalendar;
@@ -194,11 +194,11 @@ private:
   ICalFormat mFormat;
 
   /**
-    This map contains the association between a new added incidence
+    This map tqcontains the association between a new added incidence
     and the subresource it belongs to.
     That's needed to return the correct mapping in subresourceIdentifier().
 
-    We can't trust on mUidMap here, because it contains only non-pending uids.
+    We can't trust on mUidMap here, because it tqcontains only non-pending uids.
    */
   TQMap<TQString, TQString> mNewIncidencesMap;
   int mProgressDialogIncidenceLimit;
diff --git a/kresources/scalix/kioslave/scalix.cpp b/kresources/scalix/kioslave/scalix.cpp
index 043b0f4a..2a0c06cd 100644
--- a/kresources/scalix/kioslave/scalix.cpp
+++ b/kresources/scalix/kioslave/scalix.cpp
@@ -73,7 +73,7 @@ void Scalix::get( const KURL &url )
 
   TQString path = url.path();
 
-  if ( path.contains( "/freebusy/" ) ) {
+  if ( path.tqcontains( "/freebusy/" ) ) {
     retrieveFreeBusy( url );
   } else {
     error( KIO::ERR_SLAVE_DEFINED, i18n( "Unknown path. Known path is '/freebusy/'" ) );
@@ -84,7 +84,7 @@ void Scalix::put( const KURL& url, int, bool, bool )
 {
   TQString path = url.path();
 
-  if ( path.contains( "/freebusy/" ) ) {
+  if ( path.tqcontains( "/freebusy/" ) ) {
     publishFreeBusy( url );
   } else {
     error( KIO::ERR_SLAVE_DEFINED, i18n( "Unknown path. Known path is '/freebusy/'" ) );
@@ -121,7 +121,7 @@ void Scalix::retrieveFreeBusy( const KURL &url )
   connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
            this, TQT_SLOT( slotRetrieveResult( KIO::Job* ) ) );
 
-  qApp->eventLoop()->enterLoop();
+  tqApp->eventLoop()->enterLoop();
 }
 
 void Scalix::publishFreeBusy( const KURL &url )
@@ -185,7 +185,7 @@ void Scalix::publishFreeBusy( const KURL &url )
   connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
            this, TQT_SLOT( slotPublishResult( KIO::Job* ) ) );
 
-  qApp->eventLoop()->enterLoop();
+  tqApp->eventLoop()->enterLoop();
 }
 
 void Scalix::slotInfoMessage( KIO::Job *job, const TQString &data )
@@ -208,7 +208,7 @@ void Scalix::slotRetrieveResult( KIO::Job *job )
     finished();
   }
 
-  qApp->eventLoop()->exitLoop();
+  tqApp->eventLoop()->exitLoop();
 }
 
 void Scalix::slotPublishResult( KIO::Job *job )
@@ -219,7 +219,7 @@ void Scalix::slotPublishResult( KIO::Job *job )
     finished();
   }
 
-  qApp->eventLoop()->exitLoop();
+  tqApp->eventLoop()->exitLoop();
 }
 
 #include "scalix.moc"
diff --git a/kresources/scalix/knotes/resourcescalix.cpp b/kresources/scalix/knotes/resourcescalix.cpp
index 2b789528..5afd6402 100644
--- a/kresources/scalix/knotes/resourcescalix.cpp
+++ b/kresources/scalix/knotes/resourcescalix.cpp
@@ -49,7 +49,7 @@ static const char* inlineMimeType = "text/calendar";
 
 ResourceScalix::ResourceScalix( const KConfig *config )
   : ResourceNotes( config ), ResourceScalixBase( "ResourceScalix-KNotes" ),
-    mCalendar( TQString::fromLatin1("UTC") )
+    mCalendar( TQString::tqfromLatin1("UTC") )
 {
   setType( "scalix" );
 }
@@ -99,7 +99,7 @@ bool ResourceScalix::loadSubResource( const TQString& subResource,
     return false;
   }
 
-  TQMap<Q_UINT32, TQString> lst;
+  TQMap<TQ_UINT32, TQString> lst;
   if( !kmailIncidences( lst, mimetype, subResource, 0, count ) ) {
     kdError(5500) << "Communication problem in "
                   << "ResourceScalix::getIncidenceList()\n";
@@ -111,7 +111,7 @@ bool ResourceScalix::loadSubResource( const TQString& subResource,
   // Populate with the new entries
   const bool silent = mSilent;
   mSilent = true;
-  TQMap<Q_UINT32, TQString>::Iterator it;
+  TQMap<TQ_UINT32, TQString>::Iterator it;
   for ( it = lst.begin(); it != lst.end(); ++it ) {
     KCal::Journal* journal = addNote( it.data(), subResource, it.key(), mimetype );
     if ( !journal )
@@ -158,7 +158,7 @@ bool ResourceScalix::addNote( KCal::Journal* journal )
 }
 
 KCal::Journal* ResourceScalix::addNote( const TQString& data, const TQString& subresource,
-                             Q_UINT32 sernum, const TQString& )
+                             TQ_UINT32 sernum, const TQString& )
 {
   KCal::Journal* journal = 0;
     // FIXME: This does not take into account the time zone!
@@ -166,7 +166,7 @@ KCal::Journal* ResourceScalix::addNote( const TQString& data, const TQString& su
   journal = static_cast<KCal::Journal*>( formatter.fromString( data ) );
 
   Q_ASSERT( journal );
-  if( journal && !mUidMap.contains( journal->uid() ) )
+  if( journal && !mUidMap.tqcontains( journal->uid() ) )
     if ( addNote( journal, subresource, sernum ) )
       return journal;
     else
@@ -175,7 +175,7 @@ KCal::Journal* ResourceScalix::addNote( const TQString& data, const TQString& su
 }
 
 bool ResourceScalix::addNote( KCal::Journal* journal,
-                             const TQString& subresource, Q_UINT32 sernum )
+                             const TQString& subresource, TQ_UINT32 sernum )
 {
   kdDebug(5500) << "ResourceScalix::addNote( KCal::Journal*, '" << subresource << "', " << sernum << " )\n";
 
@@ -212,7 +212,7 @@ bool ResourceScalix::addNote( KCal::Journal* journal,
 bool ResourceScalix::deleteNote( KCal::Journal* journal )
 {
   const TQString uid = journal->uid();
-  if ( !mUidMap.contains( uid ) )
+  if ( !mUidMap.tqcontains( uid ) )
     // Odd
     return false;
 
@@ -252,8 +252,8 @@ KCal::Alarm::List ResourceScalix::alarms( const TQDateTime& from, const TQDateTi
 void ResourceScalix::incidenceUpdated( KCal::IncidenceBase* i )
 {
   TQString subResource;
-  Q_UINT32 sernum;
-  if ( mUidMap.contains( i->uid() ) ) {
+  TQ_UINT32 sernum;
+  if ( mUidMap.tqcontains( i->uid() ) ) {
     subResource = mUidMap[ i->uid() ].resource();
     sernum = mUidMap[ i->uid() ].serialNumber();
   } else { // can this happen?
@@ -276,7 +276,7 @@ void ResourceScalix::incidenceUpdated( KCal::IncidenceBase* i )
  */
 bool ResourceScalix::fromKMailAddIncidence( const TQString& type,
                                            const TQString& subResource,
-                                           Q_UINT32 sernum,
+                                           TQ_UINT32 sernum,
                                            int,
                                            const TQString& note )
 {
@@ -327,7 +327,7 @@ void ResourceScalix::fromKMailAddSubresource( const TQString& type,
     // Not ours
     return;
 
-  if ( mSubResources.contains( subResource ) )
+  if ( mSubResources.tqcontains( subResource ) )
     // Already registered
     return;
 
@@ -347,7 +347,7 @@ void ResourceScalix::fromKMailDelSubresource( const TQString& type,
     // Not ours
     return;
 
-  if ( !mSubResources.contains( subResource ) )
+  if ( !mSubResources.tqcontains( subResource ) )
     // Not registered
     return;
 
@@ -383,7 +383,7 @@ void ResourceScalix::fromKMailDelSubresource( const TQString& type,
   emit signalSubresourceRemoved( this, type, subResource );
 }
 
-void ResourceScalix::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+void ResourceScalix::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                               const TQString& type,
                                               const TQString& folder )
 {
@@ -393,7 +393,7 @@ void ResourceScalix::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>&
   const bool silent = mSilent;
   mSilent = true;
   TQString mimetype = inlineMimeType;
-  for( TQMap<Q_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it ) {
+  for( TQMap<TQ_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it ) {
     KCal::Journal* journal = addNote( it.data(), folder, it.key(), mimetype );
     if ( !journal )
       kdDebug(5500) << "loading note " << it.key() << " failed" << endl;
@@ -411,7 +411,7 @@ TQStringList ResourceScalix::subresources() const
 
 bool ResourceScalix::subresourceActive( const TQString& res ) const
 {
-  if ( mSubResources.contains( res ) ) {
+  if ( mSubResources.tqcontains( res ) ) {
     return mSubResources[ res ].active();
   }
 
diff --git a/kresources/scalix/knotes/resourcescalix.h b/kresources/scalix/knotes/resourcescalix.h
index cb0c50fb..dc8517b6 100644
--- a/kresources/scalix/knotes/resourcescalix.h
+++ b/kresources/scalix/knotes/resourcescalix.h
@@ -80,7 +80,7 @@ public:
 
   /// The ResourceScalixBase methods called by KMail
   bool fromKMailAddIncidence( const TQString& type, const TQString& resource,
-                              Q_UINT32 sernum, int format, const TQString& note );
+                              TQ_UINT32 sernum, int format, const TQString& note );
   void fromKMailDelIncidence( const TQString& type, const TQString& resource,
                               const TQString& uid );
   void fromKMailRefresh( const TQString& type, const TQString& resource );
@@ -90,7 +90,7 @@ public:
                                 const TQString& label, bool writable );
   void fromKMailDelSubresource( const TQString& type, const TQString& resource );
 
-  void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+  void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                  const TQString& type,
                                  const TQString& folder );
 
@@ -106,9 +106,9 @@ signals:
 
 private:
   bool addNote( KCal::Journal* journal, const TQString& resource,
-                Q_UINT32 sernum );
+                TQ_UINT32 sernum );
   KCal::Journal* addNote( const TQString& data, const TQString& subresource,
-                          Q_UINT32 sernum, const TQString &mimetype );
+                          TQ_UINT32 sernum, const TQString &mimetype );
 
   bool loadSubResource( const TQString& resource, const TQString& mimetype );
 
diff --git a/kresources/scalix/scalixadmin/delegatedialog.cpp b/kresources/scalix/scalixadmin/delegatedialog.cpp
index 661f5743..d0a9644e 100644
--- a/kresources/scalix/scalixadmin/delegatedialog.cpp
+++ b/kresources/scalix/scalixadmin/delegatedialog.cpp
@@ -35,18 +35,18 @@ DelegateDialog::DelegateDialog( TQWidget *parent )
   : KDialogBase( parent, "", true, "", Ok | Cancel, Ok, true )
 {
   TQWidget *page = new TQWidget( this );
-  TQGridLayout *layout = new TQGridLayout( page, 5, 3, 11, 6 );
+  TQGridLayout *tqlayout = new TQGridLayout( page, 5, 3, 11, 6 );
 
   TQLabel *label = new TQLabel( i18n( "User:" ), page );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mEmail = new TQLineEdit( page );
-  layout->addWidget( mEmail, 0, 1 );
+  tqlayout->addWidget( mEmail, 0, 1 );
 
   TQToolButton *emailSelector = new TQToolButton( page );
   emailSelector->setUsesTextLabel( true );
   emailSelector->setTextLabel( i18n( "..." ) );
-  layout->addWidget( emailSelector, 0, 2 );
+  tqlayout->addWidget( emailSelector, 0, 2 );
 
   TQValueList<Scalix::DelegateTypes> types;
   types << Scalix::SendOnBehalfOf;
@@ -57,7 +57,7 @@ DelegateDialog::DelegateDialog( TQWidget *parent )
   int row = 1;
   for ( uint i = 0; i < types.count(); ++i ) {
     TQCheckBox *box = new TQCheckBox( Scalix::Delegate::rightsAsString( types[ i ] ), page );
-    layout->addMultiCellWidget( box, row, row, 1, 2 );
+    tqlayout->addMultiCellWidget( box, row, row, 1, 2 );
 
     mRights.insert( types[ i ], box );
     row++;
diff --git a/kresources/scalix/scalixadmin/delegatepage.cpp b/kresources/scalix/scalixadmin/delegatepage.cpp
index 03347290..32b29d46 100644
--- a/kresources/scalix/scalixadmin/delegatepage.cpp
+++ b/kresources/scalix/scalixadmin/delegatepage.cpp
@@ -37,21 +37,21 @@
 DelegatePage::DelegatePage( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 2, 3, 11, 6 );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, 11, 6 );
 
   mView = new DelegateView( &mManager, this );
-  layout->addMultiCellWidget( mView, 0, 0, 0, 2 );
+  tqlayout->addMultiCellWidget( mView, 0, 0, 0, 2 );
 
   mAddButton = new TQPushButton( i18n( "Add Delegate..." ), this );
-  layout->addWidget( mAddButton, 1, 0 );
+  tqlayout->addWidget( mAddButton, 1, 0 );
 
   mEditButton = new TQPushButton( i18n( "Edit Delegate..." ), this );
   mEditButton->setEnabled( false );
-  layout->addWidget( mEditButton, 1, 1 );
+  tqlayout->addWidget( mEditButton, 1, 1 );
 
   mRemoveButton = new TQPushButton( i18n( "Remove Delegate" ), this );
   mRemoveButton->setEnabled( false );
-  layout->addWidget( mRemoveButton, 1, 2 );
+  tqlayout->addWidget( mRemoveButton, 1, 2 );
 
   connect( mView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( selectionChanged() ) );
   connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addDelegate() ) );
diff --git a/kresources/scalix/scalixadmin/otherusermanager.cpp b/kresources/scalix/scalixadmin/otherusermanager.cpp
index a3c19de1..cacb9474 100644
--- a/kresources/scalix/scalixadmin/otherusermanager.cpp
+++ b/kresources/scalix/scalixadmin/otherusermanager.cpp
@@ -30,7 +30,7 @@ OtherUserManager::~OtherUserManager()
 
 void OtherUserManager::addOtherUser( const TQString &email )
 {
-  if ( !mOtherUsers.contains( email ) ) {
+  if ( !mOtherUsers.tqcontains( email ) ) {
     mOtherUsers.append( email );
     emit changed();
   }
diff --git a/kresources/scalix/scalixadmin/otheruserpage.cpp b/kresources/scalix/scalixadmin/otheruserpage.cpp
index 8570cab0..f7a9ee63 100644
--- a/kresources/scalix/scalixadmin/otheruserpage.cpp
+++ b/kresources/scalix/scalixadmin/otheruserpage.cpp
@@ -40,17 +40,17 @@
 OtherUserPage::OtherUserPage( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 2, 2, 11, 6 );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, 11, 6 );
 
   mView = new OtherUserView( &mManager, this );
-  layout->addMultiCellWidget( mView, 0, 0, 0, 1 );
+  tqlayout->addMultiCellWidget( mView, 0, 0, 0, 1 );
 
   mAddButton = new TQPushButton( i18n( "Add Account..." ), this );
-  layout->addWidget( mAddButton, 1, 0 );
+  tqlayout->addWidget( mAddButton, 1, 0 );
 
   mDeleteButton = new TQPushButton( i18n( "Remove Account" ), this );
   mDeleteButton->setEnabled( false );
-  layout->addWidget( mDeleteButton, 1, 1 );
+  tqlayout->addWidget( mDeleteButton, 1, 1 );
 
   connect( mView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( selectionChanged() ) );
   connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addUser() ) );
@@ -139,12 +139,12 @@ void OtherUserPage::selectionChanged()
 
 void OtherUserPage::updateKmail()
 {
-  TQMessageBox *msg = new TQMessageBox( qApp->mainWidget() );
+  TQMessageBox *msg = new TQMessageBox( tqApp->mainWidget() );
   msg->setText( i18n( "Updating account..." ) );
   msg->show();
-  qApp->processEvents();
+  tqApp->processEvents();
   sleep( 1 );
-  qApp->processEvents();
+  tqApp->processEvents();
 
   TQString error;
   TQCString dcopService;
diff --git a/kresources/scalix/scalixadmin/outofofficepage.cpp b/kresources/scalix/scalixadmin/outofofficepage.cpp
index e1e331fc..401d4de1 100644
--- a/kresources/scalix/scalixadmin/outofofficepage.cpp
+++ b/kresources/scalix/scalixadmin/outofofficepage.cpp
@@ -36,7 +36,7 @@
 OutOfOfficePage::OutOfOfficePage( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 4, 2, 11, 6 );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, 11, 6 );
 
   TQButtonGroup *group = new TQButtonGroup( 1, Qt::Vertical, this );
 
@@ -48,10 +48,10 @@ OutOfOfficePage::OutOfOfficePage( TQWidget *parent )
   mMessage = new TQTextEdit( this );
   mSaveButton = new TQPushButton( i18n( "Save" ), this );
 
-  layout->addMultiCellWidget( group, 0, 0, 0, 1 );
-  layout->addMultiCellWidget( mLabel, 1, 1, 0, 1 );
-  layout->addMultiCellWidget( mMessage, 2, 2, 0, 1 );
-  layout->addWidget( mSaveButton, 3, 1 );
+  tqlayout->addMultiCellWidget( group, 0, 0, 0, 1 );
+  tqlayout->addMultiCellWidget( mLabel, 1, 1, 0, 1 );
+  tqlayout->addMultiCellWidget( mMessage, 2, 2, 0, 1 );
+  tqlayout->addWidget( mSaveButton, 3, 1 );
 
   statusChanged();
 
diff --git a/kresources/scalix/scalixadmin/passwordpage.cpp b/kresources/scalix/scalixadmin/passwordpage.cpp
index facc2917..e75d3fdd 100644
--- a/kresources/scalix/scalixadmin/passwordpage.cpp
+++ b/kresources/scalix/scalixadmin/passwordpage.cpp
@@ -38,29 +38,29 @@
 PasswordPage::PasswordPage( TQWidget *parent )
   : TQWidget( parent ), mJob( 0 )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 2, 3, 11, 6 );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, 11, 6 );
 
   TQLabel *label = new TQLabel( i18n( "New password:" ), this );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mPassword = new TQLineEdit( this );
   mPassword->setEchoMode( TQLineEdit::Password );
   label->setBuddy( mPassword );
-  layout->addWidget( mPassword, 0, 1 );
+  tqlayout->addWidget( mPassword, 0, 1 );
 
   label = new TQLabel( i18n( "Retype new password:" ), this );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
 
   mPasswordRetype = new TQLineEdit( this );
   mPasswordRetype->setEchoMode( TQLineEdit::Password );
   label->setBuddy( mPasswordRetype );
-  layout->addWidget( mPasswordRetype, 1, 1 );
+  tqlayout->addWidget( mPasswordRetype, 1, 1 );
 
   mButton = new TQPushButton( i18n( "Change" ), this );
   mButton->setEnabled( false );
-  layout->addWidget( mButton, 2, 1 );
+  tqlayout->addWidget( mButton, 2, 1 );
 
-  layout->setRowSpacing( 3, 1 );
+  tqlayout->setRowSpacing( 3, 1 );
 
   connect( mPassword, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged() ) );
   connect( mPasswordRetype, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged() ) );
@@ -165,8 +165,8 @@ void PasswordPage::finished( KIO::Job* job )
       // First try to store in KWallet
       if ( KWallet::Wallet::isEnabled() ) {
         WId window = 0;
-        if ( qApp->activeWindow() )
-          window = qApp->activeWindow()->winId();
+        if ( tqApp->activeWindow() )
+          window = tqApp->activeWindow()->winId();
 
         KWallet::Wallet *wallet = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(), window );
         if ( wallet ) {
diff --git a/kresources/scalix/shared/kmailconnection.cpp b/kresources/scalix/shared/kmailconnection.cpp
index b4b4b9eb..60ea25ee 100644
--- a/kresources/scalix/shared/kmailconnection.cpp
+++ b/kresources/scalix/shared/kmailconnection.cpp
@@ -88,8 +88,8 @@ bool KMailConnection::connectToKMail()
                                                    dcopService, dcopObjectId );
 
     // Attach to the KMail signals
-    if ( !connectKMailSignal( "incidenceAdded(TQString,TQString,Q_UINT32,int,TQString)",
-                              "fromKMailAddIncidence(TQString,TQString,Q_UINT32,int,TQString)" ) )
+    if ( !connectKMailSignal( "incidenceAdded(TQString,TQString,TQ_UINT32,int,TQString)",
+                              "fromKMailAddIncidence(TQString,TQString,TQ_UINT32,int,TQString)" ) )
       kdError(5650) << "DCOP connection to incidenceAdded failed" << endl;
     if ( !connectKMailSignal( "incidenceDeleted(TQString,TQString,TQString)",
                               "fromKMailDelIncidence(TQString,TQString,TQString)" ) )
@@ -103,8 +103,8 @@ bool KMailConnection::connectToKMail()
     if ( !connectKMailSignal( "subresourceDeleted(TQString,TQString)",
                               "fromKMailDelSubresource(TQString,TQString)" ) )
       kdError(5650) << "DCOP connection to subresourceDeleted failed" << endl;
-    if ( !connectKMailSignal( "asyncLoadResult(TQMap<Q_UINT32, TQString>, TQString, TQString)",
-                              "fromKMailAsyncLoadResult(TQMap<Q_UINT32, TQString>, TQString, TQString)" ) )
+    if ( !connectKMailSignal( "asyncLoadResult(TQMap<TQ_UINT32, TQString>, TQString, TQString)",
+                              "fromKMailAsyncLoadResult(TQMap<TQ_UINT32, TQString>, TQString, TQString)" ) )
       kdError(5650) << "DCOP connection to asyncLoadResult failed" << endl;
   }
 
@@ -113,7 +113,7 @@ bool KMailConnection::connectToKMail()
 
 bool KMailConnection::fromKMailAddIncidence( const TQString& type,
                                              const TQString& folder,
-                                             Q_UINT32 sernum,
+                                             TQ_UINT32 sernum,
                                              int format,
                                              const TQString& data )
 {
@@ -164,7 +164,7 @@ void KMailConnection::fromKMailDelSubresource( const TQString& type,
   mResource->fromKMailDelSubresource( type, resource );
 }
 
-void KMailConnection::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+void KMailConnection::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                                 const TQString& type,
                                                 const TQString& folder )
 {
@@ -199,7 +199,7 @@ bool KMailConnection::kmailIncidencesCount( int& count,
   return mKMailIcalIfaceStub->ok();
 }
 
-bool KMailConnection::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
+bool KMailConnection::kmailIncidences( TQMap<TQ_UINT32, TQString>& lst,
                                        const TQString& mimetype,
                                        const TQString& resource,
                                        int startIndex,
@@ -215,7 +215,7 @@ bool KMailConnection::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
 
 bool KMailConnection::kmailGetAttachment( KURL& url,
                                           const TQString& resource,
-                                          Q_UINT32 sernum,
+                                          TQ_UINT32 sernum,
                                           const TQString& filename )
 {
   if ( !connectToKMail() )
@@ -226,7 +226,7 @@ bool KMailConnection::kmailGetAttachment( KURL& url,
 }
 
 bool KMailConnection::kmailDeleteIncidence( const TQString& resource,
-                                            Q_UINT32 sernum )
+                                            TQ_UINT32 sernum )
 {
   return connectToKMail()
     && mKMailIcalIfaceStub->deleteIncidenceKolab( resource, sernum )
@@ -234,7 +234,7 @@ bool KMailConnection::kmailDeleteIncidence( const TQString& resource,
 }
 
 bool KMailConnection::kmailUpdate( const TQString& resource,
-                                   Q_UINT32& sernum,
+                                   TQ_UINT32& sernum,
                                    const TQString& subject,
                                    const TQString& plainTextBody,
                                    const TQMap<TQCString, TQString>& customHeaders,
diff --git a/kresources/scalix/shared/kmailconnection.h b/kresources/scalix/shared/kmailconnection.h
index bd02d7bb..3d34d5c6 100644
--- a/kresources/scalix/shared/kmailconnection.h
+++ b/kresources/scalix/shared/kmailconnection.h
@@ -54,13 +54,13 @@ class KMailConnection : public TQObject, public DCOPObject {
   // These are the methods called by KMail when the resource changes
 k_dcop:
   bool fromKMailAddIncidence( const TQString& type, const TQString& resource,
-                              Q_UINT32 sernum, int format, const TQString& xml );
+                              TQ_UINT32 sernum, int format, const TQString& xml );
   void fromKMailDelIncidence( const TQString& type, const TQString& resource,
                               const TQString& xml );
   void fromKMailRefresh( const TQString& type, const TQString& resource );
   void fromKMailAddSubresource( const TQString& type, const TQString& resource, const TQString& label );
   void fromKMailDelSubresource( const TQString& type, const TQString& resource );
-  void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map, const TQString& type,
+  void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map, const TQString& type,
                                  const TQString& folder );
 
 public:
@@ -78,16 +78,16 @@ public:
   bool kmailIncidencesCount( int& count,
                              const TQString& mimetype,
                              const TQString& resource );
-  bool kmailIncidences( TQMap<Q_UINT32, TQString>& lst, const TQString& mimetype,
+  bool kmailIncidences( TQMap<TQ_UINT32, TQString>& lst, const TQString& mimetype,
                         const TQString& resource,
                         int startIndex,
                         int nbMessages );
 
-  bool kmailGetAttachment( KURL& url, const TQString& resource, Q_UINT32 sernum,
+  bool kmailGetAttachment( KURL& url, const TQString& resource, TQ_UINT32 sernum,
                            const TQString& filename );
-  bool kmailDeleteIncidence( const TQString& resource, Q_UINT32 sernum );
+  bool kmailDeleteIncidence( const TQString& resource, TQ_UINT32 sernum );
   bool kmailUpdate( const TQString& resource,
-                    Q_UINT32& sernum,
+                    TQ_UINT32& sernum,
                     const TQString& subject,
                     const TQString& plainTextBody,
                     const TQMap<TQCString, TQString>& customHeaders,
diff --git a/kresources/scalix/shared/resourcescalixbase.cpp b/kresources/scalix/shared/resourcescalixbase.cpp
index e239bfb3..9bd0afb8 100644
--- a/kresources/scalix/shared/resourcescalixbase.cpp
+++ b/kresources/scalix/shared/resourcescalixbase.cpp
@@ -82,7 +82,7 @@ bool ResourceScalixBase::kmailIncidencesCount( int &count,
   return mConnection->kmailIncidencesCount( count, mimetype, resource );
 }
 
-bool ResourceScalixBase::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
+bool ResourceScalixBase::kmailIncidences( TQMap<TQ_UINT32, TQString>& lst,
                                          const TQString& mimetype,
                                          const TQString& resource,
                                          int startIndex,
@@ -92,20 +92,20 @@ bool ResourceScalixBase::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
 }
 
 bool ResourceScalixBase::kmailGetAttachment( KURL& url, const TQString& resource,
-                                            Q_UINT32 sernum,
+                                            TQ_UINT32 sernum,
                                             const TQString& filename ) const
 {
   return mConnection->kmailGetAttachment( url, resource, sernum, filename );
 }
 
 bool ResourceScalixBase::kmailDeleteIncidence( const TQString& resource,
-                                              Q_UINT32 sernum )
+                                              TQ_UINT32 sernum )
 {
   return mSilent || mConnection->kmailDeleteIncidence( resource, sernum );
 }
 
 bool ResourceScalixBase::kmailUpdate( const TQString& resource,
-                                     Q_UINT32& sernum,
+                                     TQ_UINT32& sernum,
                                      const TQString& xml,
                                      const TQString& mimetype,
                                      const TQString& subject,
diff --git a/kresources/scalix/shared/resourcescalixbase.h b/kresources/scalix/shared/resourcescalixbase.h
index 803ac47b..e402e427 100644
--- a/kresources/scalix/shared/resourcescalixbase.h
+++ b/kresources/scalix/shared/resourcescalixbase.h
@@ -78,7 +78,7 @@ public:
   // These are the methods called by KMail when the resource changes
   virtual bool fromKMailAddIncidence( const TQString& type,
                                       const TQString& resource,
-                                      Q_UINT32 sernum,
+                                      TQ_UINT32 sernum,
                                       int format,
                                       const TQString& data ) = 0;
   virtual void fromKMailDelIncidence( const TQString& type,
@@ -93,7 +93,7 @@ public:
   virtual void fromKMailDelSubresource( const TQString& type,
                                         const TQString& resource ) = 0;
 
-  virtual void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+  virtual void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                          const TQString& type,
                                          const TQString& folder ) = 0;
 protected:
@@ -115,7 +115,7 @@ protected:
 
   /// Get the mimetype attachments from a chunk of messages from this folder.
   /// Returns a TQMap with serialNumber/attachment pairs.
-  bool kmailIncidences( TQMap<Q_UINT32, TQString>& lst, const TQString& mimetype,
+  bool kmailIncidences( TQMap<TQ_UINT32, TQString>& lst, const TQString& mimetype,
                         const TQString& resource,
                         int startIndex,
                         int nbMessages ) const;
@@ -127,12 +127,12 @@ public: // for Contact
   /// be called by the resource after obtaining the incidence.
   /// The resource must delete the temp file.
   bool kmailGetAttachment( KURL& url, const TQString& resource,
-                           Q_UINT32 sernum,
+                           TQ_UINT32 sernum,
                            const TQString& filename ) const;
 
 protected:
   /// Delete an incidence.
-  bool kmailDeleteIncidence( const TQString& resource, Q_UINT32 sernum );
+  bool kmailDeleteIncidence( const TQString& resource, TQ_UINT32 sernum );
 
   KMailICalIface::StorageFormat kmailStorageFormat( const TQString& folder ) const;
 
@@ -140,7 +140,7 @@ protected:
 
   /// Update an incidence. The list of attachments are URLs.
   /// The parameter sernum is updated with the right KMail serial number
-  bool kmailUpdate( const TQString& resource, Q_UINT32& sernum,
+  bool kmailUpdate( const TQString& resource, TQ_UINT32& sernum,
                     const TQString& xml,
                     const TQString& mimetype,
                     const TQString& subject,
diff --git a/kresources/scalix/shared/scalixbase.cpp b/kresources/scalix/shared/scalixbase.cpp
index 8fb5177b..e9a5ab8c 100644
--- a/kresources/scalix/shared/scalixbase.cpp
+++ b/kresources/scalix/shared/scalixbase.cpp
@@ -42,8 +42,8 @@ using namespace Scalix;
 
 
 ScalixBase::ScalixBase( const TQString& tz )
-  : mCreationDate( TQDateTime::currentDateTime() ),
-    mLastModified( TQDateTime::currentDateTime() ),
+  : mCreationDate( TQDateTime::tqcurrentDateTime() ),
+    mLastModified( TQDateTime::tqcurrentDateTime() ),
     mSensitivity( Public ), mTimeZoneId( tz ),
     mHasPilotSyncId( false ),  mHasPilotSyncStatus( false )
 {
@@ -92,7 +92,7 @@ void ScalixBase::setFields( const KABC::Addressee* addressee )
   kdDebug(5006) << "Creation time string: " << creationString << endl;
   TQDateTime creationDate;
   if ( creationString.isEmpty() ) {
-    creationDate = TQDateTime::currentDateTime();
+    creationDate = TQDateTime::tqcurrentDateTime();
     kdDebug(5006) << "Creation date set to current time\n";
   }
   else {
@@ -101,7 +101,7 @@ void ScalixBase::setFields( const KABC::Addressee* addressee )
   }
   TQDateTime modified = addressee->revision();
   if ( !modified.isValid() )
-    modified = TQDateTime::currentDateTime();
+    modified = TQDateTime::tqcurrentDateTime();
   setLastModified( modified );
   if ( modified < creationDate ) {
     // It's not possible that the modification date is earlier than creation
diff --git a/kresources/scalix/shared/subresource.cpp b/kresources/scalix/shared/subresource.cpp
index 0acfb081..02c9e40f 100644
--- a/kresources/scalix/shared/subresource.cpp
+++ b/kresources/scalix/shared/subresource.cpp
@@ -86,7 +86,7 @@ int SubResource::completionWeight() const
   return mCompletionWeight;
 }
 
-StorageReference::StorageReference( const TQString& resource, Q_UINT32 sernum )
+StorageReference::StorageReference( const TQString& resource, TQ_UINT32 sernum )
   : mResource( resource ), mSerialNumber( sernum )
 {
 }
@@ -105,12 +105,12 @@ TQString StorageReference::resource() const
   return mResource;
 }
 
-void StorageReference::setSerialNumber( Q_UINT32 serialNumber )
+void StorageReference::setSerialNumber( TQ_UINT32 serialNumber )
 {
   mSerialNumber = serialNumber;
 }
 
-Q_UINT32 StorageReference::serialNumber() const
+TQ_UINT32 StorageReference::serialNumber() const
 {
   return mSerialNumber;
 }
diff --git a/kresources/scalix/shared/subresource.h b/kresources/scalix/shared/subresource.h
index f7898c14..d7c575da 100644
--- a/kresources/scalix/shared/subresource.h
+++ b/kresources/scalix/shared/subresource.h
@@ -89,18 +89,18 @@ public:
   // Just for QMap
   StorageReference() {}
 
-  StorageReference( const TQString& resource, Q_UINT32 sernum );
+  StorageReference( const TQString& resource, TQ_UINT32 sernum );
   virtual ~StorageReference();
 
   virtual void setResource( const TQString& resource );
   virtual TQString resource() const;
 
-  virtual void setSerialNumber( Q_UINT32 serialNumber );
-  virtual Q_UINT32 serialNumber() const;
+  virtual void setSerialNumber( TQ_UINT32 serialNumber );
+  virtual TQ_UINT32 serialNumber() const;
 
 private:
   TQString mResource;
-  Q_UINT32 mSerialNumber;
+  TQ_UINT32 mSerialNumber;
 };
 
 typedef TQMap<TQString, StorageReference> UidMap;
diff --git a/kresources/slox/kabcresourceslox.cpp b/kresources/slox/kabcresourceslox.cpp
index 16d5aced..433a6adb 100644
--- a/kresources/slox/kabcresourceslox.cpp
+++ b/kresources/slox/kabcresourceslox.cpp
@@ -218,7 +218,7 @@ bool ResourceSlox::asyncLoad()
            TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
            TQT_SLOT( cancelDownload() ) );
 
-  mPrefs->setLastSync( TQDateTime::currentDateTime() );
+  mPrefs->setLastSync( TQDateTime::tqcurrentDateTime() );
 
   return true;
 }
@@ -269,7 +269,7 @@ void ResourceSlox::slotResult( KIO::Job *job )
         a.setResource( this );
         a.setChanged( false );
 
-        mAddrMap.replace( a.uid(), a );
+        mAddrMap.tqreplace( a.uid(), a );
 
         // TODO: Do we need to try to associate addressees with slox accounts?
 
@@ -306,7 +306,7 @@ void ResourceSlox::slotUploadResult( KIO::Job *job )
     TQValueList<SloxItem>::ConstIterator it;
     for( it = items.begin(); it != items.end(); ++it ) {
       SloxItem item = *it;
-      if ( !item.response.contains( "200" ) ) {
+      if ( !item.response.tqcontains( "200" ) ) {
         savingError( this, item.response + "\n" + item.responseDescription );
         continue;
       }
@@ -320,7 +320,7 @@ void ResourceSlox::slotUploadResult( KIO::Job *job )
           a.setUid( "kresources_slox_kabc_" + item.sloxId );
           a.setResource( this );
           a.setChanged( false );
-          mAddrMap.replace( a.uid(), a );
+          mAddrMap.tqreplace( a.uid(), a );
           saveCache();
         }
       }
@@ -603,7 +603,7 @@ void ResourceSlox::createAddresseeFields( TQDomDocument &doc, TQDomElement &prop
   else
     pnSaveMap = mPhoneNumberSloxMap;
   for ( PhoneNumber::List::ConstIterator it = pnlist.begin() ; it != pnlist.end(); ++it ) {
-    if ( pnSaveMap.contains( (*it).type() ) ) {
+    if ( pnSaveMap.tqcontains( (*it).type() ) ) {
       TQStringList l = pnSaveMap[(*it).type()];
       TQString fn = l.first();
       l.remove( l.begin() );
diff --git a/kresources/slox/kcalresourceslox.cpp b/kresources/slox/kcalresourceslox.cpp
index edd13e6f..668631d3 100644
--- a/kresources/slox/kcalresourceslox.cpp
+++ b/kresources/slox/kcalresourceslox.cpp
@@ -237,7 +237,7 @@ void KCalResourceSlox::requestEvents()
            TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
            TQT_SLOT( cancelLoadEvents() ) );
 
-  mPrefs->setLastEventSync( TQDateTime::currentDateTime() );
+  mPrefs->setLastEventSync( TQDateTime::tqcurrentDateTime() );
 }
 
 void KCalResourceSlox::requestTodos()
@@ -282,7 +282,7 @@ void KCalResourceSlox::requestTodos()
            TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
            TQT_SLOT( cancelLoadTodos() ) );
 
-  mPrefs->setLastTodoSync( TQDateTime::currentDateTime() );
+  mPrefs->setLastTodoSync( TQDateTime::tqcurrentDateTime() );
 }
 
 void KCalResourceSlox::uploadIncidences()
@@ -629,11 +629,11 @@ void KCalResourceSlox::parseMembersAttribute( const TQDomElement &e,
       TQString status = memberElement.attribute( "confirm" );
       if ( !status.isEmpty() ) {
         if ( status == "accept" ) {
-          a->setStatus( Attendee::Accepted );
+          a->seStatus( Attendee::Accepted );
         } else if ( status == "decline" ) {
-          a->setStatus( Attendee::Declined );
+          a->seStatus( Attendee::Declined );
         } else {
-          a->setStatus( Attendee::NeedsAction );
+          a->seStatus( Attendee::NeedsAction );
         }
       }
     } else {
@@ -1113,7 +1113,7 @@ void KCalResourceSlox::slotUploadResult( KIO::Job *job )
         if ( !status.isNull() ) {
           TQDomElement statusElement = status.toElement();
           TQString response = statusElement.text();
-        if ( !response.contains( "200" ) ) {
+        if ( !response.tqcontains( "200" ) ) {
             TQString error = "'" + mUploadedIncidence->summary() + "'\n";
             error += response;
             TQDomNode dn = propstat.namedItem( "responsedescription" );
diff --git a/kresources/slox/sloxaccounts.cpp b/kresources/slox/sloxaccounts.cpp
index a32df5fa..a49594ea 100644
--- a/kresources/slox/sloxaccounts.cpp
+++ b/kresources/slox/sloxaccounts.cpp
@@ -65,7 +65,7 @@ void SloxAccounts::insertUser( const TQString &id, const KABC::Addressee &a )
 {
   kdDebug() << "SloxAccount::insertUser() " << id << endl;
 
-  mUsers.replace( id, a );
+  mUsers.tqreplace( id, a );
 
   TQString email = a.preferredEmail();
 
diff --git a/kresources/slox/sloxbase.h b/kresources/slox/sloxbase.h
index 7047ed28..dd96cc49 100644
--- a/kresources/slox/sloxbase.h
+++ b/kresources/slox/sloxbase.h
@@ -35,7 +35,7 @@ class KDE_EXPORT SloxBase {
       FolderId,
       LastSync,
       ObjectType,
-      ObjectStatus,
+      ObjecStatus,
       CreatedBy,
       Categories,
       IncidenceTitle, // incidence fields
diff --git a/kresources/slox/sloxfolderdialog.cpp b/kresources/slox/sloxfolderdialog.cpp
index 4f17ea89..dc3c59dc 100644
--- a/kresources/slox/sloxfolderdialog.cpp
+++ b/kresources/slox/sloxfolderdialog.cpp
@@ -70,7 +70,7 @@ void SloxFolderDialog::createFolderViewItem( SloxFolder *folder )
     return;
   if ( folder->type() != mFolderType && folder->type() != Unbound )
     return;
-  if( mManager->folders().contains( folder->parentId() ) ) {
+  if( mManager->folders().tqcontains( folder->parentId() ) ) {
     SloxFolder *parent = mManager->folders()[folder->parentId()];
     createFolderViewItem( parent );
     if ( parent->item )
diff --git a/kresources/slox/webdavhandler.cpp b/kresources/slox/webdavhandler.cpp
index 3f1b6be8..576def37 100644
--- a/kresources/slox/webdavhandler.cpp
+++ b/kresources/slox/webdavhandler.cpp
@@ -129,7 +129,7 @@ TQValueList<SloxItem> WebdavHandler::getSloxItems( SloxBase *res, const TQDomDoc
           item.status = SloxItem::New;
       }
 
-      TQDomNode sloxStatus = prop.namedItem( res->fieldName( SloxBase::ObjectStatus ) );
+      TQDomNode sloxStatus = prop.namedItem( res->fieldName( SloxBase::ObjecStatus ) );
       if ( !sloxStatus.isNull() ) {
         TQDomElement sloxStatusElement = sloxStatus.toElement();
         if ( sloxStatusElement.text() == "DELETE" ) {
diff --git a/kresources/tvanytime/kcal_resourcetvanytime.cpp b/kresources/tvanytime/kcal_resourcetvanytime.cpp
index 83ae49bb..a7cfebec 100644
--- a/kresources/tvanytime/kcal_resourcetvanytime.cpp
+++ b/kresources/tvanytime/kcal_resourcetvanytime.cpp
@@ -288,8 +288,8 @@ bool ResourceTVAnytime::readServiceInformation( const TQDomDocument & serviceInf
           Service s;
           TQDomElement e3 = n3.toElement();
           if (s.loadXML( e3 ) ) {
-            s.setActive( mActiveServices.contains( s.id() ) );
-            bool newService = !mServiceMap.contains( s.id() );   
+            s.setActive( mActiveServices.tqcontains( s.id() ) );
+            bool newService = !mServiceMap.tqcontains( s.id() );   
             if ( newService )
             {
               mServiceMap.insert( s.id(), s );
@@ -320,7 +320,7 @@ bool ResourceTVAnytime::readService( const TQString & serviceId )
   TQStringList entries = mScheduleArchive->directory()->entries();
   TQRegExp re( "^(\\d{8})" + serviceId );
   TQStringList dates;
-  TQString todaysDate = TQDate::currentDate().toString( "yyyyMMdd" );
+  TQString todaysDate = TQDate::tqcurrentDate().toString( "yyyyMMdd" );
   for( TQStringList::Iterator it = entries.begin(); it != entries.end(); ++it )
   {
     if ( re.search( *it ) != -1 ) // this entry belongs to the requested service
@@ -328,10 +328,10 @@ bool ResourceTVAnytime::readService( const TQString & serviceId )
       TQString entry = re.cap( 1 );
       // handle this date according to user preferences
       TQDate entryDate( entry.left( 4 ).toInt(), entry.mid( 4, 2 ).toInt(), entry.right( 2 ).toInt() );
-      if ( entryDate < TQDate::currentDate() || ( entryDate > TQDate::currentDate().addDays( prefs()->days() - 1 ) ) )
+      if ( entryDate < TQDate::tqcurrentDate() || ( entryDate > TQDate::tqcurrentDate().addDays( prefs()->days() - 1 ) ) )
         continue;
 
-      if ( !dates.contains( re.cap( 1 ) ) )
+      if ( !dates.tqcontains( re.cap( 1 ) ) )
         dates.append( re.cap( 1 ) );
     }
   }
@@ -415,7 +415,7 @@ bool ResourceTVAnytime::readService( const TQString & serviceId )
                 }
               }
               else
-                kdDebug() << " file contains schedule for another service!" << endl;
+                kdDebug() << " file tqcontains schedule for another service!" << endl;
             }
           }
         }
@@ -454,7 +454,7 @@ bool ResourceTVAnytime::subresourceActive( const TQString & subresource ) const
 
 void ResourceTVAnytime::setSubresourceActive( const TQString & subresource, bool active )
 {
-  if ( mServiceMap.contains( subresource ) )
+  if ( mServiceMap.tqcontains( subresource ) )
   {
     Service s = mServiceMap[ subresource ];
     if ( s.active() != active )
diff --git a/ktnef/gui/attachpropertydialog.cpp b/ktnef/gui/attachpropertydialog.cpp
index 35cd6584..06e2685d 100644
--- a/ktnef/gui/attachpropertydialog.cpp
+++ b/ktnef/gui/attachpropertydialog.cpp
@@ -53,7 +53,7 @@ void AttachPropertyDialog::setAttachment(KTNEFAttach *attach)
 	s.append(" bytes");
 	size_->setText(s);
 	KMimeType::Ptr	mimetype = KMimeType::mimeType(attach->mimeTag());
-	TQPixmap pix = loadRenderingPixmap( attach, colorGroup().background() );
+	TQPixmap pix = loadRenderingPixmap( attach, tqcolorGroup().background() );
 	if ( !pix.isNull() )
 		icon_->setPixmap( pix );
 	else
@@ -162,7 +162,7 @@ TQPixmap loadRenderingPixmap( KTNEFPropertySet *pSet, const TQColor& bgColor )
 		rendBuffer.open( IO_ReadOnly );
 		TQDataStream rendStream( &rendBuffer );
 		rendStream.setByteOrder( TQDataStream::LittleEndian );
-		Q_UINT16 type, w, h;
+		TQ_UINT16 type, w, h;
 		rendStream >> type >> w >> w; // read type and skip 4 bytes
 		rendStream >> w >> h;
 		rendBuffer.close();
diff --git a/ktnef/gui/attachpropertydialogbase.ui b/ktnef/gui/attachpropertydialogbase.ui
index 0d68c3ac..a06db962 100644
--- a/ktnef/gui/attachpropertydialogbase.ui
+++ b/ktnef/gui/attachpropertydialogbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>AttachPropertyDialogBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -169,7 +169,7 @@
             <property name="name">
                 <cstring>icon_</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>16</width>
                     <height>16</height>
@@ -211,7 +211,7 @@
         </widget>
         <widget class="QLayoutWidget" row="8" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -227,7 +227,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>150</width>
                             <height>20</height>
@@ -274,7 +274,7 @@
 <slots>
     <slot access="protected">saveClicked()</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp
index 4c158a21..ea44edbe 100644
--- a/ktnef/gui/ktnefmain.cpp
+++ b/ktnef/gui/ktnefmain.cpp
@@ -358,7 +358,7 @@ void KTNEFMain::viewDragRequested( const TQValueList<KTNEFAttach*>& list )
 
 void KTNEFMain::slotEditToolbars()
 {
-	saveMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") );
+	saveMainWindowSettings( KGlobal::config(), TQString::tqfromLatin1("MainWindow") );
 	KEditToolbar	dlg(actionCollection());
 	connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() ));
 	dlg.exec();
@@ -367,7 +367,7 @@ void KTNEFMain::slotEditToolbars()
 void KTNEFMain::slotNewToolbarConfig()
 {
 	createGUI();
-	applyMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") );
+	applyMainWindowSettings( KGlobal::config(), TQString::tqfromLatin1("MainWindow") );
 }
 
 void KTNEFMain::slotShowMessageProperties()
diff --git a/ktnef/gui/ktnefview.cpp b/ktnef/gui/ktnefview.cpp
index a7709835..79d5f073 100644
--- a/ktnef/gui/ktnefview.cpp
+++ b/ktnef/gui/ktnefview.cpp
@@ -49,7 +49,7 @@ Attachment::Attachment(TQListView *parent, KTNEFAttach *attach)
 	if (!attach_->fileName().isEmpty()) setText(0, attach_->fileName());
 	KMimeType::Ptr	mimeType = KMimeType::mimeType( attach_->mimeTag() );
 	setText(1, mimeType->comment());
-	TQPixmap pix = loadRenderingPixmap( attach, parent->colorGroup().base() );
+	TQPixmap pix = loadRenderingPixmap( attach, parent->tqcolorGroup().base() );
 	if ( !pix.isNull() )
 		setPixmap( 0, pix );
 	else
diff --git a/ktnef/gui/qwmf.cpp b/ktnef/gui/qwmf.cpp
index 41b908d1..f8e19411 100644
--- a/ktnef/gui/qwmf.cpp
+++ b/ktnef/gui/qwmf.cpp
@@ -762,7 +762,7 @@ void QWinMetaFile::extTextOut( long num, short* parm )
         mPainter.translate( -parm[ 1 ], -parm[ 0 ] );
     }
 
-    // alignment
+    // tqalignment
     if ( mTextAlign & 0x06 )
         x -= ( width / 2 );
     if ( mTextAlign & 0x08 )
diff --git a/ktnef/gui/qwmf.h b/ktnef/gui/qwmf.h
index 2a39b7b9..5717b393 100644
--- a/ktnef/gui/qwmf.h
+++ b/ktnef/gui/qwmf.h
@@ -136,7 +136,7 @@ public: // should be protected but cannot
     /****************** Text *******************/
     /* set text color */
     void setTextColor( long num, short* parms );
-    /* set text alignment */
+    /* set text tqalignment */
     void setTextAlign( long num, short* parms );
     /* draw text */
     void textOut( long num, short* parms );
diff --git a/ktnef/gui/wmfstruct.h b/ktnef/gui/wmfstruct.h
index ca4f1f7d..33a4a67c 100644
--- a/ktnef/gui/wmfstruct.h
+++ b/ktnef/gui/wmfstruct.h
@@ -6,7 +6,7 @@
 
 typedef short WORD;
 typedef int DWORD;
-typedef Q_INT32 LONG;
+typedef TQ_INT32 LONG;
 typedef void* _HANDLE;
 
 typedef struct _RECT
@@ -53,7 +53,7 @@ struct WmfEnhMetaHeader
     WORD    nHandles;           // Number of handles in the handle table
     // Handle index zero is reserved.
     WORD    sReserved;          // Reserved.  Must be zero.
-    DWORD   nDescription;       // Number of chars in the unicode description string
+    DWORD   nDescription;       // Number of chars in the tqunicode description string
     // This is 0 if there is no description string
     DWORD   offDescription;     // Offset to the metafile description record.
     // This is 0 if there is no description string
diff --git a/ktnef/lib/ktnefparser.cpp b/ktnef/lib/ktnefparser.cpp
index e97ec812..a73a1d54 100644
--- a/ktnef/lib/ktnefparser.cpp
+++ b/ktnef/lib/ktnefparser.cpp
@@ -40,11 +40,11 @@
 
 
 typedef struct {
-	Q_UINT16 type;
-	Q_UINT16 tag;
+	TQ_UINT16 type;
+	TQ_UINT16 tag;
 	TQVariant value;
 	struct {
-		Q_UINT32 type;
+		TQ_UINT32 type;
 		TQVariant value;
 	} name;
 } MAPI_value;
@@ -52,12 +52,12 @@ typedef struct {
 void clearMAPIName( MAPI_value& mapi );
 void clearMAPIValue(MAPI_value& mapi, bool clearName = true);
 TQString readMAPIString( TQDataStream& stream, bool isUnicode = false, bool align = true, int len = -1 );
-Q_UINT16 readMAPIValue(TQDataStream& stream, MAPI_value& mapi);
+TQ_UINT16 readMAPIValue(TQDataStream& stream, MAPI_value& mapi);
 TQDateTime readTNEFDate( TQDataStream& stream );
 TQString readTNEFAddress( TQDataStream& stream );
-TQByteArray readTNEFData( TQDataStream& stream, Q_UINT32 len );
-TQVariant readTNEFAttribute( TQDataStream& stream, Q_UINT16 type, Q_UINT32 len );
-TQDateTime formatTime( Q_UINT32 lowB, Q_UINT32 highB );
+TQByteArray readTNEFData( TQDataStream& stream, TQ_UINT32 len );
+TQVariant readTNEFAttribute( TQDataStream& stream, TQ_UINT16 type, TQ_UINT32 len );
+TQDateTime formatTime( TQ_UINT32 lowB, TQ_UINT32 highB );
 TQString formatRecipient( const TQMap<int,KTNEFProperty*>& props );
 
 //------------------------------------------------------------------------------------
@@ -112,8 +112,8 @@ void KTNEFParser::deleteDevice()
 
 bool KTNEFParser::decodeMessage()
 {
-	Q_UINT32	i1, i2, off;
-	Q_UINT16	u, tag, type;
+	TQ_UINT32	i1, i2, off;
+	TQ_UINT16	u, tag, type;
 	TQVariant value;
 
 	// read (type+name)
@@ -187,8 +187,8 @@ bool KTNEFParser::decodeMessage()
 			break;
 		case attMSGSTATUS:
 			{
-				Q_UINT8 c;
-				Q_UINT32 flag = 0;
+				TQ_UINT8 c;
+				TQ_UINT32 flag = 0;
 				d->stream_ >> c;
 				if ( c & fmsRead ) flag |= MSGFLAG_READ;
 				if ( !( c & fmsModified ) ) flag |= MSGFLAG_UNMODIFIED;
@@ -202,7 +202,7 @@ bool KTNEFParser::decodeMessage()
 			break;
 		case attRECIPTABLE:
 			{
-				Q_UINT32 rows;
+				TQ_UINT32 rows;
 				TQValueList<TQVariant> recipTable;
 				d->stream_ >> rows;
 				for ( uint i=0; i<rows; i++ )
@@ -254,8 +254,8 @@ bool KTNEFParser::decodeMessage()
 
 bool KTNEFParser::decodeAttachment()
 {
-	Q_UINT32	i;
-	Q_UINT16	tag, type, u;
+	TQ_UINT32	i;
+	TQ_UINT16	tag, type, u;
 	TQVariant value;
 	TQString str;
 
@@ -328,9 +328,9 @@ void KTNEFParser::setDefaultExtractDir(const TQString& dirname)
 
 bool KTNEFParser::parseDevice()
 {
-	Q_UINT16	u;
-	Q_UINT32	i;
-	Q_UINT8		c;
+	TQ_UINT16	u;
+	TQ_UINT32	i;
+	TQ_UINT8		c;
 
 	d->message_->clearAttachments();
 	if (d->current_)
@@ -405,7 +405,7 @@ bool KTNEFParser::extractAttachmentTo(KTNEFAttach *att, const TQString& dirname)
 	if ( !outfile )
 		return false;
 
-	Q_UINT32	len = att->size(), sz(16384);
+	TQ_UINT32	len = att->size(), sz(16384);
 	int		n(0);
 	char		*buf = new char[sz];
 	bool		ok(true);
@@ -465,7 +465,7 @@ void KTNEFParser::checkCurrent( int key )
 		d->current_ = new KTNEFAttach();
 	else
 	{
-		if ( d->current_->attributes().contains( key ) )
+		if ( d->current_->attributes().tqcontains( key ) )
 		{
 			if (d->current_->offset() >= 0 )
 			{
@@ -478,7 +478,7 @@ void KTNEFParser::checkCurrent( int key )
 					// and/or content (using at most 32 bytes)
 					KMimeType::Ptr mimetype;
 					if ( !d->current_->fileName().isEmpty() )
-						mimetype = KMimeType::findByPath( d->current_->fileName(), 0, true );
+						mimetype = KMimeType::tqfindByPath( d->current_->fileName(), 0, true );
                                         if (!mimetype) return; // FIXME
 					if ( mimetype->name() == "application/octet-stream" && d->current_->size() > 0 )
 					{
@@ -486,7 +486,7 @@ void KTNEFParser::checkCurrent( int key )
 						TQByteArray buffer( QMIN( 32, d->current_->size() ) );
 						d->device_->at( d->current_->offset() );
 						d->device_->readBlock( buffer.data(), buffer.size() );
-						mimetype = KMimeType::findByContent( buffer );
+						mimetype = KMimeType::tqfindByContent( buffer );
 						d->device_->at( oldOffset );
 					}
 					d->current_->setMimeTag( mimetype->name() );
@@ -521,7 +521,7 @@ void clearMAPIValue(MAPI_value& mapi, bool clearName)
 		clearMAPIName( mapi );
 }
 
-TQDateTime formatTime( Q_UINT32 lowB, Q_UINT32 highB )
+TQDateTime formatTime( TQ_UINT32 lowB, TQ_UINT32 highB )
 {
 	TQDateTime dt;
 #if ( SIZEOF_UINT64_T == 8 )
@@ -580,27 +580,27 @@ TQString formatRecipient( const TQMap<int,KTNEFProperty*>& props )
 TQDateTime readTNEFDate( TQDataStream& stream )
 {
 	// 14-bytes long
-	Q_UINT16 y, m, d, hh, mm, ss, dm;
+	TQ_UINT16 y, m, d, hh, mm, ss, dm;
 	stream >> y >> m >> d >> hh >> mm >> ss >> dm;
 	return TQDateTime( TQDate( y, m, d ), TQTime( hh, mm, ss ) );
 }
 
 TQString readTNEFAddress( TQDataStream& stream )
 {
-	Q_UINT16 totalLen, strLen, addrLen;
+	TQ_UINT16 totalLen, strLen, addrLen;
 	TQString s;
 	stream >> totalLen >> totalLen >> strLen >> addrLen;
 	s.append( readMAPIString( stream, false, false, strLen ) );
 	s.append( " <" );
 	s.append( readMAPIString( stream, false, false, addrLen ) );
 	s.append( ">" );
-	Q_UINT8 c;
+	TQ_UINT8 c;
 	for ( int i=8+strLen+addrLen; i<totalLen; i++ )
 		stream >> c;
 	return s;
 }
 
-TQByteArray readTNEFData( TQDataStream& stream, Q_UINT32 len )
+TQByteArray readTNEFData( TQDataStream& stream, TQ_UINT32 len )
 {
 	TQByteArray array( len );
 	if ( len > 0 )
@@ -608,7 +608,7 @@ TQByteArray readTNEFData( TQDataStream& stream, Q_UINT32 len )
 	return array;
 }
 
-TQVariant readTNEFAttribute( TQDataStream& stream, Q_UINT16 type, Q_UINT32 len )
+TQVariant readTNEFAttribute( TQDataStream& stream, TQ_UINT16 type, TQ_UINT32 len )
 {
 	switch ( type )
 	{
@@ -624,18 +624,18 @@ TQVariant readTNEFAttribute( TQDataStream& stream, Q_UINT16 type, Q_UINT32 len )
 
 TQString readMAPIString( TQDataStream& stream, bool isUnicode, bool align, int len_ )
 {
-	Q_UINT32 len;
+	TQ_UINT32 len;
 	char *buf = 0;
 	if ( len_ == -1 )
 		stream >> len;
 	else
 		len = len_;
-	Q_UINT32 fullLen = len;
+	TQ_UINT32 fullLen = len;
 	if ( align )
 		ALIGN( fullLen, 4 );
 	buf = new char[ len ];
 	stream.readRawBytes( buf, len );
-	Q_UINT8 c;
+	TQ_UINT8 c;
 	for ( uint i=len; i<fullLen; i++ )
 		stream >> c;
 	TQString res;
@@ -647,9 +647,9 @@ TQString readMAPIString( TQDataStream& stream, bool isUnicode, bool align, int l
 	return res;
 }
 
-Q_UINT16 readMAPIValue(TQDataStream& stream, MAPI_value& mapi)
+TQ_UINT16 readMAPIValue(TQDataStream& stream, MAPI_value& mapi)
 {
-	Q_UINT32	d;
+	TQ_UINT32	d;
 
 	clearMAPIValue(mapi);
 	stream >> d;
@@ -696,7 +696,7 @@ Q_UINT16 readMAPIValue(TQDataStream& stream, MAPI_value& mapi)
 			break;
 		   case MAPI_TYPE_TIME:
 			{
-				Q_UINT32 lowB, highB;
+				TQ_UINT32 lowB, highB;
 				stream >> lowB >> highB;
 				value = formatTime( lowB, highB );
 			}
@@ -726,7 +726,7 @@ Q_UINT16 readMAPIValue(TQDataStream& stream, MAPI_value& mapi)
 			for (uint i=0;i<d;i++)
 			{
 				value.clear();
-				Q_UINT32 len;
+				TQ_UINT32 len;
 				stream >> len;
 				value = TQByteArray( len );
 				if (len > 0)
@@ -734,7 +734,7 @@ Q_UINT16 readMAPIValue(TQDataStream& stream, MAPI_value& mapi)
 					int fullLen = len;
 					ALIGN(fullLen, 4);
 					stream.readRawBytes(value.asByteArray().data(), len);
-					Q_UINT8 c;
+					TQ_UINT8 c;
 					for ( int i=len; i<fullLen; i++ )
 						stream >> c;
 				}
@@ -754,7 +754,7 @@ Q_UINT16 readMAPIValue(TQDataStream& stream, MAPI_value& mapi)
 
 bool KTNEFParser::readMAPIProperties( TQMap<int,KTNEFProperty*>& props, KTNEFAttach *attach )
 {
-	Q_UINT32	n;
+	TQ_UINT32	n;
 	MAPI_value	mapi;
 	KTNEFProperty *p;
 	TQMap<int,KTNEFProperty*>::ConstIterator it;
@@ -792,7 +792,7 @@ bool KTNEFParser::readMAPIProperties( TQMap<int,KTNEFProperty*>& props, KTNEFAtt
 					int len = data.size();
 					ALIGN( len, 4 );
 					d->device_->at( d->device_->at()-len );
-					Q_UINT32 interface_ID;
+					TQ_UINT32 interface_ID;
 					d->stream_ >> interface_ID;
 					if ( interface_ID == MAPI_IID_IMessage )
 					{
diff --git a/ktnef/lib/ktnefwriter.cpp b/ktnef/lib/ktnefwriter.cpp
index 48734beb..3da4dc1e 100644
--- a/ktnef/lib/ktnefwriter.cpp
+++ b/ktnef/lib/ktnefwriter.cpp
@@ -34,10 +34,10 @@
 
 class KTNEFWriter::PrivateData {
 public:
-  PrivateData() { mFirstAttachNum = TQDateTime::currentDateTime().toTime_t(); }
+  PrivateData() { mFirstAttachNum = TQDateTime::tqcurrentDateTime().toTime_t(); }
 
   KTNEFPropertySet properties;
-  Q_UINT16 mFirstAttachNum;
+  TQ_UINT16 mFirstAttachNum;
 };
 
 
@@ -50,8 +50,8 @@ KTNEFWriter::KTNEFWriter() {
   addProperty( attTNEFVERSION, atpDWORD, v );
 
   // Now set the code page to something reasonable. TODO: Use the right one
-  TQVariant v1( (Q_UINT32)0x4e4 );
-  TQVariant v2( (Q_UINT32)0x0 );
+  TQVariant v1( (TQ_UINT32)0x4e4 );
+  TQVariant v2( (TQ_UINT32)0x0 );
   TQValueList<TQVariant> list;
   list << v1;
   list << v2;
@@ -69,25 +69,25 @@ void KTNEFWriter::addProperty( int tag, int type, const TQVariant& value ) {
 }
 
 
-void addToChecksum( Q_UINT32 i, Q_UINT16 &checksum ) {
+void addToChecksum( TQ_UINT32 i, TQ_UINT16 &checksum ) {
   checksum += i & 0xff;
   checksum += (i >> 8) & 0xff;
   checksum += (i >> 16) & 0xff;
   checksum += (i >> 24) & 0xff;
 }
 
-void addToChecksum( TQCString &cs, Q_UINT16 &checksum ) {
+void addToChecksum( TQCString &cs, TQ_UINT16 &checksum ) {
   int len = cs.length();
   for (int i=0; i<len; i++)
-    checksum += (Q_UINT8)cs[i];
+    checksum += (TQ_UINT8)cs[i];
 }
 
 void writeCString( TQDataStream &stream, TQCString &str ) {
   stream.writeRawBytes( str.data(), str.length() );
-  stream << (Q_UINT8)0;
+  stream << (TQ_UINT8)0;
 }
 
-Q_UINT32 mergeTagAndType( Q_UINT32 tag, Q_UINT32 type ) {
+TQ_UINT32 mergeTagAndType( TQ_UINT32 tag, TQ_UINT32 type ) {
   return ( ( type & 0xffff ) << 16 ) | ( tag & 0xffff );
 }
 
@@ -107,8 +107,8 @@ bool KTNEFWriter::writeProperty( TQDataStream &stream, int &bytes, int tag) {
 
   KTNEFProperty *property = *it;
 
-  Q_UINT32 i;
-  Q_UINT16 checksum = 0;
+  TQ_UINT32 i;
+  TQ_UINT16 checksum = 0;
   TQValueList<TQVariant> list;
   TQString s;
   TQCString cs, cs2;
@@ -117,60 +117,60 @@ bool KTNEFWriter::writeProperty( TQDataStream &stream, int &bytes, int tag) {
   TQTime time;
   switch( tag ) {
   case attMSGSTATUS:
-    // Q_UINT8
+    // TQ_UINT8
     i = property->value().toUInt() & 0xff;
     checksum = i;
 
-    stream << (Q_UINT8)LVL_MESSAGE;
+    stream << (TQ_UINT8)LVL_MESSAGE;
     stream << mergeTagAndType( tag, property->type() );
-    stream << (Q_UINT32)1;
-    stream << (Q_UINT8)i;
+    stream << (TQ_UINT32)1;
+    stream << (TQ_UINT8)i;
 
     bytes += 10;
     break;
 
   case attMSGPRIORITY:
   case attREQUESTRES:
-    // Q_UINT16
+    // TQ_UINT16
     i = property->value().toUInt() & 0xffff;
     addToChecksum( i, checksum );
 
-    stream << (Q_UINT8)LVL_MESSAGE;
+    stream << (TQ_UINT8)LVL_MESSAGE;
     stream << mergeTagAndType( tag, property->type() );
-    stream << (Q_UINT32)2;
-    stream << (Q_UINT16)i;
+    stream << (TQ_UINT32)2;
+    stream << (TQ_UINT16)i;
 
     bytes += 11;
     break;
 
   case attTNEFVERSION:
-    // Q_UINT32
+    // TQ_UINT32
     i = property->value().toUInt();
     addToChecksum( i, checksum );
 
-    stream << (Q_UINT8)LVL_MESSAGE;
+    stream << (TQ_UINT8)LVL_MESSAGE;
     stream << mergeTagAndType( tag, property->type() );
-    stream << (Q_UINT32)4;
-    stream << (Q_UINT32)i;
+    stream << (TQ_UINT32)4;
+    stream << (TQ_UINT32)i;
 
     bytes += 13;
     break;
 
   case attOEMCODEPAGE:
-    // 2 Q_UINT32
+    // 2 TQ_UINT32
     list = property->value().toList();
     assert( list.count() == 2 );
 
-    stream << (Q_UINT8)LVL_MESSAGE;
+    stream << (TQ_UINT8)LVL_MESSAGE;
     stream << mergeTagAndType( tag, property->type() );
-    stream << (Q_UINT32)8;
+    stream << (TQ_UINT32)8;
 
     i = list[0].toInt();
     addToChecksum( i, checksum );
-    stream << (Q_UINT32)i;
+    stream << (TQ_UINT32)i;
     i = list[1].toInt();
     addToChecksum( i, checksum );
-    stream << (Q_UINT32)i;
+    stream << (TQ_UINT32)i;
 
     bytes += 17;
     break;
@@ -183,9 +183,9 @@ bool KTNEFWriter::writeProperty( TQDataStream &stream, int &bytes, int tag) {
     cs = property->value().toString().local8Bit();
     addToChecksum( cs, checksum );
 
-    stream << (Q_UINT8)LVL_MESSAGE;
+    stream << (TQ_UINT8)LVL_MESSAGE;
     stream << mergeTagAndType( tag, property->type() );
-    stream << (Q_UINT32)cs.length()+1;
+    stream << (TQ_UINT32)cs.length()+1;
     writeCString( stream, cs );
 
     bytes += 9 + cs.length()+1;
@@ -200,18 +200,18 @@ bool KTNEFWriter::writeProperty( TQDataStream &stream, int &bytes, int tag) {
     cs2 = (TQString("smtp:") + list[1].toString()).local8Bit(); // Email address
     i = 18 + cs.length() + cs2.length(); // 2 * sizof(TRP) + strings + 2x'\0'
 
-    stream << (Q_UINT8)LVL_MESSAGE;
+    stream << (TQ_UINT8)LVL_MESSAGE;
     stream << mergeTagAndType( tag, property->type() );
-    stream << (Q_UINT32)i;
+    stream << (TQ_UINT32)i;
 
     // The stream has to be aligned to 4 bytes for the strings
     // TODO: Or does it? Looks like Outlook doesn't do this
     // bytes += 17;
     // Write the first TRP structure
-    stream << (Q_UINT16)4;                 // trpidOneOff
-    stream << (Q_UINT16)i;                 // totalsize
-    stream << (Q_UINT16)(cs.length()+1);   // sizeof name
-    stream << (Q_UINT16)(cs2.length()+1);  // sizeof address
+    stream << (TQ_UINT16)4;                 // trpidOneOff
+    stream << (TQ_UINT16)i;                 // totalsize
+    stream << (TQ_UINT16)(cs.length()+1);   // sizeof name
+    stream << (TQ_UINT16)(cs2.length()+1);  // sizeof address
 
     // if ( bytes % 4 != 0 )
       // Align the buffer
@@ -221,7 +221,7 @@ bool KTNEFWriter::writeProperty( TQDataStream &stream, int &bytes, int tag) {
     writeCString( stream, cs2 );
 
     // Write the empty padding TRP structure (just zeroes)
-    stream << (Q_UINT32)0 << (Q_UINT32)0;
+    stream << (TQ_UINT32)0 << (TQ_UINT32)0;
 
     addToChecksum( 4, checksum );
     addToChecksum( i, checksum );
@@ -241,37 +241,37 @@ bool KTNEFWriter::writeProperty( TQDataStream &stream, int &bytes, int tag) {
     time = dt.time();
     date = dt.date();
 
-    stream << (Q_UINT8)LVL_MESSAGE;
+    stream << (TQ_UINT8)LVL_MESSAGE;
     stream << mergeTagAndType( tag, property->type() );
-    stream << (Q_UINT32)14;
+    stream << (TQ_UINT32)14;
 
-    i = (Q_UINT16)date.year();
+    i = (TQ_UINT16)date.year();
     addToChecksum( i, checksum );
-    stream << (Q_UINT16)i;
-    i = (Q_UINT16)date.month();
+    stream << (TQ_UINT16)i;
+    i = (TQ_UINT16)date.month();
     addToChecksum( i, checksum );
-    stream << (Q_UINT16)i;
-    i = (Q_UINT16)date.day();
+    stream << (TQ_UINT16)i;
+    i = (TQ_UINT16)date.day();
     addToChecksum( i, checksum );
-    stream << (Q_UINT16)i;
-    i = (Q_UINT16)time.hour();
+    stream << (TQ_UINT16)i;
+    i = (TQ_UINT16)time.hour();
     addToChecksum( i, checksum );
-    stream << (Q_UINT16)i;
-    i = (Q_UINT16)time.minute();
+    stream << (TQ_UINT16)i;
+    i = (TQ_UINT16)time.minute();
     addToChecksum( i, checksum );
-    stream << (Q_UINT16)i;
-    i = (Q_UINT16)time.second();
+    stream << (TQ_UINT16)i;
+    i = (TQ_UINT16)time.second();
     addToChecksum( i, checksum );
-    stream << (Q_UINT16)i;
-    i = (Q_UINT16)date.dayOfWeek();
+    stream << (TQ_UINT16)i;
+    i = (TQ_UINT16)date.dayOfWeek();
     addToChecksum( i, checksum );
-    stream << (Q_UINT16)i;
+    stream << (TQ_UINT16)i;
     break;
 /*
   case attMSGSTATUS:
     {
-      Q_UINT8 c;
-      Q_UINT32 flag = 0;
+      TQ_UINT8 c;
+      TQ_UINT32 flag = 0;
       if ( c & fmsRead ) flag |= MSGFLAG_READ;
       if ( !( c & fmsModified ) ) flag |= MSGFLAG_UNMODIFIED;
       if ( c & fmsSubmitted ) flag |= MSGFLAG_SUBMIT;
@@ -280,10 +280,10 @@ bool KTNEFWriter::writeProperty( TQDataStream &stream, int &bytes, int tag) {
       d->stream_ >> c;
 
       i = property->value().toUInt();
-      stream << (Q_UINT8)LVL_MESSAGE;
-      stream << (Q_UINT32)type;
-      stream << (Q_UINT32)2;
-      stream << (Q_UINT8)i;
+      stream << (TQ_UINT8)LVL_MESSAGE;
+      stream << (TQ_UINT32)type;
+      stream << (TQ_UINT32)2;
+      stream << (TQ_UINT8)i;
       addToChecksum( i, checksum );
       // from reader: d->message_->addProperty( 0x0E07, MAPI_TYPE_ULONG, flag );
     }
@@ -296,7 +296,7 @@ bool KTNEFWriter::writeProperty( TQDataStream &stream, int &bytes, int tag) {
     return false;
   }
 
-  stream << (Q_UINT16)checksum;
+  stream << (TQ_UINT16)checksum;
   return true;
 }
 
@@ -485,7 +485,7 @@ void KTNEFWriter::setSummary( const TQString &s ) {
 // TNEF encoding: Normal =  3, high = 2, low = 1
 // MAPI encoding: Normal = -1, high = 0, low = 1
 void KTNEFWriter::setPriority( Priority p ) {
-  TQVariant v( (Q_UINT32)p );
+  TQVariant v( (TQ_UINT32)p );
   addProperty( attMSGPRIORITY, atpSHORT, v );
 }
 
diff --git a/libemailfunctions/email.cpp b/libemailfunctions/email.cpp
index 0f6b8361..8390431c 100644
--- a/libemailfunctions/email.cpp
+++ b/libemailfunctions/email.cpp
@@ -300,7 +300,7 @@ KPIM::EmailParseResult KPIM::isValidEmailAddress( const TQString& aStr )
 
   bool tooManyAtsFlag = false;
 
-  int atCount = aStr.contains('@');
+  int atCount = aStr.tqcontains('@');
   if ( atCount > 1 ) {
     tooManyAtsFlag = true;;
   } else if ( atCount == 0 ) {
@@ -463,7 +463,7 @@ TQString KPIM::emailParseResultToString( EmailParseResult errorCode )
   switch ( errorCode ) {
     case TooManyAts :
       return i18n("The email address you entered is not valid because it "
-                "contains more than one @. "
+                "tqcontains more than one @. "
                 "You will not create valid messages if you do not "
                 "change your address.");
     case TooFewAts :
@@ -481,18 +481,18 @@ TQString KPIM::emailParseResultToString( EmailParseResult errorCode )
                 "does not contain a domain part.");
     case UnbalancedParens :
       return i18n("The email address you entered is not valid because it "
-                "contains unclosed comments/brackets.");
+                "tqcontains unclosed comments/brackets.");
     case AddressOk :
       return i18n("The email address you entered is valid.");
     case UnclosedAngleAddr :
       return i18n("The email address you entered is not valid because it "
-                "contains an unclosed anglebracket.");
+                "tqcontains an unclosed anglebracket.");
     case UnopenedAngleAddr :
       return i18n("The email address you entered is not valid because it "
-                "contains an unopened anglebracket.");
+                "tqcontains an unopened anglebracket.");
     case UnexpectedComma :
       return i18n("The email address you have entered is not valid because it "
-                "contains an unexpected comma.");
+                "tqcontains an unexpected comma.");
     case UnexpectedEnd :
       return i18n("The email address you entered is not valid because it ended "
                 "unexpectedly, this probably means you have used an escaping type "
@@ -500,17 +500,17 @@ TQString KPIM::emailParseResultToString( EmailParseResult errorCode )
                 "address.");
     case UnbalancedQuote :
       return i18n("The email address you entered is not valid because it "
-                  "contains quoted text which does not end.");
+                  "tqcontains quoted text which does not end.");
     case NoAddressSpec :
       return i18n("The email address you entered is not valid because it "
                   "does not seem to contain an actual email address, i.e. "
                   "something of the form joe@kde.org.");
     case DisallowedChar :
       return i18n("The email address you entered is not valid because it "
-                  "contains an illegal character.");
+                  "tqcontains an illegal character.");
     case InvalidDisplayName :
       return i18n("The email address you have entered is not valid because it "
-                  "contains an invalid displayname.");
+                  "tqcontains an invalid displayname.");
   }
   return i18n("Unknown problem with email address");
 }
@@ -529,7 +529,7 @@ bool KPIM::isValidSimpleEmailAddress( const TQString& aStr )
   TQString localPart = aStr.left( atChar );
   bool tooManyAtsFlag = false;
   bool inQuotedString = false;
-  int atCount = localPart.contains( '@' );
+  int atCount = localPart.tqcontains( '@' );
 
   unsigned int strlen = localPart.length();
   for ( unsigned int index=0; index < strlen; index++ ) {
diff --git a/libemailfunctions/email.h b/libemailfunctions/email.h
index 5e5e665b..fd568b97 100644
--- a/libemailfunctions/email.h
+++ b/libemailfunctions/email.h
@@ -192,7 +192,7 @@ KDE_EXPORT TQString getFirstEmailAddress( const TQString & addresses );
  * and "Stefan Taferner". "joe@example.com" returns "joe@example.com"
  * and "". Note that this only returns the first address.
  * Also note that the return value is TRUE if both the name and the
- * mail are not empty: this does NOT tell you if mail contains a
+ * mail are not empty: this does NOT tell you if mail tqcontains a
  * valid email address or just some rubbish.
  */
 KDE_EXPORT bool getNameAndMail(const TQString& aStr, TQString& name, TQString& mail);
@@ -249,7 +249,7 @@ KDE_EXPORT TQString normalizeAddressesAndDecodeIDNs( const TQString & addresses
  */
 KDE_EXPORT TQString normalizeAddressesAndEncodeIDNs( const TQString & str );
 
-/** Add quote characters around the given string if it contains a 
+/** Add quote characters around the given string if it tqcontains a 
  * character that makes that necessary, in an email name, such as ",".
  */
 KDE_EXPORT TQString quoteNameIfNecessary( const TQString& str );
diff --git a/libemailfunctions/idmapper.cpp b/libemailfunctions/idmapper.cpp
index 6250d41c..089aa922 100644
--- a/libemailfunctions/idmapper.cpp
+++ b/libemailfunctions/idmapper.cpp
@@ -98,12 +98,12 @@ bool IdMapper::save()
   TQMap<TQString, TQVariant>::Iterator it;
   for ( it = mIdMap.begin(); it != mIdMap.end(); ++it ) {
     TQString fingerprint( "" );
-    if ( mFingerprintMap.contains( it.key() ) )
+    if ( mFingerprintMap.tqcontains( it.key() ) )
       fingerprint = mFingerprintMap[ it.key() ];
     content += it.key() + "\x02\x02" + it.data().toString() + "\x02\x02" + fingerprint + "\r\n";
   }
 
-  file.writeBlock( content.latin1(), qstrlen( content.latin1() ) );
+  file.writeBlock( content.latin1(), tqstrlen( content.latin1() ) );
   file.close();
 
   return true;
@@ -117,7 +117,7 @@ void IdMapper::clear()
 
 void IdMapper::setRemoteId( const TQString &localId, const TQString &remoteId )
 {
-  mIdMap.replace( localId, remoteId );
+  mIdMap.tqreplace( localId, remoteId );
 }
 
 void IdMapper::removeRemoteId( const TQString &remoteId )
@@ -159,7 +159,7 @@ TQString IdMapper::asString() const
   TQMap<TQString, TQVariant>::ConstIterator it;
   for ( it = mIdMap.begin(); it != mIdMap.end(); ++it ) {
     TQString fp;
-    if ( mFingerprintMap.contains( it.key() ) )
+    if ( mFingerprintMap.tqcontains( it.key() ) )
       fp = mFingerprintMap[ it.key() ];
     content += it.key() + "\t" + it.data().toString() + "\t" + fp + "\r\n";
   }
@@ -174,7 +174,7 @@ void IdMapper::setFingerprint( const TQString &localId, const TQString &fingerpr
 
 const TQString& IdMapper::fingerprint( const TQString &localId ) const
 {
-  if ( mFingerprintMap.contains( localId ) )
+  if ( mFingerprintMap.tqcontains( localId ) )
     return mFingerprintMap[ localId ];
   else 
     return TQString::null;
diff --git a/libemailfunctions/networkstatus.cpp b/libemailfunctions/networkstatus.cpp
index ce6fd2eb..07ea1e83 100644
--- a/libemailfunctions/networkstatus.cpp
+++ b/libemailfunctions/networkstatus.cpp
@@ -50,7 +50,7 @@ NetworkStatus::~NetworkStatus()
   group.writeEntry( "Online", mStatus == Online );
 }
 
-void NetworkStatus::setStatus( Status status )
+void NetworkStatus::seStatus( Status status )
 {
   mStatus = status;
 
@@ -69,10 +69,10 @@ void NetworkStatus::onlineStatusChanged()
   if ( reply.isValid() ) {
     int status = reply;
     if ( status == 3 )
-      setStatus( Online );
+      seStatus( Online );
     else {
       if ( mStatus != Offline )
-        setStatus( Offline );
+        seStatus( Offline );
     }
   }
 }
diff --git a/libemailfunctions/networkstatus.h b/libemailfunctions/networkstatus.h
index 42ff0f92..7b29431f 100644
--- a/libemailfunctions/networkstatus.h
+++ b/libemailfunctions/networkstatus.h
@@ -60,7 +60,7 @@ class NetworkStatus : public TQObject, public DCOPObject
      *
      * @param status The new status.
      */
-    void setStatus( Status status );
+    void seStatus( Status status );
 
     /**
      * Returns the current status.
diff --git a/libemailfunctions/tests/testemail.cpp b/libemailfunctions/tests/testemail.cpp
index 30908d83..319151c4 100644
--- a/libemailfunctions/tests/testemail.cpp
+++ b/libemailfunctions/tests/testemail.cpp
@@ -57,7 +57,7 @@ static bool checkGetNameAndEmail(const TQString& input, const TQString& expName,
 {
   TQString name, email;
   bool retVal = KPIM::getNameAndMail(input, name, email);
-  check( "getNameAndMail " + input + " retVal", retVal?TQString::fromLatin1( "true" ):TQString::fromLatin1( "false" ), expRetVal?TQString::fromLatin1( "true" ):TQString::fromLatin1( "false" ) );
+  check( "getNameAndMail " + input + " retVal", retVal?TQString::tqfromLatin1( "true" ):TQString::tqfromLatin1( "false" ), expRetVal?TQString::tqfromLatin1( "true" ):TQString::tqfromLatin1( "false" ) );
   check( "getNameAndMail " + input + " name", name, expName );
   check( "getNameAndMail " + input + " email", email, expEmail );
   return true;
diff --git a/libkcal/assignmentvisitor.cpp b/libkcal/assignmentvisitor.cpp
index 023df857..4cc52b7c 100644
--- a/libkcal/assignmentvisitor.cpp
+++ b/libkcal/assignmentvisitor.cpp
@@ -120,4 +120,4 @@ bool AssignmentVisitor::visit( FreeBusy *freebusy )
   return true;
 }
 
-// kate: space-indent on; indent-width 2; replace-tabs on;
+// kate: space-indent on; indent-width 2; tqreplace-tabs on;
diff --git a/libkcal/assignmentvisitor.h b/libkcal/assignmentvisitor.h
index 2be0215c..046de61c 100644
--- a/libkcal/assignmentvisitor.h
+++ b/libkcal/assignmentvisitor.h
@@ -119,4 +119,4 @@ class AssignmentVisitor : public IncidenceBase::Visitor
 }
 
 #endif
-// kate: space-indent on; indent-width 2; replace-tabs on;
+// kate: space-indent on; indent-width 2; tqreplace-tabs on;
diff --git a/libkcal/attendee.cpp b/libkcal/attendee.cpp
index 9aa3d46f..d129bc36 100644
--- a/libkcal/attendee.cpp
+++ b/libkcal/attendee.cpp
@@ -53,7 +53,7 @@ bool KCal::operator==( const Attendee& a1, const Attendee& a2 )
              a1.delegator() == a2.delegator() );
 }
 
-void Attendee::setStatus( Attendee::PartStat s )
+void Attendee::seStatus( Attendee::PartStat s )
 {
   mStatus = s;
 }
diff --git a/libkcal/attendee.h b/libkcal/attendee.h
index 161c77ed..a61b07c5 100644
--- a/libkcal/attendee.h
+++ b/libkcal/attendee.h
@@ -96,7 +96,7 @@ class LIBKCAL_EXPORT Attendee : public Person
     /**
       Set status. See enum for definitions of possible values.
     */
-    void setStatus( PartStat s );
+    void seStatus( PartStat s );
 
     /**
       Return status.
diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp
index 711cdc12..c76ce329 100644
--- a/libkcal/calendar.cpp
+++ b/libkcal/calendar.cpp
@@ -935,7 +935,7 @@ void Calendar::removeRelations( Incidence *incidence )
 
 void Calendar::registerObserver( Observer *observer )
 {
-  if( !mObservers.contains( observer ) )
+  if( !mObservers.tqcontains( observer ) )
     mObservers.append( observer );
   mNewObserver = true;
 }
@@ -961,7 +961,7 @@ void Calendar::setModified( bool modified )
 void Calendar::incidenceUpdated( IncidenceBase *incidence )
 {
   incidence->setSyncStatus( Event::SYNCMOD );
-  incidence->setLastModified( TQDateTime::currentDateTime() );
+  incidence->setLastModified( TQDateTime::tqcurrentDateTime() );
   // we should probably update the revision number here,
   // or internally in the Event itself when certain things change.
   // need to verify with ical documentation.
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index 2f2d7739..95b5a006 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -499,7 +499,7 @@ void CalendarLocal::appendRecurringAlarms( Alarm::List &alarms,
 void CalendarLocal::incidenceUpdated( IncidenceBase *incidence )
 {
   incidence->setSyncStatusSilent( Event::SYNCMOD );
-  incidence->setLastModified( TQDateTime::currentDateTime() );
+  incidence->setLastModified( TQDateTime::tqcurrentDateTime() );
   // we should probably update the revision number here,
   // or internally in the Event itself when certain things change.
   // need to verify with ical documentation.
diff --git a/libkcal/calendarnull.cpp b/libkcal/calendarnull.cpp
index f4b07789..39993e44 100644
--- a/libkcal/calendarnull.cpp
+++ b/libkcal/calendarnull.cpp
@@ -36,7 +36,7 @@ CalendarNull *CalendarNull::mSelf = 0;
 
 CalendarNull *CalendarNull::self()
 {
-  if ( !mSelf ) mSelf = new CalendarNull( TQString::fromLatin1( "UTC" ) );
+  if ( !mSelf ) mSelf = new CalendarNull( TQString::tqfromLatin1( "UTC" ) );
 
   return mSelf;
 }
diff --git a/libkcal/calendarresources.cpp b/libkcal/calendarresources.cpp
index abd1cc21..50c5fba5 100644
--- a/libkcal/calendarresources.cpp
+++ b/libkcal/calendarresources.cpp
@@ -324,7 +324,7 @@ bool CalendarResources::addIncidence( Incidence *incidence,
   kdDebug(5800)<< "CalendarResources: validRes is " << validRes << endl;
 
   ResourceCalendar *oldResource = 0;
-  if ( mResourceMap.contains( incidence ) ) {
+  if ( mResourceMap.tqcontains( incidence ) ) {
     oldResource = mResourceMap[incidence];
   }
   mResourceMap[incidence] = resource;
@@ -960,7 +960,7 @@ void CalendarResources::endAddingIncidences()
 
 int CalendarResources::incrementChangeCount( ResourceCalendar *r )
 {
-  if ( !mChangeCounts.contains( r ) ) {
+  if ( !mChangeCounts.tqcontains( r ) ) {
     mChangeCounts.insert( r, 0 );
   }
 
@@ -973,7 +973,7 @@ int CalendarResources::incrementChangeCount( ResourceCalendar *r )
 
 int CalendarResources::decrementChangeCount( ResourceCalendar *r )
 {
-  if ( !mChangeCounts.contains( r ) ) {
+  if ( !mChangeCounts.tqcontains( r ) ) {
     kdError() << "No change count for resource." << endl;
     return 0;
   }
diff --git a/libkcal/calendarresources.h b/libkcal/calendarresources.h
index a78b77bb..9a93be53 100644
--- a/libkcal/calendarresources.h
+++ b/libkcal/calendarresources.h
@@ -161,7 +161,7 @@ class LIBKCAL_EXPORT CalendarResources :
     */
     CalendarResources(
       const TQString &timeZoneId,
-      const TQString &family = TQString::fromLatin1( "calendar" ) );
+      const TQString &family = TQString::tqfromLatin1( "calendar" ) );
 
     /**
        Destructor
diff --git a/libkcal/calfilter.cpp b/libkcal/calfilter.cpp
index 898ec79c..c065bf44 100644
--- a/libkcal/calfilter.cpp
+++ b/libkcal/calfilter.cpp
@@ -108,14 +108,14 @@ bool CalFilter::filterIncidence(Incidence *incidence) const
     if ( (mCriteria & HideCompleted) && todo->isCompleted() ) {
       // Check if completion date is suffently long ago:
       if ( todo->completed().addDays( mCompletedTimeSpan ) <
-           TQDateTime::currentDateTime() ) {
+           TQDateTime::tqcurrentDateTime() ) {
         return false;
       }
     }
 
     if( ( mCriteria & HideInactiveTodos ) &&
         ( todo->hasStartDate() &&
-          TQDateTime::currentDateTime() < todo->dtStart() ||
+          TQDateTime::tqcurrentDateTime() < todo->dtStart() ||
           todo->isCompleted() ) )
       return false;
 
diff --git a/libkcal/calformat.cpp b/libkcal/calformat.cpp
index e506b8df..12ba3069 100644
--- a/libkcal/calformat.cpp
+++ b/libkcal/calformat.cpp
@@ -27,8 +27,8 @@
 
 using namespace KCal;
 
-TQString CalFormat::mApplication = TQString::fromLatin1("libkcal");
-TQString CalFormat::mProductId = TQString::fromLatin1("-//K Desktop Environment//NONSGML libkcal 3.5//EN");
+TQString CalFormat::mApplication = TQString::tqfromLatin1("libkcal");
+TQString CalFormat::mProductId = TQString::tqfromLatin1("-//K Desktop Environment//NONSGML libkcal 3.5//EN");
 
 
 CalFormat::CalFormat()
diff --git a/libkcal/calhelper.cpp b/libkcal/calhelper.cpp
index cae5c102..ebdb9de9 100644
--- a/libkcal/calhelper.cpp
+++ b/libkcal/calhelper.cpp
@@ -45,7 +45,7 @@ bool CalHelper::isMyKolabIncidence( Calendar *calendar, Incidence *incidence )
   CalendarResourceManager::Iterator it;
   for ( it = manager->begin(); it != manager->end(); ++it ) {
     TQString subRes = (*it)->subresourceIdentifier( incidence );
-    if ( !subRes.isEmpty() && !subRes.contains( "/.INBOX.directory/" ) ) {
+    if ( !subRes.isEmpty() && !subRes.tqcontains( "/.INBOX.directory/" ) ) {
       return false;
     }
   }
@@ -126,7 +126,7 @@ bool CalHelper::hasMyWritableEventsFolders( const TQString &family )
       if ( (*it)->type() == "imap" || (*it)->type() == "kolab" ) {
         if ( (*it)->subresourceType( ( *subIt ) ) == "todo" ||
              (*it)->subresourceType( ( *subIt ) ) == "journal" ||
-             !(*subIt).contains( "/.INBOX.directory/" ) ) {
+             !(*subIt).tqcontains( "/.INBOX.directory/" ) ) {
           continue;
         }
       }
diff --git a/libkcal/calselectdialog.cpp b/libkcal/calselectdialog.cpp
index 9c346f48..3022d7cc 100644
--- a/libkcal/calselectdialog.cpp
+++ b/libkcal/calselectdialog.cpp
@@ -54,16 +54,16 @@ CalSelectDialog::CalSelectDialog( const TQString &caption, const TQString &label
   : KDialogBase( 0, 0, true, caption, Ok|Cancel, Ok, true )
 {
   TQFrame *frame = makeMainWidget();
-  TQVBoxLayout *layout = new TQVBoxLayout( frame, 0, spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( frame, 0, spacingHint() );
 
   TQLabel *labelWidget = new TQLabel( label, frame );
-  layout->addWidget( labelWidget );
+  tqlayout->addWidget( labelWidget );
 
   mListBox = new KListBox( frame );
   mListBox->insertStringList( list );
   mListBox->setSelected( 0, true );
   mListBox->ensureCurrentVisible();
-  layout->addWidget( mListBox, 10 );
+  tqlayout->addWidget( mListBox, 10 );
 
   connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem *)),
            TQT_SLOT(slotOk()) );
@@ -72,7 +72,7 @@ CalSelectDialog::CalSelectDialog( const TQString &caption, const TQString &label
 
   mListBox->setFocus();
 
-  layout->addStretch();
+  tqlayout->addStretch();
 
   setMinimumWidth( 320 );
 }
diff --git a/libkcal/compat.cpp b/libkcal/compat.cpp
index 8268f978..5b5c6a5a 100644
--- a/libkcal/compat.cpp
+++ b/libkcal/compat.cpp
@@ -217,7 +217,7 @@ void CompatPre31::fixRecurrence( Incidence *incidence )
       TQValueList<int> months = r->byMonths();
       for ( TQValueListConstIterator<int> it = days.begin(); it != days.end(); ++it ) {
         int newmonth = TQDate( r->startDt().date().year(), 1, 1).addDays( (*it) - 1 ).month();
-        if ( !months.contains( newmonth ) )
+        if ( !months.tqcontains( newmonth ) )
           months.append( newmonth );
       }
       r->setByMonths( months );
diff --git a/libkcal/customproperties.cpp b/libkcal/customproperties.cpp
index 2d59fe91..689a2c85 100644
--- a/libkcal/customproperties.cpp
+++ b/libkcal/customproperties.cpp
@@ -123,7 +123,7 @@ TQMap<TQCString, TQString> CustomProperties::customProperties() const
 
 bool CustomProperties::checkName(const TQCString &name)
 {
-  // Check that the property name starts with 'X-' and contains
+  // Check that the property name starts with 'X-' and tqcontains
   // only the permitted characters
   const char* n = name;
   int len = name.length();
diff --git a/libkcal/dndfactory.cpp b/libkcal/dndfactory.cpp
index b94c1707..7f439819 100644
--- a/libkcal/dndfactory.cpp
+++ b/libkcal/dndfactory.cpp
@@ -232,7 +232,7 @@ Incidence::List DndFactory::pasteIncidences( const TQDate &newDate, const TQTime
   // update relations
   for ( it = list.constBegin(); it != list.constEnd(); ++it ) {
     Incidence *inc = *it;
-    if ( oldUidToNewInc.contains( inc->relatedToUid() ) ) {
+    if ( oldUidToNewInc.tqcontains( inc->relatedToUid() ) ) {
       Incidence *parentInc = oldUidToNewInc[inc->relatedToUid()];
       inc->setRelatedToUid( parentInc->uid() );
       inc->setRelatedTo( parentInc );
diff --git a/libkcal/htmlexport.cpp b/libkcal/htmlexport.cpp
index c945b88f..f5fde5d9 100644
--- a/libkcal/htmlexport.cpp
+++ b/libkcal/htmlexport.cpp
@@ -172,14 +172,14 @@ void HtmlExport::createMonthView(TQTextStream *ts)
         *ts << "    <td valign=\"top\"><table border=\"0\">";
 
         *ts << "<tr><td ";
-        if (mHolidayMap.contains(start) || start.dayOfWeek() == 7) {
+        if (mHolidayMap.tqcontains(start) || start.dayOfWeek() == 7) {
           *ts << "class=\"dateholiday\"";
         } else {
           *ts << "class=\"date\"";
         }
         *ts << ">" << TQString::number(start.day());
 
-        if (mHolidayMap.contains(start)) {
+        if (mHolidayMap.tqcontains(start)) {
           *ts << " <em>" << mHolidayMap[start] << "</em>";
         }
 
@@ -343,7 +343,7 @@ void HtmlExport::createTodoList ( TQTextStream *ts )
   }
 
   // FIXME: Sort list by priorities. This is brute force and should be
-  // replaced by a real sorting algorithm.
+  // tqreplaced by a real sorting algorithm.
   Todo::List todoList;
   for ( int i = 1; i <= 9; ++i ) {
     for( it = rawTodoList.begin(); it != rawTodoList.end(); ++it ) {
@@ -403,7 +403,7 @@ void HtmlExport::createTodoList ( TQTextStream *ts )
 
       Todo::List sortedList;
       // FIXME: Sort list by priorities. This is brute force and should be
-      // replaced by a real sorting algorithm.
+      // tqreplaced by a real sorting algorithm.
       for ( int i = 1; i <= 9; ++i ) {
         Incidence::List::ConstIterator it2;
         for( it2 = relations.begin(); it2 != relations.end(); ++it2 ) {
@@ -559,7 +559,7 @@ void HtmlExport::formatAttendees( TQTextStream *ts, Incidence *event )
 #ifndef KORG_NOKABC
     KABC::AddressBook *add_book = KABC::StdAddressBook::self( true );
     KABC::Addressee::List addressList;
-    addressList = add_book->findByEmail(event->organizer().email());
+    addressList = add_book->tqfindByEmail(event->organizer().email());
     KABC::Addressee o = addressList.first();
     if (!o.isEmpty() && addressList.size()<2) {
       *ts << "<a href=\"mailto:" << event->organizer().email() << "\">";
@@ -589,7 +589,7 @@ void HtmlExport::formatAttendees( TQTextStream *ts, Incidence *event )
 
 TQString HtmlExport::breakString(const TQString &text)
 {
-  int number = text.contains("\n");
+  int number = text.tqcontains("\n");
   if(number < 0) {
     return text;
   } else {
@@ -640,28 +640,28 @@ void HtmlExport::createFooter( TQTextStream *ts )
 TQString HtmlExport::cleanChars(const TQString &text)
 {
   TQString txt = text;
-  txt = txt.replace( "&", "&amp;" );
-  txt = txt.replace( "<", "&lt;" );
-  txt = txt.replace( ">", "&gt;" );
-  txt = txt.replace( "\"", "&quot;" );
-  txt = txt.replace( TQString::fromUtf8("ä"), "&auml;" );
-  txt = txt.replace( TQString::fromUtf8("á"), "&aacute;" );
-  txt = txt.replace( TQString::fromUtf8("à"), "&agrave;" );
-  txt = txt.replace( TQString::fromUtf8("â"), "&acirc;" );
-  txt = txt.replace( TQString::fromUtf8("Ä"), "&Auml;" );
-  txt = txt.replace( TQString::fromUtf8("ó"), "&oacute;" );
-  txt = txt.replace( TQString::fromUtf8("ô"), "&ocirc;" );
-  txt = txt.replace( TQString::fromUtf8("ö"), "&ouml;" );
-  txt = txt.replace( TQString::fromUtf8("Ö"), "&Ouml;" );
-  txt = txt.replace( TQString::fromUtf8("ü"), "&uuml;" );
-  txt = txt.replace( TQString::fromUtf8("Ü"), "&Uuml;" );
-  txt = txt.replace( TQString::fromUtf8("ß"), "&szlig;" );
-  txt = txt.replace( TQString::fromUtf8("€"), "&euro;" );
-  txt = txt.replace( TQString::fromUtf8("é"), "&eacute;" );
-  txt = txt.replace( TQString::fromUtf8("ë"), "&euml;" );
-  txt = txt.replace( TQString::fromUtf8("è"), "&egrave;" );
-  txt = txt.replace( TQString::fromUtf8("ñ"), "&ntilde;" );
-  txt = txt.replace( TQString::fromUtf8("ç"), "&ccedil;" );
+  txt = txt.tqreplace( "&", "&amp;" );
+  txt = txt.tqreplace( "<", "&lt;" );
+  txt = txt.tqreplace( ">", "&gt;" );
+  txt = txt.tqreplace( "\"", "&quot;" );
+  txt = txt.tqreplace( TQString::fromUtf8("ä"), "&auml;" );
+  txt = txt.tqreplace( TQString::fromUtf8("á"), "&aacute;" );
+  txt = txt.tqreplace( TQString::fromUtf8("à"), "&agrave;" );
+  txt = txt.tqreplace( TQString::fromUtf8("â"), "&acirc;" );
+  txt = txt.tqreplace( TQString::fromUtf8("Ä"), "&Auml;" );
+  txt = txt.tqreplace( TQString::fromUtf8("ó"), "&oacute;" );
+  txt = txt.tqreplace( TQString::fromUtf8("ô"), "&ocirc;" );
+  txt = txt.tqreplace( TQString::fromUtf8("ö"), "&ouml;" );
+  txt = txt.tqreplace( TQString::fromUtf8("Ö"), "&Ouml;" );
+  txt = txt.tqreplace( TQString::fromUtf8("ü"), "&uuml;" );
+  txt = txt.tqreplace( TQString::fromUtf8("Ü"), "&Uuml;" );
+  txt = txt.tqreplace( TQString::fromUtf8("ß"), "&szlig;" );
+  txt = txt.tqreplace( TQString::fromUtf8("€"), "&euro;" );
+  txt = txt.tqreplace( TQString::fromUtf8("é"), "&eacute;" );
+  txt = txt.tqreplace( TQString::fromUtf8("ë"), "&euml;" );
+  txt = txt.tqreplace( TQString::fromUtf8("è"), "&egrave;" );
+  txt = txt.tqreplace( TQString::fromUtf8("ñ"), "&ntilde;" );
+  txt = txt.tqreplace( TQString::fromUtf8("ç"), "&ccedil;" );
 
   return txt;
 }
diff --git a/libkcal/icaldrag.cpp b/libkcal/icaldrag.cpp
index 39315f5a..2c5f2309 100644
--- a/libkcal/icaldrag.cpp
+++ b/libkcal/icaldrag.cpp
@@ -46,7 +46,7 @@ bool ICalDrag::decode( TQMimeSource *de, Calendar *cal )
 {
   bool success = false;
 
-  TQByteArray payload = de->encodedData( "text/calendar" );
+  TQByteArray payload = de->tqencodedData( "text/calendar" );
   if ( payload.size() ) {
     TQString txt = TQString::fromUtf8( payload.data() );
 
diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp
index c6a245c8..76898ec0 100644
--- a/libkcal/icalformat.cpp
+++ b/libkcal/icalformat.cpp
@@ -440,7 +440,7 @@ ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal,
 
   if (messageText.isEmpty())
   {
-    setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::fromLatin1( "messageText was empty, unable to parse into a ScheduleMessage" ) ) );
+    setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::tqfromLatin1( "messageText was empty, unable to parse into a ScheduleMessage" ) ) );
     return 0;
   }
   // TODO FIXME: Don't we have to ical-free message??? MEMLEAK
@@ -449,7 +449,7 @@ ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal,
 
   if (!message)
   {
-    setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::fromLatin1( "icalparser was unable to parse messageText into a ScheduleMessage" ) ) );
+    setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::tqfromLatin1( "icalparser was unable to parse messageText into a ScheduleMessage" ) ) );
     return 0;
   }
 
@@ -457,7 +457,7 @@ ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal,
                                                      ICAL_METHOD_PROPERTY);
   if (!m)
   {
-    setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::fromLatin1( "message didn't contain an ICAL_METHOD_PROPERTY" ) ) );
+    setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::tqfromLatin1( "message didn't contain an ICAL_METHOD_PROPERTY" ) ) );
     return 0;
   }
 
@@ -495,7 +495,7 @@ ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal,
 
   if (!incidence) {
     kdDebug(5800) << "ICalFormat:parseScheduleMessage: object is not a freebusy, event, todo or journal" << endl;
-    setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::fromLatin1( "object is not a freebusy, event, todo or journal" ) ) );
+    setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::tqfromLatin1( "object is not a freebusy, event, todo or journal" ) ) );
     return 0;
   }
 
diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index d711dd1a..bdbc1f7b 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -73,9 +73,9 @@ static TQString quoteForParam( const TQString &text )
 {
   TQString tmp = text;
   tmp.remove( '"' );
-  if ( tmp.contains( ';' ) || tmp.contains( ':' ) || tmp.contains( ',' ) )
+  if ( tmp.tqcontains( ';' ) || tmp.tqcontains( ':' ) || tmp.tqcontains( ',' ) )
     return tmp; // libical quotes in this case already, see icalparameter_as_ical_string()
-  return TQString::fromLatin1( "\"" ) + tmp + TQString::fromLatin1( "\"" );
+  return TQString::tqfromLatin1( "\"" ) + tmp + TQString::tqfromLatin1( "\"" );
 }
 
 const int gSecondsPerMinute = 60;
@@ -157,7 +157,7 @@ icalcomponent *ICalFormatImpl::writeTodo(Todo *todo)
     if (!todo->hasCompletedDate()) {
       // If todo was created by KOrganizer <2.2 it has no correct completion
       // date. Set it to now.
-      todo->setCompleted(TQDateTime::currentDateTime());
+      todo->setCompleted(TQDateTime::tqcurrentDateTime());
     }
     icaltimetype completed = writeICalDateTime(todo->completed());
     icalcomponent_add_property(vtodo,icalproperty_new_completed(completed));
@@ -537,7 +537,7 @@ void ICalFormatImpl::writeIncidenceBase( icalcomponent *parent,
                                          IncidenceBase * incidenceBase )
 {
   icalcomponent_add_property( parent, icalproperty_new_dtstamp(
-      writeICalDateTime( TQDateTime::currentDateTime() ) ) );
+      writeICalDateTime( TQDateTime::tqcurrentDateTime() ) ) );
 
   // organizer stuff
   if ( !incidenceBase->organizer().isEmpty() ) {
@@ -1083,7 +1083,7 @@ Event *ICalFormatImpl::readEvent( icalcomponent *vevent, icalcomponent *vtimezon
 
   const TQString msade = event->nonKDECustomProperty("X-MICROSOFT-CDO-ALLDAYEVENT");
   if ( !msade.isEmpty() ) {
-    const bool floats = ( msade == TQString::fromLatin1("TRUE") );
+    const bool floats = ( msade == TQString::tqfromLatin1("TRUE") );
     event->setFloats(floats);
   }
 
@@ -1440,7 +1440,7 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, icaltimezone *tz, Inci
           default:                      stat = Incidence::StatusNone; break;
         }
         if (stat != Incidence::StatusX)
-          incidence->setStatus(stat);
+          incidence->seStatus(stat);
         break;
       }
 
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp
index 79de6723..4c41e7a9 100644
--- a/libkcal/incidence.cpp
+++ b/libkcal/incidence.cpp
@@ -207,14 +207,14 @@ bool Incidence::operator==( const Incidence& i2 ) const
 
 void Incidence::recreate()
 {
-  setCreated(TQDateTime::currentDateTime());
+  setCreated(TQDateTime::tqcurrentDateTime());
 
   setUid(CalFormat::createUniqueId());
   setSchedulingID( TQString::null );
 
   setRevision(0);
 
-  setLastModified(TQDateTime::currentDateTime());
+  setLastModified(TQDateTime::tqcurrentDateTime());
   setPilotId( 0 );
   setSyncStatus( SYNCNONE );
 }
@@ -738,7 +738,7 @@ int Incidence::priority() const
   return mPriority;
 }
 
-void Incidence::setStatus(Incidence::Status status)
+void Incidence::seStatus(Incidence::Status status)
 {
   if (mReadOnly || status == StatusX) return;
   mStatus = status;
diff --git a/libkcal/incidence.h b/libkcal/incidence.h
index 89d45b08..883d08c8 100644
--- a/libkcal/incidence.h
+++ b/libkcal/incidence.h
@@ -381,7 +381,7 @@ class LIBKCAL_EXPORT Incidence : public IncidenceBase, public Recurrence::Observ
       Sets the incidence status to a standard status value. See
       separate enum. Note that StatusX cannot be specified.
     */
-    void setStatus( Status status );
+    void seStatus( Status status );
     /**
       Sets the incidence status to a non-standard status value.
       @param status non-standard status string. If empty,
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index a8a6bdb0..518d0f63 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -394,7 +394,7 @@ unsigned long IncidenceBase::pilotId() const
 
 void IncidenceBase::registerObserver( IncidenceBase::Observer *observer )
 {
-  if( !mObservers.contains( observer ) ) mObservers.append( observer );
+  if( !mObservers.tqcontains( observer ) ) mObservers.append( observer );
 }
 
 void IncidenceBase::unRegisterObserver( IncidenceBase::Observer *observer )
diff --git a/libkcal/incidenceformatter.cpp b/libkcal/incidenceformatter.cpp
index cebdd0b1..ebfb68ea 100644
--- a/libkcal/incidenceformatter.cpp
+++ b/libkcal/incidenceformatter.cpp
@@ -74,7 +74,7 @@ static TQString htmlAddLink( const TQString &ref, const TQString &text,
 
 static TQString htmlAddTag( const TQString & tag, const TQString & text )
 {
-  int numLineBreaks = text.contains( "\n" );
+  int numLineBreaks = text.tqcontains( "\n" );
   TQString str = "<" + tag + ">";
   TQString tmpText = text;
   TQString tmpStr = str;
@@ -184,7 +184,7 @@ static TQString displayViewLinkPerson( const TQString& email, TQString name, TQS
   // and either name or uid is missing
   if ( !email.isEmpty() && ( name.isEmpty() || uid.isEmpty() ) ) {
     KABC::AddressBook *add_book = KABC::StdAddressBook::self( true );
-    KABC::Addressee::List addressList = add_book->findByEmail( email );
+    KABC::Addressee::List addressList = add_book->tqfindByEmail( email );
     if ( !addressList.isEmpty() ) {
       KABC::Addressee o = addressList.first();
       if ( !o.isEmpty() && addressList.size() < 2 ) {
@@ -1135,7 +1135,7 @@ static TQString invitationPerson( const TQString& email, TQString name, TQString
   // and either name or uid is missing
   if ( !email.isEmpty() && ( name.isEmpty() || uid.isEmpty() ) ) {
     KABC::AddressBook *add_book = KABC::StdAddressBook::self( true );
-    KABC::Addressee::List addressList = add_book->findByEmail( email );
+    KABC::Addressee::List addressList = add_book->tqfindByEmail( email );
     if ( !addressList.isEmpty() ) {
       KABC::Addressee o = addressList.first();
       if ( !o.isEmpty() && addressList.size() < 2 ) {
@@ -2278,7 +2278,7 @@ static bool incidenceOwnedByMe( Calendar *calendar, Incidence *incidence )
     return true;
   }
   const TQString subRes = res->subresourceIdentifier( incidence );
-  if ( !subRes.contains( "/.INBOX.directory/" ) ) {
+  if ( !subRes.tqcontains( "/.INBOX.directory/" ) ) {
     return false;
   }
   return true;
@@ -2426,9 +2426,9 @@ TQString IncidenceFormatter::formatICalInvitationHelper( TQString invitation,
   // First make the text of the message
   TQString html;
 
-  TQString tableStyle = TQString::fromLatin1(
+  TQString tableStyle = TQString::tqfromLatin1(
     "style=\"border: solid 1px; margin: 0em;\"" );
-  TQString tableHead = TQString::fromLatin1(
+  TQString tableHead = TQString::tqfromLatin1(
     "<div align=\"center\">"
     "<table width=\"80%\" cellpadding=\"1\" cellspacing=\"0\" %1>"
     "<tr><td>").arg(tableStyle);
@@ -2701,7 +2701,7 @@ TQString IncidenceFormatter::formatICalInvitationNoHtml( TQString invitation,
 
 //-----------------------------------------------------------------------------
 
-static TQString stringProp( KTNEFMessage* tnefMsg, const Q_UINT32& key,
+static TQString stringProp( KTNEFMessage* tnefMsg, const TQ_UINT32& key,
                            const TQString& fallback = TQString::null)
 {
   return tnefMsg->findProp( key < 0x10000 ? key & 0xFFFF : key >> 16,
@@ -2831,7 +2831,7 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
 
   KTNEFParser parser;
   TQBuffer buf( tnef );
-  CalendarLocal cal ( TQString::fromLatin1( "UTC" ) );
+  CalendarLocal cal ( TQString::tqfromLatin1( "UTC" ) );
   KABC::Addressee addressee;
   KABC::VCardConverter cardConv;
   ICalFormat calFormat;
@@ -2926,13 +2926,13 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
               Attendee *attendee = new Attendee( s, s, true );
               if( bIsReply ) {
                 if( bCompatMethodAccepted )
-                  attendee->setStatus( Attendee::Accepted );
+                  attendee->seStatus( Attendee::Accepted );
                 if( bCompatMethodDeclined )
-                  attendee->setStatus( Attendee::Declined );
+                  attendee->seStatus( Attendee::Declined );
                 if( bCompatMethodAcceptedCond )
-                  attendee->setStatus(Attendee::Tentative);
+                  attendee->seStatus(Attendee::Tentative);
               } else {
-                attendee->setStatus( Attendee::NeedsAction );
+                attendee->seStatus( Attendee::NeedsAction );
                 attendee->setRole( Attendee::ReqParticipant );
               }
               event->addAttendee(attendee);
@@ -2947,13 +2947,13 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
                                                true );
             if( bIsReply ) {
               if( bCompatMethodAccepted )
-                attendee->setStatus( Attendee::Accepted );
+                attendee->seStatus( Attendee::Accepted );
               if( bCompatMethodAcceptedCond )
-                attendee->setStatus( Attendee::Declined );
+                attendee->seStatus( Attendee::Declined );
               if( bCompatMethodDeclined )
-                attendee->setStatus( Attendee::Tentative );
+                attendee->seStatus( Attendee::Tentative );
             } else {
-              attendee->setStatus(Attendee::NeedsAction);
+              attendee->seStatus(Attendee::NeedsAction);
               attendee->setRole(Attendee::ReqParticipant);
             }
             event->addAttendee(attendee);
@@ -2966,12 +2966,12 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
         if( !s.isEmpty() )
           event->setOrganizer( s );
 
-        s = tnefMsg->findProp( 0x8516 ).replace( TQChar( '-' ), TQString::null )
-          .replace( TQChar( ':' ), TQString::null );
+        s = tnefMsg->findProp( 0x8516 ).tqreplace( TQChar( '-' ), TQString::null )
+          .tqreplace( TQChar( ':' ), TQString::null );
         event->setDtStart( TQDateTime::fromString( s ) ); // ## Format??
 
-        s = tnefMsg->findProp( 0x8517 ).replace( TQChar( '-' ), TQString::null )
-          .replace( TQChar( ':' ), TQString::null );
+        s = tnefMsg->findProp( 0x8517 ).tqreplace( TQChar( '-' ), TQString::null )
+          .tqreplace( TQChar( ':' ), TQString::null );
         event->setDtEnd( TQDateTime::fromString( s ) );
 
         s = tnefMsg->findProp( 0x8208 );
@@ -2988,9 +2988,9 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
         // PENDING(khz): is this value in local timezone? Must it be
         // adjusted? Most likely this is a bug in the server or in
         // Outlook - we ignore it for now.
-        s = tnefMsg->findProp( 0x8202 ).replace( TQChar( '-' ), TQString::null )
-          .replace( TQChar( ':' ), TQString::null );
-        // ### libkcal always uses currentDateTime()
+        s = tnefMsg->findProp( 0x8202 ).tqreplace( TQChar( '-' ), TQString::null )
+          .tqreplace( TQChar( ':' ), TQString::null );
+        // ### libkcal always uses tqcurrentDateTime()
         // event->setDtStamp(TQDateTime::fromString(s));
 
         s = tnefMsg->findNamedProp( "Keywords" );
@@ -3010,12 +3010,12 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
           Alarm *alarm = new Alarm(event);
           TQDateTime highNoonTime =
             pureISOToLocalQDateTime( tnefMsg->findProp( 0x8502 )
-                                     .replace( TQChar( '-' ), "" )
-                                     .replace( TQChar( ':' ), "" ) );
+                                     .tqreplace( TQChar( '-' ), "" )
+                                     .tqreplace( TQChar( ':' ), "" ) );
           TQDateTime wakeMeUpTime =
             pureISOToLocalQDateTime( tnefMsg->findProp( 0x8560, "" )
-                                     .replace( TQChar( '-' ), "" )
-                                     .replace( TQChar( ':' ), "" ) );
+                                     .tqreplace( TQChar( '-' ), "" )
+                                     .tqreplace( TQChar( ':' ), "" ) );
           alarm->setTime(wakeMeUpTime);
 
           if( highNoonTime.isValid() && wakeMeUpTime.isValid() )
@@ -3047,8 +3047,8 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
         addressee.insertCustom( "KADDRESSBOOK", "X-Profession", stringProp( tnefMsg, MAPI_TAG_PR_PROFESSION ) );
 
         TQString s = tnefMsg->findProp( MAPI_TAG_PR_WEDDING_ANNIVERSARY )
-          .replace( TQChar( '-' ), TQString::null )
-          .replace( TQChar( ':' ), TQString::null );
+          .tqreplace( TQChar( '-' ), TQString::null )
+          .tqreplace( TQChar( ':' ), TQString::null );
         if( !s.isEmpty() )
           addressee.insertCustom( "KADDRESSBOOK", "X-Anniversary", s );
 
@@ -3114,8 +3114,8 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
         addressee.insertPhoneNumber( KABC::PhoneNumber( nr, KABC::PhoneNumber::Fax | KABC::PhoneNumber::Work ) );
 
         s = tnefMsg->findProp( MAPI_TAG_PR_BIRTHDAY )
-          .replace( TQChar( '-' ), TQString::null )
-          .replace( TQChar( ':' ), TQString::null );
+          .tqreplace( TQChar( '-' ), TQString::null )
+          .tqreplace( TQChar( ':' ), TQString::null );
         if( !s.isEmpty() )
           addressee.setBirthday( TQDateTime::fromString( s ) );
 
@@ -3218,25 +3218,25 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Event *event, const
 
     tmp = "<br>" + i18n("Event start", "<i>From:</i>&nbsp;%1");
     if (event->doesFloat())
-      ret += tmp.arg( IncidenceFormatter::dateToString( startDt, false ).replace(" ", "&nbsp;") );
+      ret += tmp.arg( IncidenceFormatter::dateToString( startDt, false ).tqreplace(" ", "&nbsp;") );
     else
-      ret += tmp.arg( IncidenceFormatter::dateToString( startDt ).replace(" ", "&nbsp;") );
+      ret += tmp.arg( IncidenceFormatter::dateToString( startDt ).tqreplace(" ", "&nbsp;") );
 
     tmp = "<br>" + i18n("Event end","<i>To:</i>&nbsp;%1");
     if (event->doesFloat())
-      ret += tmp.arg( IncidenceFormatter::dateToString( endDt, false ).replace(" ", "&nbsp;") );
+      ret += tmp.arg( IncidenceFormatter::dateToString( endDt, false ).tqreplace(" ", "&nbsp;") );
     else
-      ret += tmp.arg( IncidenceFormatter::dateToString( endDt ).replace(" ", "&nbsp;") );
+      ret += tmp.arg( IncidenceFormatter::dateToString( endDt ).tqreplace(" ", "&nbsp;") );
 
   } else {
 
     ret += "<br>"+i18n("<i>Date:</i>&nbsp;%1").
-           arg( IncidenceFormatter::dateToString( startDt, false ).replace(" ", "&nbsp;") );
+           arg( IncidenceFormatter::dateToString( startDt, false ).tqreplace(" ", "&nbsp;") );
     if ( !event->doesFloat() ) {
       const TQString dtStartTime =
-        IncidenceFormatter::timeToString( startDt, true ).replace( " ", "&nbsp;" );
+        IncidenceFormatter::timeToString( startDt, true ).tqreplace( " ", "&nbsp;" );
       const TQString dtEndTime =
-        IncidenceFormatter::timeToString( endDt, true ).replace( " ", "&nbsp;" );
+        IncidenceFormatter::timeToString( endDt, true ).tqreplace( " ", "&nbsp;" );
       if ( dtStartTime == dtEndTime ) { // to prevent 'Time: 17:00 - 17:00'
         tmp = "<br>" + i18n("time for event, &nbsp; to prevent ugly line breaks",
         "<i>Time:</i>&nbsp;%1").
@@ -3268,7 +3268,7 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Todo *todo, const TQ
     ret += "<br>" +
            i18n("<i>Start:</i>&nbsp;%1").
            arg( IncidenceFormatter::dateTimeToString( startDt, floats, false ).
-                replace( " ", "&nbsp;" ) );
+                tqreplace( " ", "&nbsp;" ) );
   }
 
   if ( todo->hasDueDate() && todo->dtDue().isValid() ) {
@@ -3283,7 +3283,7 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Todo *todo, const TQ
     ret += "<br>" +
            i18n("<i>Due:</i>&nbsp;%1").
            arg( IncidenceFormatter::dateTimeToString( dueDt, floats, false ).
-                replace( " ", "&nbsp;" ) );
+                tqreplace( " ", "&nbsp;" ) );
   }
 
   // Print priority and completed info here, for lack of a better place
@@ -3297,7 +3297,7 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Todo *todo, const TQ
   ret += "<br>";
   if ( todo->isCompleted() ) {
     ret += "<i>" + i18n( "Completed:" ) + "</i>" + "&nbsp;";
-    ret += todo->completedStr().replace( " ", "&nbsp;" );
+    ret += todo->completedStr().tqreplace( " ", "&nbsp;" );
   } else {
     ret += "<i>" + i18n( "Percent Done:" ) + "</i>" + "&nbsp;";
     ret += i18n( "%1%" ).arg( todo->percentComplete() );
@@ -3361,7 +3361,7 @@ static TQString tooltipPerson( const TQString& email, TQString name )
   // and name is missing
   if ( name.isEmpty() && !email.isEmpty() ) {
     KABC::AddressBook *add_book = KABC::StdAddressBook::self( true );
-    KABC::Addressee::List addressList = add_book->findByEmail( email );
+    KABC::Addressee::List addressList = add_book->tqfindByEmail( email );
     if ( !addressList.isEmpty() ) {
       KABC::Addressee o = addressList.first();
       if ( !o.isEmpty() && addressList.size() < 2 ) {
@@ -3475,7 +3475,7 @@ TQString IncidenceFormatter::ToolTipVisitor::generateToolTip( Incidence* inciden
   TQString tmp = "<qt>";
 
   // header
-  tmp += "<b>" + incidence->summary().replace( "\n", "<br>" ) + "</b>";
+  tmp += "<b>" + incidence->summary().tqreplace( "\n", "<br>" ) + "</b>";
   //NOTE: using <hr> seems to confuse TQt3 tooltips in some cases so use "-----"
   tmp += "<br>----------<br>";
 
@@ -3492,7 +3492,7 @@ TQString IncidenceFormatter::ToolTipVisitor::generateToolTip( Incidence* inciden
   if ( !incidence->location().isEmpty() ) {
     tmp += "<br>";
     tmp += "<i>" + i18n( "Location:" ) + "</i>" + "&nbsp;";
-    tmp += incidence->location().replace( "\n", "<br>" );
+    tmp += incidence->location().tqreplace( "\n", "<br>" );
   }
 
   TQString durStr = IncidenceFormatter::durationString( incidence );
@@ -3515,7 +3515,7 @@ TQString IncidenceFormatter::ToolTipVisitor::generateToolTip( Incidence* inciden
     }
     tmp += "<br>----------<br>";
     tmp += "<i>" + i18n( "Description:" ) + "</i>" + "<br>";
-    tmp += desc.replace( "\n", "<br>" );
+    tmp += desc.tqreplace( "\n", "<br>" );
     tmp += "<br>----------";
   }
 
diff --git a/libkcal/recurrence.cpp b/libkcal/recurrence.cpp
index ae47db32..474d885f 100644
--- a/libkcal/recurrence.cpp
+++ b/libkcal/recurrence.cpp
@@ -112,13 +112,13 @@ bool Recurrence::operator==( const Recurrence& r2 ) const
 
 void Recurrence::addObserver( Observer *observer )
 {
-  if ( !mObservers.contains( observer ) )
+  if ( !mObservers.tqcontains( observer ) )
     mObservers.append( observer );
 }
 
 void Recurrence::removeObserver( Observer *observer )
 {
-  if ( mObservers.contains( observer ) )
+  if ( mObservers.tqcontains( observer ) )
     mObservers.remove( observer );
 }
 
@@ -269,7 +269,7 @@ bool Recurrence::recursOn(const TQDate &qd) const
 {
   TimeList tms;
   // First handle dates. Exrules override
-  if ( mExDates.contains( qd ) ) return false;
+  if ( mExDates.tqcontains( qd ) ) return false;
   // For all-day events a matching exrule excludes the whole day
   // since exclusions take precedence over inclusions, we know it can't occur on that day.
   if ( doesFloat() ) {
@@ -279,7 +279,7 @@ bool Recurrence::recursOn(const TQDate &qd) const
     }
   }
 
-  if ( mRDates.contains( qd ) ) return true;
+  if ( mRDates.tqcontains( qd ) ) return true;
 
   bool recurs = false;
 
@@ -328,14 +328,14 @@ bool Recurrence::recursOn(const TQDate &qd) const
 bool Recurrence::recursAt( const TQDateTime &dt ) const
 {
   // if it's excluded anyway, don't bother to check if it recurs at all.
-  if ( mExDateTimes.contains( dt )) return false;
-  if ( mExDates.contains( dt.date() )) return false;
+  if ( mExDateTimes.tqcontains( dt )) return false;
+  if ( mExDates.tqcontains( dt.date() )) return false;
   for ( RecurrenceRule::List::ConstIterator rr = mExRules.begin(); rr != mExRules.end(); ++rr ) {
     if ( (*rr)->recursAt( dt ) ) return false;
   }
 
   // Check explicit recurrences, then rrules.
-  bool occurs = ( startDateTime() == dt ) || mRDateTimes.contains( dt );
+  bool occurs = ( startDateTime() == dt ) || mRDateTimes.tqcontains( dt );
   if ( occurs )
     return true;
   for ( RecurrenceRule::List::ConstIterator rr = mRRules.begin(); rr != mRRules.end(); ++rr ) {
@@ -624,7 +624,7 @@ void Recurrence::addMonthlyPos( short pos, const TQBitArray &days )
   for ( int i = 0; i < 7; ++i ) {
     if ( days.testBit(i) ) {
       RecurrenceRule::WDayPos p( pos, i + 1 );
-      if ( !positions.contains( p ) ) {
+      if ( !positions.tqcontains( p ) ) {
         changed = true;
         positions.append( p );
       }
@@ -646,7 +646,7 @@ void Recurrence::addMonthlyPos( short pos, ushort day )
   TQValueList<RecurrenceRule::WDayPos> positions = rrule->byDays();
 
   RecurrenceRule::WDayPos p( pos, day );
-  if ( !positions.contains( p ) ) {
+  if ( !positions.tqcontains( p ) ) {
     positions.append( p );
     rrule->setByDays( positions );
     updated();
@@ -661,7 +661,7 @@ void Recurrence::addMonthlyDate( short day )
   if ( !rrule ) return;
 
   TQValueList<int> monthDays = rrule->byMonthDays();
-  if ( !monthDays.contains( day ) ) {
+  if ( !monthDays.tqcontains( day ) ) {
     monthDays.append( day );
     rrule->setByMonthDays( monthDays );
     updated();
@@ -682,7 +682,7 @@ void Recurrence::addYearlyDay( int day )
   if ( !rrule ) return;
 
   TQValueList<int> days = rrule->byYearDays();
-  if ( !days.contains( day ) ) {
+  if ( !days.tqcontains( day ) ) {
     days << day;
     rrule->setByYearDays( days );
     updated();
@@ -710,7 +710,7 @@ void Recurrence::addYearlyMonth( short month )
   if ( !rrule ) return;
 
   TQValueList<int> months = rrule->byMonths();
-  if ( !months.contains(month) ) {
+  if ( !months.tqcontains(month) ) {
     months << month;
     rrule->setByMonths( months );
     updated();
@@ -722,7 +722,7 @@ TimeList Recurrence::recurTimesOn( const TQDate &date ) const
 {
   TimeList times;
   // The whole day is excepted
-  if ( mExDates.contains( date ) ) return times;
+  if ( mExDates.tqcontains( date ) ) return times;
   // EXRULE takes precedence over RDATE entries, so for floating events,
   // a matching excule also excludes the whole day automatically
   if ( doesFloat() ) {
@@ -893,8 +893,8 @@ TQDateTime Recurrence::getNextDateTime( const TQDateTime &preDateTime ) const
     nextDT = dates.first();
 
     // Check if that date/time is excluded explicitly or by an exrule:
-    if ( !containsSorted( mExDates, nextDT.date() ) &&
-         !containsSorted( mExDateTimes, nextDT ) ) {
+    if ( !tqcontainsSorted( mExDates, nextDT.date() ) &&
+         !tqcontainsSorted( mExDateTimes, nextDT ) ) {
       bool allowed = true;
       for ( i = 0, end = mExRules.count();  i < end;  ++i ) {
         allowed = allowed && !( mExRules[i]->recursAt( nextDT ) );
@@ -964,8 +964,8 @@ TQDateTime Recurrence::getPreviousDateTime( const TQDateTime &afterDateTime ) co
     prevDT = dates.last();
 
     // Check if that date/time is excluded explicitly or by an exrule:
-    if ( !containsSorted( mExDates, prevDT.date() ) &&
-         !containsSorted( mExDateTimes, prevDT ) ) {
+    if ( !tqcontainsSorted( mExDates, prevDT.date() ) &&
+         !tqcontainsSorted( mExDateTimes, prevDT ) ) {
       bool allowed = true;
       for ( i = 0, end = mExRules.count();  i < end;  ++i ) {
         allowed = allowed && !( mExRules[i]->recursAt( prevDT ) );
diff --git a/libkcal/recurrence.h b/libkcal/recurrence.h
index 0a594a6f..355a922f 100644
--- a/libkcal/recurrence.h
+++ b/libkcal/recurrence.h
@@ -308,7 +308,7 @@ class LIBKCAL_EXPORT Recurrence : public RecurrenceRule::Observer
      * @return Weekday of the first day of the week (Monday=1 .. Sunday=7)
      */
     int weekStart() const;
-    /** Returns week day mask (bit 0 = Monday). */
+    /** Returns week day tqmask (bit 0 = Monday). */
     TQBitArray days() const; // Emulate the old behavior
 
     /** Sets an event to recur monthly. By default infinite recurrence is used.
@@ -410,13 +410,13 @@ class LIBKCAL_EXPORT Recurrence : public RecurrenceRule::Observer
     void addYearlyPos( short pos, const TQBitArray &days );
 
     /** Returns the day numbers within a yearly recurrence.
-     * @return the days of the year for the event. E.g. if the list contains
+     * @return the days of the year for the event. E.g. if the list tqcontains
      *         60, this means the recurrence happens on day 60 of the year, i.e.
      *         on Feb 29 in leap years and March 1 in non-leap years.
      */
     TQValueList<int> yearDays() const;
     /** Returns the dates within a yearly recurrence.
-     * @return the days of the month for the event. E.g. if the list contains
+     * @return the days of the month for the event. E.g. if the list tqcontains
      *         13, this means the recurrence happens on the 13th of the month.
      *         The months for the recurrence can be obtained through
      *         yearlyMonths(). If this list is empty, the month of the start
@@ -424,7 +424,7 @@ class LIBKCAL_EXPORT Recurrence : public RecurrenceRule::Observer
      */
     TQValueList<int> yearDates() const;
     /** Returns the months within a yearly recurrence.
-     * @return the months for the event. E.g. if the list contains
+     * @return the months for the event. E.g. if the list tqcontains
      *         11, this means the recurrence happens in November.
      *         The days for the recurrence can be obtained either through
      *         yearDates() if they are given as dates within the month or
@@ -435,7 +435,7 @@ class LIBKCAL_EXPORT Recurrence : public RecurrenceRule::Observer
     /** Returns the positions within a yearly recurrence.
      * @return the positions for the event, either within a month (if months
      *         are set through addYearlyMonth()) or within the year.
-     *         E.g. if the list contains {Pos=3, Day=5}, this means the third
+     *         E.g. if the list tqcontains {Pos=3, Day=5}, this means the third
      *         friday. If a month is set this position is understoodas third
      *         Friday in the given months, otherwise as third Friday of the
      *         year.
diff --git a/libkcal/recurrencerule.cpp b/libkcal/recurrencerule.cpp
index 17292ec5..e225edb0 100644
--- a/libkcal/recurrencerule.cpp
+++ b/libkcal/recurrencerule.cpp
@@ -104,7 +104,7 @@ TQDate DateHelper::getNthWeek( int year, int weeknumber, short weekstart )
 {
   if ( weeknumber == 0 ) return TQDate();
   // Adjust this to the first day of week #1 of the year and add 7*weekno days.
-  TQDate dt( year, 1, 4 ); // Week #1 is the week that contains Jan 4
+  TQDate dt( year, 1, 4 ); // Week #1 is the week that tqcontains Jan 4
   int adjust = -(7 + dt.dayOfWeek() - weekstart) % 7;
   if ( weeknumber > 0 ) {
     dt = dt.addDays( 7 * (weeknumber-1) + adjust );
@@ -541,13 +541,13 @@ bool RecurrenceRule::operator==( const RecurrenceRule& r ) const
 
 void RecurrenceRule::addObserver( Observer *observer )
 {
-  if ( !mObservers.contains( observer ) )
+  if ( !mObservers.tqcontains( observer ) )
     mObservers.append( observer );
 }
 
 void RecurrenceRule::removeObserver( Observer *observer )
 {
-  if ( mObservers.contains( observer ) )
+  if ( mObservers.tqcontains( observer ) )
     mObservers.remove( observer );
 }
 
diff --git a/libkcal/recurrencerule.h b/libkcal/recurrencerule.h
index 86b8ca8e..422113b5 100644
--- a/libkcal/recurrencerule.h
+++ b/libkcal/recurrencerule.h
@@ -148,7 +148,7 @@ Q_INLINE_TEMPLATES int removeSorted( TQValueList<T> &lst, const T &value, int st
 }
 
 template <class T>
-Q_INLINE_TEMPLATES bool containsSorted( const TQValueList<T> &lst, const T &value )
+Q_INLINE_TEMPLATES bool tqcontainsSorted( const TQValueList<T> &lst, const T &value )
 {
   return findSorted( lst, value, 0 ) >= 0;
 }
diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp
index dacab7e9..a6365979 100644
--- a/libkcal/resourcecached.cpp
+++ b/libkcal/resourcecached.cpp
@@ -49,7 +49,7 @@ using namespace KCal;
 static bool m_editoropen = false;
 
 ResourceCached::ResourceCached( const KConfig* config )
-  : ResourceCalendar( config ), mCalendar( TQString::fromLatin1( "UTC" ) ),
+  : ResourceCalendar( config ), mCalendar( TQString::tqfromLatin1( "UTC" ) ),
     mReloadPolicy( ReloadNever ),  mReloadInterval( 10 ),
     mReloadTimer( 0, "mReloadTimer" ), mReloaded( false ),
     mSavePolicy( SaveNever ), mSaveInterval( 10 ),
@@ -353,7 +353,7 @@ void ResourceCached::clearJournalsCache()
 
 void ResourceCached::cleanUpEventCache( const Event::List &eventList )
 {
-  CalendarLocal calendar ( TQString::fromLatin1( "UTC" ) );
+  CalendarLocal calendar ( TQString::tqfromLatin1( "UTC" ) );
 
   if ( KStandardDirs::exists( cacheFile() ) )
     calendar.load( cacheFile() );
@@ -382,7 +382,7 @@ void ResourceCached::cleanUpEventCache( const Event::List &eventList )
 
 void ResourceCached::cleanUpTodoCache( const Todo::List &todoList )
 {
-  CalendarLocal calendar ( TQString::fromLatin1( "UTC" ) );
+  CalendarLocal calendar ( TQString::tqfromLatin1( "UTC" ) );
 
   if ( KStandardDirs::exists( cacheFile() ) )
     calendar.load( cacheFile() );
@@ -427,7 +427,7 @@ TQString ResourceCached::changesCacheFile( const TQString &type ) const
 
 void ResourceCached::saveChangesCache( const TQMap<Incidence*, bool> &map, const TQString &type )
 {
-  CalendarLocal calendar ( TQString::fromLatin1( "UTC" ) );
+  CalendarLocal calendar ( TQString::tqfromLatin1( "UTC" ) );
 
   bool isEmpty = true;
   TQMap<Incidence *,bool>::ConstIterator it;
@@ -455,7 +455,7 @@ void ResourceCached::saveChangesCache()
 
 void ResourceCached::loadChangesCache( TQMap<Incidence*, bool> &map, const TQString &type )
 {
-  CalendarLocal calendar ( TQString::fromLatin1( "UTC" ) );
+  CalendarLocal calendar ( TQString::tqfromLatin1( "UTC" ) );
 
   if ( KStandardDirs::exists( changesCacheFile( type ) ) )
     calendar.load( changesCacheFile( type ) );
diff --git a/libkcal/resourcelocaldir.cpp b/libkcal/resourcelocaldir.cpp
index f1e00f32..ce9d8c8f 100644
--- a/libkcal/resourcelocaldir.cpp
+++ b/libkcal/resourcelocaldir.cpp
@@ -193,7 +193,7 @@ bool ResourceLocalDir::doSave()
 
 bool ResourceLocalDir::doSave( Incidence *incidence )
 {
-  if ( mDeletedIncidences.contains( incidence ) ) {
+  if ( mDeletedIncidences.tqcontains( incidence ) ) {
     mDeletedIncidences.remove( incidence );
     return true;
   }
diff --git a/libkcal/scheduler.cpp b/libkcal/scheduler.cpp
index 6e3cf385..4622716a 100644
--- a/libkcal/scheduler.cpp
+++ b/libkcal/scheduler.cpp
@@ -133,23 +133,23 @@ TQString Scheduler::methodName(Method method)
 {
   switch (method) {
     case Publish:
-      return TQString::fromLatin1("Publish");
+      return TQString::tqfromLatin1("Publish");
     case Request:
-      return TQString::fromLatin1("Request");
+      return TQString::tqfromLatin1("Request");
     case Refresh:
-      return TQString::fromLatin1("Refresh");
+      return TQString::tqfromLatin1("Refresh");
     case Cancel:
-      return TQString::fromLatin1("Cancel");
+      return TQString::tqfromLatin1("Cancel");
     case Add:
-      return TQString::fromLatin1("Add");
+      return TQString::tqfromLatin1("Add");
     case Reply:
-      return TQString::fromLatin1("Reply");
+      return TQString::tqfromLatin1("Reply");
     case Counter:
-      return TQString::fromLatin1("Counter");
+      return TQString::tqfromLatin1("Counter");
     case Declinecounter:
-      return TQString::fromLatin1("Decline Counter");
+      return TQString::tqfromLatin1("Decline Counter");
     default:
-      return TQString::fromLatin1("Unknown");
+      return TQString::tqfromLatin1("Unknown");
   }
 }
 
@@ -576,7 +576,7 @@ bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::Status /*
         if (attIn->email().lower()==attEv->email().lower()) {
           //update attendee-info
           kdDebug(5800) << "Scheduler::acceptTransaction update attendee" << endl;
-          attEv->setStatus(attIn->status());
+          attEv->seStatus(attIn->status());
           attEv->setDelegate(attIn->delegate());
           attEv->setDelegator(attIn->delegator());
           ret = true;
diff --git a/libkcal/tests/fbrecurring.cpp b/libkcal/tests/fbrecurring.cpp
index be70a7c8..8088c1d6 100644
--- a/libkcal/tests/fbrecurring.cpp
+++ b/libkcal/tests/fbrecurring.cpp
@@ -13,7 +13,7 @@ int main()
 {
   ICalFormat f;
 
-  CalendarLocal cal( TQString::fromLatin1("UTC") );
+  CalendarLocal cal( TQString::tqfromLatin1("UTC") );
 
   Event *event1 = new Event;
   event1->setSummary("A");
diff --git a/libkcal/tests/readandwrite.cpp b/libkcal/tests/readandwrite.cpp
index 076f55cb..a1ab5493 100644
--- a/libkcal/tests/readandwrite.cpp
+++ b/libkcal/tests/readandwrite.cpp
@@ -71,7 +71,7 @@ int main( int argc, char **argv )
   kdDebug(5800) << "Output file: " << output << endl;
 
 
-  CalendarLocal cal( TQString::fromLatin1("UTC") );
+  CalendarLocal cal( TQString::tqfromLatin1("UTC") );
 
   if ( !cal.load( input ) ) return 1;
   TQString tz = cal.nonKDECustomProperty( "X-LibKCal-Testsuite-OutTZ" );
diff --git a/libkcal/tests/testcalendar.cpp b/libkcal/tests/testcalendar.cpp
index 7d781fc5..48fb68aa 100644
--- a/libkcal/tests/testcalendar.cpp
+++ b/libkcal/tests/testcalendar.cpp
@@ -48,7 +48,7 @@ int main(int argc,char **argv)
 
   Q_UNUSED( args );
 
-  CalendarLocal cal( TQString::fromLatin1("UTC") );
+  CalendarLocal cal( TQString::tqfromLatin1("UTC") );
   
   cal.save("mycal");
 }
diff --git a/libkcal/tests/testfields.cpp b/libkcal/tests/testfields.cpp
index 6e63faa9..a6117088 100644
--- a/libkcal/tests/testfields.cpp
+++ b/libkcal/tests/testfields.cpp
@@ -50,9 +50,9 @@ int main(int argc,char **argv)
 
   Q_UNUSED(args)
 
-  CalendarLocal cal( TQString::fromLatin1("UTC") );
+  CalendarLocal cal( TQString::tqfromLatin1("UTC") );
 
-  TQString file = TQString::fromLatin1( INPUT );
+  TQString file = TQString::tqfromLatin1( INPUT );
   if (!cal.load( file ) ) {
     kdError() << "Can't load " << file << endl;
     return 1;
@@ -60,8 +60,8 @@ int main(int argc,char **argv)
 
   // 2 tests... first uid should result in a syncStatus of 0.  second uid
   // should have a new summary and a 1 for syncStatus.
-  TQString uid1 = TQString::fromLatin1("KOrganizer-1345486115.965");
-  TQString uid2 = TQString::fromLatin1("KOrganizer-1345486115.967");
+  TQString uid1 = TQString::tqfromLatin1("KOrganizer-1345486115.965");
+  TQString uid2 = TQString::tqfromLatin1("KOrganizer-1345486115.967");
 
   Event *e = cal.event( uid1 );
   if (!e) {
@@ -88,7 +88,7 @@ int main(int argc,char **argv)
 
   e->setSyncStatus(KCal::Incidence::SYNCNONE);
 
-  TQString newSummary = TQString::fromLatin1("Mooo summary");
+  TQString newSummary = TQString::tqfromLatin1("Mooo summary");
 
   Event *f = new Event(*e);
 
@@ -112,7 +112,7 @@ int main(int argc,char **argv)
 
 
   // now try to read the file back in and see if our changes made it
-  CalendarLocal cal2( TQString::fromLatin1("UTC") );
+  CalendarLocal cal2( TQString::tqfromLatin1("UTC") );
   if (!cal2.load( filew ) ) {
     kdError() << "Can't load " << filew << endl;
     return 1;
diff --git a/libkcal/tests/testrecurprevious.cpp b/libkcal/tests/testrecurprevious.cpp
index 2d127d49..ef9d62c8 100644
--- a/libkcal/tests/testrecurprevious.cpp
+++ b/libkcal/tests/testrecurprevious.cpp
@@ -80,7 +80,7 @@ int main( int argc, char **argv )
     outstream = new TQTextStream( &outfile );
   }
 
-  CalendarLocal cal( TQString::fromLatin1("UTC") );
+  CalendarLocal cal( TQString::tqfromLatin1("UTC") );
 
   if ( !cal.load( input ) ) return 1;
 	TQString tz = cal.nonKDECustomProperty( "X-LibKCal-Testsuite-OutTZ" );
diff --git a/libkcal/tests/testrecurrence.cpp b/libkcal/tests/testrecurrence.cpp
index 8fc1c527..4d0a2fae 100644
--- a/libkcal/tests/testrecurrence.cpp
+++ b/libkcal/tests/testrecurrence.cpp
@@ -80,7 +80,7 @@ int main( int argc, char **argv )
     outstream = new TQTextStream( &outfile );
   }
 
-  CalendarLocal cal( TQString::fromLatin1("UTC") );
+  CalendarLocal cal( TQString::tqfromLatin1("UTC") );
 
   if ( !cal.load( input ) ) return 1;
 	TQString tz = cal.nonKDECustomProperty( "X-LibKCal-Testsuite-OutTZ" );
diff --git a/libkcal/tests/testrecurrencetype.cpp b/libkcal/tests/testrecurrencetype.cpp
index 8fc1c527..4d0a2fae 100644
--- a/libkcal/tests/testrecurrencetype.cpp
+++ b/libkcal/tests/testrecurrencetype.cpp
@@ -80,7 +80,7 @@ int main( int argc, char **argv )
     outstream = new TQTextStream( &outfile );
   }
 
-  CalendarLocal cal( TQString::fromLatin1("UTC") );
+  CalendarLocal cal( TQString::tqfromLatin1("UTC") );
 
   if ( !cal.load( input ) ) return 1;
 	TQString tz = cal.nonKDECustomProperty( "X-LibKCal-Testsuite-OutTZ" );
diff --git a/libkcal/tests/testrecurson.cpp b/libkcal/tests/testrecurson.cpp
index 01dfb5f7..343bad45 100644
--- a/libkcal/tests/testrecurson.cpp
+++ b/libkcal/tests/testrecurson.cpp
@@ -80,7 +80,7 @@ int main( int argc, char **argv )
     outstream = new TQTextStream( &outfile );
   }
 
-  CalendarLocal cal( TQString::fromLatin1("UTC") );
+  CalendarLocal cal( TQString::tqfromLatin1("UTC") );
 
   if ( !cal.load( input ) ) return 1;
 	TQString tz = cal.nonKDECustomProperty( "X-LibKCal-Testsuite-OutTZ" );
diff --git a/libkcal/tests/testvcalexport.cpp b/libkcal/tests/testvcalexport.cpp
index 7f8b61c0..9e76dcd9 100644
--- a/libkcal/tests/testvcalexport.cpp
+++ b/libkcal/tests/testvcalexport.cpp
@@ -75,7 +75,7 @@ int main( int argc, char **argv )
   kdDebug(5800) << "Output file: " << output << endl;
 
 
-  CalendarLocal cal( TQString::fromLatin1("UTC") );
+  CalendarLocal cal( TQString::tqfromLatin1("UTC") );
 
   if ( !cal.load( input ) ) return 1;
 	TQString tz = cal.nonKDECustomProperty( "X-LibKCal-Testsuite-OutTZ" );
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index b3fe65d9..c527cbbc 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -288,7 +288,7 @@ TQDateTime Todo::dtRecurrence() const
 
 bool Todo::recursOn( const TQDate &date ) const
 {
-  TQDate today = TQDate::currentDate();
+  TQDate today = TQDate::tqcurrentDate();
   return ( Incidence::recursOn(date) &&
            !( date < today && mDtRecurrence.date() < today &&
               mDtRecurrence > recurrence()->startDateTime() ) );
@@ -304,7 +304,7 @@ bool Todo::recurTodo()
     if ( ( r->duration() == -1 || ( nextDate.isValid() && endDateTime.isValid()
            && nextDate <= endDateTime ) ) ) {
 
-      while ( !recursAt( nextDate ) || nextDate <= TQDateTime::currentDateTime() ) {
+      while ( !recursAt( nextDate ) || nextDate <= TQDateTime::tqcurrentDateTime() ) {
 
         if ( !nextDate.isValid() ||
              ( nextDate > endDateTime && r->duration() != -1 ) ) {
@@ -327,7 +327,7 @@ bool Todo::recurTodo()
 
 bool Todo::isOverdue() const
 {
-  bool inPast = doesFloat() ? dtDue().date() < TQDate::currentDate()
-                            : dtDue() < TQDateTime::currentDateTime();
+  bool inPast = doesFloat() ? dtDue().date() < TQDate::tqcurrentDate()
+                            : dtDue() < TQDateTime::tqcurrentDateTime();
   return ( inPast && !isCompleted() );
 }
diff --git a/libkcal/vcaldrag.cpp b/libkcal/vcaldrag.cpp
index 9bcfdb8d..853c5187 100644
--- a/libkcal/vcaldrag.cpp
+++ b/libkcal/vcaldrag.cpp
@@ -42,7 +42,7 @@ bool VCalDrag::decode( TQMimeSource *de, Calendar *cal )
 {
   bool success = false;
 
-  TQByteArray payload = de->encodedData( "text/x-vCalendar" );
+  TQByteArray payload = de->tqencodedData( "text/x-vCalendar" );
   if ( payload.size() ) {
     TQString txt = TQString::fromUtf8( payload.data() );
 
diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp
index 3e9e613b..21d8ae4b 100644
--- a/libkcal/vcalformat.cpp
+++ b/libkcal/vcalformat.cpp
@@ -356,7 +356,7 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent)
     tmpStr.sprintf("%lu",anEvent->pilotId());
     addPropValue(vtodo, KPilotIdProp, tmpStr.local8Bit());
     tmpStr.sprintf("%i",anEvent->syncStatus());
-    addPropValue(vtodo, KPilotStatusProp, tmpStr.local8Bit());
+    addPropValue(vtodo, KPiloStatusProp, tmpStr.local8Bit());
   }
 
   return vtodo;
@@ -642,7 +642,7 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent)
     tmpStr.sprintf("%lu",anEvent->pilotId());
     addPropValue(vevent, KPilotIdProp, tmpStr.local8Bit());
     tmpStr.sprintf("%i",anEvent->syncStatus());
-    addPropValue(vevent, KPilotStatusProp, tmpStr.local8Bit());
+    addPropValue(vevent, KPiloStatusProp, tmpStr.local8Bit());
   }
 
   return vevent;
@@ -677,7 +677,7 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo)
     deleteStr(s);
   }
   else
-    anEvent->setLastModified(TQDateTime(TQDate::currentDate(),
+    anEvent->setLastModified(TQDateTime(TQDate::tqcurrentDate(),
                                        TQTime::currentTime()));
 
   // organizer
@@ -713,7 +713,7 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo)
       } else {
         // just a name
         // WTF??? Replacing the spaces of a name and using this as email?
-        TQString email = tmpStr.replace( ' ', '.' );
+        TQString email = tmpStr.tqreplace( ' ', '.' );
         a = new Attendee(tmpStr,email);
       }
 
@@ -722,7 +722,7 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo)
         a->setRSVP(vObjectStringZValue(vp));
       // is there a status property?
       if ((vp = isAPropertyOf(vo, VCStatusProp)) != 0)
-        a->setStatus(readStatus(vObjectStringZValue(vp)));
+        a->seStatus(readStatus(vObjectStringZValue(vp)));
       // add the attendee
       anEvent->addAttendee(a);
     }
@@ -844,7 +844,7 @@ Todo *VCalFormat::VTodoToEvent(VObject *vtodo)
   else
     anEvent->setPilotId(0);
 
-  if ((vo = isAPropertyOf(vtodo, KPilotStatusProp))) {
+  if ((vo = isAPropertyOf(vtodo, KPiloStatusProp))) {
     anEvent->setSyncStatus(atoi(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
@@ -892,7 +892,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
     deleteStr(s);
   }
   else
-    anEvent->setLastModified(TQDateTime(TQDate::currentDate(),
+    anEvent->setLastModified(TQDateTime(TQDate::tqcurrentDate(),
                                        TQTime::currentTime()));
 
   // organizer
@@ -928,7 +928,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
         a = new Attendee(0, tmpStr);
       } else {
         // just a name
-        TQString email = tmpStr.replace( ' ', '.' );
+        TQString email = tmpStr.tqreplace( ' ', '.' );
         a = new Attendee(tmpStr,email);
       }
 
@@ -937,7 +937,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
         a->setRSVP(vObjectStringZValue(vp));
       // is there a status property?
       if ((vp = isAPropertyOf(vo, VCStatusProp)) != 0)
-        a->setStatus(readStatus(vObjectStringZValue(vp)));
+        a->seStatus(readStatus(vObjectStringZValue(vp)));
       // add the attendee
       anEvent->addAttendee(a);
     }
@@ -1210,10 +1210,10 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
     TQString tmpStr(s = fakeCString(vObjectUStringZValue(vo)));
     deleteStr(s);
 // TODO: Define Event status
-//    anEvent->setStatus(tmpStr);
+//    anEvent->seStatus(tmpStr);
   }
   else
-//    anEvent->setStatus("NEEDS ACTION");
+//    anEvent->seStatus("NEEDS ACTION");
 #endif
 
   // secrecy
@@ -1310,7 +1310,7 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
   else
     anEvent->setPilotId(0);
 
-  if ((vo = isAPropertyOf(vevent, KPilotStatusProp))) {
+  if ((vo = isAPropertyOf(vevent, KPiloStatusProp))) {
     anEvent->setSyncStatus(atoi(s = fakeCString(vObjectUStringZValue(vo))));
     deleteStr(s);
   }
@@ -1473,7 +1473,7 @@ void VCalFormat::populate(VObject *vcal)
     // now, check to see that the object is an event or todo.
     if (strcmp(vObjectName(curVO), VCEventProp) == 0) {
 
-      if ((curVOProp = isAPropertyOf(curVO, KPilotStatusProp)) != 0) {
+      if ((curVOProp = isAPropertyOf(curVO, KPiloStatusProp)) != 0) {
         char *s;
         s = fakeCString(vObjectUStringZValue(curVOProp));
         // check to see if event was deleted by the kpilot conduit
diff --git a/libkcal/versit/vobject.h b/libkcal/versit/vobject.h
index 0ec8b317..c84d4c8a 100644
--- a/libkcal/versit/vobject.h
+++ b/libkcal/versit/vobject.h
@@ -249,12 +249,12 @@ extern "C" {
 
 /* extensions for KOrganizer / KPilot */
 #define KPilotIdProp                            "X-PILOTID"
-#define KPilotStatusProp                        "X-PILOTSTAT"
+#define KPiloStatusProp                        "X-PILOTSTAT"
 
 /* extensions for iMIP / iTIP */
 #define ICOrganizerProp                         "X-ORGANIZER"
 #define ICMethodProp                            "X-METHOD"
-#define ICRequestStatusProp                     "X-REQUEST-STATUS"
+#define ICRequesStatusProp                     "X-REQUEST-STATUS"
 
 typedef struct VObject VObject;
 
diff --git a/libkdenetwork/libgpg-error-copy/gpg-error.h.in b/libkdenetwork/libgpg-error-copy/gpg-error.h.in
index cc1aaea8..5211341f 100644
--- a/libkdenetwork/libgpg-error-copy/gpg-error.h.in
+++ b/libkdenetwork/libgpg-error-copy/gpg-error.h.in
@@ -198,8 +198,8 @@ const char *gpg_strerror (gpg_error_t err);
    size BUFLEN.  This function is, in contrast to gpg_strerror,
    thread-safe if a thread-safe strerror_r() function is provided by
    the system.  If the function succeeds, 0 is returned and BUF
-   contains the string describing the error.  If the buffer was not
-   large enough, ERANGE is returned and BUF contains as much of the
+   tqcontains the string describing the error.  If the buffer was not
+   large enough, ERANGE is returned and BUF tqcontains as much of the
    beginning of the error string as fits into the buffer.  */
 int gpg_strerror_r (gpg_error_t err, char *buf, size_t buflen);
 
diff --git a/libkdenetwork/libgpg-error-copy/strerror.c b/libkdenetwork/libgpg-error-copy/strerror.c
index 59b8e9ae..4de90de9 100644
--- a/libkdenetwork/libgpg-error-copy/strerror.c
+++ b/libkdenetwork/libgpg-error-copy/strerror.c
@@ -130,8 +130,8 @@ system_strerror_r (int no, char *buf, size_t buflen)
    size BUFLEN.  This function is, in contrast to gpg_strerror,
    thread-safe if a thread-safe strerror_r() function is provided by
    the system.  If the function succeeds, 0 is returned and BUF
-   contains the string describing the error.  If the buffer was not
-   large enough, ERANGE is returned and BUF contains as much of the
+   tqcontains the string describing the error.  If the buffer was not
+   large enough, ERANGE is returned and BUF tqcontains as much of the
    beginning of the error string as fits into the buffer.  */
 int
 gpg_strerror_r (gpg_error_t err, char *buf, size_t buflen)
diff --git a/libkdenetwork/libgpgme-copy/assuan/assuan-buffer.c b/libkdenetwork/libgpgme-copy/assuan/assuan-buffer.c
index b06025b4..3f8730aa 100644
--- a/libkdenetwork/libgpgme-copy/assuan/assuan-buffer.c
+++ b/libkdenetwork/libgpgme-copy/assuan/assuan-buffer.c
@@ -163,7 +163,7 @@ _assuan_read_line (assuan_context_t ctx)
       int n = endp - line + 1;
 
       if (n < nread)
-	/* LINE contains more than one line.  We copy it to the attic
+	/* LINE tqcontains more than one line.  We copy it to the attic
 	   now as handlers are allowed to modify the passed
 	   buffer.  */
 	{
diff --git a/libkdenetwork/libgpgme-copy/assuan/assuan-defs.h b/libkdenetwork/libgpgme-copy/assuan/assuan-defs.h
index fa04f0b2..94fbb41b 100644
--- a/libkdenetwork/libgpgme-copy/assuan/assuan-defs.h
+++ b/libkdenetwork/libgpgme-copy/assuan/assuan-defs.h
@@ -299,7 +299,7 @@ FILE *_assuan_funopen(void *cookie,
 #define funopen(a,r,w,s,c) _assuan_funopen ((a), (r), (w), (s), (c))
 #endif /*HAVE_FOPENCOOKIE*/
 
-/* Prototypes for replacement functions.  */
+/* Prototypes for tqreplacement functions.  */
 #ifndef HAVE_MEMRCHR
 void *memrchr (const void *block, int c, size_t size);
 #endif
@@ -310,7 +310,7 @@ char *stpcpy (char *dest, const char *src);
 #define setenv _assuan_setenv
 #define unsetenv _assuan_unsetenv
 #define clearenv _assuan_clearenv
-int setenv (const char *name, const char *value, int replace);
+int setenv (const char *name, const char *value, int tqreplace);
 #endif
 #ifndef HAVE_PUTC_UNLOCKED
 int putc_unlocked (int c, FILE *stream);
diff --git a/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c b/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c
index 8ee9c748..518dc20b 100644
--- a/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c
+++ b/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c
@@ -86,7 +86,7 @@ fix_signals (void)
       if (act.sa_handler == SIG_DFL)
 	{
 	  act.sa_handler = SIG_IGN;
-	  sigemptyset (&act.sa_mask);
+	  sigemptyset (&act.sa_tqmask);
 	  act.sa_flags = 0;
 	  sigaction (SIGPIPE, &act, NULL);
         }
diff --git a/libkdenetwork/libgpgme-copy/assuan/assuan-uds.c b/libkdenetwork/libgpgme-copy/assuan/assuan-uds.c
index 77945fb5..975d2f2f 100644
--- a/libkdenetwork/libgpgme-copy/assuan/assuan-uds.c
+++ b/libkdenetwork/libgpgme-copy/assuan/assuan-uds.c
@@ -45,8 +45,8 @@
 #include "assuan-defs.h"
 
 #ifdef USE_DESCRIPTOR_PASSING
-/* Provide replacement for missing CMSG maccros.  We assume that
-   size_t matches the alignment requirement. */
+/* Provide tqreplacement for missing CMSG maccros.  We assume that
+   size_t matches the tqalignment requirement. */
 #define MY_ALIGN(n) ((((n))+ sizeof(size_t)-1) & (size_t)~(sizeof(size_t)-1))
 #ifndef CMSG_SPACE
 #define CMSG_SPACE(n) (MY_ALIGN(sizeof(struct cmsghdr)) + MY_ALIGN((n)))
diff --git a/libkdenetwork/libgpgme-copy/assuan/assuan.h b/libkdenetwork/libgpgme-copy/assuan/assuan.h
index cdf0445a..80c8d6b3 100644
--- a/libkdenetwork/libgpgme-copy/assuan/assuan.h
+++ b/libkdenetwork/libgpgme-copy/assuan/assuan.h
@@ -402,8 +402,8 @@ assuan_error_t assuan_set_okay_line (assuan_context_t ctx, const char *line);
 assuan_error_t assuan_write_status (assuan_context_t ctx,
                                     const char *keyword, const char *text);
 
-/* Negotiate a file descriptor.  If LINE contains "FD=N", returns N
-   assuming a local file descriptor.  If LINE contains "FD" reads a
+/* Negotiate a file descriptor.  If LINE tqcontains "FD=N", returns N
+   assuming a local file descriptor.  If LINE tqcontains "FD" reads a
    file descriptor via CTX and stores it in *RDF (the CTX must be
    capable of passing file descriptors).  */
 assuan_error_t assuan_command_parse_fd (assuan_context_t ctx, char *line,
diff --git a/libkdenetwork/libgpgme-copy/gpgme/error.c b/libkdenetwork/libgpgme-copy/gpgme/error.c
index f0ea4929..9f8f26f7 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/error.c
+++ b/libkdenetwork/libgpgme-copy/gpgme/error.c
@@ -37,8 +37,8 @@ gpgme_strerror (gpgme_error_t err)
    size BUFLEN.  This function is, in contrast to gpg_strerror,
    thread-safe if a thread-safe strerror_r() function is provided by
    the system.  If the function succeeds, 0 is returned and BUF
-   contains the string describing the error.  If the buffer was not
-   large enough, ERANGE is returned and BUF contains as much of the
+   tqcontains the string describing the error.  If the buffer was not
+   large enough, ERANGE is returned and BUF tqcontains as much of the
    beginning of the error string as fits into the buffer.  */
 int
 gpgme_strerror_r (gpg_error_t err, char *buf, size_t buflen)
diff --git a/libkdenetwork/libgpgme-copy/gpgme/get-env.c b/libkdenetwork/libgpgme-copy/gpgme/get-env.c
index b5884048..61e0dcbc 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/get-env.c
+++ b/libkdenetwork/libgpgme-copy/gpgme/get-env.c
@@ -1,4 +1,4 @@
-/* get_env.c - A getenv() replacement.
+/* get_env.c - A getenv() tqreplacement.
    Copyright (C) 2003, 2004 g10 Code GmbH
 
    This file is part of GPGME.
diff --git a/libkdenetwork/libgpgme-copy/gpgme/gpgme.h b/libkdenetwork/libgpgme-copy/gpgme/gpgme.h
index 4615667f..577f9c33 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/gpgme.h
+++ b/libkdenetwork/libgpgme-copy/gpgme/gpgme.h
@@ -137,8 +137,8 @@ const char *gpgme_strerror (gpgme_error_t err);
    size BUFLEN.  This function is, in contrast to gpg_strerror,
    thread-safe if a thread-safe strerror_r() function is provided by
    the system.  If the function succeeds, 0 is returned and BUF
-   contains the string describing the error.  If the buffer was not
-   large enough, ERANGE is returned and BUF contains as much of the
+   tqcontains the string describing the error.  If the buffer was not
+   large enough, ERANGE is returned and BUF tqcontains as much of the
    beginning of the error string as fits into the buffer.  */
 int gpgme_strerror_r (gpg_error_t err, char *buf, size_t buflen);
 
@@ -326,7 +326,7 @@ struct _gpgme_sig_notation
 {
   struct _gpgme_sig_notation *next;
 
-  /* If NAME is a null pointer, then VALUE contains a policy URL
+  /* If NAME is a null pointer, then VALUE tqcontains a policy URL
      rather than a notation.  */
   char *name;
 
@@ -687,19 +687,19 @@ struct _gpgme_key
   /* This is the protocol supported by this key.  */
   gpgme_protocol_t protocol;
 
-  /* If protocol is GPGME_PROTOCOL_CMS, this string contains the
+  /* If protocol is GPGME_PROTOCOL_CMS, this string tqcontains the
      issuer serial.  */
   char *issuer_serial;
 
-  /* If protocol is GPGME_PROTOCOL_CMS, this string contains the
+  /* If protocol is GPGME_PROTOCOL_CMS, this string tqcontains the
      issuer name.  */
   char *issuer_name;
 
-  /* If protocol is GPGME_PROTOCOL_CMS, this string contains the chain
+  /* If protocol is GPGME_PROTOCOL_CMS, this string tqcontains the chain
      ID.  */
   char *chain_id;
 
-  /* If protocol is GPGME_PROTOCOL_OpenPGP, this field contains the
+  /* If protocol is GPGME_PROTOCOL_OpenPGP, this field tqcontains the
      owner trust.  */
   gpgme_validity_t owner_trust;
 
@@ -1694,7 +1694,7 @@ typedef gpgme_encrypt_result_t GpgmeEncryptResult _GPGME_DEPRECATED;
 typedef gpgme_sig_notation_t GpgmeSigNotation _GPGME_DEPRECATED;
 typedef	gpgme_signature_t GpgmeSignature _GPGME_DEPRECATED;
 typedef gpgme_verify_result_t GpgmeVerifyResult _GPGME_DEPRECATED;
-typedef gpgme_import_status_t GpgmeImportStatus _GPGME_DEPRECATED;
+typedef gpgme_import_status_t GpgmeImporStatus _GPGME_DEPRECATED;
 typedef gpgme_import_result_t GpgmeImportResult _GPGME_DEPRECATED;
 typedef gpgme_genkey_result_t GpgmeGenKeyResult _GPGME_DEPRECATED;
 typedef	gpgme_trust_item_t GpgmeTrustItem _GPGME_DEPRECATED;
diff --git a/libkdenetwork/libgpgme-copy/gpgme/memrchr.c b/libkdenetwork/libgpgme-copy/gpgme/memrchr.c
index 4f91ef2b..83d66169 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/memrchr.c
+++ b/libkdenetwork/libgpgme-copy/gpgme/memrchr.c
@@ -70,7 +70,7 @@ __memrchr (s, c_in, n)
 {
   const unsigned char *char_ptr;
   const unsigned long int *longword_ptr;
-  unsigned long int longword, magic_bits, charmask;
+  unsigned long int longword, magic_bits, chartqmask;
   unsigned reg_char c;
 
   c = (unsigned char) c_in;
@@ -109,10 +109,10 @@ __memrchr (s, c_in, n)
 #endif
 
   /* Set up a longword, each of whose bytes is C.  */
-  charmask = c | (c << 8);
-  charmask |= charmask << 16;
+  chartqmask = c | (c << 8);
+  chartqmask |= chartqmask << 16;
 #if LONG_MAX > LONG_MAX_32_BITS
-  charmask |= charmask << 32;
+  chartqmask |= chartqmask << 32;
 #endif
 
   /* Instead of the traditional loop which tests each character,
@@ -154,7 +154,7 @@ __memrchr (s, c_in, n)
 	 each of whose bytes is C.  This turns each byte that is C
 	 into a zero.  */
 
-      longword = *--longword_ptr ^ charmask;
+      longword = *--longword_ptr ^ chartqmask;
 
       /* Add MAGIC_BITS to LONGWORD.  */
       if ((((longword + magic_bits)
diff --git a/libkdenetwork/libgpgme-copy/gpgme/posix-io.c b/libkdenetwork/libgpgme-copy/gpgme/posix-io.c
index 7f3b80e7..85df946f 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/posix-io.c
+++ b/libkdenetwork/libgpgme-copy/gpgme/posix-io.c
@@ -50,7 +50,7 @@ _gpgme_io_subsystem_init (void)
   if (act.sa_handler == SIG_DFL)
     {
       act.sa_handler = SIG_IGN;
-      sigemptyset (&act.sa_mask);
+      sigemptyset (&act.sa_tqmask);
       act.sa_flags = 0;
       sigaction (SIGPIPE, &act, NULL);
     }
diff --git a/libkdenetwork/libgpgme-copy/gpgme/util.h b/libkdenetwork/libgpgme-copy/gpgme/util.h
index 05fd69d5..5f20091f 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/util.h
+++ b/libkdenetwork/libgpgme-copy/gpgme/util.h
@@ -34,7 +34,7 @@ const char *_gpgme_get_gpgsm_path (void);
 int _gpgme_get_conf_int (const char *key, int *value);
 
 
-/*-- replacement functions in <funcname>.c --*/
+/*-- tqreplacement functions in <funcname>.c --*/
 #ifdef HAVE_CONFIG_H
 
 #ifndef HAVE_STPCPY
diff --git a/libkdenetwork/libgpgme-copy/gpgme/wait-global.c b/libkdenetwork/libgpgme-copy/gpgme/wait-global.c
index bfa618dd..ba064ebb 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/wait-global.c
+++ b/libkdenetwork/libgpgme-copy/gpgme/wait-global.c
@@ -41,7 +41,7 @@
    GPGME_EVENT_START event.  After that, it is added to the global
    list of active contexts.
 
-   The gpgme_wait function contains a select() loop over all file
+   The gpgme_wait function tqcontains a select() loop over all file
    descriptors in all active contexts.  If an error occurs, it closes
    all fds in that context and moves the context to the global done
    list.  Likewise, if a context has removed all I/O callbacks, it is
@@ -75,15 +75,15 @@ struct ctx_list_item
   gpgme_error_t status;
 };
 
-/* The active list contains all contexts that are in the global event
+/* The active list tqcontains all contexts that are in the global event
    loop, have active I/O callbacks, and have already seen the start
    event.  */
 static struct ctx_list_item *ctx_active_list;
 
-/* The done list contains all contexts that have previously been
+/* The done list tqcontains all contexts that have previously been
    active but now are not active any longer, either because they
    finished successfully or an I/O callback returned an error.  The
-   status field in the list item contains the error value (or 0 if
+   status field in the list item tqcontains the error value (or 0 if
    successful).  */
 static struct ctx_list_item *ctx_done_list;
 
diff --git a/libkdenetwork/qgpgme/eventloopinteractor.cpp b/libkdenetwork/qgpgme/eventloopinteractor.cpp
index 9396385b..8846bb2a 100644
--- a/libkdenetwork/qgpgme/eventloopinteractor.cpp
+++ b/libkdenetwork/qgpgme/eventloopinteractor.cpp
@@ -36,9 +36,9 @@ QGpgME::EventLoopInteractor::EventLoopInteractor( TQObject * parent, const char
  : TQObject( parent, name ), GpgME::EventLoopInteractor()
 {
   if ( !parent )
-    if ( qApp ) {
-      connect( qApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) );
-      connect( qApp, TQT_SIGNAL(aboutToQuit()), TQT_SIGNAL(aboutToDestroy()) );
+    if ( tqApp ) {
+      connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) );
+      connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SIGNAL(aboutToDestroy()) );
     }
   mSelf = this;
 }
@@ -53,7 +53,7 @@ QGpgME::EventLoopInteractor * QGpgME::EventLoopInteractor::mSelf = 0;
 QGpgME::EventLoopInteractor * QGpgME::EventLoopInteractor::instance() {
   if ( !mSelf )
 #ifndef NDEBUG
-    if ( !qApp )
+    if ( !tqApp )
       qWarning( "QGpgME::EventLoopInteractor: Need a TQApplication object before calling instance()!" );
     else
 #endif
diff --git a/libkdepim/addresseeemailselection.cpp b/libkdepim/addresseeemailselection.cpp
index f5d840c9..f9f10160 100644
--- a/libkdepim/addresseeemailselection.cpp
+++ b/libkdepim/addresseeemailselection.cpp
@@ -150,7 +150,7 @@ bool AddresseeEmailSelection::itemMatches( const KABC::Addressee &addressee, uin
 bool AddresseeEmailSelection::itemEquals( const KABC::Addressee &addressee, uint index, const TQString &pattern ) const
 {
   return (pattern == addressee.formattedName() + " " + email( addressee, index )) ||
-         (addressee.emails().contains( pattern ));
+         (addressee.emails().tqcontains( pattern ));
 }
 
 TQString AddresseeEmailSelection::distributionListText( const KABC::DistributionList *distributionList ) const
diff --git a/libkdepim/addresseelineedit.cpp b/libkdepim/addresseelineedit.cpp
index 5e3d0cf3..243b6608 100644
--- a/libkdepim/addresseelineedit.cpp
+++ b/libkdepim/addresseelineedit.cpp
@@ -217,12 +217,12 @@ void AddresseeLineEdit::keyPressEvent( TQKeyEvent *e )
 {
   bool accept = false;
 
-  if ( KStdAccel::shortcut( KStdAccel::SubstringCompletion ).contains( KKey( e ) ) ) {
+  if ( KStdAccel::shortcut( KStdAccel::SubstringCompletion ).tqcontains( KKey( e ) ) ) {
     //TODO: add LDAP substring lookup, when it becomes available in KPIM::LDAPSearch
     updateSearchString();
     doCompletion( true );
     accept = true;
-  } else if ( KStdAccel::shortcut( KStdAccel::TextCompletion ).contains( KKey( e ) ) ) {
+  } else if ( KStdAccel::shortcut( KStdAccel::TextCompletion ).tqcontains( KKey( e ) ) ) {
     int len = text().length();
 
     if ( len == cursorPosition() ) { // at End?
@@ -287,11 +287,11 @@ void AddresseeLineEdit::insert( const TQString &t )
   }
   else if ( newText.find(" at ") != -1 ) {
     // Anti-spam stuff
-    newText.replace( " at ", "@" );
-    newText.replace( " dot ", "." );
+    newText.tqreplace( " at ", "@" );
+    newText.tqreplace( " dot ", "." );
   }
   else if ( newText.find("(at)") != -1 ) {
-    newText.replace( TQRegExp("\\s*\\(at\\)\\s*"), "@" );
+    newText.tqreplace( TQRegExp("\\s*\\(at\\)\\s*"), "@" );
   }
 
   TQString contents = text();
@@ -388,8 +388,8 @@ void AddresseeLineEdit::dropEvent( TQDropEvent *e )
         return;
       }
     } else {
-      // Let's see if this drop contains a comma separated list of emails
-      TQString dropData = TQString::fromUtf8( e->encodedData( "text/plain" ) );
+      // Let's see if this drop tqcontains a comma separated list of emails
+      TQString dropData = TQString::fromUtf8( e->tqencodedData( "text/plain" ) );
       TQStringList addrs = splitEmailAddrList( dropData );
       if ( addrs.count() > 0 ) {
         setText( normalizeAddressesAndDecodeIDNs( dropData ) );
@@ -698,7 +698,7 @@ void AddresseeLineEdit::addContact( const KABC::Addressee& addr, int weight, int
      * We remove the <blank> in getAdjustedCompletionItems.
      */
     if ( isPrefEmail == prefEmailWeight )
-      fullEmail.replace( " <", "  <" );
+      fullEmail.tqreplace( " <", "  <" );
 
     addCompletionItem( fullEmail, weight + isPrefEmail, source, &keyWords );
     isPrefEmail = 0;
@@ -821,7 +821,7 @@ void AddresseeLineEdit::slotLDAPSearchData( const KPIM::LdapResultList& adrs )
     addr.setNameFromString( (*it).name );
     addr.setEmails( (*it).email );
 
-    if ( !s_ldapClientToCompletionSourceMap->contains( (*it).clientNumber ) )
+    if ( !s_ldapClientToCompletionSourceMap->tqcontains( (*it).clientNumber ) )
       updateLDAPWeights(); // we got results from a new source, so update the completion sources
 
     addContact( addr, (*it).completionWeight, (*s_ldapClientToCompletionSourceMap)[ (*it ).clientNumber ]  );
@@ -852,7 +852,7 @@ void AddresseeLineEdit::setCompletedItems( const TQStringList& items, bool autoS
         TQPoint oldPosOfItemUnderMouse;
         if ( itemUnderMouse ) {
             oldTextUnderMouse = itemUnderMouse->text();
-            oldPosOfItemUnderMouse = completionBox->itemRect( itemUnderMouse ).topLeft();
+            oldPosOfItemUnderMouse = completionBox->tqitemRect( itemUnderMouse ).topLeft();
         }
 
         completionBox->setItems( items );
@@ -865,7 +865,7 @@ void AddresseeLineEdit::setCompletedItems( const TQStringList& items, bool autoS
           // calls show(), and that's where KCompletionBox installs its filter.
           // We want to be first, though, so do it now.
           if ( s_completion->order() == KCompletion::Weighted )
-            qApp->installEventFilter( this );
+            tqApp->installEventFilter( this );
         }
 
         // Try to re-select what was selected before, otherrwise use the first
@@ -882,7 +882,7 @@ void AddresseeLineEdit::setCompletedItems( const TQStringList& items, bool autoS
               // if the mouse was over an item, before, but now that's elsewhere,
               // move the cursor, so folks don't accidently click the wrong item
               if ( newItemUnderMouse ) {
-                  TQRect r = completionBox->itemRect( newItemUnderMouse );
+                  TQRect r = completionBox->tqitemRect( newItemUnderMouse );
                   TQPoint target = r.topLeft();
                   if ( oldPosOfItemUnderMouse != target ) {
                       target.setX( target.x() + r.width()/2 );
@@ -1243,7 +1243,7 @@ const TQStringList KPIM::AddresseeLineEdit::getAdjustedCompletionItems( bool ful
       }
       (*it) = (*it).prepend( s_completionItemIndentString );
       // remove preferred email sort <blank> added in  addContact()
-      (*it).replace( "  <", " <" );
+      (*it).tqreplace( "  <", " <" );
     }
     sections[idx].append( *it );
 
diff --git a/libkdepim/addresseeselector.cpp b/libkdepim/addresseeselector.cpp
index 5bd73b5d..65e34985 100644
--- a/libkdepim/addresseeselector.cpp
+++ b/libkdepim/addresseeselector.cpp
@@ -47,7 +47,7 @@ class AddresseeSelector::AddressBookManager
     void addAddressBook( const TQString &title, SelectionItem::List &list );
 
     void clear();
-    bool contains( uint index, const SelectionItem& );
+    bool tqcontains( uint index, const SelectionItem& );
 
   private:
     struct AddressBookEntry {
@@ -101,7 +101,7 @@ void AddresseeSelector::AddressBookManager::clear()
   mAddressBooks.clear();
 }
 
-bool AddresseeSelector::AddressBookManager::contains( uint index, const SelectionItem &item )
+bool AddresseeSelector::AddressBookManager::tqcontains( uint index, const SelectionItem &item )
 {
   if ( index == 0 ) // the 'all' entry
     return true;
@@ -267,7 +267,7 @@ void AddresseeSelector::init()
 
 void AddresseeSelector::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() );
   TQGridLayout *topLayout = new TQGridLayout( this, 2, 2, KDialog::marginHint() );
 
   TQLabel *label = new TQLabel( i18n( "Address book:" ), this );
@@ -284,7 +284,7 @@ void AddresseeSelector::initGUI()
 
   topLayout->setColStretch( 1, 1 );
 
-  layout->addMultiCellLayout( topLayout, 0, 0, 0, 2 );
+  tqlayout->addMultiCellLayout( topLayout, 0, 0, 0, 2 );
 
   int row = 1;
 
@@ -303,8 +303,8 @@ void AddresseeSelector::initGUI()
     mRemoveMapper->setMapping( listView, i );
 
     TQVBoxLayout *buttonLayout = new TQVBoxLayout( this );
-    buttonLayout->setAlignment( Qt::AlignBottom );
-    layout->addLayout( buttonLayout, row, 1 );
+    buttonLayout->tqsetAlignment( Qt::AlignBottom );
+    tqlayout->addLayout( buttonLayout, row, 1 );
 
     // move button
     TQToolButton *moveButton = new TQToolButton( this );
@@ -327,7 +327,7 @@ void AddresseeSelector::initGUI()
     buttonLayout->addWidget( moveButton );
     buttonLayout->addWidget( removeButton );
 
-    layout->addWidget( listView, row, 2 );
+    tqlayout->addWidget( listView, row, 2 );
   }
 
   mAddresseeView = new KListView( this );
@@ -335,7 +335,7 @@ void AddresseeSelector::initGUI()
   mAddresseeView->header()->hide();
   mAddresseeView->setFullWidth( true );
 
-  layout->addMultiCellWidget( mAddresseeView, 1, row, 0, 0 );
+  tqlayout->addMultiCellWidget( mAddresseeView, 1, row, 0, 0 );
 }
 
 void AddresseeSelector::finish()
@@ -362,7 +362,7 @@ void AddresseeSelector::updateAddresseeView()
 
   SelectionItem::List::Iterator it;
   for ( it = mSelectionItems.begin(); it != mSelectionItems.end(); ++it ) {
-    if ( mAddressBookManager->contains( addressBookIndex, *it ) ) {
+    if ( mAddressBookManager->tqcontains( addressBookIndex, *it ) ) {
       if ( (*it).distributionList() == 0 ) {
         if ( mAddresseeFilter->text().isEmpty() ||
              mSelection->itemMatches( (*it).addressee(), (*it).index(),
@@ -565,9 +565,9 @@ AddresseeSelectorDialog::AddresseeSelectorDialog( Selection *selection,
   : KDialogBase( Plain, "", Ok | Cancel, Ok, parent, name, true )
 {
   TQFrame *frame = plainPage();
-  TQVBoxLayout *layout = new TQVBoxLayout( frame );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( frame );
   mSelector = new KPIM::AddresseeSelector( selection, frame );
-  layout->addWidget( mSelector );
+  tqlayout->addWidget( mSelector );
 
   resize( 500, 490 );
 }
diff --git a/libkdepim/addresseeview.cpp b/libkdepim/addresseeview.cpp
index 89033482..d5b3e6e2 100644
--- a/libkdepim/addresseeview.cpp
+++ b/libkdepim/addresseeview.cpp
@@ -161,17 +161,17 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
   // the global background color).
   //
   TQString backgroundColor = KGlobalSettings::alternateBackgroundColor().name();
-  TQString cellStyle = TQString::fromLatin1(
+  TQString cellStyle = TQString::tqfromLatin1(
         "style=\""
         "padding-right: 2px; "
         "border-right: #000 dashed 1px; "
         "background: %1;\"").arg(backgroundColor);
   TQString backgroundColor2 = KGlobalSettings::baseColor().name();
-  TQString cellStyle2 = TQString::fromLatin1(
+  TQString cellStyle2 = TQString::tqfromLatin1(
         "style=\""
         "padding-left: 2px; "
         "background: %1;\"").arg(backgroundColor2);
-  TQString tableStyle = TQString::fromLatin1(
+  TQString tableStyle = TQString::tqfromLatin1(
         "style=\""
         "border: solid 1px; "
         "margin: 0em;\"");
@@ -179,17 +179,17 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
   // We'll be building a table to display the vCard in.
   // Each row of the table will be built using this string for its HTML.
   //
-  TQString rowFmtStr = TQString::fromLatin1(
+  TQString rowFmtStr = TQString::tqfromLatin1(
         "<tr>"
         "<td align=\"right\" valign=\"top\" width=\"30%\" "); // Tag unclosed
   rowFmtStr.append( cellStyle );
-  rowFmtStr.append( TQString::fromLatin1(
+  rowFmtStr.append( TQString::tqfromLatin1(
 	">" // Close tag
         "<b>%1</b>"
         "</td>"
         "<td align=\"left\" valign=\"top\" width=\"70%\" ") ); // Tag unclosed
   rowFmtStr.append( cellStyle2 );
-  rowFmtStr.append( TQString::fromLatin1(
+  rowFmtStr.append( TQString::tqfromLatin1(
 	">" // Close tag
         "%2"
         "</td>"
@@ -228,9 +228,9 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
 
       TQString url;
       if ( (*phoneIt).type() & KABC::PhoneNumber::Fax )
-        url = TQString::fromLatin1( "fax:" ) + number;
+        url = TQString::tqfromLatin1( "fax:" ) + number;
       else
-        url = TQString::fromLatin1( "phone:" ) + number;
+        url = TQString::tqfromLatin1( "phone:" ) + number;
 
       if ( linkMask & PhoneLinks ) {
         TQString smsURL;
@@ -238,11 +238,11 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
           smsURL = TQString(" (<a href=\"sms:%1\">%2</a>)" ).arg( number ).arg( i18n( "SMS") );
 
         dynamicPart += rowFmtStr
-          .arg( (*phoneIt).typeLabel().replace( " ", "&nbsp;" ) )
-          .arg( TQString::fromLatin1( "<a href=\"%1\">%2</a>%3" ).arg( url ).arg( number ).arg( smsURL ) );
+          .arg( (*phoneIt).typeLabel().tqreplace( " ", "&nbsp;" ) )
+          .arg( TQString::tqfromLatin1( "<a href=\"%1\">%2</a>%3" ).arg( url ).arg( number ).arg( smsURL ) );
       } else {
         dynamicPart += rowFmtStr
-          .arg( (*phoneIt).typeLabel().replace( " ", "&nbsp;" ) )
+          .arg( (*phoneIt).typeLabel().tqreplace( " ", "&nbsp;" ) )
           .arg( number );
       }
     }
@@ -258,7 +258,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
 
       if ( linkMask & EmailLinks ) {
         dynamicPart += rowFmtStr.arg( type )
-          .arg( TQString::fromLatin1( "<a href=\"mailto:%1\">%2</a>" )
+          .arg( TQString::tqfromLatin1( "<a href=\"mailto:%1\">%2</a>" )
           .arg( fullEmail, TQStyleSheet::escape( *emailIt ) ) );
       } else {
         dynamicPart += rowFmtStr.arg( type ).arg( *emailIt );
@@ -296,7 +296,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
         TQString formattedAddress;
 
         formattedAddress = TQStyleSheet::escape( (*addrIt).formattedAddress().stripWhiteSpace() );
-        formattedAddress = formattedAddress.replace( '\n', "<br>" );
+        formattedAddress = formattedAddress.tqreplace( '\n', "<br>" );
 
         TQString link = "<a href=\"addr:" + (*addrIt).id() + "\">" +
                        formattedAddress + "</a>";
@@ -312,7 +312,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
         }
       } else {
         TQString link = "<a href=\"addr:" + (*addrIt).id() + "\">" +
-                       (*addrIt).label().replace( '\n', "<br>" ) + "</a>";
+                       (*addrIt).label().tqreplace( '\n', "<br>" ) + "</a>";
 
         if ( linkMask & AddressLinks ) {
           dynamicPart += rowFmtStr
@@ -321,7 +321,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
         } else {
           dynamicPart += rowFmtStr
             .arg( KABC::Address::typeLabel( (*addrIt).type() ) )
-            .arg( (*addrIt).label().replace( '\n', "<br>" ) );
+            .arg( (*addrIt).label().tqreplace( '\n', "<br>" ) );
         }
       }
     }
@@ -333,7 +333,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
     // the data afterwards (keeps us safe from possible % signs
     // in either one).
     notes = TQStyleSheet::escape( addr.note() );
-    notes = rowFmtStr.arg( i18n( "Notes" ) ).arg( notes.replace( '\n', "<br>" ) ) ;
+    notes = rowFmtStr.arg( i18n( "Notes" ) ).arg( notes.tqreplace( '\n', "<br>" ) ) ;
   }
 
   TQString customData;
@@ -393,7 +393,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
         // set image source to either a TQMimeSourceFactory key or a data:/ URL
         TQString imgSrc;
         if ( internalLoading ) {
-          imgSrc = TQString::fromLatin1( "im_status_%1_image").arg( addr.uid() );
+          imgSrc = TQString::tqfromLatin1( "im_status_%1_image").arg( addr.uid() );
           TQMimeSourceFactory::defaultFactory()->setPixmap( imgSrc, proxy->presenceIcon( addr.uid() ) );
         } else
           imgSrc = pixmapAsDataUrl( proxy->presenceIcon( addr.uid() ) );
@@ -401,9 +401,9 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
         // make the status a link, if required
         TQString imStatus;
         if ( linkMask & IMLinks )
-          imStatus = TQString::fromLatin1( "<a href=\"im:\"><img src=\"%1\"> (%2)</a>" );
+          imStatus = TQString::tqfromLatin1( "<a href=\"im:\"><img src=\"%1\"> (%2)</a>" );
         else
-          imStatus = TQString::fromLatin1( "<img src=\"%1\"> (%2)" );
+          imStatus = TQString::tqfromLatin1( "<img src=\"%1\"> (%2)" );
 
         // append our status to the rest of the dynamic part of the addressee
         dynamicPart += rowFmtStr
@@ -419,53 +419,53 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
   // @STYLE@ - construct the string by parts, substituting in
   // the styles first. There are lots of appends, but we need to
   // do it this way to avoid cases where the substituted string
-  // contains %1 and the like.
+  // tqcontains %1 and the like.
   //
-  TQString strAddr = TQString::fromLatin1(
+  TQString strAddr = TQString::tqfromLatin1(
     "<div align=\"center\">"
     "<table cellpadding=\"1\" cellspacing=\"0\" %1>"
     "<tr>").arg(tableStyle);
 
-  strAddr.append( TQString::fromLatin1(
+  strAddr.append( TQString::tqfromLatin1(
     "<td align=\"right\" valign=\"top\" width=\"30%\" rowspan=\"3\" %2>")
     .arg( cellStyle ) );
-  strAddr.append( TQString::fromLatin1(
+  strAddr.append( TQString::tqfromLatin1(
     "<img src=\"%1\" width=\"50\" vspace=\"1\">" // image
     "</td>")
     .arg( image ) );
-  strAddr.append( TQString::fromLatin1(
+  strAddr.append( TQString::tqfromLatin1(
     "<td align=\"left\" width=\"70%\" %2>")
     .arg( cellStyle2 ) );
-  strAddr.append( TQString::fromLatin1(
+  strAddr.append( TQString::tqfromLatin1(
     "<font size=\"+2\"><b>%2</b></font></td>"  // name
     "</tr>")
     .arg( name ) );
-  strAddr.append( TQString::fromLatin1(
+  strAddr.append( TQString::tqfromLatin1(
     "<tr>"
     "<td align=\"left\" width=\"70%\" %2>")
     .arg( cellStyle2 ) );
-  strAddr.append( TQString::fromLatin1(
+  strAddr.append( TQString::tqfromLatin1(
     "%3</td>"  // role
     "</tr>")
     .arg( role ) );
-  strAddr.append( TQString::fromLatin1(
+  strAddr.append( TQString::tqfromLatin1(
     "<tr>"
     "<td align=\"left\" width=\"70%\" %2>")
     .arg( cellStyle2 ) );
-  strAddr.append( TQString::fromLatin1(
+  strAddr.append( TQString::tqfromLatin1(
     "%4</td>"  // organization
     "</tr>")
     .arg( organization ) );
-  strAddr.append( TQString::fromLatin1(
+  strAddr.append( TQString::tqfromLatin1(
     "<tr><td %2>")
     .arg( cellStyle ) );
-  strAddr.append( TQString::fromLatin1(
+  strAddr.append( TQString::tqfromLatin1(
     "&nbsp;</td><td %2>&nbsp;</td></tr>")
     .arg( cellStyle2 ) );
   strAddr.append( dynamicPart );
   strAddr.append( notes );
   strAddr.append( customData );
-  strAddr.append( TQString::fromLatin1( "</table></div>\n" ) );
+  strAddr.append( TQString::tqfromLatin1( "</table></div>\n" ) );
 
   if ( addr.resource() ) {
     TQString addrBookName = addr.resource()->resourceName();
@@ -526,7 +526,7 @@ void AddresseeView::updateView()
   TQString strAddr = vCardAsHTML( mAddressee, mKIMProxy, (LinkMask)mLinkMask,
                                  true, (FieldMask)fieldMask );
 
-  strAddr = TQString::fromLatin1(
+  strAddr = TQString::tqfromLatin1(
     "<html>"
     "<body text=\"%1\" bgcolor=\"%2\">" // text and background color
     "%3" // dynamic part
@@ -591,7 +591,7 @@ void AddresseeView::phoneNumberClicked( const TQString &number )
     return;
   }
 
-  commandLine.replace( "%N", number );
+  commandLine.tqreplace( "%N", number );
   KRun::runCommand( commandLine );
 }
 
@@ -623,8 +623,8 @@ void AddresseeView::sendSMS( const TQString &number, const TQString &text )
   *stream << text;
   file.close();
 
-  commandLine.replace( "%N", number );
-  commandLine.replace( "%F", file.name() );
+  commandLine.tqreplace( "%N", number );
+  commandLine.tqreplace( "%F", file.name() );
 
   KRun::runCommand( commandLine );
 }
@@ -640,7 +640,7 @@ void AddresseeView::faxNumberClicked( const TQString &number )
     return;
   }
 
-  commandLine.replace( "%N", number );
+  commandLine.tqreplace( "%N", number );
   KRun::runCommand( commandLine );
 }
 
diff --git a/libkdepim/addresseeview.h b/libkdepim/addresseeview.h
index ae7281b5..74c3a657 100644
--- a/libkdepim/addresseeview.h
+++ b/libkdepim/addresseeview.h
@@ -84,7 +84,7 @@ class KDE_EXPORT AddresseeView : public KTextBrowser
 
     /**
       Sets which parts of the contact shall be presented as links.
-      The mask can be OR'ed LinkMask. By default all links are enabled.
+      The tqmask can be OR'ed LinkMask. By default all links are enabled.
      */
     void enableLinks( int linkMask );
 
@@ -114,7 +114,7 @@ class KDE_EXPORT AddresseeView : public KTextBrowser
         </div>
 
       @param addr The addressee object.
-      @param linkMask The mask for which parts of the contact will
+      @param linkMask The tqmask for which parts of the contact will
                       be displayed as links.
                       The links looks like this:
                         "addr://<addr id>" for addresses
@@ -124,7 +124,7 @@ class KDE_EXPORT AddresseeView : public KTextBrowser
                         "im:<im addrss>" for instant messaging addresses
                         "sms://<phone number>" for sending a sms
       @param internalLoading If true, the loading of internal pictures is done automatically.
-      @param fieldMask The mask for which fields of the contact will
+      @param fieldMask The tqmask for which fields of the contact will
                        be displayed.
      */
     static TQString vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *proxy, LinkMask linkMask = DefaultLinks,
diff --git a/libkdepim/addressesdialog.cpp b/libkdepim/addressesdialog.cpp
index 14feafb6..5807b0d6 100644
--- a/libkdepim/addressesdialog.cpp
+++ b/libkdepim/addressesdialog.cpp
@@ -176,7 +176,7 @@ AddresseeViewItem::email() const
 
 bool AddresseeViewItem::matches(const TQString& txt) const
 {
-    return d->address.realName().contains(txt, false) || d->address.preferredEmail().contains(txt, false);
+    return d->address.realName().tqcontains(txt, false) || d->address.preferredEmail().tqcontains(txt, false);
 }
 
 void AddresseeViewItem::setSelected(bool selected)
@@ -1043,11 +1043,11 @@ AddressesDialog::filterChanged( const TQString& txt )
         }
         p2 = static_cast<AddresseeViewItem*>( p2->nextSibling() );
       }
-      if ( !pcount && !p->text( 0 ).contains( txt, false ) ) {
+      if ( !pcount && !p->text( 0 ).tqcontains( txt, false ) ) {
         p->setVisible( false );
       }
       distlistgroupVisible += pcount;
-      if ( p->text( 0 ).contains( txt, false ) ) {
+      if ( p->text( 0 ).tqcontains( txt, false ) ) {
         distlistgroupVisible++;
       }
     }
diff --git a/libkdepim/addresspicker.ui b/libkdepim/addresspicker.ui
index f6e9b784..e0bf7a9a 100644
--- a/libkdepim/addresspicker.ui
+++ b/libkdepim/addresspicker.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>AddressPickerUI</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -66,7 +66,7 @@
         </widget>
         <widget class="QLayoutWidget" row="1" column="1">
             <property name="name">
-                <cstring>layout10</cstring>
+                <cstring>tqlayout10</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -82,7 +82,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>16</height>
@@ -132,7 +132,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>16</height>
@@ -160,7 +160,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -181,7 +181,7 @@
             <property name="text">
                 <string>&amp;Selected Addresses</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignCenter</set>
             </property>
             <property name="buddy" stdset="0">
@@ -200,7 +200,7 @@
             <property name="text">
                 <string>&amp;Address Book</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignCenter</set>
             </property>
             <property name="buddy" stdset="0">
@@ -209,7 +209,7 @@
         </widget>
         <widget class="QLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -315,7 +315,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/libkdepim/broadcaststatus.cpp b/libkdepim/broadcaststatus.cpp
index b566bd4b..fb48f05c 100644
--- a/libkdepim/broadcaststatus.cpp
+++ b/libkdepim/broadcaststatus.cpp
@@ -23,46 +23,46 @@
 #include "broadcaststatus.h"
 #include "progressmanager.h"
 
-KPIM::BroadcastStatus* KPIM::BroadcastStatus::instance_ = 0;
-static KStaticDeleter<KPIM::BroadcastStatus> broadcastStatusDeleter;
+KPIM::BroadcasStatus* KPIM::BroadcasStatus::instance_ = 0;
+static KStaticDeleter<KPIM::BroadcasStatus> broadcasStatusDeleter;
 
 namespace KPIM {
 
-BroadcastStatus* BroadcastStatus::instance()
+BroadcasStatus* BroadcasStatus::instance()
 {
   if (!instance_)
-    broadcastStatusDeleter.setObject( instance_, new BroadcastStatus() );
+    broadcasStatusDeleter.setObject( instance_, new BroadcasStatus() );
 
   return instance_;
 }
 
-BroadcastStatus::BroadcastStatus()
+BroadcasStatus::BroadcasStatus()
   :mTransientActive( false )
 {
 }
 
-BroadcastStatus::~BroadcastStatus()
+BroadcasStatus::~BroadcasStatus()
 {
   instance_ = 0;
 }
 
-void BroadcastStatus::setStatusMsg( const TQString& message )
+void BroadcasStatus::seStatusMsg( const TQString& message )
 {
   mStatusMsg = message;
   if( !mTransientActive )
     emit statusMsg( message );
 }
 
-void BroadcastStatus::setStatusMsgWithTimestamp( const TQString& message )
+void BroadcasStatus::seStatusMsgWithTimestamp( const TQString& message )
 {
   KLocale* locale = KGlobal::locale();
-  setStatusMsg( i18n( "%1 is a time, %2 is a status message", "[%1] %2" )
+  seStatusMsg( i18n( "%1 is a time, %2 is a status message", "[%1] %2" )
                 .arg( locale->formatTime( TQTime::currentTime(),
                                           true /* with seconds */ ) )
                 .arg( message ) );
 }
 
-void BroadcastStatus::setStatusMsgTransmissionCompleted( int numMessages,
+void BroadcasStatus::seStatusMsgTransmissionCompleted( int numMessages,
                                                            int numBytes,
                                                            int numBytesRead,
                                                            int numBytesToRead,
@@ -94,12 +94,12 @@ void BroadcastStatus::setStatusMsgTransmissionCompleted( int numMessages,
   else
     statusMsg = i18n( "Transmission complete. No new messages." );
 
-  setStatusMsgWithTimestamp( statusMsg );
+  seStatusMsgWithTimestamp( statusMsg );
   if ( item )
-    item->setStatus( statusMsg );
+    item->seStatus( statusMsg );
 }
 
-void BroadcastStatus::setStatusMsgTransmissionCompleted( const TQString& account,
+void BroadcasStatus::seStatusMsgTransmissionCompleted( const TQString& account,
                                                            int numMessages,
                                                            int numBytes,
                                                            int numBytesRead,
@@ -142,18 +142,18 @@ void BroadcastStatus::setStatusMsgTransmissionCompleted( const TQString& account
     statusMsg = i18n( "Transmission for account %1 complete. No new messages.")
                 .arg( account );
 
-  setStatusMsgWithTimestamp( statusMsg );
+  seStatusMsgWithTimestamp( statusMsg );
   if ( item )
-    item->setStatus( statusMsg );
+    item->seStatus( statusMsg );
 }
 
-void BroadcastStatus::setTransientStatusMsg( const TQString& msg )
+void BroadcasStatus::setTransienStatusMsg( const TQString& msg )
 {
   mTransientActive = true;
   emit statusMsg( msg );
 }
 
-void BroadcastStatus::reset()
+void BroadcasStatus::reset()
 {
   mTransientActive = false;
   // restore
diff --git a/libkdepim/broadcaststatus.h b/libkdepim/broadcaststatus.h
index ad5c11bc..11eacd3e 100644
--- a/libkdepim/broadcaststatus.h
+++ b/libkdepim/broadcaststatus.h
@@ -29,29 +29,29 @@ class ProgressItem;
   */
 
 
-class KDE_EXPORT BroadcastStatus : public QObject
+class KDE_EXPORT BroadcasStatus : public QObject
 {
 
   Q_OBJECT
 
 public:
-  virtual ~BroadcastStatus();
+  virtual ~BroadcasStatus();
 
   /** Return the instance of the singleton object for this class */
-  static BroadcastStatus *instance();
+  static BroadcasStatus *instance();
 
-  /** Return the last status message from setStatusMsg() */
+  /** Return the last status message from seStatusMsg() */
   TQString statusMsg() const { return mStatusMsg; }
   /** Sets a status bar message with timestamp */
-  void setStatusMsgWithTimestamp( const TQString& message );
+  void seStatusMsgWithTimestamp( const TQString& message );
   /** Sets a transmission completed status bar message */
-  void setStatusMsgTransmissionCompleted( int numMessages,
+  void seStatusMsgTransmissionCompleted( int numMessages,
                                           int numBytes = -1,
                                           int numBytesRead = -1,
                                           int numBytesToRead = -1,
                                           bool mLeaveOnServer = false,
                                           KPIM::ProgressItem* progressItem = 0 ); // set the same status in this progress item
-  void setStatusMsgTransmissionCompleted( const TQString& account,
+  void seStatusMsgTransmissionCompleted( const TQString& account,
                                           int numMessages,
                                           int numBytes = -1,
                                           int numBytesRead = -1,
@@ -62,13 +62,13 @@ public:
 public slots:
   /** Emit an update status bar signal. It's a slot so it can be hooked up
       to other signals. */
-  void setStatusMsg( const TQString& message );
+  void seStatusMsg( const TQString& message );
 
   /**
       Set a status message that will go away again with the next call of
       reset().
    */
-  void setTransientStatusMsg( const TQString& msg );
+  void setTransienStatusMsg( const TQString& msg );
   /**
       Reset the status message to what ever non-transient message was last
       active or has since been set.
@@ -77,15 +77,15 @@ public slots:
 
 signals:
 
-  /** Emitted when setStatusMsg is called. */
+  /** Emitted when seStatusMsg is called. */
   void statusMsg( const TQString& );
 
 protected:
 
-  BroadcastStatus();
+  BroadcasStatus();
   TQString mStatusMsg;
   bool mTransientActive;
-  static BroadcastStatus* instance_;
+  static BroadcasStatus* instance_;
 };
 
 
diff --git a/libkdepim/categoryeditdialog.cpp b/libkdepim/categoryeditdialog.cpp
index 719bd920..d386ae10 100644
--- a/libkdepim/categoryeditdialog.cpp
+++ b/libkdepim/categoryeditdialog.cpp
@@ -66,23 +66,23 @@ CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, TQWidget* parent,
   TQWidget *widget = new TQWidget( this );
   setMainWidget( widget );
 
-  TQGridLayout *layout = new TQGridLayout( widget, 4, 2, marginHint(), spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( widget, 4, 2, marginHint(), spacingHint() );
 
   d->mView = new TQListView( widget );
   d->mView->addColumn( "" );
   d->mView->header()->hide();
   d->mView->setDefaultRenameAction( TQListView::Accept );
 
-  layout->addMultiCellWidget( d->mView, 0, 3, 0, 0 );
+  tqlayout->addMultiCellWidget( d->mView, 0, 3, 0, 0 );
 
   d->mAddButton = new TQPushButton( i18n( "Add" ), widget );
-  layout->addWidget( d->mAddButton, 0, 1 );
+  tqlayout->addWidget( d->mAddButton, 0, 1 );
 
   d->mEditButton = new TQPushButton( i18n( "Edit" ), widget );
-  layout->addWidget( d->mEditButton, 1, 1 );
+  tqlayout->addWidget( d->mEditButton, 1, 1 );
 
   d->mDeleteButton = new TQPushButton( i18n( "Remove" ), widget );
-  layout->addWidget( d->mDeleteButton, 2, 1 );
+  tqlayout->addWidget( d->mDeleteButton, 2, 1 );
 
 
   fillList();
diff --git a/libkdepim/categoryeditdialog_base.ui b/libkdepim/categoryeditdialog_base.ui
index 21a9faf2..b23a6697 100644
--- a/libkdepim/categoryeditdialog_base.ui
+++ b/libkdepim/categoryeditdialog_base.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>CategoryEditDialog_base</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -54,7 +54,7 @@
         </widget>
         <widget class="QLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>layout103</cstring>
+                <cstring>tqlayout103</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -86,7 +86,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -103,5 +103,5 @@
     <tabstop>mButtonAdd</tabstop>
     <tabstop>mButtonRemove</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/libkdepim/categoryselectdialog_base.ui b/libkdepim/categoryselectdialog_base.ui
index 713efbbf..c5030679 100644
--- a/libkdepim/categoryselectdialog_base.ui
+++ b/libkdepim/categoryselectdialog_base.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>CategorySelectDialog_base</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -73,7 +73,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -97,5 +97,5 @@
     <tabstop>mButtonClear</tabstop>
     <tabstop>mButtonEdit</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/libkdepim/cfgc/general_base.ui b/libkdepim/cfgc/general_base.ui
index fda2fc23..040990ef 100644
--- a/libkdepim/cfgc/general_base.ui
+++ b/libkdepim/cfgc/general_base.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>GeneralBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -42,5 +42,5 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/libkdepim/cfgc/myoptions_base.ui b/libkdepim/cfgc/myoptions_base.ui
index 60207f9e..fe5d43ac 100644
--- a/libkdepim/cfgc/myoptions_base.ui
+++ b/libkdepim/cfgc/myoptions_base.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>MyOptionsBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>textLabel1</cstring>
         </property>
-        <property name="geometry">
+        <property name="tqgeometry">
             <rect>
                 <x>30</x>
                 <y>180</y>
@@ -32,7 +32,7 @@
         <property name="name">
             <cstring>MyString</cstring>
         </property>
-        <property name="geometry">
+        <property name="tqgeometry">
             <rect>
                 <x>130</x>
                 <y>180</y>
@@ -42,5 +42,5 @@
         </property>
     </widget>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/libkdepim/clicklineedit.cpp b/libkdepim/clicklineedit.cpp
index dfe7cbad..98748e44 100644
--- a/libkdepim/clicklineedit.cpp
+++ b/libkdepim/clicklineedit.cpp
@@ -39,13 +39,13 @@ ClickLineEdit::~ClickLineEdit() {}
 void ClickLineEdit::setClickMessage( const TQString &msg )
 {
   mClickMessage = msg;
-  repaint();
+  tqrepaint();
 }
 
 void ClickLineEdit::setText( const TQString &txt )
 {
   mDrawClickMsg = txt.isEmpty();
-  repaint();
+  tqrepaint();
   KLineEdit::setText( txt );
 }
 
@@ -67,7 +67,7 @@ void ClickLineEdit::focusInEvent( TQFocusEvent *ev )
   if ( mDrawClickMsg == true ) 
   { 
     mDrawClickMsg = false;
-    repaint();
+    tqrepaint();
   }
   TQLineEdit::focusInEvent( ev );
 }
@@ -77,7 +77,7 @@ void ClickLineEdit::focusOutEvent( TQFocusEvent *ev )
   if ( text().isEmpty() )
   {
     mDrawClickMsg = true;
-    repaint();
+    tqrepaint();
   }
   TQLineEdit::focusOutEvent( ev );
 }
diff --git a/libkdepim/clicklineedit.h b/libkdepim/clicklineedit.h
index 0eb4c7a8..65357375 100644
--- a/libkdepim/clicklineedit.h
+++ b/libkdepim/clicklineedit.h
@@ -27,7 +27,7 @@
 namespace KPIM {
 
 /** 
-  This class provides a KLineEdit which contains a greyed-out hinting
+  This class provides a KLineEdit which tqcontains a greyed-out hinting
   text as long as the user didn't enter any text
 
   @short LineEdit with customizable "Click here" text
diff --git a/libkdepim/csshelper.cpp b/libkdepim/csshelper.cpp
index 6b37fbf1..4116e583 100644
--- a/libkdepim/csshelper.cpp
+++ b/libkdepim/csshelper.cpp
@@ -328,7 +328,7 @@ namespace KPIM {
       if ( mQuoteFont[i].bold() )
         quoteCSS += "  font-weight: bold ! important;\n";
       if ( mShrinkQuotes )
-        quoteCSS += "  font-size: " + TQString::fromLatin1( quoteFontSizes[i] )
+        quoteCSS += "  font-size: " + TQString::tqfromLatin1( quoteFontSizes[i] )
           + "% ! important;\n";
       quoteCSS += "}\n\n";
     }
diff --git a/libkdepim/designerfields.cpp b/libkdepim/designerfields.cpp
index ba78df0e..5569c258 100644
--- a/libkdepim/designerfields.cpp
+++ b/libkdepim/designerfields.cpp
@@ -50,7 +50,7 @@ DesignerFields::DesignerFields( const TQString &uiFile, TQWidget *parent,
 
 void DesignerFields::initGUI( const TQString &uiFile )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
 
   TQWidget *wdg = TQWidgetFactory::create( uiFile, 0, this );
   if ( !wdg ) {
@@ -61,7 +61,7 @@ void DesignerFields::initGUI( const TQString &uiFile )
   mTitle = wdg->caption();
   mIdentifier = wdg->name();
 
-  layout->addWidget( wdg );
+  tqlayout->addWidget( wdg );
 
   TQObjectList *list = wdg->queryList( "TQWidget" );
   TQObjectListIt it( *list );
@@ -78,7 +78,7 @@ void DesignerFields::initGUI( const TQString &uiFile )
                << "KDatePicker";
 
   while ( it.current() ) {
-    if ( allowedTypes.contains( it.current()->className() ) ) {
+    if ( allowedTypes.tqcontains( it.current()->className() ) ) {
       TQString name = it.current()->name();
       if ( name.startsWith( "X_" ) ) {
         name = name.mid( 2 );
@@ -154,13 +154,13 @@ void DesignerFields::load( DesignerFields::Storage *storage )
       wdg->setChecked( false );
     } else if ( widIt.data()->inherits( "QDateTimeEdit" ) ) {
       QDateTimeEdit *wdg = static_cast<QDateTimeEdit*>( widIt.data() );
-      wdg->setDateTime( TQDateTime::currentDateTime() );
+      wdg->setDateTime( TQDateTime::tqcurrentDateTime() );
     } else if ( widIt.data()->inherits( "KDateTimeWidget" ) ) {
       KDateTimeWidget *wdg = static_cast<KDateTimeWidget*>( widIt.data() );
-      wdg->setDateTime( TQDateTime::currentDateTime() );
+      wdg->setDateTime( TQDateTime::tqcurrentDateTime() );
     } else if ( widIt.data()->inherits( "KDatePicker" ) ) {
       KDatePicker *wdg = static_cast<KDatePicker*>( widIt.data() );
-      wdg->setDate( TQDate::currentDate() );
+      wdg->setDate( TQDate::tqcurrentDate() );
     } else if ( widIt.data()->inherits( "TQComboBox" ) ) {
       TQComboBox *wdg = static_cast<TQComboBox*>( widIt.data() );
       wdg->setCurrentItem( 0 );
diff --git a/libkdepim/distributionlist.cpp b/libkdepim/distributionlist.cpp
index 2ccdeb52..6d96b235 100644
--- a/libkdepim/distributionlist.cpp
+++ b/libkdepim/distributionlist.cpp
@@ -63,7 +63,7 @@ void KPIM::DistributionList::insertEntry( const TQString& uid, const TQString& e
   TQString str = custom( "KADDRESSBOOK", s_customFieldName );
   // Assumption: UIDs don't contain ; nor ,
   str += ";" + uid + "," + email;
-  insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // replace old value
+  insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // tqreplace old value
 }
 
 void KPIM::DistributionList::removeEntry( const Addressee& addr, const TQString& email )
@@ -88,7 +88,7 @@ void KPIM::DistributionList::removeEntry( const TQString& uid, const TQString& e
   }
   if ( str.isEmpty() )
     str = ";"; // keep something, for isDistributionList to work
-  insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // replace old value
+  insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // tqreplace old value
 }
 
 bool KPIM::DistributionList::isDistributionList( const KABC::Addressee& addr )
@@ -131,15 +131,15 @@ KPIM::DistributionList KPIM::DistributionList::findByName( KABC::AddressBook* bo
   return DistributionList();
 }
 
-static KABC::Addressee findByUidOrName( KABC::AddressBook* book, const TQString& uidOrName, const TQString& email )
+static KABC::Addressee tqfindByUidOrName( KABC::AddressBook* book, const TQString& uidOrName, const TQString& email )
 {
-  KABC::Addressee a = book->findByUid( uidOrName );
+  KABC::Addressee a = book->tqfindByUid( uidOrName );
   if ( a.isEmpty() ) {
     // UID not found, maybe it is a name instead.
     // If we have an email, let's use that for the lookup.
     // [This is used by e.g. the Kolab resource]
     if ( !email.isEmpty() ) {
-      KABC::Addressee::List lst = book->findByEmail( email );
+      KABC::Addressee::List lst = book->tqfindByEmail( email );
       KABC::Addressee::List::ConstIterator listit = lst.begin();
       for ( ; listit != lst.end(); ++listit )
         if ( (*listit).formattedName() == uidOrName ) {
@@ -170,7 +170,7 @@ KPIM::DistributionList::Entry::List KPIM::DistributionList::entries( KABC::Addre
     const TQString uid = (*it).first;
     const TQString email = (*it).second;
     // look up contact
-    KABC::Addressee a = findByUidOrName( book, uid, email );
+    KABC::Addressee a = tqfindByUidOrName( book, uid, email );
     if ( a.isEmpty() ) {
       // ## The old DistributionListManager had a "missing entries" list...
       kdWarning() << "Addressee not found: " << uid << endl;
@@ -192,7 +192,7 @@ TQStringList KPIM::DistributionList::emails( KABC::AddressBook* book ) const
     const TQString thisEmail = (*it).second;
 
     // look up contact
-    KABC::Addressee a = findByUidOrName( book, thisUid, thisEmail );
+    KABC::Addressee a = tqfindByUidOrName( book, thisUid, thisEmail );
     if ( a.isEmpty() ) {
       // ## The old DistributionListManager had a "missing entries" list...
       continue;
diff --git a/libkdepim/embeddedurlpage.cpp b/libkdepim/embeddedurlpage.cpp
index d0120574..12b25ded 100644
--- a/libkdepim/embeddedurlpage.cpp
+++ b/libkdepim/embeddedurlpage.cpp
@@ -41,8 +41,8 @@ EmbeddedURLPage::EmbeddedURLPage( const TQString &url, const TQString &mimetype,
 
 void EmbeddedURLPage::initGUI( const TQString &url, const TQString &/*mimetype*/ )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this );
-  layout->setAutoAdd( true );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+  tqlayout->setAutoAdd( true );
   new TQLabel( i18n("Showing URL %1").arg( url ), this );
 }
 
diff --git a/libkdepim/kabcresourcecached.cpp b/libkdepim/kabcresourcecached.cpp
index d46156f6..beeb7b90 100644
--- a/libkdepim/kabcresourcecached.cpp
+++ b/libkdepim/kabcresourcecached.cpp
@@ -165,8 +165,8 @@ void ResourceCached::slotKABCSave()
 
 void ResourceCached::insertAddressee( const Addressee &addr )
 {
-  if ( !mAddrMap.contains( addr.uid() ) ) { // new contact
-    if ( mDeletedAddressees.contains( addr.uid() ) ) {
+  if ( !mAddrMap.tqcontains( addr.uid() ) ) { // new contact
+    if ( mDeletedAddressees.tqcontains( addr.uid() ) ) {
       // it was first removed, then added, so it's an update...
       mDeletedAddressees.remove( addr.uid() );
 
@@ -189,7 +189,7 @@ void ResourceCached::insertAddressee( const Addressee &addr )
 
 void ResourceCached::removeAddressee( const Addressee &addr )
 {
-  if ( mAddedAddressees.contains( addr.uid() ) ) {
+  if ( mAddedAddressees.tqcontains( addr.uid() ) ) {
     mAddedAddressees.remove( addr.uid() );
     return;
   }
diff --git a/libkdepim/kaddrbook.cpp b/libkdepim/kaddrbook.cpp
index e5ef47e6..187ce637 100644
--- a/libkdepim/kaddrbook.cpp
+++ b/libkdepim/kaddrbook.cpp
@@ -56,7 +56,7 @@ void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) {
   }
 #endif
 
-  KABC::Addressee::List addressees = ab->findByEmail( email );
+  KABC::Addressee::List addressees = ab->tqfindByEmail( email );
 
   if ( addressees.count() > 0 ) {
     if ( kapp->dcopClient()->isApplicationRegistered( "kaddressbook" ) ){
@@ -109,7 +109,7 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) {
   }
 #endif
 
-  KABC::Addressee::List addressees = ab->findByEmail( email );
+  KABC::Addressee::List addressees = ab->tqfindByEmail( email );
 
   if ( addressees.isEmpty() ) {
     KABC::Addressee a;
@@ -181,7 +181,7 @@ bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *pa
   ab->setErrorHandler( new KABC::GuiErrorHandler( parent ) );
 
   KABC::Addressee::List addressees =
-      ab->findByEmail( addressee.preferredEmail() );
+      ab->tqfindByEmail( addressee.preferredEmail() );
 
   if ( addressees.isEmpty() ) {
     if ( KAddrBookExternal::addAddressee( addressee ) ) {
diff --git a/libkdepim/kcmdesignerfields.cpp b/libkdepim/kcmdesignerfields.cpp
index 330d8b84..15935693 100644
--- a/libkdepim/kcmdesignerfields.cpp
+++ b/libkdepim/kcmdesignerfields.cpp
@@ -261,7 +261,7 @@ void KCMDesignerFields::defaults()
 
 void KCMDesignerFields::initGUI()
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this, KDialog::marginHint(),
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   bool noDesigner = KStandardDirs::findExe("designer").isEmpty();
@@ -272,10 +272,10 @@ void KCMDesignerFields::initGUI()
       i18n("<qt><b>Warning:</b> Qt Designer could not be found. It is probably not "
          "installed. You will only be able to import existing designer files.</qt>");
     TQLabel *lbl = new TQLabel( txt, this );
-    layout->addWidget( lbl );
+    tqlayout->addWidget( lbl );
   }
 
-  TQHBoxLayout *hbox = new TQHBoxLayout( layout, KDialog::spacingHint() );
+  TQHBoxLayout *hbox = new TQHBoxLayout( tqlayout, KDialog::spacingHint() );
 
   mPageView = new KListView( this );
   mPageView->addColumn( i18n( "Available Pages" ) );
@@ -295,7 +295,7 @@ void KCMDesignerFields::initGUI()
 
   loadUiFiles();
 
-  hbox = new TQHBoxLayout( layout, KDialog::spacingHint() );
+  hbox = new TQHBoxLayout( tqlayout, KDialog::spacingHint() );
 
   TQString cwHowto = i18n("<qt><p>This section allows you to add your own GUI"
                          "  Elements ('<i>Widgets</i>') to store your own values"
@@ -323,7 +323,7 @@ void KCMDesignerFields::initGUI()
   hbox->addWidget( activeLabel );
 
   // ### why is this needed? Looks like a KActiveLabel bug...
-  activeLabel->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum );
+  activeLabel->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum );
 
   hbox->addStretch( 1 );
 
@@ -361,7 +361,7 @@ void KCMDesignerFields::updatePreview( TQListViewItem *item )
                                  "<tr><td align=\"right\"><b>%7</b></td><td>%8</td></tr>"
                                  "</table></qt>" )
                                 .arg( i18n( "Key:" ) )
-                                .arg( item->text( 0 ).replace("X_","X-") )
+                                .arg( item->text( 0 ).tqreplace("X_","X-") )
                                 .arg( i18n( "Type:" ) )
                                 .arg( item->text( 1 ) )
                                 .arg( i18n( "Classname:" ) )
diff --git a/libkdepim/kdateedit.cpp b/libkdepim/kdateedit.cpp
index 1791d4da..c4221556 100644
--- a/libkdepim/kdateedit.cpp
+++ b/libkdepim/kdateedit.cpp
@@ -49,7 +49,7 @@ class DateValidator : public QValidator
       if ( length <= 0 )
         return Intermediate;
 
-      if ( mKeywords.contains( str.lower() ) )
+      if ( mKeywords.tqcontains( str.lower() ) )
         return Acceptable;
 
       bool ok = false;
@@ -72,13 +72,13 @@ KDateEdit::KDateEdit( TQWidget *parent, const char *name )
   // need at least one entry for popup to work
   setMaxCount( 1 );
 
-  mDate = TQDate::currentDate();
+  mDate = TQDate::tqcurrentDate();
   TQString today = KGlobal::locale()->formatDate( mDate, true );
 
   insertItem( today );
   setCurrentItem( 0 );
   changeItem( today, 0 );
-  setMinimumSize( sizeHint() );
+  setMinimumSize( tqsizeHint() );
 
   connect( lineEdit(), TQT_SIGNAL( returnPressed() ),
            this, TQT_SLOT( lineEnterPressed() ) );
@@ -138,13 +138,13 @@ void KDateEdit::popup()
 
   TQPoint popupPoint = mapToGlobal( TQPoint( 0,0 ) );
 
-  int dateFrameHeight = mPopup->sizeHint().height();
+  int dateFrameHeight = mPopup->tqsizeHint().height();
   if ( popupPoint.y() + height() + dateFrameHeight > desk.bottom() )
     popupPoint.setY( popupPoint.y() - dateFrameHeight );
   else
     popupPoint.setY( popupPoint.y() + height() );
 
-  int dateFrameWidth = mPopup->sizeHint().width();
+  int dateFrameWidth = mPopup->tqsizeHint().width();
   if ( popupPoint.x() + dateFrameWidth > desk.right() )
     popupPoint.setX( desk.right() - dateFrameWidth );
 
@@ -157,13 +157,13 @@ void KDateEdit::popup()
   if ( mDate.isValid() )
     mPopup->setDate( mDate );
   else
-    mPopup->setDate( TQDate::currentDate() );
+    mPopup->setDate( TQDate::tqcurrentDate() );
 
   mPopup->popup( popupPoint );
 
   // The combo box is now shown pressed. Make it show not pressed again
   // by causing its (invisible) list box to emit a 'selected' signal.
-  // First, ensure that the list box contains the date currently displayed.
+  // First, ensure that the list box tqcontains the date currently displayed.
   TQDate date = parseDate();
   assignDate( date );
   updateView();
@@ -191,12 +191,12 @@ void KDateEdit::dateSelected( TQDate date )
 
 void KDateEdit::lineEnterPressed()
 {
-  bool replaced = false;
+  bool tqreplaced = false;
 
-  TQDate date = parseDate( &replaced );
+  TQDate date = parseDate( &tqreplaced );
 
   if (assignDate( date ) ) {
-    if ( replaced )
+    if ( tqreplaced )
       updateView();
 
     emit dateChanged( date );
@@ -204,18 +204,18 @@ void KDateEdit::lineEnterPressed()
   }
 }
 
-TQDate KDateEdit::parseDate( bool *replaced ) const
+TQDate KDateEdit::parseDate( bool *tqreplaced ) const
 {
   TQString text = currentText();
   TQDate result;
 
-  if ( replaced )
-    (*replaced) = false;
+  if ( tqreplaced )
+    (*tqreplaced) = false;
 
   if ( text.isEmpty() )
     result = TQDate();
-  else if ( mKeywordMap.contains( text.lower() ) ) {
-    TQDate today = TQDate::currentDate();
+  else if ( mKeywordMap.tqcontains( text.lower() ) ) {
+    TQDate today = TQDate::tqcurrentDate();
     int i = mKeywordMap[ text.lower() ];
     if ( i >= 100 ) {
       /* A day name has been entered. Convert to offset from today.
@@ -235,8 +235,8 @@ TQDate KDateEdit::parseDate( bool *replaced ) const
     }
 
     result = today.addDays( i );
-    if ( replaced )
-      (*replaced) = true;
+    if ( tqreplaced )
+      (*tqreplaced) = true;
   } else {
     result = KGlobal::locale()->readDate( text );
   }
@@ -286,7 +286,7 @@ bool KDateEdit::eventFilter( TQObject *object, TQEvent *event )
       case TQEvent::MouseButtonDblClick:
       case TQEvent::MouseButtonPress: {
         TQMouseEvent *mouseEvent = (TQMouseEvent*)event;
-        if ( !mPopup->rect().contains( mouseEvent->pos() ) ) {
+        if ( !mPopup->rect().tqcontains( mouseEvent->pos() ) ) {
           TQPoint globalPos = mPopup->mapToGlobal( mouseEvent->pos() );
           if ( TQApplication::widgetAt( globalPos, true ) == this ) {
             // The date picker is being closed by a click on the
diff --git a/libkdepim/kdateedit.h b/libkdepim/kdateedit.h
index 819ce933..0adb6ee5 100644
--- a/libkdepim/kdateedit.h
+++ b/libkdepim/kdateedit.h
@@ -36,7 +36,7 @@ class TQEvent;
 
 /**
   A date editing widget that consists of an editable combo box.
-  The combo box contains the date in text form, and clicking the combo
+  The combo box tqcontains the date in text form, and clicking the combo
   box arrow will display a 'popup' style date picker.
 
   This widget also supports advanced features like allowing the user
diff --git a/libkdepim/kdatepickerpopup.cpp b/libkdepim/kdatepickerpopup.cpp
index 2e28dd83..8e3f3695 100644
--- a/libkdepim/kdatepickerpopup.cpp
+++ b/libkdepim/kdatepickerpopup.cpp
@@ -97,12 +97,12 @@ void KDatePickerPopup::slotDateChanged( TQDate date )
 
 void KDatePickerPopup::slotToday()
 {
-  emit dateChanged( TQDate::currentDate() );
+  emit dateChanged( TQDate::tqcurrentDate() );
 }
 
 void KDatePickerPopup::slotTomorrow()
 {
-  emit dateChanged( TQDate::currentDate().addDays( 1 ) );
+  emit dateChanged( TQDate::tqcurrentDate().addDays( 1 ) );
 }
 
 void KDatePickerPopup::slotNoDate()
@@ -112,12 +112,12 @@ void KDatePickerPopup::slotNoDate()
 
 void KDatePickerPopup::slotNextWeek()
 {
-  emit dateChanged( TQDate::currentDate().addDays( 7 ) );
+  emit dateChanged( TQDate::tqcurrentDate().addDays( 7 ) );
 }
 
 void KDatePickerPopup::slotNextMonth()
 {
-  emit dateChanged( TQDate::currentDate().addMonths( 1 ) );
+  emit dateChanged( TQDate::tqcurrentDate().addMonths( 1 ) );
 }
 
 #include "kdatepickerpopup.moc"
diff --git a/libkdepim/kdatepickerpopup.h b/libkdepim/kdatepickerpopup.h
index 080bf498..70ed6793 100644
--- a/libkdepim/kdatepickerpopup.h
+++ b/libkdepim/kdatepickerpopup.h
@@ -56,7 +56,7 @@ class KDE_EXPORT KDatePickerPopup: public QPopupMenu
        @param parent The object's parent.
        @param name The object's name.
     */
-    KDatePickerPopup( int items = DatePicker, const TQDate &date = TQDate::currentDate(),
+    KDatePickerPopup( int items = DatePicker, const TQDate &date = TQDate::tqcurrentDate(),
                       TQWidget *parent = 0, const char *name = 0 );
 
     /**
diff --git a/libkdepim/kfileio.cpp b/libkdepim/kfileio.cpp
index 4d49c114..6a7eea7c 100644
--- a/libkdepim/kfileio.cpp
+++ b/libkdepim/kfileio.cpp
@@ -190,7 +190,7 @@ KDE_EXPORT bool kBytesToFile(const char* aBuffer, int len,
     if (aAskIfExists)
     {
       TQString str;
-      str = i18n("File %1 exists.\nDo you want to replace it?")
+      str = i18n("File %1 exists.\nDo you want to tqreplace it?")
 		  .arg(aFileName);
       rc = KMessageBox::warningContinueCancel(0,
 	   str, i18n("Save to File"), i18n("&Replace"));
diff --git a/libkdepim/kfileio.h b/libkdepim/kfileio.h
index 91552888..99d4d1dc 100644
--- a/libkdepim/kfileio.h
+++ b/libkdepim/kfileio.h
@@ -17,7 +17,7 @@ class TQString;
 
 namespace KPIM {
 
-/** Load a file. Returns a pointer to the memory-block that contains
+/** Load a file. Returns a pointer to the memory-block that tqcontains
  * the loaded file. Returns a null string if the file could not be loaded.
  * If withDialogs is FALSE no warning dialogs are opened if there are
  * problems.
diff --git a/libkdepim/kfoldertree.cpp b/libkdepim/kfoldertree.cpp
index 5e263673..2bf6ca1b 100644
--- a/libkdepim/kfoldertree.cpp
+++ b/libkdepim/kfoldertree.cpp
@@ -118,7 +118,7 @@ int KFolderTreeItem::compare( TQListViewItem * i, int col, bool ) const
   else
   {
     // sort by unread or total-column
-    Q_INT64 a = 0, b = 0;
+    TQ_INT64 a = 0, b = 0;
     if (col == static_cast<KFolderTree*>(listView())->unreadIndex())
     {
       a = mUnread;
@@ -181,7 +181,7 @@ void KFolderTreeItem::setTotalCount( int aTotal )
 }
 
 //-----------------------------------------------------------------------------
-void KFolderTreeItem::setFolderSize( Q_INT64 aSize )
+void KFolderTreeItem::setFolderSize( TQ_INT64 aSize )
 {
   if ( aSize < 0 ) return;  // we need to update even if nothing changed, kids ...
 
@@ -195,10 +195,10 @@ void KFolderTreeItem::setFolderSize( Q_INT64 aSize )
           size = KIO::convertSize(mSize);
   }
   if ( childCount() > 0 && !isOpen() ) {
-      Q_INT64 recursiveSize = recursiveFolderSize();
+      TQ_INT64 recursiveSize = recursiveFolderSize();
       if ( recursiveSize != mSize ) {
             if ( mType != Root )
-                size += TQString::fromLatin1(" + %1").arg( KIO::convertSize( recursiveSize - mSize ) );
+                size += TQString::tqfromLatin1(" + %1").arg( KIO::convertSize( recursiveSize - mSize ) );
             else 
                 size = KIO::convertSize( recursiveSize );
       }
@@ -209,9 +209,9 @@ void KFolderTreeItem::setFolderSize( Q_INT64 aSize )
 }
 
 //-----------------------------------------------------------------------------
-Q_INT64 KFolderTreeItem::recursiveFolderSize() const
+TQ_INT64 KFolderTreeItem::recursiveFolderSize() const
 {
-  Q_INT64 size = mSize;
+  TQ_INT64 size = mSize;
 
   for ( TQListViewItem *item = firstChild() ;
       item ; item = item->nextSibling() )
@@ -351,7 +351,7 @@ void KFolderTreeItem::setFolderIsCloseToQuota( bool v )
 {
   if ( mFolderIsCloseToQuota != v) {
     mFolderIsCloseToQuota = v;
-    repaint();
+    tqrepaint();
   }
 }
 
@@ -391,9 +391,9 @@ void KFolderTree::setStyleDependantFrameWidth()
   // set the width of the frame to a reasonable value for the current GUI style
   int frameWidth;
   if( style().isA("KeramikStyle") )
-    frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
+    frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
   else
-    frameWidth = style().pixelMetric( TQStyle::PM_DefaultFrameWidth );
+    frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth );
   if ( frameWidth < 0 )
     frameWidth = 0;
   if ( frameWidth != lineWidth() )
@@ -464,7 +464,7 @@ bool KFolderTree::acceptDrag( TQDropEvent* event ) const
 void KFolderTree::addUnreadColumn( const TQString & name, int width )
 {
   mUnreadIndex = addColumn( name, width );
-  setColumnAlignment( mUnreadIndex, qApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight );
+  setColumnAlignment( mUnreadIndex, tqApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight );
   header()->adjustHeaderSize();
 }
 
@@ -472,7 +472,7 @@ void KFolderTree::addUnreadColumn( const TQString & name, int width )
 void KFolderTree::addTotalColumn( const TQString & name, int width )
 {
   mTotalIndex = addColumn( name, width );
-  setColumnAlignment( mTotalIndex, qApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight );
+  setColumnAlignment( mTotalIndex, tqApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight );
   header()->adjustHeaderSize();
 }
 
@@ -507,7 +507,7 @@ void KFolderTree::removeTotalColumn()
 void KFolderTree::addSizeColumn( const TQString & name, int width )
 {
   mSizeIndex = addColumn( name, width );
-  setColumnAlignment( mSizeIndex, qApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight );
+  setColumnAlignment( mSizeIndex, tqApp->reverseLayout() ? Qt::AlignLeft : Qt::AlignRight );
   header()->adjustHeaderSize();
 }
 
@@ -535,7 +535,7 @@ void KFolderTree::setFullWidth( bool fullWidth )
 //-----------------------------------------------------------------------------
 void KFolderTree::slotSizeChanged( int section, int, int newSize )
 {
-  viewport()->repaint(
+  viewport()->tqrepaint(
       header()->sectionPos(section), 0, newSize, visibleHeight(), false );
 }
 
diff --git a/libkdepim/kfoldertree.h b/libkdepim/kfoldertree.h
index 2d280584..5ababa1c 100644
--- a/libkdepim/kfoldertree.h
+++ b/libkdepim/kfoldertree.h
@@ -191,8 +191,8 @@ class KDE_EXPORT KFolderTreeItem : public KListViewItem
     virtual void setTotalCount( int aTotal );
 
     /** set/get the total-count */
-    Q_INT64 folderSize() { return mSize; }
-    virtual void setFolderSize( Q_INT64 aSize );
+    TQ_INT64 folderSize() { return mSize; }
+    virtual void setFolderSize( TQ_INT64 aSize );
 
     /** set/get the protocol of the item */
     Protocol protocol() const { return mProtocol; }
@@ -205,7 +205,7 @@ class KDE_EXPORT KFolderTreeItem : public KListViewItem
     /** recursive unread count */
     virtual int countUnreadRecursive();
 
-    virtual Q_INT64 recursiveFolderSize() const;
+    virtual TQ_INT64 recursiveFolderSize() const;
 
     /** paints the cell */
     virtual void paintCell( TQPainter * p, const TQColorGroup & cg,
@@ -233,7 +233,7 @@ class KDE_EXPORT KFolderTreeItem : public KListViewItem
     Type mType;
     int mUnread;
     int mTotal;
-    Q_INT64 mSize;
+    TQ_INT64 mSize;
     bool mFolderIsCloseToQuota;
 };
 
@@ -309,7 +309,7 @@ class KDE_EXPORT KFolderTree : public KListView
     int mSizeIndex;
 
   private slots:
-    /** repaints the complete column (instead of only parts of it as done in
+    /** tqrepaints the complete column (instead of only parts of it as done in
         TQListView) if the size has changed */
     void slotSizeChanged( int section, int oldSize, int newSize );
 
diff --git a/libkdepim/kimportdialog.cpp b/libkdepim/kimportdialog.cpp
index ffccd500..cb59200a 100644
--- a/libkdepim/kimportdialog.cpp
+++ b/libkdepim/kimportdialog.cpp
@@ -323,7 +323,7 @@ void KImportDialog::readFile( int rows )
   pDialog.setAutoClose(true);
   
   KProgress *progress = pDialog.progressBar();
-  progress->setTotalSteps( mFile.contains(mSeparator, false) );
+  progress->setTotalSteps( mFile.tqcontains(mSeparator, false) );
   progress->setValue(0);
   int progressValue = 0;
   
@@ -337,7 +337,7 @@ void KImportDialog::readFile( int rows )
     if (x == mSeparator)
     {
       progress->setValue(progressValue++);
-      if (progressValue % 15 == 0) // try not to constantly repaint
+      if (progressValue % 15 == 0) // try not to constantly tqrepaint
         kapp->processEvents();
     }
     
@@ -550,9 +550,9 @@ void KImportDialog::assignColumn(TQListViewItem *item)
   for(int i=selection.leftCol();i<=selection.rightCol();++i) {
     if (i >= 0) {
       mTable->horizontalHeader()->setLabel(i,colItem->text(0));
-      mColumnDict.replace(i,colItem->column());
+      mColumnDict.tqreplace(i,colItem->column());
       int format = mFormatCombo->currentItem() + 1;
-      mFormats.replace(i,format);
+      mFormats.tqreplace(i,format);
       colItem->column()->addColId(i);
     }
   }
@@ -616,8 +616,8 @@ void KImportDialog::assignTemplate()
       continue;
     KImportColumn *col = mColumns.at(i);
     mTable->horizontalHeader()->setLabel( tableColumn, col->header() );
-    mColumnDict.replace( tableColumn, col );
-    mFormats.replace( tableColumn, format );
+    mColumnDict.tqreplace( tableColumn, col );
+    mFormats.tqreplace( tableColumn, format );
     col->addColId( tableColumn );
   }
 
@@ -698,7 +698,7 @@ void KImportDialog::addColumn(KImportColumn *col)
 void KImportDialog::setData( uint row, uint col, const TQString &value )
 {
   TQString val = value;
-  val.replace( "\\n", "\n" );
+  val.tqreplace( "\\n", "\n" );
 
   if ( row >= mData.count() ) {
     mData.resize( row + 1 );
@@ -734,7 +734,7 @@ void KImportDialog::saveTemplate()
   if ( fileName.isEmpty() )
     return;
 
-  if ( !fileName.contains( ".desktop" ) )
+  if ( !fileName.tqcontains( ".desktop" ) )
     fileName += ".desktop";
 
   TQString name = KInputDialog::getText( i18n( "Template Name" ), i18n( "Please enter a name for the template:" ) );
diff --git a/libkdepim/kmailcompletion.cpp b/libkdepim/kmailcompletion.cpp
index b7c37852..e7e9e17f 100644
--- a/libkdepim/kmailcompletion.cpp
+++ b/libkdepim/kmailcompletion.cpp
@@ -90,7 +90,7 @@ void KMailCompletion::postProcessMatches( TQStringList * pMatches )const
     return;
 
   //KCompletion has found the keywords for us, we can now map them to mail-addr
-  TQMap< TQString, bool > mailAddrDistinct; //TODO replace with QSet in KDE4
+  TQMap< TQString, bool > mailAddrDistinct; //TODO tqreplace with QSet in KDE4
   for ( TQStringList::ConstIterator sit ( pMatches->begin() ), sEnd( pMatches->end() ); sit != sEnd; ++sit ) {
     const TQStringList &mailAddr = m_keyMap[ (*sit) ]; //get all mailAddr for this keyword
     for ( TQStringList::ConstIterator sit ( mailAddr.begin() ), sEnd( mailAddr.end() ); sit != sEnd; ++sit ) {
diff --git a/libkdepim/kmailcompletion.h b/libkdepim/kmailcompletion.h
index e56eb77c..8f29d7e0 100644
--- a/libkdepim/kmailcompletion.h
+++ b/libkdepim/kmailcompletion.h
@@ -58,14 +58,14 @@ class KMailCompletion : public KCompletion
      *
      * Items may be added with KCompletion::addItem, those will only be returned as match if they
      * are in one of these formats:
-     * \li contains localpart@domain 
-     * \li contains <email>
+     * \li tqcontains localpart@domain 
+     * \li tqcontains <email>
      * or if they have also been added with this function.
      */
     void addItemWithKeys( const TQString& email, int weight, const TQStringList * keyWords);
 
     /**
-     * Uses an internal map to replace all keywords in pMatches whith corrsesponding email addresses.
+     * Uses an internal map to tqreplace all keywords in pMatches whith corrsesponding email addresses.
      */
     virtual void postProcessMatches( TQStringList * pMatches )const;
 
diff --git a/libkdepim/komposer/core/core.h b/libkdepim/komposer/core/core.h
index 7d004c96..91ef133e 100644
--- a/libkdepim/komposer/core/core.h
+++ b/libkdepim/komposer/core/core.h
@@ -46,7 +46,7 @@ namespace Komposer
   {
     Q_OBJECT
   public:
-    Core( TQWidget *parentWidget = 0, const char *name = 0 );
+    Core( TQWidget *tqparentWidget = 0, const char *name = 0 );
     virtual ~Core();
 
   public slots:
diff --git a/libkdepim/komposer/core/pluginmanager.cpp b/libkdepim/komposer/core/pluginmanager.cpp
index c7cf7492..d4fd5acc 100644
--- a/libkdepim/komposer/core/pluginmanager.cpp
+++ b/libkdepim/komposer/core/pluginmanager.cpp
@@ -82,8 +82,8 @@ PluginManager::PluginManager( TQObject *parent )
                                                    this, TQT_SLOT( loadAllPlugins() ) );
 
   d->plugins = KPluginInfo::fromServices(
-    KTrader::self()->query( TQString::fromLatin1( "Komposer/Plugin" ),
-                            TQString::fromLatin1( "[X-Komposer-Version] == 1" ) ) );
+    KTrader::self()->query( TQString::tqfromLatin1( "Komposer/Plugin" ),
+                            TQString::tqfromLatin1( "[X-Komposer-Version] == 1" ) ) );
 }
 
 PluginManager::~PluginManager()
@@ -205,7 +205,7 @@ PluginManager::slotShutdownTimeout()
 
   kdWarning() << k_funcinfo << "Some plugins didn't shutdown in time!" << endl
               << "Remaining plugins: "
-              << remaining.join( TQString::fromLatin1( ", " ) ) << endl
+              << remaining.join( TQString::tqfromLatin1( ", " ) ) << endl
               << "Forcing Komposer shutdown now." << endl;
 #endif
 
@@ -229,18 +229,18 @@ PluginManager::loadAllPlugins()
     d->config = KSharedConfig::openConfig( "komposerrc" );
 
   TQMap<TQString, TQString> entries = d->config->entryMap(
-    TQString::fromLatin1( "Plugins" ) );
+    TQString::tqfromLatin1( "Plugins" ) );
 
   TQMap<TQString, TQString>::Iterator it;
   for ( it = entries.begin(); it != entries.end(); ++it )
   {
     TQString key = it.key();
-    if ( key.endsWith( TQString::fromLatin1( "Enabled" ) ) )
+    if ( key.endsWith( TQString::tqfromLatin1( "Enabled" ) ) )
     {
       key.setLength( key.length() - 7 );
       //kdDebug() << k_funcinfo << "Set " << key << " to " << it.data() << endl;
 
-      if ( it.data() == TQString::fromLatin1( "true" ) )
+      if ( it.data() == TQString::tqfromLatin1( "true" ) )
       {
         if ( !plugin( key ) )
           d->pluginsToLoad.push( key );
@@ -305,13 +305,13 @@ PluginManager::loadPluginInternal( const TQString &pluginId )
     return 0;
   }
 
-  if ( d->loadedPlugins.contains( info ) )
+  if ( d->loadedPlugins.tqcontains( info ) )
     return d->loadedPlugins[ info ];
 
   int error = 0;
   Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Komposer::Plugin>(
-    TQString::fromLatin1( "Komposer/Plugin" ),
-    TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ),
+    TQString::tqfromLatin1( "Komposer/Plugin" ),
+    TQString::tqfromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ),
     this, 0, TQStringList(), &error );
 
   if ( plugin ) {
@@ -408,7 +408,7 @@ PluginManager::plugin( const TQString &pluginId ) const
   if ( !info )
     return 0;
 
-  if ( d->loadedPlugins.contains( info ) )
+  if ( d->loadedPlugins.tqcontains( info ) )
     return d->loadedPlugins[ info ];
   else
     return 0;
@@ -424,7 +424,7 @@ PluginManager::pluginName( const Plugin *plugin ) const
       return it.key()->name();
   }
 
-  return TQString::fromLatin1( "Unknown" );
+  return TQString::tqfromLatin1( "Unknown" );
 }
 
 QString
@@ -437,7 +437,7 @@ PluginManager::pluginId( const Plugin *plugin ) const
       return it.key()->pluginName();
   }
 
-  return TQString::fromLatin1( "unknown" );
+  return TQString::tqfromLatin1( "unknown" );
 }
 
 QString
@@ -450,7 +450,7 @@ PluginManager::pluginIcon( const Plugin *plugin ) const
       return it.key()->icon();
   }
 
-  return TQString::fromLatin1( "Unknown" );
+  return TQString::tqfromLatin1( "Unknown" );
 }
 
 KPluginInfo*
@@ -478,7 +478,7 @@ PluginManager::setPluginEnabled( const TQString &pluginId, bool enabled /* = tru
   if ( !infoForPluginId( pluginId ) )
     return false;
 
-  d->config->writeEntry( pluginId + TQString::fromLatin1( "Enabled" ), enabled );
+  d->config->writeEntry( pluginId + TQString::tqfromLatin1( "Enabled" ), enabled );
   d->config->sync();
 
   return true;
diff --git a/libkdepim/komposer/core/prefsmodule.cpp b/libkdepim/komposer/core/prefsmodule.cpp
index 7dd1673e..3536ebb8 100644
--- a/libkdepim/komposer/core/prefsmodule.cpp
+++ b/libkdepim/komposer/core/prefsmodule.cpp
@@ -75,8 +75,8 @@ EditorSelection::EditorSelection( const TQString &text, TQString &reference,
   : m_reference( reference )
 {
   m_box = new TQGroupBox( 0, Qt::Vertical, text, parent );
-  TQVBoxLayout *boxLayout = new TQVBoxLayout( m_box->layout() );
-  boxLayout->setAlignment( Qt::AlignTop );
+  TQVBoxLayout *boxLayout = new TQVBoxLayout( m_box->tqlayout() );
+  boxLayout->tqsetAlignment( Qt::AlignTop );
 
   m_editorsCombo = new KComboBox( m_box );
   boxLayout->addWidget( m_editorsCombo );
@@ -101,16 +101,16 @@ EditorSelection::readConfig()
   m_editorsCombo->clear();
 
   KTrader::OfferList editors = KTrader::self()->query(
-    TQString::fromLatin1( "Komposer/Editor" ) );
+    TQString::tqfromLatin1( "Komposer/Editor" ) );
   KTrader::OfferList::ConstIterator it;
   int i = 0;
   for ( it = editors.begin(); it != editors.end(); ++it, ++i ) {
-    if ( !(*it)->hasServiceType( TQString::fromLatin1( "Komposer/Editor" ) ) )
+    if ( !(*it)->hasServiceType( TQString::tqfromLatin1( "Komposer/Editor" ) ) )
       continue;
 
     TQString name = (*it)->property( "X-KDE-KomposerIdentifier" ).toString();
     m_editorsCombo->insertItem( name );
-    if ( m_reference.contains( name ) )
+    if ( m_reference.tqcontains( name ) )
       m_editorsCombo->setCurrentItem( i );
   }
 }
diff --git a/libkdepim/komposer/core/tests/testmanager.cpp b/libkdepim/komposer/core/tests/testmanager.cpp
index 8895cfe9..0fcba16b 100644
--- a/libkdepim/komposer/core/tests/testmanager.cpp
+++ b/libkdepim/komposer/core/tests/testmanager.cpp
@@ -34,7 +34,7 @@ void TestManager::slotAllPluginsLoaded()
 {
   kdDebug()<<"Done"<<endl;
   m_manager->shutdown();
-  qApp->exit();
+  tqApp->exit();
 }
 
 void TestManager::slotPluginLoaded( Plugin *plugin )
diff --git a/libkdepim/komposer/plugins/default/defaulteditor.cpp b/libkdepim/komposer/plugins/default/defaulteditor.cpp
index b8abf17b..56f97d22 100644
--- a/libkdepim/komposer/plugins/default/defaulteditor.cpp
+++ b/libkdepim/komposer/plugins/default/defaulteditor.cpp
@@ -36,8 +36,8 @@
 #include <kprinter.h>
 #include <kfinddialog.h>
 #include <kfind.h>
-#include <kreplacedialog.h>
-#include <kreplace.h>
+#include <ktqreplacedialog.h>
+#include <ktqreplace.h>
 
 #include <tqtextedit.h>
 #include <tqwidget.h>
@@ -89,7 +89,7 @@ DefaultEditor::changeSignature( const TQString &sig )
   int sigStart = text.findRev( "-- " );
   TQString sigText = TQString( "-- \n%1" ).arg( sig );
 
-  text.replace( sigStart, text.length(), sigText );
+  text.tqreplace( sigStart, text.length(), sigText );
 }
 
 void
@@ -202,10 +202,10 @@ DefaultEditor::createActions( KActionCollection *ac )
   connect( m_actionAlignJustify, TQT_SIGNAL(toggled(bool)),
            this, TQT_SLOT(setAlignJustify(bool)) );
 
-  m_actionAlignLeft->setExclusiveGroup( "alignment" );
-  m_actionAlignCenter->setExclusiveGroup( "alignment" );
-  m_actionAlignRight->setExclusiveGroup( "alignment" );
-  m_actionAlignJustify->setExclusiveGroup( "alignment" );
+  m_actionAlignLeft->setExclusiveGroup( "tqalignment" );
+  m_actionAlignCenter->setExclusiveGroup( "tqalignment" );
+  m_actionAlignRight->setExclusiveGroup( "tqalignment" );
+  m_actionAlignJustify->setExclusiveGroup( "tqalignment" );
 
   //
   // Tools
@@ -244,7 +244,7 @@ DefaultEditor::updateCharFmt()
 void
 DefaultEditor::updateAligment()
 {
-  int align = m_textEdit->alignment();
+  int align = m_textEdit->tqalignment();
 
   switch ( align ) {
   case AlignRight:
@@ -288,28 +288,28 @@ void
 DefaultEditor::setAlignLeft( bool yes )
 {
   if ( yes )
-    m_textEdit->setAlignment( AlignLeft );
+    m_textEdit->tqsetAlignment( AlignLeft );
 }
 
 void
 DefaultEditor::setAlignRight( bool yes )
 {
   if ( yes )
-    m_textEdit->setAlignment( AlignRight );
+    m_textEdit->tqsetAlignment( AlignRight );
 }
 
 void
 DefaultEditor::setAlignCenter( bool yes )
 {
   if ( yes )
-    m_textEdit->setAlignment( AlignCenter );
+    m_textEdit->tqsetAlignment( AlignCenter );
 }
 
 void
 DefaultEditor::setAlignJustify( bool yes )
 {
   if ( yes )
-    m_textEdit->setAlignment( AlignJustify );
+    m_textEdit->tqsetAlignment( AlignJustify );
 }
 
 //
diff --git a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp
index b615c40b..922e5126 100644
--- a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp
+++ b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp
@@ -26,11 +26,11 @@
 #include <kapplication.h>
 #include <kdepimmacros.h>
 
-KPartsGenericPart::KPartsGenericPart( TQWidget* parentWidget, const char* name )
-    : TQWidget( parentWidget, name ), m_part( 0 )
+KPartsGenericPart::KPartsGenericPart( TQWidget* tqparentWidget, const char* name )
+    : TQWidget( tqparentWidget, name ), m_part( 0 )
 {
-    TQVBoxLayout* layout = new TQVBoxLayout( this );
-    layout->setAutoAdd( true );
+    TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+    tqlayout->setAutoAdd( true );
 }
 
 void KPartsGenericPart::load()
diff --git a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h
index 5df3db24..1302b137 100644
--- a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h
+++ b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.h
@@ -34,7 +34,7 @@ class KPartsGenericPart : public TQWidget {
     Q_PROPERTY( TQString url READ url WRITE setURL )
     Q_PROPERTY( TQString mimetype READ mimetype WRITE setMimetype )
 public:
-    KPartsGenericPart( TQWidget* parentWidget, const char* name );
+    KPartsGenericPart( TQWidget* tqparentWidget, const char* name );
 
     TQString url() const { return m_url; }
     void setURL( const TQString& url ) { m_url = url; load(); }
diff --git a/libkdepim/kpixmapregionselectorwidget.cpp b/libkdepim/kpixmapregionselectorwidget.cpp
index 918d3b84..308ae0cc 100644
--- a/libkdepim/kpixmapregionselectorwidget.cpp
+++ b/libkdepim/kpixmapregionselectorwidget.cpp
@@ -227,7 +227,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev)
       };
 
       TQCursor cursor;
-      if ( m_selectedRegion.contains( mev->pos() )
+      if ( m_selectedRegion.tqcontains( mev->pos() )
           && m_selectedRegion!=m_originalPixmap.rect() )
       {
          m_state=Moving;
diff --git a/libkdepim/kprefsdialog.cpp b/libkdepim/kprefsdialog.cpp
index 1af04fd4..93b3feaa 100644
--- a/libkdepim/kprefsdialog.cpp
+++ b/libkdepim/kprefsdialog.cpp
@@ -376,7 +376,7 @@ KPrefsWidDate::KPrefsWidDate( KConfigSkeleton::ItemDateTime *item,
 
 void KPrefsWidDate::readConfig()
 {
-  mDateEdit->setDate( mItem->value().date().isValid() ? mItem->value().date() : TQDate::currentDate()  );
+  mDateEdit->setDate( mItem->value().date().isValid() ? mItem->value().date() : TQDate::tqcurrentDate()  );
 }
 
 void KPrefsWidDate::writeConfig()
@@ -766,18 +766,18 @@ void KPrefsDialog::autoCreate()
     kdDebug() << "ITEMS: " << (*it)->name() << endl;
 
     TQWidget *page;
-    TQGridLayout *layout;
+    TQGridLayout *tqlayout;
     int currentRow;
-    if ( !mGroupPages.contains( group ) ) {
+    if ( !mGroupPages.tqcontains( group ) ) {
       page = addPage( group );
-      layout = new TQGridLayout( page );
+      tqlayout = new TQGridLayout( page );
       mGroupPages.insert( group, page );
-      mGroupLayouts.insert( group, layout );
+      mGroupLayouts.insert( group, tqlayout );
       currentRow = 0;
       mCurrentRows.insert( group, currentRow );
     } else {
       page = mGroupPages[ group ];
-      layout = mGroupLayouts[ group ];
+      tqlayout = mGroupLayouts[ group ];
       currentRow = mCurrentRows[ group ];
     }
 
@@ -786,11 +786,11 @@ void KPrefsDialog::autoCreate()
     if ( wid ) {
       TQValueList<TQWidget *> widgets = wid->widgets();
       if ( widgets.count() == 1 ) {
-        layout->addMultiCellWidget( widgets[ 0 ],
+        tqlayout->addMultiCellWidget( widgets[ 0 ],
                                     currentRow, currentRow, 0, 1 );
       } else if ( widgets.count() == 2 ) {
-        layout->addWidget( widgets[ 0 ], currentRow, 0 );
-        layout->addWidget( widgets[ 1 ], currentRow, 1 );
+        tqlayout->addWidget( widgets[ 0 ], currentRow, 0 );
+        tqlayout->addWidget( widgets[ 1 ], currentRow, 1 );
       } else {
         kdError() << "More widgets than expected: " << widgets.count() << endl;
       }
@@ -804,7 +804,7 @@ void KPrefsDialog::autoCreate()
 
       addWid( wid );
 
-      mCurrentRows.replace( group, ++currentRow );
+      mCurrentRows.tqreplace( group, ++currentRow );
     }
   }
 
diff --git a/libkdepim/kprefsdialog.h b/libkdepim/kprefsdialog.h
index 3c9f85cc..3667a7ae 100644
--- a/libkdepim/kprefsdialog.h
+++ b/libkdepim/kprefsdialog.h
@@ -86,7 +86,7 @@ class KDE_EXPORT KPrefsWid : public QObject
   @short Widgets for bool settings in @ref KPrefsDialog.
 
   This class provides a control element for configuring bool values. It is meant
-  to be used by KPrefsDialog. The user is responsible for the layout management.
+  to be used by KPrefsDialog. The user is responsible for the tqlayout management.
 */
 class KDE_EXPORT KPrefsWidBool : public KPrefsWid
 {
@@ -119,7 +119,7 @@ class KDE_EXPORT KPrefsWidBool : public KPrefsWid
   @short Widgets for int settings in @ref KPrefsDialog.
 
   This class provides a control element for configuring integer values. It is
-  meant to be used by KPrefsDialog. The user is responsible for the layout
+  meant to be used by KPrefsDialog. The user is responsible for the tqlayout
   management.
 */
 class KDE_EXPORT KPrefsWidInt : public KPrefsWid
@@ -160,7 +160,7 @@ class KDE_EXPORT KPrefsWidInt : public KPrefsWid
   @short Widgets for time settings in @ref KPrefsDialog.
 
   This class provides a control element for configuring time values. It is
-  meant to be used by KPrefsDialog. The user is responsible for the layout
+  meant to be used by KPrefsDialog. The user is responsible for the tqlayout
   management.
 */
 class KDE_EXPORT KPrefsWidTime : public KPrefsWid
@@ -197,7 +197,7 @@ class KDE_EXPORT KPrefsWidTime : public KPrefsWid
   @short Widgets for duration settings in @ref KPrefsDialog.
 
   This class provides a control element for configuring duration values. It is
-  meant to be used by KPrefsDialog. The user is responsible for the layout
+  meant to be used by KPrefsDialog. The user is responsible for the tqlayout
   management.
 */
 class KDE_EXPORT KPrefsWidDuration : public KPrefsWid
@@ -235,7 +235,7 @@ class KDE_EXPORT KPrefsWidDuration : public KPrefsWid
   @short Widgets for time settings in @ref KPrefsDialog.
 
   This class provides a control element for configuring date values. It is
-  meant to be used by KPrefsDialog. The user is responsible for the layout
+  meant to be used by KPrefsDialog. The user is responsible for the tqlayout
   management.
 */
 class KDE_EXPORT KPrefsWidDate : public KPrefsWid
@@ -272,7 +272,7 @@ class KDE_EXPORT KPrefsWidDate : public KPrefsWid
   @short Widgets for color settings in @ref KPrefsDialog.
 
   This class provides a control element for configuring color values. It is
-  meant to be used by KPrefsDialog. The user is responsible for the layout
+  meant to be used by KPrefsDialog. The user is responsible for the tqlayout
   management.
 */
 class KDE_EXPORT KPrefsWidColor : public KPrefsWid
@@ -315,7 +315,7 @@ class KDE_EXPORT KPrefsWidColor : public KPrefsWid
   @short Widgets for font settings in @ref KPrefsDialog.
 
   This class provides a control element for configuring font values. It is meant
-  to be used by KPrefsDialog. The user is responsible for the layout management.
+  to be used by KPrefsDialog. The user is responsible for the tqlayout management.
 */
 class KDE_EXPORT KPrefsWidFont : public KPrefsWid
 {
@@ -368,7 +368,7 @@ class KDE_EXPORT KPrefsWidFont : public KPrefsWid
   @ref KPrefsDialog.
 
   This class provides a control element for configuring selections. It is meant
-  to be used by KPrefsDialog. The user is responsible for the layout management.
+  to be used by KPrefsDialog. The user is responsible for the tqlayout management.
 
   The setting is interpreted as an int value, corresponding to the position of
   the radio button. The position of the button is defined by the sequence of
@@ -417,7 +417,7 @@ class KDE_EXPORT KPrefsWidRadios : public KPrefsWid
   @ref KPrefsDialog.
 
   This class provides a control element for configuring selections. It is meant
-  to be used by KPrefsDialog. The user is responsible for the layout management.
+  to be used by KPrefsDialog. The user is responsible for the tqlayout management.
 
   The setting is interpreted as an int value, corresponding to the index in 
   the combo box.
@@ -452,7 +452,7 @@ class KDE_EXPORT KPrefsWidCombo : public KPrefsWid
   @short Widgets for string settings in @ref KPrefsDialog.
 
   This class provides a control element for configuring string values. It is
-  meant to be used by KPrefsDialog. The user is responsible for the layout
+  meant to be used by KPrefsDialog. The user is responsible for the tqlayout
   management.
 */
 class KDE_EXPORT KPrefsWidString : public KPrefsWid
@@ -499,7 +499,7 @@ class KDE_EXPORT KPrefsWidString : public KPrefsWid
   @short Widgets for string settings in @ref KPrefsDialog.
 
   This class provides a control element for configuring string values. It is
-  meant to be used by KPrefsDialog. The user is responsible for the layout
+  meant to be used by KPrefsDialog. The user is responsible for the tqlayout
   management.
 */
 class KDE_EXPORT KPrefsWidPath : public KPrefsWid
@@ -708,7 +708,7 @@ class KDE_EXPORT KPrefsWidManager
 
   This class provides the framework for a preferences dialog. You have to
   subclass it and add the code to create the actual configuration widgets and
-  do the layout management.
+  do the tqlayout management.
 
   KPrefsDialog provides functions to add subclasses of @ref KPrefsWid via
   KPrefsWidManager. For these widgets the reading, writing and setting to
diff --git a/libkdepim/kregexp3.cpp b/libkdepim/kregexp3.cpp
index 6bb519e5..f34dad33 100644
--- a/libkdepim/kregexp3.cpp
+++ b/libkdepim/kregexp3.cpp
@@ -37,13 +37,13 @@
 #include <kdebug.h>
 #endif
 
-TQString KRegExp3::replace( const TQString & str,
-			   const TQString & replacementStr,
+TQString KRegExp3::tqreplace( const TQString & str,
+			   const TQString & tqreplacementStr,
 			   int start, bool global )
 {
   int oldpos, pos;
 
-  //-------- parsing the replacementStr into
+  //-------- parsing the tqreplacementStr into
   //-------- literal parts and backreferences:
   TQStringList     literalStrs;
   TQValueList<int> backRefs;
@@ -55,30 +55,30 @@ TQString KRegExp3::replace( const TQString & str,
   TQRegExp brx("\\");
 
 #ifdef DEBUG_KREGEXP3
-  kdDebug() << "Analyzing replacementStr: \"" + replacementStr + "\"" << endl;
+  kdDebug() << "Analyzing tqreplacementStr: \"" + tqreplacementStr + "\"" << endl;
 #endif
 
   oldpos = 0;
   pos = 0;
   while ( true ) {
-    pos = rx.search( replacementStr, pos );
+    pos = rx.search( tqreplacementStr, pos );
     
 #ifdef DEBUG_KREGEXP3
     kdDebug() << TQString("  Found match at pos %1").arg(pos) << endl;
 #endif
 
     if ( pos < 0 ) {
-      literalStrs << replacementStr.mid( oldpos )
-	.replace( bbrx, "\\" )
-	.replace( brx, "" );
+      literalStrs << tqreplacementStr.mid( oldpos )
+	.tqreplace( bbrx, "\\" )
+	.tqreplace( brx, "" );
 #ifdef DEBUG_KREGEXP3
       kdDebug() << "  No more matches. Last literal is \"" + literalStrs.last() + "\"" << endl;
 #endif
       break;
     } else {
-      literalStrs << replacementStr.mid( oldpos, pos-oldpos )
-	.replace( bbrx, "\\" )
-	.replace( brx, "" );
+      literalStrs << tqreplacementStr.mid( oldpos, pos-oldpos )
+	.tqreplace( bbrx, "\\" )
+	.tqreplace( brx, "" );
 #ifdef DEBUG_KREGEXP3
       kdDebug() << TQString("  Inserting \"") + literalStrs.last() + "\" as literal." << endl;
       kdDebug() << "    Searching for corresponding digit(s):" << endl;
@@ -101,7 +101,7 @@ TQString KRegExp3::replace( const TQString & str,
   }
 
 #ifdef DEBUG_KREGEXP3
-  kdDebug() << "Finished the analysis of replacementStr!" << endl;
+  kdDebug() << "Finished the analysis of tqreplacementStr!" << endl;
 #endif
   Q_ASSERT( literalStrs.count() == backRefs.count() + 1 );
 
@@ -145,7 +145,7 @@ TQString KRegExp3::replace( const TQString & str,
             iIt != backRefs.end() ; ++sIt, ++iIt ) {
 	result += (*sIt);
 #ifdef DEBUG_KREGEXP3
-	kdDebug() << "   Adding literal replacement part:" << endl;
+	kdDebug() << "   Adding literal tqreplacement part:" << endl;
 	kdDebug() << "    result == \"" + result + "\"" << endl;
 #endif
 	result += cap( (*iIt) );
@@ -156,7 +156,7 @@ TQString KRegExp3::replace( const TQString & str,
       }
       result += (*sIt);
 #ifdef DEBUG_KREGEXP3
-      kdDebug() << "   Adding literal replacement part:" << endl;
+      kdDebug() << "   Adding literal tqreplacement part:" << endl;
       kdDebug() << "    result == \"" + result + "\"" << endl;
 #endif
     }
@@ -173,7 +173,7 @@ TQString KRegExp3::replace( const TQString & str,
     oldpos = pos;
 
     if ( !global ) {
-      // only replace the first occurrence, so stop here:
+      // only tqreplace the first occurrence, so stop here:
       result += str.mid( oldpos );
       break;
     }
diff --git a/libkdepim/kregexp3.h b/libkdepim/kregexp3.h
index 40c7681d..c9b53c5f 100644
--- a/libkdepim/kregexp3.h
+++ b/libkdepim/kregexp3.h
@@ -36,21 +36,21 @@
 
 #include <kdepimmacros.h>
 
-/** @short A TQRegExp (Qt3.x) with a replace() method.
+/** @short A TQRegExp (Qt3.x) with a tqreplace() method.
 
     This class is simply there to provide a namespace for some nice
     enhancements of the mighty TQRegExp (Qt3 version) regular
-    expression engine, namely the method replace(), which can be
-    used to do search-and-replace like one is used to from perl or sed.
+    expression engine, namely the method tqreplace(), which can be
+    used to do search-and-tqreplace like one is used to from perl or sed.
     
-    It "simply" adds the ability to define a replacement string which
-    contains references to the captured substrings. The following
+    It "simply" adds the ability to define a tqreplacement string which
+    tqcontains references to the captured substrings. The following
     constructs are understood, which can be freely mixed in the
-    replacement string:
+    tqreplacement string:
 
     @section Sed syntax
 
-    Back references in the replacement string are made using \n
+    Back references in the tqreplacement string are made using \n
     (backslash-digit), where @p n is a single digit. With this mode of
     operation, only the first nine captured substrings can be
     referenced.
@@ -60,7 +60,7 @@
 
     @section Perl syntax
 
-    Back references in the replacement string are made using $n
+    Back references in the tqreplacement string are made using $n
     (dollarsign-digit), where @p n is a single digit. With this mode
     of operation, only the first nine captured substrings can be
     referenced.
@@ -91,21 +91,21 @@ public:
     : TQRegExp( (TQRegExp)rx ) {}
 
   /** Replaces each matching subpattern in @p str with
-      @p replacementStr, inserting captured substrings for
+      @p tqreplacementStr, inserting captured substrings for
       \\n, $n and ${nn} as described in the class documentation.
       @param str The source string.
-      @param replacementStr The string which replaces matched
+      @param tqreplacementStr The string which tqreplaces matched
              substrings of @p str.
       @param start Start position for the search.
              If @p start is negative, starts @p -(start) positions
 	     from the end of @p str.
-      @param global If @p TRUE, requests to replace all occurrences
-             of the regexp with @p replacementStr; if @p FALSE,
-	     only the first occurrence will be replaced.
+      @param global If @p TRUE, requests to tqreplace all occurrences
+             of the regexp with @p tqreplacementStr; if @p FALSE,
+	     only the first occurrence will be tqreplaced.
 	     Equivalent to the /g switch to perl's s/// operator.
       @return The modified string.
   */
-  TQString replace( const TQString & str,
-		   const TQString & replacementStr,
+  TQString tqreplace( const TQString & str,
+		   const TQString & tqreplacementStr,
 		   int start=0, bool global=TRUE );
 };
diff --git a/libkdepim/krsqueezedtextlabel.cpp b/libkdepim/krsqueezedtextlabel.cpp
index c61a706b..ef9746ee 100644
--- a/libkdepim/krsqueezedtextlabel.cpp
+++ b/libkdepim/krsqueezedtextlabel.cpp
@@ -24,30 +24,30 @@
 
 KRSqueezedTextLabel::KRSqueezedTextLabel( const TQString &text , TQWidget *parent, const char *name )
  : TQLabel ( parent, name ) {
-  setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+  tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
   fullText = text;
   squeezeTextToLabel();
 }
 
 KRSqueezedTextLabel::KRSqueezedTextLabel( TQWidget *parent, const char *name )
  : TQLabel ( parent, name ) {
-  setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+  tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
 }
 
 void KRSqueezedTextLabel::resizeEvent( TQResizeEvent * ) {
   squeezeTextToLabel();
 }
 
-TQSize KRSqueezedTextLabel::minimumSizeHint() const
+TQSize KRSqueezedTextLabel::tqminimumSizeHint() const
 {
-  TQSize sh = TQLabel::minimumSizeHint();
+  TQSize sh = TQLabel::tqminimumSizeHint();
   sh.setWidth(-1);
   return sh;
 }
 
-TQSize KRSqueezedTextLabel::sizeHint() const
+TQSize KRSqueezedTextLabel::tqsizeHint() const
 {
-  return TQSize(contentsRect().width(), TQLabel::sizeHint().height());
+  return TQSize(contentsRect().width(), TQLabel::tqsizeHint().height());
 }
 
 void KRSqueezedTextLabel::setText( const TQString &text ) {
@@ -75,11 +75,11 @@ void KRSqueezedTextLabel::squeezeTextToLabel() {
   }
 }
 
-void KRSqueezedTextLabel::setAlignment( int alignment )
+void KRSqueezedTextLabel::tqsetAlignment( int tqalignment )
 {
   // save fullText and restore it
   TQString tmpFull(fullText);
-  TQLabel::setAlignment(alignment);
+  TQLabel::tqsetAlignment(tqalignment);
   fullText = tmpFull;
 }
 
diff --git a/libkdepim/krsqueezedtextlabel.h b/libkdepim/krsqueezedtextlabel.h
index a5e4e776..13627252 100644
--- a/libkdepim/krsqueezedtextlabel.h
+++ b/libkdepim/krsqueezedtextlabel.h
@@ -25,7 +25,7 @@
 #include <kdepimmacros.h>
 
 /**
- * @short A replacement for TQLabel that squeezes its text
+ * @short A tqreplacement for TQLabel that squeezes its text
  *
  * A label class that squeezes its text into the label
  *
@@ -48,12 +48,12 @@ public:
   KRSqueezedTextLabel( TQWidget *parent, const char *name = 0 );
   KRSqueezedTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 );
 
-  virtual TQSize minimumSizeHint() const;
-  virtual TQSize sizeHint() const;
+  virtual TQSize tqminimumSizeHint() const;
+  virtual TQSize tqsizeHint() const;
   /**
    * Overridden for internal reasons; the API remains unaffected.
    */
-  virtual void setAlignment( int );
+  virtual void tqsetAlignment( int );
 
 public slots:
   void setText( const TQString & );
diff --git a/libkdepim/kscoring.cpp b/libkdepim/kscoring.cpp
index 17dd1d43..c9d1f614 100644
--- a/libkdepim/kscoring.cpp
+++ b/libkdepim/kscoring.cpp
@@ -47,19 +47,19 @@ static TQString toXml(const TQString& str)
   uint i = 0;
   while ( i < len ) {
     if (tmp[(int)i] == '<') {
-      tmp.replace(i, 1, "&lt;");
+      tmp.tqreplace(i, 1, "&lt;");
       len += 3;
       i += 4;
     } else if (tmp[(int)i] == '"') {
-      tmp.replace(i, 1, "&quot;");
+      tmp.tqreplace(i, 1, "&quot;");
       len += 5;
       i += 6;
     } else if (tmp[(int)i] == '&') {
-       tmp.replace(i, 1, "&amp;");
+       tmp.tqreplace(i, 1, "&amp;");
        len += 4;
        i += 5;
     } else if (tmp[(int)i] == '>') {
-       tmp.replace(i, 1, "&gt;");
+       tmp.tqreplace(i, 1, "&gt;");
        len += 3;
        i += 4;
     } else {
@@ -91,7 +91,7 @@ NotifyDialog::NotifyDialog(TQWidget* p)
 
 void NotifyDialog::slotShowAgainToggled(bool flag)
 {
-  dict.replace(msg,!flag);
+  dict.tqreplace(msg,!flag);
   kdDebug(5100) << "note \"" << note << "\" will popup again: " << flag << endl;
 }
 
@@ -109,7 +109,7 @@ void NotifyDialog::display(ScorableArticle& a, const TQString& s)
                   arg(a.subject()).
                   arg(s);
     me->note->setText(msg);
-    if ( i == dict.end() ) i = dict.replace(s,false);
+    if ( i == dict.end() ) i = dict.tqreplace(s,false);
     me->adjustSize();
     me->exec();
   }
@@ -773,7 +773,7 @@ TQString KScoringRule::getExpireDateString() const
 
 bool KScoringRule::isExpired() const
 {
-  return (expires.isValid() && (expires < TQDate::currentDate()));
+  return (expires.isValid() && (expires < TQDate::tqcurrentDate()));
 }
 
 
@@ -925,7 +925,7 @@ KScoringRule* KScoringManager::addRule(const ScorableArticle& a, TQString group,
     new KScoringExpression("From","CONTAINS",
                             a.from(),"0"));
   if (score) rule->addAction(new ActionSetScore(score));
-  rule->setExpireDate(TQDate::currentDate().addDays(30));
+  rule->setExpireDate(TQDate::tqcurrentDate().addDays(30));
   addRule(rule);
   KScoringEditor *edit = KScoringEditor::createEditor(this);
   edit->setRule(rule);
diff --git a/libkdepim/kscoringeditor.cpp b/libkdepim/kscoringeditor.cpp
index 6c469f49..de76d3e8 100644
--- a/libkdepim/kscoringeditor.cpp
+++ b/libkdepim/kscoringeditor.cpp
@@ -91,7 +91,7 @@ SingleConditionWidget::SingleConditionWidget(KScoringManager *m,TQWidget *p, con
   connect( regExpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( showRegExpDialog() ) );
 
   // occupy at much width as possible
-  setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed));
+  tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed));
   setFrameStyle(Box | Sunken);
   setLineWidth(1);
 }
@@ -421,7 +421,7 @@ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n)
   groupsBox = new KComboBox( false, groupB, "groupsBox" );
   groupsBox->setDuplicatesEnabled(false);
   groupsBox->insertStringList(manager->getGroups());
-  groupsBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
+  groupsBox->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
   groupL->addWidget( groupsBox, 3, 1 );
 
   // expires
@@ -508,7 +508,7 @@ void RuleEditWidget::slotEditRule(const TQString& ruleName)
   expireEdit->setEnabled(b);
   expireLabel->setEnabled(b);
   if (b)
-    expireEdit->setValue(TQDate::currentDate().daysTo(rule->getExpireDate()));
+    expireEdit->setValue(TQDate::tqcurrentDate().daysTo(rule->getExpireDate()));
   else
     expireEdit->setValue(30);
   if (rule->getLinkMode() == KScoringRule::AND) {
@@ -546,7 +546,7 @@ void RuleEditWidget::updateRule(KScoringRule *rule)
     rule->setGroups(TQStringList::split(";",groups));
   bool b = expireCheck->isChecked();
   if (b)
-    rule->setExpireDate(TQDate::currentDate().addDays(expireEdit->value()));
+    rule->setExpireDate(TQDate::tqcurrentDate().addDays(expireEdit->value()));
   else
     rule->setExpireDate(TQDate());
   actionEditor->updateRule(rule);
@@ -655,7 +655,7 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p,
   TQStringList l = m->getGroups();
   filterBox->insertItem(i18n("<all groups>"));
   filterBox->insertStringList(l);
-  filterBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
+  filterBox->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
   connect(filterBox,TQT_SIGNAL(activated(const TQString&)),
           this,TQT_SLOT(slotGroupFilter(const TQString&)));
   slotGroupFilter(i18n("<all groups>"));
@@ -881,7 +881,7 @@ KScoringEditor::KScoringEditor(KScoringManager* m,
   connect(ruleEditor, TQT_SIGNAL(shrink()), TQT_SLOT(slotShrink()));
   connect(this,TQT_SIGNAL(finished()),TQT_SLOT(slotFinished()));
   ruleLister->slotRuleSelected(0);
-  resize(550, sizeHint().height());
+  resize(550, tqsizeHint().height());
 }
 
 void KScoringEditor::setDirty()
@@ -918,7 +918,7 @@ void KScoringEditor::slotDoShrink()
 {
   updateGeometry();
   TQApplication::sendPostedEvents();
-  resize(width(),sizeHint().height());
+  resize(width(),tqsizeHint().height());
 }
 
 void KScoringEditor::slotApply()
@@ -996,7 +996,7 @@ void KScoringEditorWidgetDialog::slotDoShrink()
 {
   updateGeometry();
   TQApplication::sendPostedEvents();
-  resize(width(),sizeHint().height());
+  resize(width(),tqsizeHint().height());
 }
 
 //============================================================================
diff --git a/libkdepim/ksubscription.cpp b/libkdepim/ksubscription.cpp
index f61b633c..f1c5b657 100644
--- a/libkdepim/ksubscription.cpp
+++ b/libkdepim/ksubscription.cpp
@@ -271,7 +271,7 @@ KSubscription::KSubscription( TQWidget *parent, const TQString &caption,
   else
     groupView->header()->setStretchEnabled(true, 0);
 
-  // layout
+  // tqlayout
   TQGridLayout *topL = new TQGridLayout(page,4,1,0, KDialog::spacingHint());
   TQHBoxLayout *filterL = new TQHBoxLayout(KDialog::spacingHint());
   TQVBoxLayout *arrL = new TQVBoxLayout(KDialog::spacingHint());
diff --git a/libkdepim/ktimeedit.cpp b/libkdepim/ktimeedit.cpp
index 2e82b7df..9b955952 100644
--- a/libkdepim/ktimeedit.cpp
+++ b/libkdepim/ktimeedit.cpp
@@ -104,7 +104,7 @@ public:
 
 // KTimeWidget/QTimeEdit provide nicer editing, but don't provide a combobox.
 // Difficult to get all in one...
-// But Qt-3.2 will offer TQLineEdit::setMask, so a "99:99" mask would help.
+// But Qt-3.2 will offer TQLineEdit::setMask, so a "99:99" tqmask would help.
 KTimeEdit::KTimeEdit( TQWidget *parent, TQTime qt, const char *name )
   : TQComboBox( true, parent, name )
 {
diff --git a/libkdepim/kvcarddrag.cpp b/libkdepim/kvcarddrag.cpp
index b8057367..1217d6fb 100644
--- a/libkdepim/kvcarddrag.cpp
+++ b/libkdepim/kvcarddrag.cpp
@@ -68,7 +68,7 @@ bool KVCardDrag::decode( TQMimeSource *e, TQByteArray &content )
   if ( !canDecode( e ) ) {
     return false;
   }
-  content = e->encodedData( vcard_mime_string );
+  content = e->tqencodedData( vcard_mime_string );
   return true;
 }
 #else
@@ -77,7 +77,7 @@ bool KVCardDrag::decode( TQMimeSource *e, TQString &content )
   if ( !canDecode( e ) ) {
     return false;
   }
-  content = TQString::fromUtf8( e->encodedData( vcard_mime_string ) );
+  content = TQString::fromUtf8( e->tqencodedData( vcard_mime_string ) );
   return true;
 }
 #endif
@@ -88,9 +88,9 @@ bool KVCardDrag::decode( TQMimeSource *e, KABC::Addressee::List& addressees )
     return false;
   }
 #if defined(KABC_VCARD_ENCODING_FIX)
-  addressees = KABC::VCardConverter().parseVCardsRaw( e->encodedData( vcard_mime_string ).data() );
+  addressees = KABC::VCardConverter().parseVCardsRaw( e->tqencodedData( vcard_mime_string ).data() );
 #else
-  addressees = KABC::VCardConverter().parseVCards( e->encodedData( vcard_mime_string ) );
+  addressees = KABC::VCardConverter().parseVCards( e->tqencodedData( vcard_mime_string ) );
 #endif
   return true;
 }
diff --git a/libkdepim/kvcarddrag.h b/libkdepim/kvcarddrag.h
index 30d8dd74..3e99a0e6 100644
--- a/libkdepim/kvcarddrag.h
+++ b/libkdepim/kvcarddrag.h
@@ -66,7 +66,7 @@ class KDE_EXPORT KVCardDrag : public QStoredDrag
     void setVCard( const TQString &content );
 #endif
     /**
-     * Returns true if the MIME source @p e contains a vcard object.
+     * Returns true if the MIME source @p e tqcontains a vcard object.
      */
     static bool canDecode( TQMimeSource *e );
 
diff --git a/libkdepim/kwidgetlister.cpp b/libkdepim/kwidgetlister.cpp
index e26b0530..13e1675b 100644
--- a/libkdepim/kwidgetlister.cpp
+++ b/libkdepim/kwidgetlister.cpp
@@ -135,7 +135,7 @@ void KWidgetLister::addWidgetAtEnd(TQWidget *w)
 
 void KWidgetLister::removeLastWidget()
 {
-  // The layout will take care that the
+  // The tqlayout will take care that the
   // widget is removed from screen, too.
   mWidgetList.removeLast();
   enableControls();
diff --git a/libkdepim/kwidgetlister.h b/libkdepim/kwidgetlister.h
index cd1ed625..19616aa1 100644
--- a/libkdepim/kwidgetlister.h
+++ b/libkdepim/kwidgetlister.h
@@ -73,19 +73,19 @@ protected slots:
   /** Called whenever the user clicks on the 'more' button.
       Reimplementations should call this method, because this
       implementation does all the dirty work with adding the widgets
-      to the layout (through @ref addWidgetAtEnd) and enabling/disabling
+      to the tqlayout (through @ref addWidgetAtEnd) and enabling/disabling
       the control buttons. */
   virtual void slotMore();
   /** Called whenever the user clicks on the 'fewer' button.
       Reimplementations should call this method, because this
       implementation does all the dirty work with removing the widgets
-      from the layout (through @ref removeLastWidget) and
+      from the tqlayout (through @ref removeLastWidget) and
       enabling/disabling the control buttons. */
   virtual void slotFewer();
   /** Called whenever the user clicks on the 'clear' button.
       Reimplementations should call this method, because this
       implementation does all the dirty work with removing all but
-      @ref mMinWidgets widgets from the layout and enabling/disabling
+      @ref mMinWidgets widgets from the tqlayout and enabling/disabling
       the control buttons. */
   virtual void slotClear();
 
@@ -115,7 +115,7 @@ protected:
   /** Because QT 2.x does not support signals/slots in template
       classes, we are forced to emulate this by forcing the
       implementers of subclasses of KWidgetLister to reimplement this
-      function which replaces the "@p new @p T" call. */
+      function which tqreplaces the "@p new @p T" call. */
   virtual TQWidget* createWidget( TQWidget *parent );
   /** Sets the number of widgets on scrren to exactly @p aNum. Doesn't
       check if @p aNum is inside the range @p
diff --git a/libkdepim/kxface.cpp b/libkdepim/kxface.cpp
index ecd24bc2..9813da7c 100644
--- a/libkdepim/kxface.cpp
+++ b/libkdepim/kxface.cpp
@@ -132,8 +132,8 @@ TQString KXFace::fromImage( const TQImage &image )
       tmp[i-1] = t;
     }
   }
-  tmp.replace( TQRegExp( "(\\w{12})" ), "\\1\n" );
-  tmp.replace( TQRegExp( "(\\w{4})" ), "0x\\1," );
+  tmp.tqreplace( TQRegExp( "(\\w{12})" ), "\\1\n" );
+  tmp.tqreplace( TQRegExp( "(\\w{4})" ), "0x\\1," );
   len = tmp.length();
   char *fbuf = (char *)malloc( len + 1 );
   strncpy( fbuf, (const char *)tmp, len );
diff --git a/libkdepim/ldapclient.cpp b/libkdepim/ldapclient.cpp
index 39d384e8..bf4f995e 100644
--- a/libkdepim/ldapclient.cpp
+++ b/libkdepim/ldapclient.cpp
@@ -49,7 +49,7 @@ static KStaticDeleter<KConfig> configDeleter;
 
 TQString LdapObject::toString() const
 {
-  TQString result = TQString::fromLatin1( "\ndn: %1\n" ).arg( dn );
+  TQString result = TQString::tqfromLatin1( "\ndn: %1\n" ).arg( dn );
   for ( LdapAttrMap::ConstIterator it = attrs.begin(); it != attrs.end(); ++it ) {
     TQString attr = it.key();
     for ( LdapAttrValue::ConstIterator it2 = (*it).begin(); it2 != (*it).end(); ++it2 ) {
@@ -575,7 +575,7 @@ void LdapSearch::makeSearchData( TQStringList& ret, LdapResultList& resList )
         // must use the correct SMTP server, by definition.
         //
         //mail = (*it1).client->base().simplifyWhiteSpace();
-        //mail.replace( ",dc=", ".", false );
+        //mail.tqreplace( ",dc=", ".", false );
         //if( mail.startsWith("dc=", false) )
         //  mail.remove(0, 3);
         //mail.prepend( '@' );
diff --git a/libkdepim/ldapsearchdialog.cpp b/libkdepim/ldapsearchdialog.cpp
index a51ccfb9..37b29f6d 100644
--- a/libkdepim/ldapsearchdialog.cpp
+++ b/libkdepim/ldapsearchdialog.cpp
@@ -137,7 +137,7 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name )
   groupBox->setFrameShape( TQGroupBox::Box );
   groupBox->setFrameShadow( TQGroupBox::Sunken );
   groupBox->setColumnLayout( 0, Qt::Vertical );
-  TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 2,
+  TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 2,
                                             5, spacingHint() );
   boxLayout->setColStretch( 1, 1 );
 
@@ -160,10 +160,10 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name )
 
   TQSize buttonSize;
   mSearchButton = new TQPushButton( i18n( "Stop" ), groupBox );
-  buttonSize = mSearchButton->sizeHint();
+  buttonSize = mSearchButton->tqsizeHint();
   mSearchButton->setText( i18n( "Search" ) );
-  if ( buttonSize.width() < mSearchButton->sizeHint().width() )
-    buttonSize = mSearchButton->sizeHint();
+  if ( buttonSize.width() < mSearchButton->tqsizeHint().width() )
+    buttonSize = mSearchButton->tqsizeHint();
   mSearchButton->setFixedWidth( buttonSize.width() );
 
   mSearchButton->setDefault( true );
@@ -186,7 +186,7 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name )
   mResultListView->setShowSortIndicator( true );
   topLayout->addWidget( mResultListView );
 
-  resize( TQSize( 600, 400).expandedTo( minimumSizeHint() ) );
+  resize( TQSize( 600, 400).expandedTo( tqminimumSizeHint() ) );
 
   setButtonText( User1, i18n( "Unselect All" ) );
   setButtonText( User2, i18n( "Select All" ) );
diff --git a/libkdepim/linklocator.cpp b/libkdepim/linklocator.cpp
index 0ea0fa68..46542f89 100644
--- a/libkdepim/linklocator.cpp
+++ b/libkdepim/linklocator.cpp
@@ -176,12 +176,12 @@ TQString LinkLocator::getEmailAddress()
 
     // determine the local part of the email address
     int start = mPos - 1;
-    while ( start >= 0 && mText[start].unicode() < 128 &&
+    while ( start >= 0 && mText[start].tqunicode() < 128 &&
             ( mText[start].isLetterOrNumber() ||
               mText[start] == '@' || // allow @ to find invalid email addresses
               allowedSpecialChars.find( mText[start] ) != -1 ) ) {
       if ( mText[start] == '@' )
-        return TQString(); // local part contains '@' -> no email address
+        return TQString(); // local part tqcontains '@' -> no email address
       --start;
     }
     ++start;
@@ -200,7 +200,7 @@ TQString LinkLocator::getEmailAddress()
               mText[end] == '.' ||
               mText[end] == '-' ) ) {
       if ( mText[end] == '@' )
-        return TQString(); // domain part contains '@' -> no email address
+        return TQString(); // domain part tqcontains '@' -> no email address
       if ( mText[end] == '.' )
         dotPos = QMIN( dotPos, end ); // remember index of first dot in domain
       ++end;
@@ -305,7 +305,7 @@ TQString LinkLocator::convertToHtml(const TQString& plainText, int flags,
           else
             hyperlink = str;
 
-          str = str.replace('&', "&amp;");
+          str = str.tqreplace('&', "&amp;");
           result += "<a href=\"" + hyperlink + "\">" + str + "</a>";
           x += locator.mPos - start;
           continue;
@@ -319,7 +319,7 @@ TQString LinkLocator::convertToHtml(const TQString& plainText, int flags,
 
           // remove the local part from the result (as '&'s have been expanded to
           // &amp; we have to take care of the 4 additional characters per '&')
-          result.truncate(result.length() - len - (localPart.contains('&')*4));
+          result.truncate(result.length() - len - (localPart.tqcontains('&')*4));
           x -= len;
 
           result += "<a href=\"mailto:" + str + "\">" + str + "</a>";
@@ -361,7 +361,7 @@ TQString LinkLocator::pngToDataUrl( const TQString & iconPath )
 
   TQByteArray ba = pngFile.readAll();
   pngFile.close();
-  return TQString::fromLatin1("data:image/png;base64,%1")
+  return TQString::tqfromLatin1("data:image/png;base64,%1")
          .arg( KCodecs::base64Encode( ba ) );
 }
 
@@ -390,11 +390,11 @@ TQString LinkLocator::getEmoticon()
     return TQString::null;
 
   const TQString smiley = mText.mid( mPos, smileyLen );
-  if ( !s_smileyEmoticonNameMap->contains( smiley ) )
+  if ( !s_smileyEmoticonNameMap->tqcontains( smiley ) )
     return TQString::null; // that's not a (known) smiley
 
   TQString htmlRep;
-  if ( s_smileyEmoticonHTMLCache->contains( smiley ) ) {
+  if ( s_smileyEmoticonHTMLCache->tqcontains( smiley ) ) {
     htmlRep = (*s_smileyEmoticonHTMLCache)[smiley];
   }
   else {
@@ -403,14 +403,14 @@ TQString LinkLocator::getEmoticon()
 #if KDE_IS_VERSION( 3, 3, 91 )
     const TQString iconPath = locate( "emoticons",
                                      EmotIcons::theme() +
-                                     TQString::fromLatin1( "/" ) +
-                                     imageName + TQString::fromLatin1(".png") );
+                                     TQString::tqfromLatin1( "/" ) +
+                                     imageName + TQString::tqfromLatin1(".png") );
 #else
     const TQString iconPath = locate( "data",
-                                     TQString::fromLatin1( "kopete/pics/emoticons/" )+
+                                     TQString::tqfromLatin1( "kopete/pics/emoticons/" )+
                                      EmotIcons::theme() +
-                                     TQString::fromLatin1( "/" ) +
-                                     imageName + TQString::fromLatin1(".png") );
+                                     TQString::tqfromLatin1( "/" ) +
+                                     imageName + TQString::tqfromLatin1(".png") );
 #endif
 
     const TQString dataUrl = pngToDataUrl( iconPath );
diff --git a/libkdepim/linklocator.h b/libkdepim/linklocator.h
index 6078fed1..618bc6c8 100644
--- a/libkdepim/linklocator.h
+++ b/libkdepim/linklocator.h
@@ -123,7 +123,7 @@ public:
    *                         - PreserveSpaces, preserves the appearance of
    *                                           sequences of space and tab
    *                                           characters in the resulting HTML.
-   *                         - ReplaceSmileys, replace text smileys with
+   *                         - ReplaceSmileys, tqreplace text smileys with
    *                                           emoticon images.
    *                         - IgnoreUrls, doesn't parse any URLs.
    *                         - HighlightText, interprets text highlighting markup
diff --git a/libkdepim/maillistdrag.cpp b/libkdepim/maillistdrag.cpp
index 434ef5ec..4f4a79bc 100644
--- a/libkdepim/maillistdrag.cpp
+++ b/libkdepim/maillistdrag.cpp
@@ -30,14 +30,14 @@
 
 using namespace KPIM;
 
-MailSummary::MailSummary( Q_UINT32 serialNumber, TQString messageId, 
+MailSummary::MailSummary( TQ_UINT32 serialNumber, TQString messageId, 
 			  TQString subject, TQString from, TQString to, 
 			  time_t date )
     : mSerialNumber( serialNumber ), mMessageId( messageId ),
       mSubject( subject ), mFrom( from ), mTo( to ), mDate( date )
 {}
 
-Q_UINT32 MailSummary::serialNumber() const 
+TQ_UINT32 MailSummary::serialNumber() const 
 { 
     return mSerialNumber; 
 }
@@ -67,7 +67,7 @@ time_t MailSummary::date()
     return mDate;
 }
 
-void MailSummary::set( Q_UINT32 serialNumber, TQString messageId, 
+void MailSummary::set( TQ_UINT32 serialNumber, TQString messageId, 
 		       TQString subject, TQString from, TQString to, time_t date )
 {
     mSerialNumber = serialNumber;
@@ -114,7 +114,7 @@ TQDataStream& operator<< ( TQDataStream &s, MailSummary &d )
 
 TQDataStream& operator>> ( TQDataStream &s, MailSummary &d )
 {
-    Q_UINT32 serialNumber;
+    TQ_UINT32 serialNumber;
     TQString messageId, subject, from, to;
     time_t date;
     s >> serialNumber;
@@ -150,7 +150,7 @@ TQDataStream& operator>> ( TQDataStream &s, MailList &mailList )
 
 bool MailListDrag::decode( TQDropEvent* e, MailList& mailList )
 {
-    TQByteArray payload = e->encodedData( MailListDrag::format() );
+    TQByteArray payload = e->tqencodedData( MailListDrag::format() );
     TQDataStream buffer( payload, IO_ReadOnly );
     if ( payload.size() ) {
 	e->accept();
@@ -221,16 +221,16 @@ bool MailListDrag::provides(const char *mimeType) const
     return TQStoredDrag::provides(mimeType);
 }
 
-TQByteArray MailListDrag::encodedData(const char *mimeType) const
+TQByteArray MailListDrag::tqencodedData(const char *mimeType) const
 {
     if (TQCString(mimeType) != "message/rfc822") {
-        return TQStoredDrag::encodedData(mimeType);
+        return TQStoredDrag::tqencodedData(mimeType);
     }
 
     TQByteArray rc; 
     if (_src) {
         MailList ml;
-        TQByteArray enc = TQStoredDrag::encodedData(format());
+        TQByteArray enc = TQStoredDrag::tqencodedData(format());
         decode(enc, ml);
 
         KProgressDialog *dlg = new KProgressDialog(0, 0, TQString::null, i18n("Retrieving and storing messages..."), true);
diff --git a/libkdepim/maillistdrag.h b/libkdepim/maillistdrag.h
index 92982189..7556cec5 100644
--- a/libkdepim/maillistdrag.h
+++ b/libkdepim/maillistdrag.h
@@ -47,16 +47,16 @@ namespace KPIM {
 class KDE_EXPORT MailSummary 
 {
 public:
-    MailSummary( Q_UINT32 serialNumber, TQString messageId, TQString subject, 
+    MailSummary( TQ_UINT32 serialNumber, TQString messageId, TQString subject, 
 		 TQString from, TQString to, time_t date );
     MailSummary() {}
     ~MailSummary() {}
 
     /*** Set fields for this mail summary  ***/
-    void set( Q_UINT32, TQString, TQString, TQString, TQString, time_t );
+    void set( TQ_UINT32, TQString, TQString, TQString, TQString, time_t );
 
     /*** KMail unique identification number ***/
-    Q_UINT32 serialNumber() const;
+    TQ_UINT32 serialNumber() const;
 
     /*** MD5 checksum of message identification string ***/
     TQString messageId();
@@ -74,7 +74,7 @@ public:
     time_t date();
 
 private:
-    Q_UINT32 mSerialNumber;
+    TQ_UINT32 mSerialNumber;
     TQString mMessageId, mSubject, mFrom, mTo;
     time_t mDate;
 };
@@ -88,7 +88,7 @@ public:
     MailTextSource() {}
     virtual ~MailTextSource() {}
 
-    virtual TQCString text(Q_UINT32 serialNumber) const = 0;
+    virtual TQCString text(TQ_UINT32 serialNumber) const = 0;
 };
 
 // Drag and drop object for mails
@@ -103,7 +103,7 @@ public:
 
     bool provides(const char *mimeType) const;
 
-    TQByteArray encodedData(const char *) const;
+    TQByteArray tqencodedData(const char *) const;
 
     /* Reset the list of mail summaries */
     void setMailList( MailList );
diff --git a/libkdepim/overlaywidget.cpp b/libkdepim/overlaywidget.cpp
index 2e6f703c..1369009f 100644
--- a/libkdepim/overlaywidget.cpp
+++ b/libkdepim/overlaywidget.cpp
@@ -51,9 +51,9 @@ void OverlayWidget::reposition()
   p.setX( mAlignWidget->width() - width() );
   p.setY( -height() );
   // Position in the toplevelwidget's coordinates
-  TQPoint pTopLevel = mAlignWidget->mapTo( topLevelWidget(), p );
-  // Position in the widget's parentWidget coordinates
-  TQPoint pParent = parentWidget()->mapFrom( topLevelWidget(), pTopLevel );
+  TQPoint pTopLevel = mAlignWidget->mapTo( tqtopLevelWidget(), p );
+  // Position in the widget's tqparentWidget coordinates
+  TQPoint pParent = tqparentWidget()->mapFrom( tqtopLevelWidget(), pTopLevel );
   // Move 'this' to that position.
   move( pParent );
 }
diff --git a/libkdepim/overlaywidget.h b/libkdepim/overlaywidget.h
index d0aed33a..b9918468 100644
--- a/libkdepim/overlaywidget.h
+++ b/libkdepim/overlaywidget.h
@@ -35,11 +35,11 @@
 namespace KPIM {
 
 /**
- * This is a widget that can align itself with another one, without using a layout,
+ * This is a widget that can align itself with another one, without using a tqlayout,
  * so that it can actually be on top of other widgets.
- * Currently the only supported type of alignment is "right aligned, on top of the other widget".
+ * Currently the only supported type of tqalignment is "right aligned, on top of the other widget".
  *
- * OverlayWidget inherits TQHBox for convenience purposes (layout, and frame)
+ * OverlayWidget inherits TQHBox for convenience purposes (tqlayout, and frame)
  */
 class OverlayWidget : public QHBox
 {
diff --git a/libkdepim/pluginloaderbase.cpp b/libkdepim/pluginloaderbase.cpp
index 40a4beb2..9be0ffd0 100644
--- a/libkdepim/pluginloaderbase.cpp
+++ b/libkdepim/pluginloaderbase.cpp
@@ -58,7 +58,7 @@ namespace KPIM {
   }
 
   const PluginMetaData * PluginLoaderBase::infoForName( const TQString & type ) const {
-    return mPluginMap.contains( type ) ? &(mPluginMap[type]) : 0 ;
+    return mPluginMap.tqcontains( type ) ? &(mPluginMap[type]) : 0 ;
   }
 
 
@@ -114,7 +114,7 @@ namespace KPIM {
 
   void * PluginLoaderBase::mainFunc( const TQString & type,
 				     const char * mf_name ) const {
-    if ( type.isEmpty() || !mPluginMap.contains( type ) )
+    if ( type.isEmpty() || !mPluginMap.tqcontains( type ) )
       return 0;
 
     const TQString libName = mPluginMap[ type ].library;
diff --git a/libkdepim/progressdialog.cpp b/libkdepim/progressdialog.cpp
index 227e7376..8c0ab889 100644
--- a/libkdepim/progressdialog.cpp
+++ b/libkdepim/progressdialog.cpp
@@ -84,34 +84,34 @@ void TransactionItemView::resizeContents( int w, int h )
   // (handling of TQEvent::LayoutHint in TQScrollView calls this method)
   //kdDebug(5300) << k_funcinfo << w << "," << h << endl;
   TQScrollView::resizeContents( w, h );
-  // Tell the layout in the parent (progressdialog) that our size changed
+  // Tell the tqlayout in the parent (progressdialog) that our size changed
   updateGeometry();
   // Resize the parent (progressdialog) - this works but resize horizontally too often
-  //parentWidget()->adjustSize();
+  //tqparentWidget()->adjustSize();
 
   TQApplication::sendPostedEvents( 0, TQEvent::ChildInserted );
   TQApplication::sendPostedEvents( 0, TQEvent::LayoutHint );
-  TQSize sz = parentWidget()->sizeHint();
-  int currentWidth = parentWidget()->width();
+  TQSize sz = tqparentWidget()->tqsizeHint();
+  int currentWidth = tqparentWidget()->width();
   // Don't resize to sz.width() every time when it only reduces a little bit
   if ( currentWidth < sz.width() || currentWidth > sz.width() + 100 )
     currentWidth = sz.width();
-  parentWidget()->resize( currentWidth, sz.height() );
+  tqparentWidget()->resize( currentWidth, sz.height() );
 }
 
-TQSize TransactionItemView::sizeHint() const
+TQSize TransactionItemView::tqsizeHint() const
 {
-  return minimumSizeHint();
+  return tqminimumSizeHint();
 }
 
-TQSize TransactionItemView::minimumSizeHint() const
+TQSize TransactionItemView::tqminimumSizeHint() const
 {
   int f = 2 * frameWidth();
   // Make room for a vertical scrollbar in all cases, to avoid a horizontal one
-  int vsbExt = verticalScrollBar()->sizeHint().width();
-  int minw = topLevelWidget()->width() / 3;
-  int maxh = topLevelWidget()->height() / 2;
-  TQSize sz( mBigBox->minimumSizeHint() );
+  int vsbExt = verticalScrollBar()->tqsizeHint().width();
+  int minw = tqtopLevelWidget()->width() / 3;
+  int maxh = tqtopLevelWidget()->height() / 2;
+  TQSize sz( mBigBox->tqminimumSizeHint() );
   sz.setWidth( QMAX( sz.width(), minw ) + f + vsbExt );
   sz.setHeight( QMIN( sz.height(), maxh ) + f );
   return sz;
@@ -146,7 +146,7 @@ TransactionItem::TransactionItem( TQWidget* parent,
 {
   setSpacing( 2 );
   setMargin( 2 );
-  setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+  tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
 
   mFrame = new TQFrame( this );
   mFrame->setFrameShape( TQFrame::HLine );
@@ -160,8 +160,8 @@ TransactionItem::TransactionItem( TQWidget* parent,
   mItemLabel = new TQLabel( item->label(), h );
   // always interpret the label text as RichText, but disable word wrapping
   mItemLabel->setTextFormat( Qt::RichText );
-  mItemLabel->setAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::SingleLine );
-  h->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+  mItemLabel->tqsetAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::SingleLine );
+  h->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
 
   mProgress = new TQProgressBar( 100, h );
   mProgress->setProgress( item->progress() );
@@ -175,17 +175,17 @@ TransactionItem::TransactionItem( TQWidget* parent,
 
   h = new TQHBox( this );
   h->setSpacing( 5 );
-  h->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+  h->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
   mSSLLabel = new SSLLabel( h );
-  mSSLLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mSSLLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
   mItemStatus = new TQLabel( item->status(), h );
   // always interpret the status text as RichText, but disable word wrapping
   mItemStatus->setTextFormat( Qt::RichText );
-  mItemStatus->setAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::SingleLine );
-  // richtext leads to sizeHint acting as if wrapping was enabled though,
+  mItemStatus->tqsetAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::SingleLine );
+  // richtext leads to tqsizeHint acting as if wrapping was enabled though,
   // so make sure we only ever have the height of one line.
-  mItemStatus->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) );
-  mItemStatus->setFixedHeight( mItemLabel->sizeHint().height() );
+  mItemStatus->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) );
+  mItemStatus->setFixedHeight( mItemLabel->tqsizeHint().height() );
   setCrypto( item->usesCrypto() );
   if( first ) hideHLine();
 }
@@ -209,7 +209,7 @@ void TransactionItem::setLabel( const TQString& label )
   mItemLabel->setText( label );
 }
 
-void TransactionItem::setStatus( const TQString& status )
+void TransactionItem::seStatus( const TQString& status )
 {
   mItemStatus->setText( status );
 }
@@ -258,7 +258,7 @@ ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const c
     TQVBox* rightBox = new TQVBox( this );
     TQToolButton* pbClose = new TQToolButton( rightBox );
     pbClose->setAutoRaise(true);
-    pbClose->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+    pbClose->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
     pbClose->setFixedSize( 16, 16 );
     pbClose->setIconSet( KGlobal::iconLoader()->loadIconSet( "fileclose", KIcon::Small, 14 ) );
     TQToolTip::add( pbClose, i18n( "Hide detailed progress window" ) );
@@ -309,7 +309,7 @@ void ProgressDialog::slotTransactionAdded( ProgressItem *item )
 {
    TransactionItem *parent = 0;
    if ( item->parent() ) {
-     if ( mTransactionsToListviewItems.contains( item->parent() ) ) {
+     if ( mTransactionsToListviewItems.tqcontains( item->parent() ) ) {
        parent = mTransactionsToListviewItems[ item->parent() ];
        parent->addSubTransaction( item );
      }
@@ -317,7 +317,7 @@ void ProgressDialog::slotTransactionAdded( ProgressItem *item )
      const bool first = mTransactionsToListviewItems.empty();
      TransactionItem *ti = mScrollView->addTransactionItem( item, first );
      if ( ti )
-       mTransactionsToListviewItems.replace( item, ti );
+       mTransactionsToListviewItems.tqreplace( item, ti );
      if ( first && mWasLastShown )
        TQTimer::singleShot( 1000, this, TQT_SLOT( slotShow() ) );
 
@@ -326,7 +326,7 @@ void ProgressDialog::slotTransactionAdded( ProgressItem *item )
 
 void ProgressDialog::slotTransactionCompleted( ProgressItem *item )
 {
-   if ( mTransactionsToListviewItems.contains( item ) ) {
+   if ( mTransactionsToListviewItems.tqcontains( item ) ) {
      TransactionItem *ti = mTransactionsToListviewItems[ item ];
      mTransactionsToListviewItems.remove( item );
      ti->setItemComplete();
@@ -347,7 +347,7 @@ void ProgressDialog::slotTransactionCanceled( ProgressItem* )
 void ProgressDialog::slotTransactionProgress( ProgressItem *item,
                                               unsigned int progress )
 {
-   if ( mTransactionsToListviewItems.contains( item ) ) {
+   if ( mTransactionsToListviewItems.tqcontains( item ) ) {
      TransactionItem *ti = mTransactionsToListviewItems[ item ];
      ti->setProgress( progress );
    }
@@ -356,16 +356,16 @@ void ProgressDialog::slotTransactionProgress( ProgressItem *item,
 void ProgressDialog::slotTransactionStatus( ProgressItem *item,
                                             const TQString& status )
 {
-   if ( mTransactionsToListviewItems.contains( item ) ) {
+   if ( mTransactionsToListviewItems.tqcontains( item ) ) {
      TransactionItem *ti = mTransactionsToListviewItems[ item ];
-     ti->setStatus( status );
+     ti->seStatus( status );
    }
 }
 
 void ProgressDialog::slotTransactionLabel( ProgressItem *item,
                                            const TQString& label )
 {
-   if ( mTransactionsToListviewItems.contains( item ) ) {
+   if ( mTransactionsToListviewItems.tqcontains( item ) ) {
      TransactionItem *ti = mTransactionsToListviewItems[ item ];
      ti->setLabel( label );
    }
@@ -375,7 +375,7 @@ void ProgressDialog::slotTransactionLabel( ProgressItem *item,
 void ProgressDialog::slotTransactionUsesCrypto( ProgressItem *item,
                                                 bool value )
 {
-   if ( mTransactionsToListviewItems.contains( item ) ) {
+   if ( mTransactionsToListviewItems.tqcontains( item ) ) {
      TransactionItem *ti = mTransactionsToListviewItems[ item ];
      ti->setCrypto( value );
    }
@@ -383,7 +383,7 @@ void ProgressDialog::slotTransactionUsesCrypto( ProgressItem *item,
 
 void ProgressDialog::slotTransactionUsesBusyIndicator( KPIM::ProgressItem *item, bool value )
 {
-  if ( mTransactionsToListviewItems.contains( item ) ) {
+  if ( mTransactionsToListviewItems.tqcontains( item ) ) {
      TransactionItem *ti = mTransactionsToListviewItems[ item ];
      if ( value )
        ti->setTotalSteps( 0 );
diff --git a/libkdepim/progressdialog.h b/libkdepim/progressdialog.h
index cabcb69a..b9a29e4b 100644
--- a/libkdepim/progressdialog.h
+++ b/libkdepim/progressdialog.h
@@ -62,8 +62,8 @@ public:
   TransactionItem* addTransactionItem( ProgressItem *item, bool first );
 
 
-  TQSize sizeHint() const;
-  TQSize minimumSizeHint() const;
+  TQSize tqsizeHint() const;
+  TQSize tqminimumSizeHint() const;
 public slots:
   void slotLayoutFirstItem();
 
@@ -88,7 +88,7 @@ public:
 
   void setProgress( int progress );
   void setLabel( const TQString& );
-  void setStatus( const TQString& );
+  void seStatus( const TQString& );
   void setCrypto( bool );
   void setTotalSteps( int totalSteps );
 
diff --git a/libkdepim/progressmanager.cpp b/libkdepim/progressmanager.cpp
index 2e5f4d6e..740e6c12 100644
--- a/libkdepim/progressmanager.cpp
+++ b/libkdepim/progressmanager.cpp
@@ -66,7 +66,7 @@ void ProgressItem::setComplete()
 
 void ProgressItem::addChild( ProgressItem *kiddo )
 {
-  mChildren.replace( kiddo, true );
+  mChildren.tqreplace( kiddo, true );
 }
 
 void ProgressItem::removeChild( ProgressItem *kiddo )
@@ -93,7 +93,7 @@ void ProgressItem::cancel()
      if ( kid->canBeCanceled() )
        kid->cancel();
    }
-   setStatus( i18n( "Aborting..." ) );
+   seStatus( i18n( "Aborting..." ) );
    emit progressItemCanceled( this );
 }
 
@@ -111,7 +111,7 @@ void ProgressItem::setLabel( const TQString& v )
   emit progressItemLabel( this, mLabel );
 }
 
-void ProgressItem::setStatus( const TQString& v )
+void ProgressItem::seStatus( const TQString& v )
 {
   mStatus = v;
   emit progressItemStatus( this, mStatus );
diff --git a/libkdepim/progressmanager.h b/libkdepim/progressmanager.h
index bf284271..47409002 100644
--- a/libkdepim/progressmanager.h
+++ b/libkdepim/progressmanager.h
@@ -75,7 +75,7 @@ class KDE_EXPORT ProgressItem : public QObject
      * @p v will be interpreted as rich text, so it might have to be escaped.
      * @param v The status string.
      */
-    void setStatus( const TQString& v );
+    void seStatus( const TQString& v );
 
     /**
      * @return Whether this item can be cancelled.
@@ -131,7 +131,7 @@ class KDE_EXPORT ProgressItem : public QObject
      * Reset the progress value of this item to 0 and the status string to
      * the empty string.
      */
-    void reset() { setProgress( 0 ); setStatus( TQString::null ); mCompleted = 0; }
+    void reset() { setProgress( 0 ); seStatus( TQString::null ); mCompleted = 0; }
 
     void cancel();
 
@@ -358,7 +358,7 @@ class KDE_EXPORT ProgressManager : public QObject
      * @return the only top level progressitem when there's only one.
      * Returns 0 if there is no item, or more than one top level item.
      * Since this is used to calculate the overall progress, it will also return
-     * 0 if there is an item which uses a busy indicator, since that will invalidate
+     * 0 if there is an item which uses a busy indicator, since that will tqinvalidate
      * the overall progress.
      */
     ProgressItem* singleItem() const;
diff --git a/libkdepim/qutf7codec.cpp b/libkdepim/qutf7codec.cpp
index 11c0db92..bbee2d8c 100644
--- a/libkdepim/qutf7codec.cpp
+++ b/libkdepim/qutf7codec.cpp
@@ -18,7 +18,7 @@
   with any version of Qt by TrollTech AS, Norway. In this case, the
   use of this plugin doesn't cause the resulting executable to be
   covered by the GNU General Public License.
-  This exception does not however invalidate any other reasons why the
+  This exception does not however tqinvalidate any other reasons why the
   executable file might be covered by the GNU General Public License.
 */
 
@@ -137,10 +137,10 @@ int QUtf7Codec::heuristicContentMatch(const char* chars, int len) const
 }
 
 class QUtf7Decoder : public TQTextDecoder {
-  // the storage for our unicode char until it's finished
+  // the storage for our tqunicode char until it's finished
   ushort uc;
   // the state of the base64 decoding
-  // can be 0 (just finished three unicode chars)
+  // can be 0 (just finished three tqunicode chars)
   //        1 (have the upper  6 bits of uc already)
   //        2 (have the upper 12 bits of uc already)
   //        3 (have the upper  2 bits of uc already)
@@ -148,7 +148,7 @@ class QUtf7Decoder : public TQTextDecoder {
   //        7 (have the upper 10 bits of uc already)
   //   =>   n (have the upper (n * 6) % 16 bits of uc already)
   // "stepNo" cycles through all it's values every three
-  // unicode chars.
+  // tqunicode chars.
   char stepNo;
   // remembers if we are in shifted-sequence mode
   bool shifted;
@@ -183,7 +183,7 @@ public:
 	qWarning("QUtf7Decoder: 8bit char found in input. "
 		 "Parser has been re-initialized!");
 	resetParser();
-	result += TQChar::replacement;
+	result += TQChar::tqreplacement;
 	continue;
       }
 
@@ -374,8 +374,8 @@ private:
 	// if mayContinue, this char has already been written
 	*t++ = toBase64( outbits | ( u >> 14 ) );
       }
-      *t++ = toBase64( (u & 0x3F00 /* mask top 2 bits */ ) >> 8 );
-      *t++ = toBase64( (u & 0x00FC /* mask msbyte */ ) >> 2 );
+      *t++ = toBase64( (u & 0x3F00 /* tqmask top 2 bits */ ) >> 8 );
+      *t++ = toBase64( (u & 0x00FC /* tqmask msbyte */ ) >> 2 );
       // save 2 lowest-significant bits in outbits[5..4]
       outbits = (u & 0x0003) << 4;
       break;
@@ -462,7 +462,7 @@ public:
 #endif
 
     // source and destination cursor
-    const TQChar * s = uc.unicode();
+    const TQChar * s = uc.tqunicode();
     TQCString::Iterator t = result.data();
 
     if ( uc.isNull() ) {
@@ -473,7 +473,7 @@ public:
       // normal operation:
       for (int i = 0 ; i < len_in_out ;
 	   i++/*, checkOutBuf(result,maxreslen,t,i,len_in_out,5)*/ ) {
-	ushort ch = s[i].unicode();
+	ushort ch = s[i].tqunicode();
 	
 	//
 	// first, we check whether we might get around encoding:
diff --git a/libkdepim/qutf7codec.h b/libkdepim/qutf7codec.h
index 675692af..116fa02a 100644
--- a/libkdepim/qutf7codec.h
+++ b/libkdepim/qutf7codec.h
@@ -18,7 +18,7 @@
   with any version of Qt by TrollTech AS, Norway. In this case, the
   use of this plugin doesn't cause the resulting executable to be
   covered by the GNU General Public License.
-  This exception does not however invalidate any other reasons why the
+  This exception does not however tqinvalidate any other reasons why the
   executable file might be covered by the GNU General Public License.
 */
 
diff --git a/libkdepim/qutf7codecplugin.cpp b/libkdepim/qutf7codecplugin.cpp
index e6dcf7c6..27b70682 100644
--- a/libkdepim/qutf7codecplugin.cpp
+++ b/libkdepim/qutf7codecplugin.cpp
@@ -18,7 +18,7 @@
   with any version of Qt by TrollTech AS, Norway. In this case, the
   use of this plugin doesn't cause the resulting executable to be
   covered by the GNU General Public License.
-  This exception does not however invalidate any other reasons why the
+  This exception does not however tqinvalidate any other reasons why the
   executable file might be covered by the GNU General Public License.
 */
 
diff --git a/libkdepim/recentaddresses.cpp b/libkdepim/recentaddresses.cpp
index a8e7e76b..80fe3912 100644
--- a/libkdepim/recentaddresses.cpp
+++ b/libkdepim/recentaddresses.cpp
@@ -162,11 +162,11 @@ RecentAddressDialog::RecentAddressDialog( TQWidget *parent, const char *name )
                  parent, name, true )
 {
   TQWidget *page = plainPage();
-  TQVBoxLayout *layout = new TQVBoxLayout( page, 0, spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( page, 0, spacingHint() );
 
   mEditor = new KEditListBox( i18n( "Recent Addresses" ), page, "", false,
                               KEditListBox::Add | KEditListBox::Remove );
-  layout->addWidget( mEditor );
+  tqlayout->addWidget( mEditor );
 }
 
 void RecentAddressDialog::setAddresses( const TQStringList &addrs )
diff --git a/libkdepim/sendsmsdialog.cpp b/libkdepim/sendsmsdialog.cpp
index 93671a34..7011c712 100644
--- a/libkdepim/sendsmsdialog.cpp
+++ b/libkdepim/sendsmsdialog.cpp
@@ -32,19 +32,19 @@ SendSMSDialog::SendSMSDialog( const TQString &recipientName, TQWidget *parent, c
 {
   TQWidget *page = plainPage();
 
-  TQGridLayout *layout = new TQGridLayout( page, 3, 3, marginHint(), spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( page, 3, 3, marginHint(), spacingHint() );
 
-  layout->addWidget( new TQLabel( i18n( "Message" ), page ), 0, 0 );
+  tqlayout->addWidget( new TQLabel( i18n( "Message" ), page ), 0, 0 );
 
   mMessageLength = new TQLabel( "0/160", page );
-  mMessageLength->setAlignment( Qt::AlignRight );
-  layout->addWidget( mMessageLength, 0, 2 );
+  mMessageLength->tqsetAlignment( Qt::AlignRight );
+  tqlayout->addWidget( mMessageLength, 0, 2 );
 
   mText = new TQTextEdit( page );
-  layout->addMultiCellWidget( mText, 1, 1, 0, 2 );
+  tqlayout->addMultiCellWidget( mText, 1, 1, 0, 2 );
 
-  layout->addWidget( new TQLabel( i18n( "Recipient:" ), page ), 2, 0 );
-  layout->addWidget( new TQLabel( recipientName, page ), 2, 2 );
+  tqlayout->addWidget( new TQLabel( i18n( "Recipient:" ), page ), 2, 0 );
+  tqlayout->addWidget( new TQLabel( recipientName, page ), 2, 2 );
 
   setButtonText( Ok, i18n( "Send" ) );
 
diff --git a/libkdepim/spellingfilter.cpp b/libkdepim/spellingfilter.cpp
index cc94968d..e57745e5 100644
--- a/libkdepim/spellingfilter.cpp
+++ b/libkdepim/spellingfilter.cpp
@@ -89,7 +89,7 @@ void SpellingFilter::TextCensor::censorQuotations(const TQString& quotePrefix)
       int len = mPos - start;
       TQString spaces;
       spaces.fill(' ', len);
-      mText.replace(start, len, spaces);
+      mText.tqreplace(start, len, spaces);
 
       //kdDebug(5006) << "censored quotation ["
       //  << start << ", " << mPos << ")" << endl;
@@ -116,7 +116,7 @@ void SpellingFilter::TextCensor::censorUrls()
 
       // Replace url with spaces
       url.fill(' ');
-      mText.replace(start, url.length(), url);
+      mText.tqreplace(start, url.length(), url);
 
       //kdDebug(5006) << "censored url ["
       //  << start << ", " << mPos << ")" << endl;
@@ -141,7 +141,7 @@ void SpellingFilter::TextCensor::censorEmailAddresses()
 
         // Replace address with spaces
         address.fill(' ');
-        mText.replace(start, address.length(), address);
+        mText.tqreplace(start, address.length(), address);
 
         //kdDebug(5006) << "censored addr ["
         //  << start << ", "<< mPos << ")" << endl;
@@ -162,7 +162,7 @@ void SpellingFilter::TextCensor::censorString(const TQString& s)
       // Replace string with spaces
       TQString spaces;
       spaces.fill(' ', s.length());
-      mText.replace(mPos, s.length(), spaces);
+      mText.tqreplace(mPos, s.length(), spaces);
       mPos += s.length();
 
       //kdDebug(5006) << "censored string ["
diff --git a/libkdepim/statusbarprogresswidget.cpp b/libkdepim/statusbarprogresswidget.cpp
index a7b240ea..16637663 100644
--- a/libkdepim/statusbarprogresswidget.cpp
+++ b/libkdepim/statusbarprogresswidget.cpp
@@ -67,7 +67,7 @@ StatusbarProgressWidget::StatusbarProgressWidget( ProgressDialog* progressDialog
   box = new TQHBoxLayout( this, 0, 0 );
 
   m_pButton = new TQPushButton( this );
-  m_pButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
+  m_pButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
                                          TQSizePolicy::Minimum ) );
   m_pButton->setPixmap( SmallIcon( "up" ) );
   box->addWidget( m_pButton  );
@@ -88,12 +88,12 @@ StatusbarProgressWidget::StatusbarProgressWidget( ProgressDialog* progressDialog
   stack->addWidget( m_pProgressBar, 1 );
 
   m_pLabel = new TQLabel( TQString::null, this );
-  m_pLabel->setAlignment( AlignHCenter | AlignVCenter );
+  m_pLabel->tqsetAlignment( AlignHCenter | AlignVCenter );
   m_pLabel->installEventFilter( this );
   m_pLabel->setMinimumWidth( w );
   stack->addWidget( m_pLabel, 2 );
   m_pButton->setMaximumHeight( fontMetrics().height() );
-  setMinimumWidth( minimumSizeHint().width() );
+  setMinimumWidth( tqminimumSizeHint().width() );
 
   mode = None;
   setMode();
diff --git a/libkdepim/tests/test_kregexp.cpp b/libkdepim/tests/test_kregexp.cpp
index a44e3be0..0644bbba 100644
--- a/libkdepim/tests/test_kregexp.cpp
+++ b/libkdepim/tests/test_kregexp.cpp
@@ -9,8 +9,8 @@ main()
 
   // test for http://bugs.kde.org/show_bug.cgi?id=54886
   KRegExp3 reg("^");
-  TQString res = reg.replace(TQString::fromLatin1("Fun stuff"),
-			    TQString::fromLatin1("[fun] "));
+  TQString res = reg.tqreplace(TQString::tqfromLatin1("Fun stuff"),
+			    TQString::tqfromLatin1("[fun] "));
   kdDebug() << res << endl;
 
 }
diff --git a/libkdepim/tests/testdateedit.cpp b/libkdepim/tests/testdateedit.cpp
index 993967cb..e0d1d732 100644
--- a/libkdepim/tests/testdateedit.cpp
+++ b/libkdepim/tests/testdateedit.cpp
@@ -34,10 +34,10 @@
 DateEdit::DateEdit( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
   
   KDateEdit *edit = new KDateEdit( this );
-  layout->addWidget( edit );
+  tqlayout->addWidget( edit );
 
   connect( edit, TQT_SIGNAL( dateChanged( const TQDate& ) ),
            this, TQT_SLOT( dateChanged( const TQDate& ) ) );
diff --git a/libkdepim/tests/testutf7encoder.cpp b/libkdepim/tests/testutf7encoder.cpp
index 925bab21..04ed8f70 100644
--- a/libkdepim/tests/testutf7encoder.cpp
+++ b/libkdepim/tests/testutf7encoder.cpp
@@ -9,7 +9,7 @@ void main( int argc, char * argv[] ) {
 
     TQTextEncoder * enc;
 
-    TQString arg = TQString::fromLatin1( argv[1] );
+    TQString arg = TQString::tqfromLatin1( argv[1] );
     int len;
 
     cout << "Original string:\n"
diff --git a/libkholidays/parseholiday.c b/libkholidays/parseholiday.c
index c215515e..c78d3605 100644
--- a/libkholidays/parseholiday.c
+++ b/libkholidays/parseholiday.c
@@ -20,7 +20,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
-/* As a special exception, you may create a larger work that contains
+/* As a special exception, you may create a larger work that tqcontains
    part or all of the Bison parser skeleton and distribute that work
    under terms of your choice, so long as that work isn't itself a
    parser generator using the skeleton or a modified version thereof
@@ -1127,7 +1127,7 @@ yystpcpy (yydest, yysrc)
 /* Copy to YYRES the contents of YYSTR after stripping away unnecessary
    quotes and backslashes, so that it's suitable for yyerror.  The
    heuristic is that double-quoting is unnecessary unless the string
-   contains an apostrophe, a comma, or backslash (other than
+   tqcontains an apostrophe, a comma, or backslash (other than
    backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
    null, do not copy; instead, return the length of what the result
    would have been.  */
diff --git a/libkholidays/parseholiday.h b/libkholidays/parseholiday.h
index 709aa567..3802c4d5 100644
--- a/libkholidays/parseholiday.h
+++ b/libkholidays/parseholiday.h
@@ -20,7 +20,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
-/* As a special exception, you may create a larger work that contains
+/* As a special exception, you may create a larger work that tqcontains
    part or all of the Bison parser skeleton and distribute that work
    under terms of your choice, so long as that work isn't itself a
    parser generator using the skeleton or a modified version thereof
diff --git a/libkmime/boolflags.cpp b/libkmime/boolflags.cpp
index 2110acbd..a9ba7a9f 100644
--- a/libkmime/boolflags.cpp
+++ b/libkmime/boolflags.cpp
@@ -20,7 +20,7 @@ void BoolFlags::set(unsigned int i, bool b)
 {
   if(i>15) return;
 
-  unsigned char p; //bitmask
+  unsigned char p; //bitqmask
   int n;
 
   if(i<8) { //first byte
@@ -43,7 +43,7 @@ bool BoolFlags::get(unsigned int i)
 {
   if(i>15) return false;
 
-  unsigned char p; //bitmask
+  unsigned char p; //bitqmask
   int n;
 
   if(i<8) { //first byte
diff --git a/libkmime/kmime_charfreq.cpp b/libkmime/kmime_charfreq.cpp
index fa496b99..a75d7685 100644
--- a/libkmime/kmime_charfreq.cpp
+++ b/libkmime/kmime_charfreq.cpp
@@ -77,7 +77,7 @@ void CharFreq::count( const char * it, size_t len ) {
       break;
     case 'F': // check for lines starting with From_ if not found already:
       if ( !mLeadingFrom )
-	if ( prevChar == '\n' && end - it >= 5 && !qstrncmp( "From ", it, 5 ) )
+	if ( prevChar == '\n' && end - it >= 5 && !tqstrncmp( "From ", it, 5 ) )
 	  mLeadingFrom = true;
       ++printable;
       break;
diff --git a/libkmime/kmime_charfreq.h b/libkmime/kmime_charfreq.h
index e85e063b..8f2c8bda 100644
--- a/libkmime/kmime_charfreq.h
+++ b/libkmime/kmime_charfreq.h
@@ -37,7 +37,7 @@ public:
   /** Returns true if buf has trailing whitespace, i.e. if any line ends
       with space (' ') or tab ('\t'). */
   bool hasTrailingWhitespace() const;
-  /** Returns true if buf contains a line that starts with "From ". */
+  /** Returns true if buf tqcontains a line that starts with "From ". */
   bool hasLeadingFrom() const;
   /** Returns the percentage of printable characters: printable/total.
       If total == 0, the result is undefined. */
diff --git a/libkmime/kmime_codecs.h b/libkmime/kmime_codecs.h
index 3ff0c4a4..211867bc 100644
--- a/libkmime/kmime_codecs.h
+++ b/libkmime/kmime_codecs.h
@@ -87,7 +87,7 @@ public:
    * This function doesn't support chaining of blocks. The returned
    * block cannot be added to, but you don't need to finalize it, too.
    *
-   * Example usage (@p in contains the input data):
+   * Example usage (@p in tqcontains the input data):
    * <pre>
    * KMime::Codec * codec = KMime::Codec::codecForName( "base64" );
    * kdFatal( !codec ) << "no base64 codec found!?" << endl;
@@ -123,7 +123,7 @@ public:
    * This function doesn't support chaining of blocks. The returned
    * block cannot be added to, but you don't need to finalize it, too.
    *
-   * Example usage (@p in contains the input data):
+   * Example usage (@p in tqcontains the input data):
    * <pre>
    * KMime::Codec * codec = KMime::Codec::codecForName( "base64" );
    * kdFatal( !codec ) << "no base64 codec found!?" << endl;
@@ -230,7 +230,7 @@ public:
  * the output and then delete the decoder instance. If you want to
  * process another input block sequence, you create a new instance.
  *
- * Typical usage (@p in contains the (base64-encoded) input data),
+ * Typical usage (@p in tqcontains the (base64-encoded) input data),
  * taking into account all the conventions detailed above:
  *
  * <pre>
diff --git a/libkmime/kmime_content.cpp b/libkmime/kmime_content.cpp
index 6eca383f..b6b6229f 100644
--- a/libkmime/kmime_content.cpp
+++ b/libkmime/kmime_content.cpp
@@ -313,9 +313,9 @@ TQCString Content::encodedContent(bool useCrLf)
 
     // add proper mime headers...
     if (convertNonMimeBinaries) {
-      h_ead.replace(TQRegExp("MIME-Version: .*\\n"),"");
-      h_ead.replace(TQRegExp("Content-Type: .*\\n"),"");
-      h_ead.replace(TQRegExp("Content-Transfer-Encoding: .*\\n"),"");
+      h_ead.tqreplace(TQRegExp("MIME-Version: .*\\n"),"");
+      h_ead.tqreplace(TQRegExp("Content-Type: .*\\n"),"");
+      h_ead.tqreplace(TQRegExp("Content-Transfer-Encoding: .*\\n"),"");
       h_ead+="MIME-Version: 1.0\n";
       h_ead+=contentType(true)->as7BitString()+"\n";
       h_ead+=contentTransferEncoding(true)->as7BitString()+"\n";
@@ -327,7 +327,7 @@ TQCString Content::encodedContent(bool useCrLf)
   e+="\n";
 
   //body
-  if(!b_ody.isEmpty()) { //this message contains only one part
+  if(!b_ody.isEmpty()) { //this message tqcontains only one part
     Headers::CTEncoding *enc=contentTransferEncoding();
 
     if(enc->needToEncode()) {
@@ -439,25 +439,25 @@ void Content::decodedText(TQStringList &l, bool trimText,
   if(!decodeText()) //this is not a text content !!
     return;
 
-  TQString unicode;
+  TQString tqunicode;
   bool ok=true;
 
   TQTextCodec *codec=KGlobal::charsets()->codecForName(contentType()->charset(),ok);
 
-  unicode=codec->toUnicode(b_ody.data(), b_ody.length());
+  tqunicode=codec->toUnicode(b_ody.data(), b_ody.length());
 
   if (trimText && removeTrailingNewlines) {
     int i;
-    for (i=unicode.length()-1; i>=0; i--)
-      if (!unicode[i].isSpace())
+    for (i=tqunicode.length()-1; i>=0; i--)
+      if (!tqunicode[i].isSpace())
         break;
-    unicode.truncate(i+1);
+    tqunicode.truncate(i+1);
   } else {
-    if (unicode.right(1)=="\n")
-      unicode.truncate(unicode.length()-1);    // remove trailing new-line
+    if (tqunicode.right(1)=="\n")
+      tqunicode.truncate(tqunicode.length()-1);    // remove trailing new-line
   }
 
-  l=TQStringList::split('\n', unicode, true); //split the string at linebreaks
+  l=TQStringList::split('\n', tqunicode, true); //split the string at linebreaks
 }
 
 
@@ -630,7 +630,7 @@ void Content::changeEncoding(Headers::contentEncoding e)
 
   if(decodeText())
     enc->setCte(e); // text is not encoded until it's sent or saved so we just set the new encoding
-  else { // this content contains non textual data, that has to be re-encoded
+  else { // this content tqcontains non textual data, that has to be re-encoded
 
     if(e!=Headers::CEbase64) {
       //kdWarning(5003) << "Content::changeEncoding() : non textual data and encoding != base64 - this should not happen\n => forcing base64" << endl;
@@ -652,7 +652,7 @@ void Content::toStream(TQTextStream &ts, bool scrambleFromLines)
   TQCString ret=encodedContent(false);
 
   if (scrambleFromLines)
-    ret.replace(TQRegExp("\\n\\nFrom "), "\n\n>From ");
+    ret.tqreplace(TQRegExp("\\n\\nFrom "), "\n\n>From ");
 
   ts << ret;
 }
@@ -684,7 +684,7 @@ Headers::Generic*  Content::getNextHeader(TQCString &head)
     if (!folded)
       header = new Headers::Generic(head.left(pos1-2), this, head.mid(pos1, pos2-pos1));
     else
-      header = new Headers::Generic(head.left(pos1-2), this, head.mid(pos1, pos2-pos1).replace(TQRegExp("\\s*\\n\\s*")," "));
+      header = new Headers::Generic(head.left(pos1-2), this, head.mid(pos1, pos2-pos1).tqreplace(TQRegExp("\\s*\\n\\s*")," "));
 
     head.remove(0,pos2+1);
   }
@@ -816,8 +816,8 @@ int Content::lineCount()
 {
   int ret=0;
   if(type()==ATmimeContent)
-    ret+=h_ead.contains('\n');
-  ret+=b_ody.contains('\n');
+    ret+=h_ead.tqcontains('\n');
+  ret+=b_ody.tqcontains('\n');
 
   if(c_ontents && !c_ontents->isEmpty())
     for(Content *c=c_ontents->first(); c; c=c_ontents->next())
diff --git a/libkmime/kmime_content.h b/libkmime/kmime_content.h
index 1d2aac2d..8c828500 100644
--- a/libkmime/kmime_content.h
+++ b/libkmime/kmime_content.h
@@ -35,7 +35,7 @@ namespace KMime {
 
 
 /** Base class for messages in mime format
-    It contains all the enums, static functions
+    It tqcontains all the enums, static functions
     and parser-classes, that are needed for
     mime handling */
 
@@ -110,7 +110,7 @@ class KDE_EXPORT Content : public Base {
     void changeEncoding(Headers::contentEncoding e);
 
     //saves the encoded content to the given textstream
-    // scrambleFromLines: replace "\nFrom " with "\n>From ", this is
+    // scrambleFromLines: tqreplace "\nFrom " with "\n>From ", this is
     // needed to avoid problem with mbox-files
     void toStream(TQTextStream &ts, bool scrambleFromLines=false);
 
diff --git a/libkmime/kmime_header_parsing.cpp b/libkmime/kmime_header_parsing.cpp
index 9222ff91..6b06c903 100644
--- a/libkmime/kmime_header_parsing.cpp
+++ b/libkmime/kmime_header_parsing.cpp
@@ -256,7 +256,7 @@ bool parseAtom( const char * & scursor, const char * const send,
   QPair<const char*,int> maybeResult;
 
   if ( parseAtom( scursor, send, maybeResult, allow8Bit ) ) {
-    result += TQString::fromLatin1( maybeResult.first, maybeResult.second );
+    result += TQString::tqfromLatin1( maybeResult.first, maybeResult.second );
     return true;
   }
 
@@ -296,7 +296,7 @@ bool parseToken( const char * & scursor, const char * const send,
   QPair<const char*,int> maybeResult;
 
   if ( parseToken( scursor, send, maybeResult, allow8Bit ) ) {
-    result += TQString::fromLatin1( maybeResult.first, maybeResult.second );
+    result += TQString::tqfromLatin1( maybeResult.first, maybeResult.second );
     return true;
   }
 
@@ -1065,9 +1065,9 @@ bool parseAddressList( const char* & scursor, const char * const send,
 }
 
 
-static TQString asterisk = TQString::fromLatin1("*0*",1);
-static TQString asteriskZero = TQString::fromLatin1("*0*",2);
-//static TQString asteriskZeroAsterisk = TQString::fromLatin1("*0*",3);
+static TQString asterisk = TQString::tqfromLatin1("*0*",1);
+static TQString asteriskZero = TQString::tqfromLatin1("*0*",2);
+//static TQString asteriskZeroAsterisk = TQString::tqfromLatin1("*0*",3);
 
 bool parseParameter( const char* & scursor, const char * const send,
 		     QPair<TQString,QStringOrQPair> & result, bool isCRLF ) {
@@ -1223,7 +1223,7 @@ static void decodeRFC2231Value( Codec* & rfc2231Codec,
       // take the whole value to be in latin-1:
       KMIME_WARN << "No charset in extended-initial-value. "
 	"Assuming \"iso-8859-1\"." << endl;
-      value += TQString::fromLatin1( decBegin, source.second );
+      value += TQString::tqfromLatin1( decBegin, source.second );
       return;
     }
 
@@ -1263,7 +1263,7 @@ static void decodeRFC2231Value( Codec* & rfc2231Codec,
   }
 
   if ( !textcodec ) {
-    value += TQString::fromLatin1( decCursor, decEnd - decCursor );
+    value += TQString::tqfromLatin1( decCursor, decEnd - decCursor );
     return;
   }
 
@@ -1348,7 +1348,7 @@ bool parseParameterList( const char* & scursor,	const char * const send,
       } else {
 	// not encoded.
 	if ( (*it).qpair.first )
-	  value += TQString::fromLatin1( (*it).qpair.first, (*it).qpair.second );
+	  value += TQString::tqfromLatin1( (*it).qpair.first, (*it).qpair.second );
 	else
 	  value += (*it).qstring;
       }
@@ -1377,7 +1377,7 @@ bool parseParameterList( const char* & scursor,	const char * const send,
       } else {
 	// not encoded
 	if ( (*it).qpair.first )
-	  value += TQString::fromLatin1( (*it).qpair.first, (*it).qpair.second );
+	  value += TQString::tqfromLatin1( (*it).qpair.first, (*it).qpair.second );
 	else
 	  value += (*it).qstring;
       }
diff --git a/libkmime/kmime_header_parsing.h b/libkmime/kmime_header_parsing.h
index 699b56e1..10751f03 100644
--- a/libkmime/kmime_header_parsing.h
+++ b/libkmime/kmime_header_parsing.h
@@ -94,7 +94,7 @@ namespace HeaderParsing {
 	           to and including the encoding specifier. The
 		   encoded-text is quite generously parsed and @p ok
 		   is still set to @p true when e.g. the encoded-word
-		   appears to be truncated or contains whitespace.
+		   appears to be truncated or tqcontains whitespace.
       @return the decoded string the encoded word represented.
   */
   bool parseEncodedWord( const char* & scursor, const char * const send,
diff --git a/libkmime/kmime_headers.cpp b/libkmime/kmime_headers.cpp
index d4557c12..cef3f7a4 100644
--- a/libkmime/kmime_headers.cpp
+++ b/libkmime/kmime_headers.cpp
@@ -529,7 +529,7 @@ void MessageID::fromUnicodeString(const TQString &s, const TQCString&)
 
 TQString MessageID::asUnicodeString()
 {
-  return TQString::fromLatin1(m_id);
+  return TQString::tqfromLatin1(m_id);
 }
 
 
@@ -567,7 +567,7 @@ void Control::fromUnicodeString(const TQString &s, const TQCString&)
 
 TQString Control::asUnicodeString()
 {
-  return TQString::fromLatin1(c_trlMsg);
+  return TQString::tqfromLatin1(c_trlMsg);
 }
 
 //-----</Control>------------------------------
@@ -797,7 +797,7 @@ void Date::fromUnicodeString(const TQString &s, const TQCString&)
 
 TQString Date::asUnicodeString()
 {
-  return TQString::fromLatin1(as7BitString(false));
+  return TQString::tqfromLatin1(as7BitString(false));
 }
 
 
@@ -811,7 +811,7 @@ TQDateTime Date::qdt()
 
 int Date::ageInDays()
 {
-  TQDate today=TQDate::currentDate();
+  TQDate today=TQDate::tqcurrentDate();
   return ( qdt().date().daysTo(today) );
 }
 
@@ -1075,7 +1075,7 @@ void References::fromUnicodeString(const TQString &s, const TQCString&)
 
 TQString References::asUnicodeString()
 {
-  return TQString::fromLatin1(r_ef);
+  return TQString::tqfromLatin1(r_ef);
 }
 
 
@@ -1221,7 +1221,7 @@ void UserAgent::fromUnicodeString(const TQString &s, const TQCString&)
 
 TQString UserAgent::asUnicodeString()
 {
-  return TQString::fromLatin1(u_agent);
+  return TQString::tqfromLatin1(u_agent);
 }
 
 //-----</UserAgent>----------------------------
@@ -1268,7 +1268,7 @@ void ContentType::fromUnicodeString(const TQString &s, const TQCString&)
 
 TQString ContentType::asUnicodeString()
 {
-  return TQString::fromLatin1(as7BitString(false));
+  return TQString::tqfromLatin1(as7BitString(false));
 }
 
 
@@ -1544,7 +1544,7 @@ void CTEncoding::fromUnicodeString(const TQString &s, const TQCString&)
 
 TQString CTEncoding::asUnicodeString()
 {
-  return TQString::fromLatin1(as7BitString(false));
+  return TQString::tqfromLatin1(as7BitString(false));
 }
 
 //-----</CTEncoding>---------------------------
diff --git a/libkmime/kmime_headers.h b/libkmime/kmime_headers.h
index 2ba0e1b8..1c980a04 100644
--- a/libkmime/kmime_headers.h
+++ b/libkmime/kmime_headers.h
@@ -239,7 +239,7 @@ private:
 };
 
 /** This is the base class for all structured header fields. It
-    contains parsing methods for all basic token types found in
+    tqcontains parsing methods for all basic token types found in
     rfc2822.
 
     @section Parsing
diff --git a/libkmime/kmime_mdn.cpp b/libkmime/kmime_mdn.cpp
index 75f1a91e..702f5f81 100644
--- a/libkmime/kmime_mdn.cpp
+++ b/libkmime/kmime_mdn.cpp
@@ -240,9 +240,9 @@ namespace MDN {
     // headers that are only present for certain disposition {types,modifiers}:
     if ( d == Failed )
       result += "Failure: " + encodeRFC2047String( spec, "utf-8" ) + "\n";
-    else if ( m.contains( Error ) )
+    else if ( m.tqcontains( Error ) )
       result += "Error: " + encodeRFC2047String( spec, "utf-8" ) + "\n";
-    else if ( m.contains( Warning ) )
+    else if ( m.tqcontains( Warning ) )
       result += "Warning: " + encodeRFC2047String( spec, "utf-8" ) + "\n";
 
     return result;
diff --git a/libkmime/kmime_parsers.cpp b/libkmime/kmime_parsers.cpp
index 6527c991..446f1af7 100644
--- a/libkmime/kmime_parsers.cpp
+++ b/libkmime/kmime_parsers.cpp
@@ -149,11 +149,11 @@ bool UUEncoded::parse()
 
   while (success) {
     int beginPos=currentPos, uuStart=currentPos, endPos=0, lineCount=0, MCount=0, pos=0, len=0;
-    bool containsBegin=false, containsEnd=false;
+    bool tqcontainsBegin=false, tqcontainsEnd=false;
     TQCString tmp,fileName;
 
     if( (beginPos=s_rc.find(TQRegExp("begin [0-9][0-9][0-9]"),currentPos))>-1 && (beginPos==0 || s_rc.at(beginPos-1)=='\n') ) {
-      containsBegin=true;
+      tqcontainsBegin=true;
       uuStart=s_rc.find('\n', beginPos);
       if(uuStart==-1) {//no more line breaks found, we give up
         success = false;
@@ -166,9 +166,9 @@ bool UUEncoded::parse()
     if ( (endPos=s_rc.find("\nend",(uuStart>0)? uuStart-1:0))==-1 )
       endPos=s_rc.length(); //no end found
     else
-      containsEnd=true;
+      tqcontainsEnd=true;
 
-    if ((containsBegin && containsEnd) || firstIteration) {
+    if ((tqcontainsBegin && tqcontainsEnd) || firstIteration) {
 
       //printf("beginPos=%d , uuStart=%d , endPos=%d\n", beginPos, uuStart, endPos);
       //all lines in a uuencoded text start with 'M'
@@ -183,12 +183,12 @@ bool UUEncoded::parse()
 
       //printf("lineCount=%d , MCount=%d\n", lineCount, MCount);
       if( MCount==0 || (lineCount-MCount)>10 ||
-          ((!containsBegin || !containsEnd) && (MCount<15)) ) {  // harder check for splitted-articles
+          ((!tqcontainsBegin || !tqcontainsEnd) && (MCount<15)) ) {  // harder check for splitted-articles
         success = false;
         break; //too many "non-M-Lines" found, we give up
       }
 
-      if( (!containsBegin || !containsEnd) && s_ubject) {  // message may be split up => parse subject
+      if( (!tqcontainsBegin || !tqcontainsEnd) && s_ubject) {  // message may be split up => parse subject
 	TQRegExp rx("[0-9]+/[0-9]+");
 	pos=rx.search(TQString(s_ubject), 0);
 	len=rx.matchedLength();
@@ -207,7 +207,7 @@ bool UUEncoded::parse()
       if(beginPos>0)
         t_ext.append(s_rc.mid(currentPos,beginPos-currentPos));
 
-      if(containsBegin)
+      if(tqcontainsBegin)
         fileName = s_rc.mid(beginPos+10, uuStart-beginPos-11); //everything between "begin ### " and the next LF is considered as the filename
       else
         fileName = "";
@@ -281,7 +281,7 @@ bool YENCEncoded::parse()
 
   while (success) {
     int beginPos=currentPos, yencStart=currentPos;
-    bool containsPart=false;
+    bool tqcontainsPart=false;
     TQCString fileName,mimeType;
 
     if ((beginPos=s_rc.find("=ybegin ", currentPos))>-1 && ( beginPos==0 || s_rc.at( beginPos-1)=='\n') ) {
@@ -292,7 +292,7 @@ bool YENCEncoded::parse()
       } else {
         yencStart++;
         if (s_rc.find("=ypart", yencStart)==yencStart) {
-          containsPart=true;
+          tqcontainsPart=true;
           yencStart=s_rc.find( '\n', yencStart);
           if ( yencStart== -1) {
             success=false;
@@ -332,7 +332,7 @@ bool YENCEncoded::parse()
       }
 
       int partBegin, partEnd;
-      if (containsPart) {
+      if (tqcontainsPart) {
         if (!yencMeta(meta, "part", &p_artNr)) {
           success=false;
           break;
@@ -355,7 +355,7 @@ bool YENCEncoded::parse()
       int len=s_rc.length();
       bool lineStart=true;
       int lineLength=0;
-      bool containsEnd=false;
+      bool tqcontainsEnd=false;
       TQByteArray binary = TQByteArray(yencSize);
       while (pos<len) {
         int ch=s_rc.at(pos);
@@ -382,7 +382,7 @@ bool YENCEncoded::parse()
               ch=s_rc.at( pos+1);
               if (lineStart && ch=='y')
               {
-                containsEnd=true;
+                tqcontainsEnd=true;
                 break;
               }
               pos+=2;
@@ -412,7 +412,7 @@ bool YENCEncoded::parse()
         }
       }
       
-      if (!containsEnd)
+      if (!tqcontainsEnd)
       {
         success=false;
         break;
diff --git a/libkmime/kmime_util.cpp b/libkmime/kmime_util.cpp
index 313aabe7..2f0d04a1 100644
--- a/libkmime/kmime_util.cpp
+++ b/libkmime/kmime_util.cpp
@@ -400,7 +400,7 @@ TQCString extractHeader(const TQCString &src, const char *name)
     if (!folded)
       return src.mid(pos1, pos2-pos1);
     else
-      return (src.mid(pos1, pos2-pos1).replace(TQRegExp("\\s*\\n\\s*")," "));
+      return (src.mid(pos1, pos2-pos1).tqreplace(TQRegExp("\\s*\\n\\s*")," "));
   }
   else {
     return TQCString(0); //header not found
@@ -411,7 +411,7 @@ TQCString extractHeader(const TQCString &src, const char *name)
 TQCString CRLFtoLF(const TQCString &s)
 {
   TQCString ret=s.copy();
-  ret.replace(TQRegExp("\\r\\n"), "\n");
+  ret.tqreplace(TQRegExp("\\r\\n"), "\n");
   return ret;
 }
 
@@ -419,7 +419,7 @@ TQCString CRLFtoLF(const TQCString &s)
 TQCString CRLFtoLF(const char *s)
 {
   TQCString ret=s;
-  ret.replace(TQRegExp("\\r\\n"), "\n");
+  ret.tqreplace(TQRegExp("\\r\\n"), "\n");
   return ret;
 }
 
@@ -427,7 +427,7 @@ TQCString CRLFtoLF(const char *s)
 TQCString LFtoCRLF(const TQCString &s)
 {
   TQCString ret=s.copy();
-  ret.replace(TQRegExp("\\n"), "\r\n");
+  ret.tqreplace(TQRegExp("\\n"), "\r\n");
   return ret;
 }
 
@@ -563,7 +563,7 @@ DateFormatter::custom(time_t t) const
 
   d.setTime_t(t);
   if ( z != -1 ) {
-    ret.replace(z,1,zone(t));
+    ret.tqreplace(z,1,zone(t));
   }
 
   ret = d.toString(ret);
@@ -737,7 +737,7 @@ DateFormatter::localized(time_t otime, bool shortFormat, bool includeSecs,
 QString
 DateFormatter::cTime(time_t otime) const
 {
-  return TQString::fromLatin1( ctime(  &otime ) ).stripWhiteSpace() ;
+  return TQString::tqfromLatin1( ctime(  &otime ) ).stripWhiteSpace() ;
 }
 
 QString
diff --git a/libkmime/kmime_util.h b/libkmime/kmime_util.h
index e2b3c833..3c710ab7 100644
--- a/libkmime/kmime_util.h
+++ b/libkmime/kmime_util.h
@@ -35,7 +35,7 @@ namespace KMime {
       keeping strings in a common repository.*/
   extern const char* cachedLanguage(const TQCString &name) KDE_EXPORT;
 
-  /** checks whether @p s contains any non-us-ascii characters */
+  /** checks whether @p s tqcontains any non-us-ascii characters */
   extern bool isUsAscii(const TQString &s) KDE_EXPORT;
 
   inline bool isOfSet(const uchar map[16], unsigned char ch) {
@@ -167,7 +167,7 @@ namespace KMime {
   */
   KDE_EXPORT extern void removeQuots(TQString &str);
   /** Converts the given string into a quoted-string if
-      the string contains any special characters
+      the string tqcontains any special characters
       (ie. one of ()<>@,.;:[]=\").
       @param str us-ascii string to work on.
       @param forceQuotes if @p true, always add quote characters.
diff --git a/libkmime/tests/test_dates.cpp b/libkmime/tests/test_dates.cpp
index 7087a01a..e3a40f81 100644
--- a/libkmime/tests/test_dates.cpp
+++ b/libkmime/tests/test_dates.cpp
@@ -80,14 +80,14 @@ main()
 							  "Z MMMM dddd yyyy") <<endl;
   t.setFormat(DateFormatter::Fancy);
   kdDebug()<<"TQDateTime taking: (dates as in first test)"<<endl;
-  kdDebug()<<"\tFancy : \t"<<t.dateString((TQDateTime::currentDateTime()))<<endl;
+  kdDebug()<<"\tFancy : \t"<<t.dateString((TQDateTime::tqcurrentDateTime()))<<endl;
   t.setFormat(DateFormatter::Localized);
-  kdDebug()<<"\tLocalized : \t"<<t.dateString(TQDateTime::currentDateTime())<<endl;
+  kdDebug()<<"\tLocalized : \t"<<t.dateString(TQDateTime::tqcurrentDateTime())<<endl;
   t.setFormat(DateFormatter::CTime);
-  kdDebug()<<"\tCTime : \t"<<t.dateString(TQDateTime::currentDateTime())<<endl;
+  kdDebug()<<"\tCTime : \t"<<t.dateString(TQDateTime::tqcurrentDateTime())<<endl;
   t.setFormat(DateFormatter::Iso);
-  kdDebug()<<"\tIso   : \t"<<t.dateString(TQDateTime::currentDateTime())<<endl;
+  kdDebug()<<"\tIso   : \t"<<t.dateString(TQDateTime::tqcurrentDateTime())<<endl;
   t.setCustomFormat("MMMM d dddd yyyy Z");
-  kdDebug()<<"\tCustom : \t"<<t.dateString(TQDateTime::currentDateTime())<<endl;
+  kdDebug()<<"\tCustom : \t"<<t.dateString(TQDateTime::tqcurrentDateTime())<<endl;
 
 }
diff --git a/libkmime/tests/test_kmime_codec.cpp b/libkmime/tests/test_kmime_codec.cpp
index e30a89ac..68ab08ec 100644
--- a/libkmime/tests/test_kmime_codec.cpp
+++ b/libkmime/tests/test_kmime_codec.cpp
@@ -239,8 +239,8 @@ void encode_decode_convenience_qba( bool encode, const Codec * codec,
   else
     out = codec->decode( infile_buffer, withCRLF );
   if ( writing ) {
-    Q_LONG written = outfile.writeBlock( out );
-    assert( written == (Q_LONG)out.size() );
+    TQ_LONG written = outfile.writeBlock( out );
+    assert( written == (TQ_LONG)out.size() );
   }
 }
 
@@ -304,8 +304,8 @@ void encode_decode_kio( bool encode, const Codec * codec,
     else
       decode_kio_internal( dec, iit, iend, out );
     if ( writing && out.size() ) {
-      Q_LONG written = outfile.writeBlock( out );
-      assert( written == (Q_LONG)out.size() );
+      TQ_LONG written = outfile.writeBlock( out );
+      assert( written == (TQ_LONG)out.size() );
     }
   } while ( out.size() );
 
@@ -329,7 +329,7 @@ void encode_decode_chunkwise( bool encode, const Codec * codec,
 #define write_full_outdata_then_reset  do { \
      kdDebug( verbose ) << "  flushing output buffer." << endl; \
      if ( writing ) { \
-       Q_LONG outlen = outfile.writeBlock( outdata.data(), \
+       TQ_LONG outlen = outfile.writeBlock( outdata.data(), \
 					   outdata.size() ); \
        if ( outlen != (int)outdata.size() ) \
          exit(OUTFILE_WRITE_ERR); \
@@ -432,7 +432,7 @@ void encode_decode_chunkwise( bool encode, const Codec * codec,
   // Write out last (partial) output chunk:
   //
   if ( writing ) {
-    Q_LONG outlen = outfile.writeBlock( outdata.data(),
+    TQ_LONG outlen = outfile.writeBlock( outdata.data(),
 					oit - outdata.begin() );
     if ( outlen != oit - outdata.begin() )
       exit(OUTFILE_WRITE_ERR);
diff --git a/libkpgp/kpgp.cpp b/libkpgp/kpgp.cpp
index 8a9c6898..53b77913 100644
--- a/libkpgp/kpgp.cpp
+++ b/libkpgp/kpgp.cpp
@@ -313,7 +313,7 @@ Module::clearsign( Block& block,
 
 Kpgp::Result
 Module::encrypt( Block& block,
-                 const TQStringList& receivers, const KeyID& keyId,
+                 const TQStringList& tqreceivers, const KeyID& keyId,
                  bool sign, const TQCString& charset )
 {
   KeyIDList encryptionKeyIds; // list of keys which are used for encryption
@@ -324,8 +324,8 @@ Module::encrypt( Block& block,
 
   setUser( keyId );
 
-  if( !receivers.empty() ) {
-    Kpgp::Result result = getEncryptionKeys( encryptionKeyIds, receivers,
+  if( !tqreceivers.empty() ) {
+    Kpgp::Result result = getEncryptionKeys( encryptionKeyIds, tqreceivers,
                                              keyId );
     if( Kpgp::Ok != result ) {
       return result;
@@ -1705,7 +1705,7 @@ Module::keysForAddress( const TQString& address )
     return KeyIDList();
   }
   TQString addr = canonicalAddress( address ).lower();
-  if( addressDataDict.contains( addr ) ) {
+  if( addressDataDict.tqcontains( addr ) ) {
     return addressDataDict[addr].keyIds;
   }
   else {
@@ -1720,7 +1720,7 @@ Module::setKeysForAddress( const TQString& address, const KeyIDList& keyIds )
     return;
   }
   TQString addr = canonicalAddress( address ).lower();
-  if( addressDataDict.contains( addr ) ) {
+  if( addressDataDict.tqcontains( addr ) ) {
     addressDataDict[addr].keyIds = keyIds;
   }
   else {
@@ -1782,7 +1782,7 @@ EncryptPref
 Module::encryptionPreference( const TQString& address )
 {
   TQString addr = canonicalAddress( address ).lower();
-  if( addressDataDict.contains( addr ) ) {
+  if( addressDataDict.tqcontains( addr ) ) {
     return addressDataDict[addr].encrPref;
   }
   else {
@@ -1798,7 +1798,7 @@ Module::setEncryptionPreference( const TQString& address,
     return;
   }
   TQString addr = canonicalAddress( address ).lower();
-  if( addressDataDict.contains( addr ) ) {
+  if( addressDataDict.tqcontains( addr ) ) {
     addressDataDict[addr].encrPref = pref;
   }
   else {
diff --git a/libkpgp/kpgp.h b/libkpgp/kpgp.h
index e36f07fd..ec937015 100644
--- a/libkpgp/kpgp.h
+++ b/libkpgp/kpgp.h
@@ -123,7 +123,7 @@ public:
       Ok       if everything is o.k.
   */
   Kpgp::Result encrypt( Block& block,
-                const TQStringList& receivers, const KeyID& keyId,
+                const TQStringList& tqreceivers, const KeyID& keyId,
                 bool sign, const TQCString& charset = 0 );
 
   /** Determines the keys which should be used for encrypting the message
@@ -308,7 +308,7 @@ public:
 
   /** Parses the given message and splits it into OpenPGP blocks and
       Non-OpenPGP blocks.
-      Returns TRUE if the message contains at least one OpenPGP block and
+      Returns TRUE if the message tqcontains at least one OpenPGP block and
       FALSE otherwise.
       The format is then:
       <pre>
diff --git a/libkpgp/kpgpbase.cpp b/libkpgp/kpgpbase.cpp
index 157c73e3..ec2ffd12 100644
--- a/libkpgp/kpgpbase.cpp
+++ b/libkpgp/kpgpbase.cpp
@@ -70,7 +70,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
   int len, len2;
   FILE *pass;
   pid_t child_pid;
-  int childExitStatus;
+  int childExiStatus;
   struct pollfd pollin, pollout, pollerr;
   int pollstatus;
 
@@ -251,8 +251,8 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
 
   do {
     //kdDebug(5100) << "Checking if PGP is still running..." << endl;
-    childExitStatus = 0;
-    waitpidRetVal = waitpid(child_pid, &childExitStatus, WNOHANG);
+    childExiStatus = 0;
+    waitpidRetVal = waitpid(child_pid, &childExiStatus, WNOHANG);
     //kdDebug(5100) << "waitpid returned " << waitpidRetVal << endl;
     if (pout[0] >= 0) {
       do {
@@ -351,14 +351,14 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
     close(ppass[0]);
 
   // Did the child exit normally?
-  if (WIFEXITED(childExitStatus) != 0) {
+  if (WIFEXITED(childExiStatus) != 0) {
     // Get the return code of the child
-    childExitStatus = WEXITSTATUS(childExitStatus);
-    kdDebug(5100) << "PGP exited with exit status " << childExitStatus
+    childExiStatus = WEXITSTATUS(childExiStatus);
+    kdDebug(5100) << "PGP exited with exit status " << childExiStatus
                   << endl;
   }
   else {
-    childExitStatus = -1;
+    childExiStatus = -1;
     kdDebug(5100) << "PGP exited abnormally!" << endl;
   }
 
@@ -371,7 +371,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
    */
   kdDebug(5100) << error << endl;
 
-  return childExitStatus;
+  return childExiStatus;
 }
 
 
@@ -387,7 +387,7 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG )
   int len, len2;
   FILE *pass;
   pid_t child_pid;
-  int childExitStatus;
+  int childExiStatus;
   char gpgcmd[1024] = "\0";
   struct pollfd poller[3];
   int num_pollers = 0;
@@ -529,8 +529,8 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG )
 
   do {
     //kdDebug(5100) << "Checking if GnuPG is still running..." << endl;
-    childExitStatus = 0;
-    waitpidRetVal = waitpid(child_pid, &childExitStatus, WNOHANG);
+    childExiStatus = 0;
+    waitpidRetVal = waitpid(child_pid, &childExiStatus, WNOHANG);
     //kdDebug(5100) << "waitpid returned " << waitpidRetVal << endl;
     do {
       // poll the pipes
@@ -645,14 +645,14 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG )
     close(ppass[0]);
 
   // Did the child exit normally?
-  if (WIFEXITED(childExitStatus) != 0) {
+  if (WIFEXITED(childExiStatus) != 0) {
     // Get the return code of the child
-    childExitStatus = WEXITSTATUS(childExitStatus);
-    kdDebug(5100) << "GnuPG exited with exit status " << childExitStatus
+    childExiStatus = WEXITSTATUS(childExiStatus);
+    kdDebug(5100) << "GnuPG exited with exit status " << childExiStatus
                   << endl;
   }
   else {
-    childExitStatus = -1;
+    childExiStatus = -1;
     kdDebug(5100) << "GnuPG exited abnormally!" << endl;
   }
 
@@ -663,7 +663,7 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG )
   // get to know what's going on during the gpg calls.
   kdDebug(5100) << "gpg stderr:\n" << error << endl;
 
-  return childExitStatus;
+  return childExiStatus;
 }
 
 
diff --git a/libkpgp/kpgpbase2.cpp b/libkpgp/kpgpbase2.cpp
index 301470b7..06c0d1e6 100644
--- a/libkpgp/kpgpbase2.cpp
+++ b/libkpgp/kpgpbase2.cpp
@@ -66,7 +66,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
                 const char *passphrase )
 {
   TQCString cmd;
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   if(!recipients.isEmpty() && passphrase != 0)
     cmd = PGP2 " +batchmode +language=en +verbose=1 -seat";
@@ -100,12 +100,12 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
 
   clear();
   input = block.text();
-  exitStatus = run(cmd.data(), passphrase);
+  exiStatus = run(cmd.data(), passphrase);
   if( !output.isEmpty() )
     block.setProcessedText( output );
   block.setError( error );
 
-  if(exitStatus != 0)
+  if(exiStatus != 0)
     status = ERROR;
 
 #if 0
@@ -218,7 +218,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
   }
 
   //kdDebug(5100) << "status = " << status << endl;
-  block.setStatus( status );
+  block.seStatus( status );
   return status;
 }
 
@@ -227,11 +227,11 @@ int
 Base2::decrypt( Block& block, const char *passphrase )
 {
   int index, index2;
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   clear();
   input = block.text();
-  exitStatus = run(PGP2 " +batchmode +language=en -f", passphrase);
+  exiStatus = run(PGP2 " +batchmode +language=en -f", passphrase);
   if( !output.isEmpty() )
     block.setProcessedText( output );
   block.setError( error );
@@ -249,16 +249,16 @@ Base2::decrypt( Block& block, const char *passphrase )
     index1 = input.find('\n', index1);
     index2 = input.find("\n\n", index1);
     input.remove(index1, index2 - index1);
-    exitStatus = run(PGP2 " +batchmode +language=en -f", passphrase);
+    exiStatus = run(PGP2 " +batchmode +language=en -f", passphrase);
     if( !output.isEmpty() )
       block.setProcessedText( output );
     block.setError( error );
   }
 
-  if(exitStatus == -1) {
+  if(exiStatus == -1) {
     errMsg = i18n("error running PGP");
     status = RUN_ERR;
-    block.setStatus( status );
+    block.seStatus( status );
     return status;
   }
 
@@ -457,7 +457,7 @@ Base2::decrypt( Block& block, const char *passphrase )
     }
   }
   //kdDebug(5100) << "status = " << status << endl;
-  block.setStatus( status );
+  block.seStatus( status );
   return status;
 }
 
@@ -467,13 +467,13 @@ Base2::readPublicKey( const KeyID& keyID,
                       const bool readTrust /* = false */,
                       Key* key /* = 0 */ )
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   status = 0;
-  exitStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kvc -f 0x" +
+  exiStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kvc -f 0x" +
                     keyID, 0, true );
 
-  if(exitStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return 0;
   }
@@ -487,10 +487,10 @@ Base2::readPublicKey( const KeyID& keyID,
 
   if( readTrust )
   {
-    exitStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kc -f",
+    exiStatus = run( PGP2 " +batchmode +language=en +verbose=0 -kc -f",
                       0, true );
 
-    if(exitStatus != 0) {
+    if(exiStatus != 0) {
       status = ERROR;
       return 0;
     }
@@ -512,14 +512,14 @@ Base2::publicKeys( const TQStringList & patterns )
 KeyList
 Base2::doGetPublicKeys( const TQCString & cmd, const TQStringList & patterns )
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
   KeyList publicKeys;
 
   status = 0;
   if ( patterns.isEmpty() ) {
-    exitStatus = run( cmd, 0, true );
+    exiStatus = run( cmd, 0, true );
 
-    if ( exitStatus != 0 ) {
+    if ( exiStatus != 0 ) {
       status = ERROR;
       return KeyList();
     }
@@ -533,10 +533,10 @@ Base2::doGetPublicKeys( const TQCString & cmd, const TQStringList & patterns )
 
     for ( TQStringList::ConstIterator it = patterns.begin();
           it != patterns.end(); ++it ) {
-      exitStatus = run( cmd + " " + KProcess::quote( *it ).local8Bit(),
+      exiStatus = run( cmd + " " + KProcess::quote( *it ).local8Bit(),
                         0, true );
 
-      if ( exitStatus != 0 ) {
+      if ( exiStatus != 0 ) {
         status = ERROR;
         return KeyList();
       }
@@ -547,7 +547,7 @@ Base2::doGetPublicKeys( const TQCString & cmd, const TQStringList & patterns )
       // put all new keys into a map, remove duplicates
       while ( !publicKeys.isEmpty() ) {
         Key * key = publicKeys.take( 0 );
-        if ( !map.contains( key->primaryFingerprint() ) )
+        if ( !map.tqcontains( key->primaryFingerprint() ) )
           map.insert( key->primaryFingerprint(), key );
         else
           delete key;
@@ -576,16 +576,16 @@ int
 Base2::signKey(const KeyID& keyID, const char *passphrase)
 {
   TQCString cmd;
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   cmd = PGP2 " +batchmode +language=en -ks -f ";
   cmd += addUserId();
   cmd += " 0x" + keyID;
 
   status = 0;
-  exitStatus = run(cmd.data(),passphrase);
+  exiStatus = run(cmd.data(),passphrase);
 
-  if (exitStatus != 0)
+  if (exiStatus != 0)
     status = ERROR;
 
   return status;
@@ -594,16 +594,16 @@ Base2::signKey(const KeyID& keyID, const char *passphrase)
 
 TQCString Base2::getAsciiPublicKey(const KeyID& keyID)
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   if (keyID.isEmpty())
     return TQCString();
 
   status = 0;
-  exitStatus = run( PGP2 " +batchmode +force +language=en -kxaf 0x" + keyID,
+  exiStatus = run( PGP2 " +batchmode +force +language=en -kxaf 0x" + keyID,
                     0, true );
 
-  if(exitStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return TQCString();
   }
@@ -646,7 +646,7 @@ Base2::parsePublicKeyData( const TQCString& output, Key* key /* = 0 */ )
 
     if( !strncmp( output.data() + index, "pub", 3 ) ||
         !strncmp( output.data() + index, "sec", 3 ) )
-    { // line contains primary key data
+    { // line tqcontains primary key data
       // Example 1 (nothing special):
       // pub  1024/E2D074D3 2001/09/09 Test Key <testkey@xyz>
       // Example 2 (disabled key):
@@ -737,7 +737,7 @@ Base2::parsePublicKeyData( const TQCString& output, Key* key /* = 0 */ )
       }
     }
     else if( output[index] == ' ' )
-    { // line contains additional key data
+    { // line tqcontains additional key data
 
       if( key == 0 )
         break;
@@ -748,20 +748,20 @@ Base2::parsePublicKeyData( const TQCString& output, Key* key /* = 0 */ )
         pos++;
 
       if( !strncmp( output.data() + pos, "Key fingerprint = ", 18 ) )
-      { // line contains a fingerprint
+      { // line tqcontains a fingerprint
         // Example:
         //             Key fingerprint = 47 30 7C 76 05 BF 5E FB  72 41 00 F2 7D 0B D0 49
 
         TQCString fingerprint = output.mid( pos, index2-pos );
         // remove white space from the fingerprint
 	for ( int idx = 0 ; (idx = fingerprint.find(' ', idx)) >= 0 ; )
-	  fingerprint.replace( idx, 1, "" );
+	  fingerprint.tqreplace( idx, 1, "" );
 
         subkey->setFingerprint( fingerprint );
       }
       else if( !strncmp( output.data() + pos, "Expire: ", 8 ) ||
                !strncmp( output.data() + pos, "no expire ", 10 ) )
-      { // line contains additional key properties
+      { // line tqcontains additional key properties
         // Examples:
         //            Expire: 2001/09/10
         //                     no expire ENCRyption only
@@ -801,7 +801,7 @@ Base2::parsePublicKeyData( const TQCString& output, Key* key /* = 0 */ )
         }
       }
       else
-      { // line contains an additional user id
+      { // line tqcontains an additional user id
         // Example:
         //                               Test key (2nd user ID) <abc@xyz>
 
@@ -854,7 +854,7 @@ Base2::parseTrustDataForKey( Key* key, const TQCString& str )
       break;
 
     if( str[index+21] != ' ' )
-    { // line contains a validity value for a user ID
+    { // line tqcontains a validity value for a user ID
 
       // determine the validity
       Validity validity = KPGP_VALIDITY_UNKNOWN;
@@ -927,7 +927,7 @@ Base2::parseKeyList( const TQCString& output, bool secretKeys )
 
     if( !strncmp( output.data() + index, "pub", 3 ) ||
         !strncmp( output.data() + index, "sec", 3 ) )
-    { // line contains primary key data
+    { // line tqcontains primary key data
       // Example 1:
       // pub  1024/E2D074D3 2001/09/09 Test Key <testkey@xyz>
       // Example 2 (disabled key):
@@ -1017,7 +1017,7 @@ Base2::parseKeyList( const TQCString& output, bool secretKeys )
       }
     }
     else if( output[index] == ' ' )
-    { // line contains additional key data
+    { // line tqcontains additional key data
 
       if( key == 0 )
         break;
@@ -1027,7 +1027,7 @@ Base2::parseKeyList( const TQCString& output, bool secretKeys )
         pos++;
 
       if( !strncmp( output.data() + pos, "Key fingerprint = ", 18 ) )
-      { // line contains a fingerprint
+      { // line tqcontains a fingerprint
         // Example:
         //             Key fingerprint = 47 30 7C 76 05 BF 5E FB  72 41 00 F2 7D 0B D0 49
 
@@ -1036,13 +1036,13 @@ Base2::parseKeyList( const TQCString& output, bool secretKeys )
         TQCString fingerprint = output.mid( pos, index2-pos );
         // remove white space from the fingerprint
 	for ( int idx = 0 ; (idx = fingerprint.find(' ', idx)) >= 0 ; )
-	  fingerprint.replace( idx, 1, "" );
+	  fingerprint.tqreplace( idx, 1, "" );
 
         subkey->setFingerprint( fingerprint );
       }
       else if( !strncmp( output.data() + pos, "Expire: ", 8 ) ||
                !strncmp( output.data() + pos, "no expire ", 10 ) )
-      { // line contains additional key properties
+      { // line tqcontains additional key properties
         // Examples:
         //            Expire: 2001/09/10
         //                     no expire ENCRyption only
@@ -1082,7 +1082,7 @@ Base2::parseKeyList( const TQCString& output, bool secretKeys )
         }
       }
       else
-      { // line contains an additional user id
+      { // line tqcontains an additional user id
         // Example:
         //                               Test key (2nd user ID) <abc@xyz>
 
diff --git a/libkpgp/kpgpbase5.cpp b/libkpgp/kpgpbase5.cpp
index 21ca1dc4..a5988a9c 100644
--- a/libkpgp/kpgpbase5.cpp
+++ b/libkpgp/kpgpbase5.cpp
@@ -66,7 +66,7 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
                 const char *passphrase )
 {
   TQCString cmd;
-  int exitStatus = 0;
+  int exiStatus = 0;
   int index;
   // used to work around a bug in pgp5. pgp5 treats files
   // with non ascii chars (umlauts, etc...) as binary files, but
@@ -112,14 +112,14 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
   if (signonly)
   {
     input.append("\n");
-    input.replace(TQRegExp("[ \t]+\n"), "\n");   //strip trailing whitespace
+    input.tqreplace(TQRegExp("[ \t]+\n"), "\n");   //strip trailing whitespace
   }
   //We have to do this otherwise it's all in vain
 
-  exitStatus = run(cmd.data(), passphrase);
+  exiStatus = run(cmd.data(), passphrase);
   block.setError( error );
 
-  if(exitStatus != 0)
+  if(exiStatus != 0)
     status = ERROR;
 
   // now parse the returned info
@@ -179,13 +179,13 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
     if (input[0] == '-')
       input = "- " + input;
     for ( int idx = 0 ; (idx = input.find("\n-", idx)) >= 0 ; idx += 4 )
-      input.replace(idx, 2, "\n- -");
+      input.tqreplace(idx, 2, "\n- -");
 
     output = "-----BEGIN PGP SIGNED MESSAGE-----\n\n" + input + "\n" + output;
   }
 
   block.setProcessedText( output );
-  block.setStatus( status );
+  block.seStatus( status );
   return status;
 }
 
@@ -193,19 +193,19 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
 int
 Base5::decrypt( Block& block, const char *passphrase )
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   clear();
   input = block.text();
-  exitStatus = run("pgpv -f +batchmode=1", passphrase);
+  exiStatus = run("pgpv -f +batchmode=1", passphrase);
   if( !output.isEmpty() )
     block.setProcessedText( output );
   block.setError( error );
 
-  if(exitStatus == -1) {
+  if(exiStatus == -1) {
     errMsg = i18n("Error running PGP");
     status = RUN_ERR;
-    block.setStatus( status );
+    block.seStatus( status );
     return status;
   }
 
@@ -313,7 +313,7 @@ Base5::decrypt( Block& block, const char *passphrase )
   }
 
   //kdDebug(5100) << "status = " << status << endl;
-  block.setStatus( status );
+  block.seStatus( status );
   return status;
 }
 
@@ -321,12 +321,12 @@ Base5::decrypt( Block& block, const char *passphrase )
 Key*
 Base5::readPublicKey( const KeyID& keyId, const bool readTrust, Key* key )
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   status = 0;
-  exitStatus = run( "pgpk -ll 0x" + keyId, 0, true );
+  exiStatus = run( "pgpk -ll 0x" + keyId, 0, true );
 
-  if(exitStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return 0;
   }
@@ -340,9 +340,9 @@ Base5::readPublicKey( const KeyID& keyId, const bool readTrust, Key* key )
 
   if( readTrust )
   {
-    exitStatus = run( "pgpk -c 0x" + keyId, 0, true );
+    exiStatus = run( "pgpk -c 0x" + keyId, 0, true );
 
-    if(exitStatus != 0) {
+    if(exiStatus != 0) {
       status = ERROR;
       return 0;
     }
@@ -357,7 +357,7 @@ Base5::readPublicKey( const KeyID& keyId, const bool readTrust, Key* key )
 KeyList
 Base5::publicKeys( const TQStringList & patterns )
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   TQCString cmd = "pgpk -ll";
   for ( TQStringList::ConstIterator it = patterns.begin();
@@ -366,9 +366,9 @@ Base5::publicKeys( const TQStringList & patterns )
     cmd += KProcess::quote( *it ).local8Bit();
   }
   status = 0;
-  exitStatus = run( cmd, 0, true );
+  exiStatus = run( cmd, 0, true );
 
-  if(exitStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return KeyList();
   }
@@ -386,7 +386,7 @@ Base5::publicKeys( const TQStringList & patterns )
 KeyList
 Base5::secretKeys( const TQStringList & patterns )
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   status = 0;
   TQCString cmd = "pgpk -ll";
@@ -396,9 +396,9 @@ Base5::secretKeys( const TQStringList & patterns )
     cmd += KProcess::quote( *it ).local8Bit();
   }
   status = 0;
-  exitStatus = run( cmd, 0, true );
+  exiStatus = run( cmd, 0, true );
 
-  if(exitStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return KeyList();
   }
@@ -415,15 +415,15 @@ Base5::secretKeys( const TQStringList & patterns )
 
 TQCString Base5::getAsciiPublicKey(const KeyID& keyID)
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   if (keyID.isEmpty())
     return TQCString();
 
   status = 0;
-  exitStatus = run( "pgpk -xa 0x" + keyID, 0, true );
+  exiStatus = run( "pgpk -xa 0x" + keyID, 0, true );
 
-  if(exitStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return TQCString();
   }
@@ -436,7 +436,7 @@ int
 Base5::signKey(const KeyID& keyID, const char *passphrase)
 {
   TQCString cmd;
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   if(passphrase == 0) return false;
 
@@ -445,9 +445,9 @@ Base5::signKey(const KeyID& keyID, const char *passphrase)
   cmd += addUserId();
 
   status = 0;
-  exitStatus = run(cmd.data(), passphrase);
+  exiStatus = run(cmd.data(), passphrase);
 
-  if (exitStatus != 0)
+  if (exiStatus != 0)
     status = ERROR;
 
   return status;
@@ -492,7 +492,7 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
     if( !strncmp( output.data() + offset, "pub", 3 ) ||
         !strncmp( output.data() + offset, "sec", 3 ) ||
         !strncmp( output.data() + offset, "sub", 3 ) )
-    { // line contains key data
+    { // line tqcontains key data
       //kdDebug(5100)<<"Key data:\n";
       int pos, pos2;
 
@@ -579,7 +579,7 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
           TQDateTime dt( TQDate( year, month, day ), TQTime( 00, 00 ) );
           subkey->setCreationDate( epoch.secsTo( dt ) );
           // has the key already expired?
-          if( TQDateTime::currentDateTime() >= dt )
+          if( TQDateTime::tqcurrentDateTime() >= dt )
           {
             subkey->setExpired( true );
             key->setExpired( true );
@@ -647,7 +647,7 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
     }
     else if( !strncmp( output.data() + offset, "f16", 3 ) ||
              !strncmp( output.data() + offset, "f20", 3 ) )
-    { // line contains a fingerprint
+    { // line tqcontains a fingerprint
       /* Examples:
          f16    Fingerprint16 = DE 2A 77 08 78 64 7C 42  72 75 B1 A7 3E 42 3F 79
          f20    Fingerprint20 = 226F 4B63 6DA2 7389 91D1  2A49 D58A 3EC1 5214 181E
@@ -657,13 +657,13 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
       TQCString fingerprint = output.mid( pos, eol-pos );
       // remove white space from the fingerprint
       for ( int idx = 0 ; (idx = fingerprint.find(' ', idx)) >= 0 ; )
-	fingerprint.replace( idx, 1, "" );
+	fingerprint.tqreplace( idx, 1, "" );
       assert( subkey != 0 );
       subkey->setFingerprint( fingerprint );
       //kdDebug(5100)<<"Fingerprint: "<<fingerprint<<endl;
     }
     else if( !strncmp( output.data() + offset, "uid", 3 ) )
-    { // line contains a uid
+    { // line tqcontains a uid
       int pos = offset+5;
       TQCString uid = output.mid( pos, eol-pos );
       key->addUserID( uid );
@@ -678,7 +678,7 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
     else if ( !strncmp( output.data() + offset, "sig", 3 ) ||
               !strncmp( output.data() + offset, "SIG", 3 ) ||
               !strncmp( output.data() + offset, "ret", 3 ) )
-    { // line contains a signature
+    { // line tqcontains a signature
       // SIG = sig with own key; ret = sig with revoked key
       // we ignore it for now
     }
@@ -792,7 +792,7 @@ Base5::parseTrustDataForKey( Key* key, const TQCString& str )
       break;
 
     if( str[offset+23] != ' ' )
-    { // line contains a validity value for a user ID
+    { // line tqcontains a validity value for a user ID
 
       // determine the validity
       Validity validity = KPGP_VALIDITY_UNKNOWN;
diff --git a/libkpgp/kpgpbase6.cpp b/libkpgp/kpgpbase6.cpp
index 6ee6af22..fba6d4ec 100644
--- a/libkpgp/kpgpbase6.cpp
+++ b/libkpgp/kpgpbase6.cpp
@@ -49,19 +49,19 @@ int
 Base6::decrypt( Block& block, const char *passphrase )
 {
   int index, index2;
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   clear();
   input = block.text();
-  exitStatus = run( PGP6 " +batchmode +language=C -f", passphrase);
+  exiStatus = run( PGP6 " +batchmode +language=C -f", passphrase);
   if( !output.isEmpty() )
     block.setProcessedText( output );
   block.setError( error );
 
-  if(exitStatus == -1) {
+  if(exiStatus == -1) {
     errMsg = i18n("error running PGP");
     status = RUN_ERR;
-    block.setStatus( status );
+    block.seStatus( status );
     return status;
   }
 
@@ -180,7 +180,7 @@ Base6::decrypt( Block& block, const char *passphrase )
     }
   }
   //kdDebug(5100) << "status = " << status << endl;
-  block.setStatus( status );
+  block.seStatus( status );
   return status;
 }
 
@@ -190,13 +190,13 @@ Base6::readPublicKey( const KeyID& keyID,
                       const bool readTrust /* = false */,
                       Key* key /* = 0 */ )
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   status = 0;
-  exitStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kvvc "
+  exiStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kvvc "
                     "0x" + keyID, 0, true );
 
-  if(exitStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return 0;
   }
@@ -210,10 +210,10 @@ Base6::readPublicKey( const KeyID& keyID,
 
   if( readTrust )
   {
-    exitStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kc "
+    exiStatus = run( PGP6 " +batchmode -compatible +verbose=0 +language=C -kc "
                       "0x" + keyID, 0, true );
 
-    if(exitStatus != 0) {
+    if(exiStatus != 0) {
       status = ERROR;
       return 0;
     }
@@ -238,13 +238,13 @@ QStrList
 Base6::pubKeys()
 {
   int index, index2;
-  int exitStatus = 0;
+  int exiStatus = 0;
   int compatibleMode = 1;
 
   status = 0;
-  exitStatus = run("pgp +batchmode +language=C -kv -f");
+  exiStatus = run("pgp +batchmode +language=C -kv -f");
 
-  if(exitStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return 0;
   }
@@ -319,9 +319,9 @@ Base6::pubKeys()
   }
 
   // Also look for pgp key groups
-  exitStatus = run("pgp +batchmode +language=C -gv -f");
+  exiStatus = run("pgp +batchmode +language=C -gv -f");
 
-  if(exitStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return 0;
   }
@@ -352,11 +352,11 @@ Base6::secretKeys( const TQStringList & patterns )
 int
 Base6::isVersion6()
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
 
-  exitStatus = run( PGP6, 0, true );
+  exiStatus = run( PGP6, 0, true );
 
-  if(exitStatus == -1) {
+  if(exiStatus == -1) {
     errMsg = i18n("error running PGP");
     status = RUN_ERR;
     return 0;
@@ -406,7 +406,7 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
 
     if( firstLine && ( !strncmp( output.data() + offset, "DSS", 3 ) ||
                        !strncmp( output.data() + offset, "RSA", 3 ) ) )
-    { // line contains primary key data
+    { // line tqcontains primary key data
       // Example 1:
       // RSA  1024      0xE2D074D3 2001/09/09 Test Key <testkey@xyz>
       // Example 2 (disabled key):
@@ -554,7 +554,7 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
     else if( !strncmp( output.data() + offset, "DSS", 3 ) ||
              !strncmp( output.data() + offset, " DH", 3 ) ||
              !strncmp( output.data() + offset, "RSA", 3 ) )
-    { // line contains secondary key data (or data for the next key)
+    { // line tqcontains secondary key data (or data for the next key)
       if( fpr )
         break; // here begins the next key's data
       //kdDebug(5100)<<"Secondary key data:\n";
@@ -639,11 +639,11 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
       canEncr = canEncr || encr;
     }
     else if( !strncmp( output.data() + offset, "Unknown type", 12 ) )
-    { // line contains key data of unknown type (ignored)
+    { // line tqcontains key data of unknown type (ignored)
       kdDebug(5100)<<"Unknown key type.\n";
     }
     else if( output[offset] == ' ' )
-    { // line contains additional key data
+    { // line tqcontains additional key data
       if( key == 0 )
         break;
       //kdDebug(5100)<<"Additional key data:\n";
@@ -653,7 +653,7 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
         pos++;
 
       if( !strncmp( output.data() + pos, "Key fingerprint = ", 18 ) )
-      { // line contains a fingerprint
+      { // line tqcontains a fingerprint
         // Example:
         //           Key fingerprint =  D0 6C BB 3A F5 16 82 C4  F3 A0 8A B3 7B 16 99 70
 
@@ -663,14 +663,14 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
         TQCString fingerprint = output.mid( pos, eol-pos );
         // remove white space from the fingerprint
 	for ( int idx = 0 ; (idx = fingerprint.find(' ', idx)) >= 0 ; )
-	  fingerprint.replace( idx, 1, "" );
+	  fingerprint.tqreplace( idx, 1, "" );
 
         //kdDebug(5100)<<"Fingerprint: "<<fingerprint<<endl;
         assert( subkey != 0 );
         subkey->setFingerprint( fingerprint );
       }
       else
-      { // line contains an additional user id
+      { // line tqcontains an additional user id
         // Example:
         //                               Test key (2nd user ID) <abc@xyz>
 
@@ -679,7 +679,7 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
       }
     }
     else if( !strncmp( output.data() + offset, "sig", 3 ) )
-    { // line contains signature data (ignored)
+    { // line tqcontains signature data (ignored)
       //kdDebug(5100)<<"Signature.\n";
     }
     else // end of key data
@@ -804,7 +804,7 @@ Base6::parseTrustDataForKey( Key* key, const TQCString& str )
       break;
 
     if( str[offset+23] != ' ' )
-    { // line contains a validity value for a user ID
+    { // line tqcontains a validity value for a user ID
 
       // determine the validity
       Validity validity = KPGP_VALIDITY_UNKNOWN;
diff --git a/libkpgp/kpgpbaseG.cpp b/libkpgp/kpgpbaseG.cpp
index 768d5c02..5aa619ec 100644
--- a/libkpgp/kpgpbaseG.cpp
+++ b/libkpgp/kpgpbaseG.cpp
@@ -73,7 +73,7 @@ BaseG::encsign( Block& block, const KeyIDList& recipients,
                 const char *passphrase )
 {
   TQCString cmd;
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   if(!recipients.isEmpty() && passphrase != 0)
     cmd = "--batch --armor --sign --encrypt --textmode";
@@ -109,12 +109,12 @@ BaseG::encsign( Block& block, const KeyIDList& recipients,
 
   clear();
   input = block.text();
-  exitStatus = runGpg(cmd.data(), passphrase);
+  exiStatus = runGpg(cmd.data(), passphrase);
   if( !output.isEmpty() )
     block.setProcessedText( output );
   block.setError( error );
 
-  if( exitStatus != 0 )
+  if( exiStatus != 0 )
   {
     // this error message is later hopefully overwritten
     errMsg = i18n( "Unknown error." );
@@ -199,7 +199,7 @@ BaseG::encsign( Block& block, const KeyIDList& recipients,
   }
 
   //kdDebug(5100) << "status = " << status << endl;
-  block.setStatus( status );
+  block.seStatus( status );
   return status;
 }
 
@@ -208,19 +208,19 @@ int
 BaseG::decrypt( Block& block, const char *passphrase )
 {
   int index, index2;
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   clear();
   input = block.text();
-  exitStatus = runGpg("--batch --decrypt", passphrase);
+  exiStatus = runGpg("--batch --decrypt", passphrase);
   if( !output.isEmpty() && ( error.find( "gpg: quoted printable" ) == -1 ) )
     block.setProcessedText( output );
   block.setError( error );
 
-  if(exitStatus == -1) {
+  if(exiStatus == -1) {
     errMsg = i18n("Error running gpg");
     status = RUN_ERR;
-    block.setStatus( status );
+    block.seStatus( status );
     return status;
   }
 
@@ -361,7 +361,7 @@ BaseG::decrypt( Block& block, const char *passphrase )
     }
   }
   //kdDebug(5100) << "status = " << status << endl;
-  block.setStatus( status );
+  block.seStatus( status );
   return status;
 }
 
@@ -371,15 +371,15 @@ BaseG::readPublicKey( const KeyID& keyID,
                       const bool readTrust /* = false */,
                       Key* key /* = 0 */ )
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   status = 0;
   if( readTrust )
-    exitStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode 0x" + keyID, 0, true );
+    exiStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode 0x" + keyID, 0, true );
   else
-    exitStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode --no-expensive-trust-checks 0x" + keyID, 0, true );
+    exiStatus = runGpg( "--batch --list-public-keys --with-fingerprint --with-colons --fixed-list-mode --no-expensive-trust-checks 0x" + keyID, 0, true );
 
-  if(exitStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return 0;
   }
@@ -405,7 +405,7 @@ BaseG::readPublicKey( const KeyID& keyID,
 KeyList
 BaseG::publicKeys( const TQStringList & patterns )
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   // the option --with-colons should be used for interprocess communication
   // with gpg (according to Werner Koch)
@@ -417,9 +417,9 @@ BaseG::publicKeys( const TQStringList & patterns )
     cmd += KProcess::quote( *it ).local8Bit();
   }
   status = 0;
-  exitStatus = runGpg( cmd, 0, true );
+  exiStatus = runGpg( cmd, 0, true );
 
-  if(exitStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return KeyList();
   }
@@ -437,7 +437,7 @@ BaseG::publicKeys( const TQStringList & patterns )
 KeyList
 BaseG::secretKeys( const TQStringList & patterns )
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   // the option --with-colons should be used for interprocess communication
   // with gpg (according to Werner Koch)
@@ -449,9 +449,9 @@ BaseG::secretKeys( const TQStringList & patterns )
     cmd += KProcess::quote( *it ).local8Bit();
   }
   status = 0;
-  exitStatus = runGpg( cmd, 0, true );
+  exiStatus = runGpg( cmd, 0, true );
 
-  if(exitStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return KeyList();
   }
@@ -470,7 +470,7 @@ int
 BaseG::signKey(const KeyID& keyID, const char *passphrase)
 {
   TQCString cmd;
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   cmd = "--batch";
   cmd += addUserId();
@@ -478,9 +478,9 @@ BaseG::signKey(const KeyID& keyID, const char *passphrase)
   cmd += keyID;
 
   status = 0;
-  exitStatus = runGpg(cmd.data(), passphrase);
+  exiStatus = runGpg(cmd.data(), passphrase);
 
-  if (exitStatus != 0)
+  if (exiStatus != 0)
     status = ERROR;
 
   return status;
@@ -490,15 +490,15 @@ BaseG::signKey(const KeyID& keyID, const char *passphrase)
 QCString
 BaseG::getAsciiPublicKey(const KeyID& keyID)
 {
-  int exitStatus = 0;
+  int exiStatus = 0;
 
   if (keyID.isEmpty())
     return TQCString();
 
   status = 0;
-  exitStatus = runGpg("--batch --armor --export 0x" + keyID, 0, true);
+  exiStatus = runGpg("--batch --armor --export 0x" + keyID, 0, true);
 
-  if(exitStatus != 0) {
+  if(exiStatus != 0) {
     status = ERROR;
     return TQCString();
   }
@@ -542,7 +542,7 @@ BaseG::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
     bool bIsPublicKey = false;
     if( ( bIsPublicKey = !strncmp( output.data() + index, "pub:", 4 ) )
         || !strncmp( output.data() + index, "sec:", 4 ) )
-    { // line contains primary key data
+    { // line tqcontains primary key data
       // Example: pub:f:1024:17:63CB691DFAEBD5FC:860451781::379:-:::scESC:
 
       // abort parsing if we found the start of the next key
@@ -657,7 +657,7 @@ BaseG::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
       key->addSubkey( subkey );
     }
     else if( !strncmp( output.data() + index, "uid:", 4 ) )
-    { // line contains a user id
+    { // line tqcontains a user id
       // Example: uid:f::::::::Philip R. Zimmermann <prz@pgp.com>:
 
       UserID *userID = new UserID( "" );
@@ -710,19 +710,19 @@ BaseG::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
           break;
         case 10: // User-ID
           TQCString uid = output.mid( pos, pos2-pos );
-          // replace "\xXX" with the corresponding character;
+          // tqreplace "\xXX" with the corresponding character;
           // other escaped characters, i.e. \n, \r etc., are ignored
           // because they shouldn't appear in user IDs
           for ( int idx = 0 ; (idx = uid.find( "\\x", idx )) >= 0 ; ++idx ) {
             char str[2] = "x";
             str[0] = (char) TQString( uid.mid( idx + 2, 2 ) ).toShort( 0, 16 );
-            uid.replace( idx, 4, str );
+            uid.tqreplace( idx, 4, str );
           }
           TQString uidString = TQString::fromUtf8( uid.data() );
           // check whether uid was utf-8 encoded
           bool isUtf8 = true;
           for ( unsigned int i = 0; i + 1 < uidString.length(); ++i ) {
-            if ( uidString[i].unicode() == 0xdbff &&
+            if ( uidString[i].tqunicode() == 0xdbff &&
                  uidString[i+1].row() == 0xde ) {
               // we found a non-Unicode character (see TQString::fromUtf8())
               isUtf8 = false;
@@ -778,7 +778,7 @@ BaseG::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
             else {
               // assume latin1 encoding
               kdDebug(5100) << "Assume latin1 encoding." << endl;
-              uidString = TQString::fromLatin1( uid.data() );
+              uidString = TQString::tqfromLatin1( uid.data() );
             }
           }
           userID->setText( uidString );
@@ -792,7 +792,7 @@ BaseG::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ )
       key->addUserID( userID );
     }
     else if( !strncmp( output.data() + index, "fpr:", 4 ) )
-    { // line contains a fingerprint
+    { // line tqcontains a fingerprint
       // Example: fpr:::::::::17AFBAAF21064E513F037E6E63CB691DFAEBD5FC:
 
       if (key == 0) // invalid key data
diff --git a/libkpgp/kpgpblock.cpp b/libkpgp/kpgpblock.cpp
index 015929c2..9d0a6805 100644
--- a/libkpgp/kpgpblock.cpp
+++ b/libkpgp/kpgpblock.cpp
@@ -122,7 +122,7 @@ Block::clearsign( const TQCString& keyId, const TQCString& charset )
 }
 
 Kpgp::Result
-Block::encrypt( const TQStringList& receivers, const TQCString& keyId,
+Block::encrypt( const TQStringList& tqreceivers, const TQCString& keyId,
                 const bool sign, const TQCString& charset )
 {
   Kpgp::Module *pgp = Kpgp::Module::getKpgp();
@@ -130,7 +130,7 @@ Block::encrypt( const TQStringList& receivers, const TQCString& keyId,
   if( pgp == 0 )
     return Kpgp::Failure;
 
-  return pgp->encrypt( *this, receivers, keyId, sign, charset );
+  return pgp->encrypt( *this, tqreceivers, keyId, sign, charset );
 }
 
 } // namespace Kpgp
diff --git a/libkpgp/kpgpblock.h b/libkpgp/kpgpblock.h
index a85dcea6..c741062a 100644
--- a/libkpgp/kpgpblock.h
+++ b/libkpgp/kpgpblock.h
@@ -103,7 +103,7 @@ class KDE_EXPORT Block
   void setProcessedText( const TQCString& str );
 
   int status() const;
-  void setStatus( const int status );
+  void seStatus( const int status );
 
   BlockType type();
 
@@ -169,7 +169,7 @@ class KDE_EXPORT Block
       false  if there was an unresolvable error or if encryption was canceled
       true   if everything is o.k.
   */
-  Kpgp::Result encrypt( const TQStringList& receivers, const TQCString& keyId,
+  Kpgp::Result encrypt( const TQStringList& tqreceivers, const TQCString& keyId,
                 const bool sign, const TQCString& charset = TQCString() );
 
  private:
@@ -235,7 +235,7 @@ Block::status() const
 }
 
 inline void
-Block::setStatus( const int status )
+Block::seStatus( const int status )
 {
   mStatus = status;
 }
diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp
index e0d5bee2..29456046 100644
--- a/libkpgp/kpgpui.cpp
+++ b/libkpgp/kpgpui.cpp
@@ -115,7 +115,7 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt )
   TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 
   group = new TQVGroupBox( i18n("Warning"), this );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
   // (mmutz) work around Qt label bug in 3.0.0 (and possibly later):
   // 1. Don't use rich text: No <qt><b>...</b></qt>
   label = new TQLabel( i18n("Please check if encryption really "
@@ -126,13 +126,13 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt )
   labelFont.setBold( true );
   label->setFont( labelFont );
   // 3. and activate wordwarp:
-  label->setAlignment( AlignLeft|WordBreak );
+  label->tqsetAlignment( AlignLeft|WordBreak );
   // end; to remove the workaround, add <qt><b>..</b></qt> around the
-  // text and remove lines TQFont... -> label->setAlignment(...).
+  // text and remove lines TQFont... -> label->tqsetAlignment(...).
   topLayout->addWidget( group );
 
   group = new TQVGroupBox( i18n("Encryption Tool"), this );
-  group->layout()->setSpacing( KDialog::spacingHint() );
+  group->tqlayout()->setSpacing( KDialog::spacingHint() );
 
   TQHBox * hbox = new TQHBox( group );
   label = new TQLabel( i18n("Select encryption tool to &use:"), hbox );
@@ -153,7 +153,7 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt )
   topLayout->addWidget( group );
 
   mpOptionsGroupBox = new TQVGroupBox( i18n("Options"), this );
-  mpOptionsGroupBox->layout()->setSpacing( KDialog::spacingHint() );
+  mpOptionsGroupBox->tqlayout()->setSpacing( KDialog::spacingHint() );
   storePass = new TQCheckBox( i18n("&Keep passphrase in memory"),
                              mpOptionsGroupBox );
   connect( storePass, TQT_SIGNAL( toggled( bool ) ),
@@ -1176,7 +1176,7 @@ KeyRequester::KeyRequester( TQWidget * parent, bool multipleKeys,
   // the button to unset any key:
   mEraseButton = new TQPushButton( this );
   mEraseButton->setAutoDefault( false );
-  mEraseButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
+  mEraseButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
 					    TQSizePolicy::Minimum ) );
   mEraseButton->setPixmap( SmallIcon( "clear_left" ) );
   TQToolTip::add( mEraseButton, i18n("Clear") );
@@ -1192,7 +1192,7 @@ KeyRequester::KeyRequester( TQWidget * parent, bool multipleKeys,
   connect( mEraseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEraseButtonClicked()) );
   connect( mDialogButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDialogButtonClicked()) );
 
-  setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+  tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
 			      TQSizePolicy::Fixed ) );
 }
 
@@ -1480,21 +1480,21 @@ KeyApprovalDialog::KeyApprovalDialog( const TQStringList& addresses,
   // calculate the optimal width for the dialog
   int dialogWidth = marginHint()
                   + sv->frameWidth()
-                  + bigvbox->sizeHint().width()
-                  + sv->verticalScrollBar()->sizeHint().width()
+                  + bigvbox->tqsizeHint().width()
+                  + sv->verticalScrollBar()->tqsizeHint().width()
                   + sv->frameWidth()
                   + marginHint()
                   + 2;
   // calculate the optimal height for the dialog
   int dialogHeight = marginHint()
-                   + label->sizeHint().height()
+                   + label->tqsizeHint().height()
                    + topLayout->spacing()
                    + sv->frameWidth()
-                   + bigvbox->sizeHint().height()
-                   + sv->horizontalScrollBar()->sizeHint().height()
+                   + bigvbox->tqsizeHint().height()
+                   + sv->horizontalScrollBar()->tqsizeHint().height()
                    + sv->frameWidth()
                    + topLayout->spacing()
-                   + actionButton( KDialogBase::Cancel )->sizeHint().height()
+                   + actionButton( KDialogBase::Cancel )->tqsizeHint().height()
                    + marginHint()
                    + 2;
   // don't make the dialog too large
@@ -1630,26 +1630,26 @@ CipherTextDialog::CipherTextDialog( const TQCString & text,
   mEditBox->setReadOnly(true);
   topLayout->addWidget( mEditBox, 10 );
 
-  TQString unicodeText;
+  TQString tqunicodeText;
   if (charset.isEmpty())
-    unicodeText = TQString::fromLocal8Bit(text.data());
+    tqunicodeText = TQString::fromLocal8Bit(text.data());
   else {
     bool ok=true;
     TQTextCodec *codec = KGlobal::charsets()->codecForName(charset, ok);
     if(!ok)
-      unicodeText = TQString::fromLocal8Bit(text.data());
+      tqunicodeText = TQString::fromLocal8Bit(text.data());
     else
-      unicodeText = codec->toUnicode(text.data(), text.length());
+      tqunicodeText = codec->toUnicode(text.data(), text.length());
   }
 
-  mEditBox->setText(unicodeText);
+  mEditBox->setText(tqunicodeText);
 
   setMinimumSize();
 }
 
 void CipherTextDialog::setMinimumSize()
 {
-  // this seems to force a layout of the entire document, so we get a
+  // this seems to force a tqlayout of the entire document, so we get a
   // a proper contentsWidth(). Is there a better way?
   for ( int i = 0; i < mEditBox->paragraphs(); i++ )
       (void) mEditBox->paragraphRect( i );
@@ -1660,7 +1660,7 @@ void CipherTextDialog::setMinimumSize()
 
 
 #if KDE_IS_VERSION( 3, 1, 90 )
-  int maxWidth = KGlobalSettings::desktopGeometry(parentWidget()).width()-100;
+  int maxWidth = KGlobalSettings::desktopGeometry(tqparentWidget()).width()-100;
 #else
   KConfig gc("kdeglobals", false, false);
   gc.setGroup("Windows");
@@ -1668,9 +1668,9 @@ void CipherTextDialog::setMinimumSize()
   if (TQApplication::desktop()->isVirtualDesktop() &&
       gc.readBoolEntry("XineramaEnabled", true) &&
       gc.readBoolEntry("XineramaPlacementEnabled", true)) {
-    maxWidth = TQApplication::desktop()->screenGeometry(TQApplication::desktop()->screenNumber(parentWidget())).width()-100;
+    maxWidth = TQApplication::desktop()->screenGeometry(TQApplication::desktop()->screenNumber(tqparentWidget())).width()-100;
   } else {
-    maxWidth = TQApplication::desktop()->geometry().width()-100;
+    maxWidth = TQApplication::desktop()->tqgeometry().width()-100;
   }
 #endif
 
diff --git a/libkpimexchange/core/exchangeaccount.cpp b/libkpimexchange/core/exchangeaccount.cpp
index 858169ad..a974f264 100644
--- a/libkpimexchange/core/exchangeaccount.cpp
+++ b/libkpimexchange/core/exchangeaccount.cpp
@@ -89,8 +89,8 @@ TQString endecryptStr( const TQString &aStr )
 {
   TQString result;
   for (uint i = 0; i < aStr.length(); i++)
-    result += (aStr[i].unicode() < 0x20) ? aStr[i] :
-              TQChar(0x1001F - aStr[i].unicode());
+    result += (aStr[i].tqunicode() < 0x20) ? aStr[i] :
+              TQChar(0x1001F - aStr[i].tqunicode());
   return result;
 }
 
@@ -163,7 +163,7 @@ bool ExchangeAccount::authenticate( TQWidget *window )
 bool ExchangeAccount::authenticate()
 {
   long windowId;
-  TQWidgetList *widgets = TQApplication::topLevelWidgets();
+  TQWidgetList *widgets = TQApplication::tqtopLevelWidgets();
   if ( widgets->isEmpty() )
     windowId = 0;
   else
@@ -206,7 +206,7 @@ bool ExchangeAccount::authenticate( int windowId )
   // TODO: Remove this busy loop
   TQApplication::setOverrideCursor( KCursor::waitCursor() );
   do {
-    qApp->processEvents();
+    tqApp->processEvents();
   } while ( !mCalendarURL && !mError );
   TQApplication::restoreOverrideCursor();
 
diff --git a/libkpimexchange/core/exchangeclient.cpp b/libkpimexchange/core/exchangeclient.cpp
index 3a1c46cc..1047f36e 100644
--- a/libkpimexchange/core/exchangeclient.cpp
+++ b/libkpimexchange/core/exchangeclient.cpp
@@ -226,7 +226,7 @@ int ExchangeClient::downloadSynchronous( KCal::Calendar *calendar,
   TQApplication::setOverrideCursor
   ( KCursor::waitCursor() );
   do {
-    qApp->processEvents();
+    tqApp->processEvents();
   } while ( mClientState == WaitingForResult );
   TQApplication::restoreOverrideCursor();  
 
@@ -247,7 +247,7 @@ int ExchangeClient::uploadSynchronous( KCal::Event* event )
   // TODO: Remove this busy loop
   TQApplication::setOverrideCursor( KCursor::waitCursor() );
   do {
-    qApp->processEvents();
+    tqApp->processEvents();
   } while ( mClientState == WaitingForResult );
   TQApplication::restoreOverrideCursor();  
   disconnect( this, TQT_SIGNAL( uploadFinished( int, const TQString & ) ), 
@@ -266,7 +266,7 @@ int ExchangeClient::removeSynchronous( KCal::Event* event )
   // TODO: Remove this busy loop
   TQApplication::setOverrideCursor( KCursor::waitCursor() );
   do {
-    qApp->processEvents();
+    tqApp->processEvents();
   } while ( mClientState == WaitingForResult );
   TQApplication::restoreOverrideCursor();  
   disconnect( this, TQT_SIGNAL( removeFinished( int, const TQString & ) ), 
diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp
index 60879d26..16b1a1a3 100644
--- a/libkpimexchange/core/exchangedownload.cpp
+++ b/libkpimexchange/core/exchangedownload.cpp
@@ -255,7 +255,7 @@ void ExchangeDownload::handleAppointments( const TQDomDocument &response,
           continue;
         }
         TQString uid = uidElement.text();
-        if ( ! m_uids.contains( uid ) ) {
+        if ( ! m_uids.tqcontains( uid ) ) {
           m_uids[uid] = 1;
           handleRecurrence(uid);
           successCount++;
@@ -582,7 +582,7 @@ void ExchangeDownload::slotPropFindResult( KIO::Job *job )
   if ( mCalendar ) {
     KCal::Event *oldEvent = mCalendar->event( event->uid() );
     if ( oldEvent ) {
-      kdWarning() << "Already got his event, replace it..." << endl;
+      kdWarning() << "Already got his event, tqreplace it..." << endl;
       mCalendar->deleteEvent( oldEvent );
     }
     kdDebug() << "ADD EVENT" << endl;
diff --git a/libkpimexchange/core/exchangemonitor.cpp b/libkpimexchange/core/exchangemonitor.cpp
index 8e552503..ae33a369 100644
--- a/libkpimexchange/core/exchangemonitor.cpp
+++ b/libkpimexchange/core/exchangemonitor.cpp
@@ -261,7 +261,7 @@ void ExchangeMonitor::slotUnsubscribeResult( KIO::Job * job )
   kdDebug() << "Subscription ID.text(): " << subscriptionID.text() << endl;
   bool ok;
   ID id = subscriptionID.text().toLong( &ok );
-  if ( ! status.text().contains( "200" ) || !ok) {
+  if ( ! status.text().tqcontains( "200" ) || !ok) {
     kdError() << "UNSUBSCRIBE result is not 200 or no subscription ID found" << endl;
     emit error( ExchangeClient::ServerResponseError, "UNSUBSCRIBE yields an error response: \n" + response.toString() );
   }
@@ -285,7 +285,7 @@ void ExchangeMonitor::slotActivated( int )
     return;
 
   TQCString response( maxLen+2 );
-  Q_LONG len = mSocket->readBlock ( response.data(), maxLen+1 );
+  TQ_LONG len = mSocket->readBlock ( response.data(), maxLen+1 );
 
   if ( len <= 0 ) {
     kdDebug() << "Error: len<=0" << endl;
@@ -346,7 +346,7 @@ void ExchangeMonitor::slotPollResult( KIO::Job * job )
     TQDomElement item = responses.item( i ).toElement();
     TQDomElement status = item.namedItem( "status" ).toElement();
     TQDomElement subscriptionID = item.namedItem( "subscriptionID" ).toElement();
-    if ( status.text().contains( "200" ) ) {
+    if ( status.text().tqcontains( "200" ) ) {
       kdDebug() << "subscriptionID: " << subscriptionID.text() << endl;
       IDList IDs = makeIDList( subscriptionID.text() );
       TQValueList<KURL> urls;
@@ -355,7 +355,7 @@ void ExchangeMonitor::slotPollResult( KIO::Job * job )
         urls += mSubscriptionMap[ *it ];
       }
       emit notify( IDs, urls );
-    } else if ( ! status.text().contains( "204" ) ) {
+    } else if ( ! status.text().tqcontains( "204" ) ) {
       kdWarning() << "POLL result is not 200 or 204, what's up?" << endl;
       emit error( ExchangeClient::ServerResponseError, "Poll result is wrong: \n" +  response.toString() );
     }
diff --git a/libkpimexchange/core/exchangeupload.cpp b/libkpimexchange/core/exchangeupload.cpp
index 29a796dd..f62d6a32 100644
--- a/libkpimexchange/core/exchangeupload.cpp
+++ b/libkpimexchange/core/exchangeupload.cpp
@@ -256,7 +256,7 @@ void ExchangeUpload::startUpload( const KURL &url )
     offsetString = TQString( "+%1:%2" ).arg(tzOffset/60, 2).arg( tzOffset%60, 2 );
   else
     offsetString = TQString( "-%1:%2" ).arg((-tzOffset)/60, 2).arg( (-tzOffset)%60, 2 );
-  offsetString = offsetString.replace( TQRegExp(" "), "0" );
+  offsetString = offsetString.tqreplace( TQRegExp(" "), "0" );
 
   kdDebug() << "Timezone offset: " << tzOffset << " : " << offsetString << endl;
   kdDebug() << "ExchangeUpload::mTimeZoneId=" << mTimeZoneId << endl;
@@ -292,8 +292,8 @@ void ExchangeUpload::startUpload( const KURL &url )
     KCal::ICalFormat *format = new KCal::ICalFormat();
     TQString recurstr = format->toString( recurrence->defaultRRule() );
     // Strip leading "RRULE\n :" and whitespace
-    recurstr = recurstr.replace( TQRegExp("^[A-Z]*[\\s]*:"), "").stripWhiteSpace();
-    kdDebug() << "Recurrence rule after replace: \"" << recurstr << "\"" << endl;
+    recurstr = recurstr.tqreplace( TQRegExp("^[A-Z]*[\\s]*:"), "").stripWhiteSpace();
+    kdDebug() << "Recurrence rule after tqreplace: \"" << recurstr << "\"" << endl;
     delete format;
     TQDomElement rrule = addElement( doc, prop, "urn:schemas:calendar:", "rrule" );
     addElement( doc, rrule, "xml:", "v", recurstr );
@@ -360,8 +360,8 @@ void ExchangeUpload::slotPatchResult( KIO::Job *job )
                          .toElement();
   kdDebug() << "status: " << status.text() << endl;
   kdDebug() << "propstat: " << propstat.text() << endl;
-  if ( ! ( status.text().contains( "201" ) || 
-           propstat.text().contains( "200" ) ) )
+  if ( ! ( status.text().tqcontains( "201" ) || 
+           propstat.text().tqcontains( "200" ) ) )
     emit finished( this, ExchangeClient::EventWriteError,
                    "Upload error response: \n" + response.toString() ); 
   else 
diff --git a/libkpimidentities/identity.cpp b/libkpimidentities/identity.cpp
index fb2f1ac1..62eeba75 100644
--- a/libkpimidentities/identity.cpp
+++ b/libkpimidentities/identity.cpp
@@ -143,16 +143,16 @@ TQString Signature::withSeparator( bool * ok ) const
   }
   if ( ok ) *ok = true;
   if ( signature.isEmpty() ) return signature; // don't add a separator in this case
-  if ( signature.startsWith( TQString::fromLatin1("-- \n") ) )
+  if ( signature.startsWith( TQString::tqfromLatin1("-- \n") ) )
     // already have signature separator at start of sig:
-    return TQString::fromLatin1("\n") += signature;
-  else if ( signature.find( TQString::fromLatin1("\n-- \n") ) != -1 )
+    return TQString::tqfromLatin1("\n") += signature;
+  else if ( signature.find( TQString::tqfromLatin1("\n-- \n") ) != -1 )
     // already have signature separator inside sig; don't prepend '\n'
     // to improve abusing signatures as templates:
     return signature;
   else
     // need to prepend one:
-    return TQString::fromLatin1("\n-- \n") + signature;
+    return TQString::tqfromLatin1("\n-- \n") + signature;
 }
 
 
@@ -211,13 +211,13 @@ void Signature::writeConfig( KConfigBase * config ) const
 }
 
 TQDataStream & KPIM::operator<<( TQDataStream & stream, const KPIM::Signature & sig ) {
-  return stream << static_cast<Q_UINT8>(sig.mType)
+  return stream << static_cast<TQ_UINT8>(sig.mType)
 		<< sig.mUrl
 		<< sig.mText;
 }
 
 TQDataStream & KPIM::operator>>( TQDataStream & stream, KPIM::Signature & sig ) {
-    Q_UINT8 s;
+    TQ_UINT8 s;
     stream >> s
            >> sig.mUrl
            >> sig.mText;
@@ -382,7 +382,7 @@ void Identity::writeConfig( KConfigBase * config ) const
 }
 
 TQDataStream & KPIM::operator<<( TQDataStream & stream, const KPIM::Identity & i ) {
-  return stream << static_cast<Q_UINT32>(i.uoid())
+  return stream << static_cast<TQ_UINT32>(i.uoid())
 		<< i.identityName()
 		<< i.fullName()
 		<< i.organization()
@@ -406,7 +406,7 @@ TQDataStream & KPIM::operator<<( TQDataStream & stream, const KPIM::Identity & i
 }
 
 TQDataStream & KPIM::operator>>( TQDataStream & stream, KPIM::Identity & i ) {
-  Q_UINT32 uoid;
+  TQ_UINT32 uoid;
   TQString format;
   stream        >> uoid
 		>> i.mIdentity
@@ -531,7 +531,7 @@ TQString Identity::fullEmailAddr(void) const
   // add DQUOTE's if necessary:
   bool needsQuotes=false;
   for (unsigned int i=0; i < mFullName.length(); i++) {
-    if ( specials.contains( mFullName[i] ) )
+    if ( specials.tqcontains( mFullName[i] ) )
       needsQuotes = true;
     else if ( mFullName[i] == '\\' || mFullName[i] == '"' ) {
       needsQuotes = true;
diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp
index e7380ca6..939cb704 100644
--- a/libkpimidentities/identitymanager.cpp
+++ b/libkpimidentities/identitymanager.cpp
@@ -201,7 +201,7 @@ void IdentityManager::writeConfig() const {
   int i = 0;
   for ( ConstIterator it = mIdentities.begin() ;
 	it != mIdentities.end() ; ++it, ++i ) {
-    KConfigGroup cg( mConfig, TQString::fromLatin1("Identity #%1").arg(i) );
+    KConfigGroup cg( mConfig, TQString::tqfromLatin1("Identity #%1").arg(i) );
     (*it).writeConfig( &cg );
     if ( (*it).isDefault() ) {
       // remember which one is default:
@@ -326,7 +326,7 @@ Identity & IdentityManager::modifyIdentityForName( const TQString & name )
 {
   for ( Iterator it = modifyBegin() ; it != modifyEnd() ; ++it )
     if ( (*it).identityName() == name ) return (*it);
-  kdWarning( 5006 ) << "IdentityManager::identityForName() used as newFromScratch() replacement!"
+  kdWarning( 5006 ) << "IdentityManager::identityForName() used as newFromScratch() tqreplacement!"
 		    << "\n  name == \"" << name << "\"" << endl;
   return newFromScratch( name );
 }
@@ -335,7 +335,7 @@ Identity & IdentityManager::modifyIdentityForUoid( uint uoid )
 {
   for ( Iterator it = modifyBegin() ; it != modifyEnd() ; ++it )
     if ( (*it).uoid() == uoid ) return (*it);
-  kdWarning( 5006 ) << "IdentityManager::identityForUoid() used as newFromScratch() replacement!"
+  kdWarning( 5006 ) << "IdentityManager::identityForUoid() used as newFromScratch() tqreplacement!"
 		    << "\n  uoid == \"" << uoid << "\"" << endl;
   return newFromScratch( i18n("Unnamed") );
 }
diff --git a/libkpimidentities/identitymanager.h b/libkpimidentities/identitymanager.h
index dfb8e8ab..4c8587be 100644
--- a/libkpimidentities/identitymanager.h
+++ b/libkpimidentities/identitymanager.h
@@ -101,7 +101,7 @@ public:
   **/
   const Identity & identityForAddress( const TQString & addresses ) const;
 
-  /** @return true if @p addressList contains any of our addresses,
+  /** @return true if @p addressList tqcontains any of our addresses,
       false otherwise.
       @see #identityForAddress
   **/
diff --git a/libksieve/parser/lexer.cpp b/libksieve/parser/lexer.cpp
index c0b7cb8b..be0c493f 100644
--- a/libksieve/parser/lexer.cpp
+++ b/libksieve/parser/lexer.cpp
@@ -476,9 +476,9 @@ namespace KSieve {
 
     const int identifierLength = mState.cursor - identifierStart;
 
-    // Can use the fast fromLatin1 here, since identifiers are always
+    // Can use the fast tqfromLatin1 here, since identifiers are always
     // in the us-ascii subset:
-    result += TQString::fromLatin1( identifierStart, identifierLength );
+    result += TQString::tqfromLatin1( identifierStart, identifierLength );
 
     if ( atEnd() || isDelim( *mState.cursor ) )
       return true;
diff --git a/libksieve/tests/lexertest.cpp b/libksieve/tests/lexertest.cpp
index dee04bd1..df5ac6e1 100644
--- a/libksieve/tests/lexertest.cpp
+++ b/libksieve/tests/lexertest.cpp
@@ -37,7 +37,7 @@ using KSieve::Lexer;
 #include <ksieve/error.h>
 using KSieve::Error;
 
-#include <tqcstring.h> // qstrlen
+#include <tqcstring.h> // tqstrlen
 #include <tqstring.h>
 
 #include <iostream>
@@ -398,7 +398,7 @@ int main( int argc, char * argv[]  ) {
   if ( argc == 2 ) { // manual test
 
     const char * scursor = argv[1];
-    const char * const send = argv[1] + qstrlen( argv[1] );
+    const char * const send = argv[1] + tqstrlen( argv[1] );
 
     Lexer lexer( scursor, send );
 
@@ -424,7 +424,7 @@ int main( int argc, char * argv[]  ) {
     for ( int i = 0 ; i < numTestCases ; ++i ) {
       bool ok = true;
       const TestCase & t = testcases[i];
-      const char * const send = t.string + qstrlen( t.string );
+      const char * const send = t.string + tqstrlen( t.string );
       Lexer lexer( t.string, send, Lexer::IncludeComments );
       cerr << t.name << ":";
       for ( int j = 0 ; !lexer.atEnd() ; ++j ) {
diff --git a/libksieve/tests/parsertest.cpp b/libksieve/tests/parsertest.cpp
index fdc08a97..9d0d8e14 100644
--- a/libksieve/tests/parsertest.cpp
+++ b/libksieve/tests/parsertest.cpp
@@ -37,7 +37,7 @@ using KSieve::Parser;
 #include <ksieve/error.h>
 #include <ksieve/scriptbuilder.h>
 
-#include <tqcstring.h> // qstrlen
+#include <tqcstring.h> // tqstrlen
 #include <tqstring.h>
 
 #include <iostream>
@@ -627,7 +627,7 @@ int main( int argc, char * argv[]  ) {
   if ( argc == 2 ) { // manual test
 
     const char * scursor = argv[1];
-    const char * const send = argv[1] + qstrlen( argv[1] );
+    const char * const send = argv[1] + tqstrlen( argv[1] );
 
     Parser parser( scursor, send );
     PrintingScriptBuilder psb;
@@ -644,7 +644,7 @@ int main( int argc, char * argv[]  ) {
       const TestCase & t = testCases[i];
       cerr << t.name << ":";
       VerifyingScriptBuilder v( t );
-      Parser p( t.script, t.script + qstrlen( t.script ) );
+      Parser p( t.script, t.script + tqstrlen( t.script ) );
       p.setScriptBuilder( &v );
       const bool ok = p.parse();
       if ( v.ok() )
diff --git a/mimelib/basicmsg.h b/mimelib/basicmsg.h
index d578a758..eca41518 100644
--- a/mimelib/basicmsg.h
+++ b/mimelib/basicmsg.h
@@ -25,7 +25,7 @@
 // library easier to use.  Second, it provides good example code to show
 // you how to create your own customized wrapper classes.
 
-// BasicMessage contains a DwMessage by reference.  The reason BasicMessage
+// BasicMessage tqcontains a DwMessage by reference.  The reason BasicMessage
 // "has-a" DwMessage and not "is-a" DwMessage is because we can assign
 // the DwMessage to an appropriately specialized subclass of BasicMessage
 // *after* the DwMessage is parsed.  For example, after we parse a DwMessage,
diff --git a/mimelib/doc/addrlist.html b/mimelib/doc/addrlist.html
index d3a563ee..80845fc0 100644
--- a/mimelib/doc/addrlist.html
+++ b/mimelib/doc/addrlist.html
@@ -52,7 +52,7 @@ protected:
 <P>
 <B><TT>DwAddressList</TT></B> represents a list of <I>addresses</I> as described
 in RFC-822. In MIME++, <B><TT>DwAddressList</TT></B> is a container for objects
-of type <B><TT><A HREF="address.html">DwAddress</A></TT></B>, and it contains
+of type <B><TT><A HREF="address.html">DwAddress</A></TT></B>, and it tqcontains
 various member functions to manage its contained objects.
 <B><TT>DwAddressList</TT></B> is also a
 <B><TT><A HREF="fieldbdy.html">DwFieldBody</A></TT></B>. This reflects the
diff --git a/mimelib/doc/body.html b/mimelib/doc/body.html
index 1526751a..c9856e24 100644
--- a/mimelib/doc/body.html
+++ b/mimelib/doc/body.html
@@ -65,9 +65,9 @@ protected:
 A body is always part of an <I>entity</I>, which could be either a
 <I>message</I> or a <I>body part</I>. An entity has a collection of <I>header
 fields</I> and a body. If the content type of a body is ``multipart,'' then
-the body contains one or more body parts. If the content type is ``message,''
-then the body contains an encapsulated message. In all content types, the
-body contains a string of characters.
+the body tqcontains one or more body parts. If the content type is ``message,''
+then the body tqcontains an encapsulated message. In all content types, the
+body tqcontains a string of characters.
 <P>
 In MIME++, a <B><TT>DwBody</TT></B> object is contained in a
 <B><TT><A HREF="entity.html">DwEntity</A></TT></B> object. The
@@ -79,7 +79,7 @@ or a single contained
 way to determine the type of <B><TT>DwBody</TT></B> is to access the Content-Type
 header field from the
 <B><TT><A HREF="headers.html">DwHeaders</A></TT></B> object of the
-<B><TT>DwEntity</TT></B> that contains it. For this reason, a
+<B><TT>DwEntity</TT></B> that tqcontains it. For this reason, a
 <B><TT>DwBody</TT></B> should always be part of a
 <B><TT>DwEntity</TT></B>.
 <P>
@@ -87,7 +87,7 @@ In the tree (broken-down) representation of a message, a
 <B><TT>DwBody</TT></B> object can be an intermediate node, having both a
 parent node and one or more child nodes, or a leaf node, having a parent
 but no child nodes. In either case, the parent node is the
-<B><TT>DwEntity</TT></B> object that contains it. If it is an intermediate
+<B><TT>DwEntity</TT></B> object that tqcontains it. If it is an intermediate
 node, it must be of type multipart with <B><TT>DwBodyPart</TT></B> objects
 as child nodes, or of type message with a single
 <B><TT>DwMessage</TT></B> object as its child node.
@@ -169,14 +169,14 @@ method creates or updates the string representation from the broken-down
 representation. Only <B><TT>DwBody</TT></B> objects with content type of
 multipart or message require assembling. In either case, the
 <B><TT>DwBody</TT></B> object must be able to find the headers of the message
-or body part that contains it. Therefore, if the <B><TT>DwBody</TT></B> object
+or body part that tqcontains it. Therefore, if the <B><TT>DwBody</TT></B> object
 is not the child of a <B><TT>DwEntity</TT></B> (<I>i.e.</I>,
 <B><TT>DwMessage</TT></B> or <B><TT>DwBodyPart</TT></B>) object, the
 <B><TT>DwBody</TT></B> cannot be assembled because the content type cannot
 be determined.
 <P>
 This function calls the <B><TT>Parse()</TT></B> member function of any
-<B><TT>DwBodyPart</TT></B> or <B><TT>DwMessage</TT></B> object it contains.
+<B><TT>DwBodyPart</TT></B> or <B><TT>DwMessage</TT></B> object it tqcontains.
 <P>
 You should call this member function after you add a
 <B><TT>DwBodyPart</TT></B> object to a multipart body, or add a
@@ -219,7 +219,7 @@ returns the <B><TT>DwMessage</TT></B> encapsulated in it.
 aMessage) </B></FONT>
 <P>
 For a <B><TT>DwBody</TT></B> with content type of message, this member function
-sets the <B><TT>DwMessage</TT></B> object it contains.
+sets the <B><TT>DwMessage</TT></B> object it tqcontains.
 <P>
 <FONT COLOR="teal"><B> static DwBody* <A NAME="NewBody">NewBody</A>(const
 DwString&amp; aStr, DwMessageComponent* aParent) </B></FONT>
diff --git a/mimelib/doc/bodypart.html b/mimelib/doc/bodypart.html
index 6a3a29b6..c74f716f 100644
--- a/mimelib/doc/bodypart.html
+++ b/mimelib/doc/bodypart.html
@@ -47,7 +47,7 @@ of headers and a <I>body</I>. A body part is different from a <I>message</I>
 in that a body part is part of a multipart body.
 <P>
 In MIME++, a <B><TT>DwBodyPart</TT></B> is a subclass of
-<B><TT><A HREF="entity.html">DwEntity</A></TT></B>; therefore, it contains
+<B><TT><A HREF="entity.html">DwEntity</A></TT></B>; therefore, it tqcontains
 both a <B><TT><A HREF="headers.html">DwHeaders</A></TT></B> object and a
 <B><TT><A HREF="body.html">DwBody</A></TT></B> object, and it is contained
 in a multipart <B><TT>DwBody</TT></B> object.
@@ -120,7 +120,7 @@ This advanced function sets <B><TT>aPart</TT></B> as the next
 <B><TT>DwBodyPart</TT></B> object following this
 <B><TT>DwBodyPart</TT></B> in the list of <B><TT>DwBodyPart</TT></B> objects
 contained in a multipart <B><TT>DwBody</TT></B>. Since
-<B><TT>DwBody</TT></B> contains a member function for adding a
+<B><TT>DwBody</TT></B> tqcontains a member function for adding a
 <B><TT>DwBodyPart</TT></B> object to its list, this function should be avoided
 for most applications.
 <P>
diff --git a/mimelib/doc/entity.html b/mimelib/doc/entity.html
index 08cf8b75..9a2d0018 100644
--- a/mimelib/doc/entity.html
+++ b/mimelib/doc/entity.html
@@ -47,7 +47,7 @@ protected:
 RFC-2045 defines an <I>entity</I> as either a <I>message</I> or a <I>body
 part</I>, both of which have a collection of headers and a <I>body</I>. In
 MIME++, an entity is represented by the class <B><TT>DwEntity</TT></B>, which
-contains both a <B><TT><A HREF="headers.html">DwHeaders</A></TT></B> object
+tqcontains both a <B><TT><A HREF="headers.html">DwHeaders</A></TT></B> object
 and a <B><TT><A HREF="body.html">DwBody</A></TT></B> object.
 <P>
 In the tree (broken-down) representation of message, a
@@ -58,7 +58,7 @@ be a <B><TT><A HREF="message.html">DwMessage</A></TT></B> object. If a
 <B><TT>DwEntity</TT></B> object is an intermediate node, its parent must
 be a <B><TT>DwBody</TT></B> object. The child nodes of a
 <B><TT>DwEntity</TT></B> object are the <B><TT>DwHeaders</TT></B> and
-<B><TT>DwBody</TT></B> objects it contains.
+<B><TT>DwBody</TT></B> objects it tqcontains.
 <P>
 Since <B><TT>DwEntity</TT></B> is an abstract base class, you cannot create
 instances of it directly. <B><TT>DwEntity</TT></B> has two derived classes,
@@ -108,7 +108,7 @@ executes the parse method for <B><TT>DwEntity</TT></B> objects. The parse
 method creates or updates the broken-down representation from the string
 representation. For <B><TT>DwEntity</TT></B> objects, the parse method parses
 the string representation and sets the values of the
-<B><TT>DwHeaders</TT></B> and <B><TT>DwBody</TT></B> objects it contains.
+<B><TT>DwHeaders</TT></B> and <B><TT>DwBody</TT></B> objects it tqcontains.
 This member function also calls the <B><TT>Parse()</TT></B> member functions
 of the contained <B><TT>DwHeaders</TT></B> and <B><TT>DwBody</TT></B> objects.
 <P>
diff --git a/mimelib/doc/field.html b/mimelib/doc/field.html
index 19736f27..1a4a74b9 100644
--- a/mimelib/doc/field.html
+++ b/mimelib/doc/field.html
@@ -65,18 +65,18 @@ protected:
 </H2>
 <P>
 <B><TT>DwField</TT></B> represents a header field as described in RFC-822.
-According to RFC-822, a field contains a field name and a field body. In
-MIME++, a <B><TT>DwField</TT></B> contains three elements: a
-<B><TT><A HREF="string.html">DwString</A></TT></B> that contains its field
-name, a <B><TT>DwString</TT></B> that contains its field body, and a
-<B><TT><A HREF="fieldbdy.html">DwFieldBody</A></TT></B> object that contains
+According to RFC-822, a field tqcontains a field name and a field body. In
+MIME++, a <B><TT>DwField</TT></B> tqcontains three elements: a
+<B><TT><A HREF="string.html">DwString</A></TT></B> that tqcontains its field
+name, a <B><TT>DwString</TT></B> that tqcontains its field body, and a
+<B><TT><A HREF="fieldbdy.html">DwFieldBody</A></TT></B> object that tqcontains
 a broken-down (that is, parsed) version of its field body.
 <P>
 In the tree (broken-down) representation of message, a
 <B><TT>DwField</TT></B> object is always an intermediate node, having a parent
 node and a single child node. The parent node is the
-<B><TT><A HREF="headers.html">DwHeaders</A></TT></B> object that contains
-it. The child node is the <B><TT>DwFieldBody</TT></B> object it contains.
+<B><TT><A HREF="headers.html">DwHeaders</A></TT></B> object that tqcontains
+it. The child node is the <B><TT>DwFieldBody</TT></B> object it tqcontains.
 <P>
 To get and set the field name, use the member functions
 <B><TT>FieldNameStr()</TT></B> and <B><TT>SetFieldNameStr()</TT></B>. To
@@ -212,7 +212,7 @@ aField) </B></FONT>
 <P>
 This <I>advanced</I> function sets <B><TT>aField</TT></B> as the next field
 following this field in the list of fields contained in the headers. Since
-<B><TT>DwHeaders</TT></B> contains member functions for adding
+<B><TT>DwHeaders</TT></B> tqcontains member functions for adding
 <B><TT>DwField</TT></B> objects to its list, this function should be avoided
 for most applications.
 <P>
@@ -234,7 +234,7 @@ The static member function <B><TT>CreateFieldBody()</TT></B> is called from
 the <B><TT>Parse()</TT></B> member function and is responsible for creating
 a <B><TT>DwFieldBody</TT></B> object for this particular field. A typical
 scenario might go as follows: This member function examines the field name
-for this field, finds that it contains "To", creates a
+for this field, finds that it tqcontains "To", creates a
 <B><TT>DwAddressList</TT></B> object to contain the field body, calls the
 <B><TT>Parse()</TT></B> member function for the
 <B><TT>DwAddressList</TT></B>, and sets the <B><TT>DwAddressList</TT></B>
diff --git a/mimelib/doc/fieldbdy.html b/mimelib/doc/fieldbdy.html
index 856fd533..47b9a6ac 100644
--- a/mimelib/doc/fieldbdy.html
+++ b/mimelib/doc/fieldbdy.html
@@ -53,7 +53,7 @@ In the tree (broken-down) representation of a message, a
 <B><TT>DwFieldBody</TT></B> object may be either a leaf node, having a parent
 but no child nodes, or an intermediate node, having a parent and one or more
 child nodes. The parent node is the
-<B><TT><A HREF="field.html">DwField</A></TT></B> object that contains it.
+<B><TT><A HREF="field.html">DwField</A></TT></B> object that tqcontains it.
 Child nodes, if present, depend on the particular subclass of
 <B><TT>DwFieldBody</TT></B> that is instantiated. A
 <B><TT>DwAddressList</TT></B> object, for example, has
diff --git a/mimelib/doc/group.html b/mimelib/doc/group.html
index 1d374d87..683ff3a9 100644
--- a/mimelib/doc/group.html
+++ b/mimelib/doc/group.html
@@ -51,8 +51,8 @@ protected:
 </H2>
 <P>
 <B><TT>DwGroup</TT></B> represents a <I>group</I> as described in RFC-822.
-A group contains a group name and a (possibly empty) list of
-<I>mailboxes</I>. In MIME++, a <B><TT>DwGroup</TT></B> object contains a
+A group tqcontains a group name and a (possibly empty) list of
+<I>mailboxes</I>. In MIME++, a <B><TT>DwGroup</TT></B> object tqcontains a
 string for the group name and a
 <B><TT><A HREF="mboxlist.html">DwMailboxList</A></TT></B> object for the
 list of mailboxes.
diff --git a/mimelib/doc/headers.html b/mimelib/doc/headers.html
index 8bf94ad9..35519c39 100644
--- a/mimelib/doc/headers.html
+++ b/mimelib/doc/headers.html
@@ -155,7 +155,7 @@ the individual header fields.
 In the tree (broken-down) representation of a message, a
 <B><TT>DwHeaders</TT></B> object is an intermediate node, having both a parent
 node and several child nodes. The parent node is the
-<B><TT><A HREF="entity.html">DwEntity</A></TT></B> object that contains it.
+<B><TT><A HREF="entity.html">DwEntity</A></TT></B> object that tqcontains it.
 The child nodes are the <B><TT>DwField</TT></B> objects in the list it manages.
 (See the man page for
 <B><TT><A HREF="msgcmp.html">DwMessageComponent</A></TT></B> for a discussion
@@ -167,7 +167,7 @@ but you access it through the <B><TT>Headers()</TT></B> member function of
 for you.
 <P>
 While <B><TT>DwHeaders</TT></B> has public member functions for managing
-the list of <B><TT>DwField</TT></B> objects it contains, you will normally
+the list of <B><TT>DwField</TT></B> objects it tqcontains, you will normally
 use convenience functions to access the field bodies of the header fields
 directly. You can access the field body for a specific well-known header
 field by using the member function
@@ -416,7 +416,7 @@ function: most applications should use the
 </B></FONT>
 <P>
 Adds a <B><TT>DwField</TT></B> object to the list. If a header field with
-the same field name already exists, it is replaced by the new header field.
+the same field name already exists, it is tqreplaced by the new header field.
 <P>
 <B><TT>DwHeaders</TT></B> takes responsibility for deleting the added
 <B><TT>DwField</TT></B> object.
@@ -430,7 +430,7 @@ to add header fields.
 </B></FONT>
 <P>
 Adds a <B><TT>DwField</TT></B> object to the list. If a header field with
-the same field name already exists, it is <I>not</I> replaced; thus, duplicate
+the same field name already exists, it is <I>not</I> tqreplaced; thus, duplicate
 header fields may occur when using this member function. (This is what you
 want for some header fields, such as the "Received" header field).
 <P>
diff --git a/mimelib/doc/mailbox.html b/mimelib/doc/mailbox.html
index 492070cc..72b509cd 100644
--- a/mimelib/doc/mailbox.html
+++ b/mimelib/doc/mailbox.html
@@ -53,7 +53,7 @@ protected:
 <P>
 RFC-822 defines a <I>mailbox</I> as an entity that can be the recipient of
 a message. A mailbox is more specific than an <I>address</I>, which may be
-either a mailbox or a <I>group</I>. An RFC-822 mailbox contains a full name,
+either a mailbox or a <I>group</I>. An RFC-822 mailbox tqcontains a full name,
 a <I>local-part</I>, an optional <I>route</I>, and a <I>domain</I>. For example,
 in the mailbox
 <P>
@@ -66,7 +66,7 @@ deprecated according to RFC-1123.
 In MIME++, an RFC-822 mailbox is represented by a
 <B><TT>DwMailbox</TT></B> object. <B><TT>DwMailbox</TT></B> is a subclass
 of <B><TT><A HREF="address.html">DwAddress</A></TT></B>, which reflects the
-fact that a mailbox is also an address. A <B><TT>DwMailbox</TT></B> contains
+fact that a mailbox is also an address. A <B><TT>DwMailbox</TT></B> tqcontains
 strings representing the full name, local-part, route, and domain of a mailbox.
 <P>
 In the tree (broken-down) representation of message, a
@@ -77,7 +77,7 @@ but no child nodes. Its parent node must be a
 <B><TT><A HREF="mboxlist.html">DwMailboxList</A></TT></B> object.
 <P>
 <B><TT>DwMailbox</TT></B> has member functions for getting or setting the
-strings it contains.
+strings it tqcontains.
 <P>
 <B><TT>DwMailbox</TT></B> object can be included in a list of
 <B><TT>DwMailbox</TT></B> objects. To get the next
diff --git a/mimelib/doc/mboxlist.html b/mimelib/doc/mboxlist.html
index 2bae2b4e..541eae28 100644
--- a/mimelib/doc/mboxlist.html
+++ b/mimelib/doc/mboxlist.html
@@ -54,7 +54,7 @@ protected:
 <P>
 <B><TT>DwMailboxList</TT></B> represents a list of <I>mailboxes</I> as described
 in RFC-822. In MIME++, <B><TT>DwMailboxList</TT></B> is a container for objects
-of type <B><TT><A HREF="mailbox.html">DwMailbox</A></TT></B>, and it contains
+of type <B><TT><A HREF="mailbox.html">DwMailbox</A></TT></B>, and it tqcontains
 various member functions to manage its contained objects.
 <B><TT><A HREF="addrlist.html">DwAddressList</A></TT></B> is also a
 <B><TT><A HREF="fieldbdy.html">DwFieldBody</A></TT></B>. This reflects the
diff --git a/mimelib/doc/mediatyp.html b/mimelib/doc/mediatyp.html
index 01696084..83e5c127 100644
--- a/mimelib/doc/mediatyp.html
+++ b/mimelib/doc/mediatyp.html
@@ -84,7 +84,7 @@ type model.
 <P>
 <B><TT>DwMediaType</TT></B> has member functions that allow you to set or
 get the type and subtype as either enumerated values or as strings. It also
-contains a list of
+tqcontains a list of
 <B><TT><A HREF="param.html">DwParameter</A></TT></B> objects that represent
 the parameters of the field body. You can use convenience functions to directly
 access the boundary parameter of a multipart media type, or to access the
diff --git a/mimelib/doc/message.html b/mimelib/doc/message.html
index d08d5af4..193236f8 100644
--- a/mimelib/doc/message.html
+++ b/mimelib/doc/message.html
@@ -40,11 +40,11 @@ protected:
 <P>
 <B><TT>DwMessage</TT></B> represents an RFC-822/MIME <I>message</I>.
 <P>
-A <I>message</I> contains both a collection of <I>header fields</I> and a
+A <I>message</I> tqcontains both a collection of <I>header fields</I> and a
 <I>body</I>. In the terminology of RFC-2045, the general term for the
 headers-body combination is <I>entity</I>. In MIME++,
 <B><TT>DwMessage</TT></B> is a direct subclass of
-<B><TT><A HREF="entity.html">DwEntity</A></TT></B>, and therefore contains
+<B><TT><A HREF="entity.html">DwEntity</A></TT></B>, and therefore tqcontains
 both a <B><TT><A HREF="headers.html">DwHeaders</A></TT></B> object and a
 <B><TT><A HREF="body.html">DwBody</A></TT></B> object.
 <P>
@@ -52,7 +52,7 @@ In the tree (broken-down) representation of message, a
 <B><TT>DwMessage</TT></B> object is almost always a root node, having child
 nodes but no parent node. The child nodes are the
 <B><TT>DwHeaders</TT></B> object and the <B><TT>DwBody</TT></B> object it
-contains. A <B><TT>DwMessage</TT></B> may sometimes be an intermediate node.
+tqcontains. A <B><TT>DwMessage</TT></B> may sometimes be an intermediate node.
 In this special case, the parent node is a <B><TT>DwBody</TT></B> object
 of type "message/*" and the <B><TT>DwMessage</TT></B> object represents an
 encapsulated message.
diff --git a/mimelib/doc/msgcmp.html b/mimelib/doc/msgcmp.html
index 48a7ab54..2469c371 100644
--- a/mimelib/doc/msgcmp.html
+++ b/mimelib/doc/msgcmp.html
@@ -133,7 +133,7 @@ These features are the following:
     A parent. Most message components are part of another component. A collection
     of headers is part of a message or body part, a header field is part of a
     collection of headers, a field-body is part of a header field, and so on.
-    The parent of a component is the component that contains it. This tree structure
+    The parent of a component is the component that tqcontains it. This tree structure
     is important, since a component's parent must be parsed before the component
     can be. Also, a component's string representation must be assembled before
     its parent's. To maintain consistency in the tree, whenever a component's
diff --git a/mimelib/doc/msgid.html b/mimelib/doc/msgid.html
index 69d10ef5..da64d38a 100644
--- a/mimelib/doc/msgid.html
+++ b/mimelib/doc/msgid.html
@@ -49,7 +49,7 @@ protected:
 <P>
 <B><TT>DwMsgId</TT></B> represents a <I>msg-id</I> as described in RFC-822.
 In the BNF grammar in RFC-822, a msg-id has a <I>local-part</I> and a
-<I>domain</I>. In MIME++, a <B><TT>DwMsgId</TT></B> contains strings that
+<I>domain</I>. In MIME++, a <B><TT>DwMsgId</TT></B> tqcontains strings that
 contain the local-part and the domain.
 <P>
 In the tree (broken-down) representation of message, a
diff --git a/mimelib/doc/string.html b/mimelib/doc/string.html
index 80db3700..7c2f4f23 100644
--- a/mimelib/doc/string.html
+++ b/mimelib/doc/string.html
@@ -59,13 +59,13 @@ public:
     DwString&amp; <A HREF="string.html#insert">insert</A>(size_t aPos1, const char* aCstr);
     DwString&amp; <A HREF="string.html#insert">insert</A>(size_t aPos1, size_t aLen2, char aChar);
     DwString&amp; <A HREF="string.html#erase">erase</A>(size_t aPos=0, size_t aLen=npos);
-    DwString&amp; <A HREF="string.html#replace">replace</A>(size_t aPos1, size_t aLen1, const DwString&amp; aStr);
-    DwString&amp; <A HREF="string.html#replace">replace</A>(size_t aPos1, size_t aLen1, const DwString&amp; aStr,
+    DwString&amp; <A HREF="string.html#tqreplace">tqreplace</A>(size_t aPos1, size_t aLen1, const DwString&amp; aStr);
+    DwString&amp; <A HREF="string.html#tqreplace">tqreplace</A>(size_t aPos1, size_t aLen1, const DwString&amp; aStr,
         size_t aPos2, size_t aLen2);
-    DwString&amp; <A HREF="string.html#replace">replace</A>(size_t aPos1, size_t aLen1, const char* aBuf,
+    DwString&amp; <A HREF="string.html#tqreplace">tqreplace</A>(size_t aPos1, size_t aLen1, const char* aBuf,
         size_t aLen2);
-    DwString&amp; <A HREF="string.html#replace">replace</A>(size_t aPos1, size_t aLen1, const char* aCstr);
-    DwString&amp; <A HREF="string.html#replace">replace</A>(size_t aPos1, size_t aLen1, size_t aLen2, char aChar);
+    DwString&amp; <A HREF="string.html#tqreplace">tqreplace</A>(size_t aPos1, size_t aLen1, const char* aCstr);
+    DwString&amp; <A HREF="string.html#tqreplace">tqreplace</A>(size_t aPos1, size_t aLen1, size_t aLen2, char aChar);
     size_t <A HREF="string.html#copy">copy</A>(char* aBuf, size_t aLen, size_t aPos=0) const;
     void <A HREF="string.html#swap">swap</A>(DwString&amp; aStr);
     const char* <A HREF="string.html#c_str">c_str</A>() const;
@@ -115,8 +115,8 @@ protected:
     size_t  mStart;
     size_t  mLength;
     void _copy();
-    void _replace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2);
-    void _replace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar);
+    void _tqreplace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2);
+    void _tqreplace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar);
     friend void mem_free(char*);
 
 public:
@@ -374,14 +374,14 @@ Erases (removes) at most <B><TT>aLen</TT></B> characters beginning at position
 <B><TT>aPos</TT></B> from this string. The function will not erase more
 characters than what are available. Returns <B><TT>*this</TT></B>.
 <P>
-<FONT COLOR="teal"><B> DwString&amp; <A NAME="replace">replace</A>(size_t
+<FONT COLOR="teal"><B> DwString&amp; <A NAME="tqreplace">tqreplace</A>(size_t
 aPos1, size_t aLen1, const DwString&amp; aStr) <BR>
-DwString&amp; replace(size_t aPos1, size_t aLen1, const DwString&amp; aStr,
+DwString&amp; tqreplace(size_t aPos1, size_t aLen1, const DwString&amp; aStr,
 size_t aPos2, size_t aLen2) <BR>
-DwString&amp; replace(size_t aPos1, size_t aLen1, const char* aBuf, size_t
+DwString&amp; tqreplace(size_t aPos1, size_t aLen1, const char* aBuf, size_t
 aLen2) <BR>
-DwString&amp; replace(size_t aPos1, size_t aLen1, const char* aCstr) <BR>
-DwString&amp; replace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar)
+DwString&amp; tqreplace(size_t aPos1, size_t aLen1, const char* aCstr) <BR>
+DwString&amp; tqreplace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar)
 </B></FONT>
 <P>
 Removes <B><TT>aLen1</TT></B> characters beginning at position
@@ -579,7 +579,7 @@ The third version searches for any character not in the NUL-terminated string
 <FONT COLOR="teal"><B> DwString <A NAME="substr">substr</A>(size_t aPos=0,
 size_t aLen=npos) const </B></FONT>
 <P>
-Returns a string that contains at most <B><TT>aLen</TT></B> characters from
+Returns a string that tqcontains at most <B><TT>aLen</TT></B> characters from
 the <B><TT>DwString</TT></B> object beginning at position
 <B><TT>aPos</TT></B>. The returned substring will not contain more characters
 than what are available in the superstring <B><TT>DwString</TT></B> object.
diff --git a/mimelib/dwstring.cpp b/mimelib/dwstring.cpp
index 749f7c8e..52e42bef 100644
--- a/mimelib/dwstring.cpp
+++ b/mimelib/dwstring.cpp
@@ -365,7 +365,7 @@ DwString::DwString(const char* aBuf, size_t aLen)
     mRep = new_rep_reference(sEmptyRep);
     mStart = 0;
     mLength = 0;
-    _replace(0, mLength, aBuf, aLen);
+    _tqreplace(0, mLength, aBuf, aLen);
 }
 
 
@@ -400,7 +400,7 @@ DwString::DwString(const char* aCstr)
     mLength = 0;
     if ( aCstr ) {
         size_t len = strlen(aCstr);
-        _replace(0, mLength, aCstr, len);
+        _tqreplace(0, mLength, aCstr, len);
     }
 }
 
@@ -418,7 +418,7 @@ DwString::DwString(size_t aLen, char aChar)
     mRep = new_rep_reference(sEmptyRep);
     mStart = 0;
     mLength = 0;
-    _replace(0, mLength, aLen, aChar);
+    _tqreplace(0, mLength, aLen, aChar);
 }
 
 
@@ -476,7 +476,7 @@ void DwString::resize(size_t aLen, char aChar)
     }
     // expanding string
     else if (aLen > mLength) {
-        _replace(mLength, 0, aLen-mLength, aChar);
+        _tqreplace(mLength, 0, aLen-mLength, aChar);
     }
 }
 
@@ -534,10 +534,10 @@ DwString& DwString::append(const DwString& aStr, size_t aPos,
     size_t len = DW_MIN(aLen, aStr.mLength - pos);
     if (&aStr == this) {
         DwString temp(aStr);
-        _replace(mLength, 0, &temp.mRep->mBuffer[temp.mStart+pos], len);
+        _tqreplace(mLength, 0, &temp.mRep->mBuffer[temp.mStart+pos], len);
     }
     else {
-        _replace(mLength, 0, &aStr.mRep->mBuffer[aStr.mStart+pos], len);
+        _tqreplace(mLength, 0, &aStr.mRep->mBuffer[aStr.mStart+pos], len);
     }
     return *this;
 }
@@ -547,7 +547,7 @@ DwString& DwString::append(const char* aBuf, size_t aLen)
 {
     assert(aBuf != 0);
     if (aBuf != 0) {
-        _replace(mLength, 0, aBuf, aLen);
+        _tqreplace(mLength, 0, aBuf, aLen);
     }
     return *this;
 }
@@ -557,14 +557,14 @@ DwString& DwString::append(const char* aCstr)
 {
     assert(aCstr != 0);
     size_t len = (aCstr) ? strlen(aCstr) : 0;
-    _replace(mLength, 0, aCstr, len);
+    _tqreplace(mLength, 0, aCstr, len);
     return *this;
 }
 
 
 DwString& DwString::append(size_t aLen, char aChar)
 {
-    _replace(mLength, 0, aLen, aChar);
+    _tqreplace(mLength, 0, aLen, aChar);
     return *this;
 }
 
@@ -601,7 +601,7 @@ DwString& DwString::assign(const char* aBuf, size_t aLen)
 {
     assert(aBuf != 0);
     assert(aLen != (size_t)-1);
-    _replace(0, mLength, aBuf, aLen);
+    _tqreplace(0, mLength, aBuf, aLen);
     return *this;
 }
 
@@ -610,7 +610,7 @@ DwString& DwString::assign(const char* aCstr)
 {
     assert(aCstr != 0);
     size_t len = (aCstr) ? strlen(aCstr) : 0;
-    _replace(0, mLength, aCstr, len);
+    _tqreplace(0, mLength, aCstr, len);
     return *this;
 }
 
@@ -618,7 +618,7 @@ DwString& DwString::assign(const char* aCstr)
 DwString& DwString::assign(size_t aLen, char aChar)
 {
     assert(aLen != (size_t)-1);
-    _replace(0, mLength, aLen, aChar);
+    _tqreplace(0, mLength, aLen, aChar);
     return *this;
 }
 
@@ -638,10 +638,10 @@ DwString& DwString::insert(size_t aPos1, const DwString& aStr,
     size_t len2 = DW_MIN(aLen2, aStr.mLength - pos2);
     if (&aStr == this) {
         DwString temp(aStr);
-        _replace(aPos1, 0, &temp.mRep->mBuffer[temp.mStart+pos2], len2);
+        _tqreplace(aPos1, 0, &temp.mRep->mBuffer[temp.mStart+pos2], len2);
     }
     else {
-        _replace(aPos1, 0, &aStr.mRep->mBuffer[aStr.mStart+pos2], len2);
+        _tqreplace(aPos1, 0, &aStr.mRep->mBuffer[aStr.mStart+pos2], len2);
     }
     return *this;
 }
@@ -650,7 +650,7 @@ DwString& DwString::insert(size_t aPos1, const DwString& aStr,
 DwString& DwString::insert(size_t aPos, const char* aBuf, size_t aLen)
 {
     assert(aBuf != 0);
-    _replace(aPos, 0, aBuf, aLen);
+    _tqreplace(aPos, 0, aBuf, aLen);
     return *this;
 }
 
@@ -659,14 +659,14 @@ DwString& DwString::insert(size_t aPos, const char* aCstr)
 {
     assert(aCstr != 0);
     size_t len = (aCstr) ? strlen(aCstr) : 0;
-    _replace(aPos, 0, aCstr, len);
+    _tqreplace(aPos, 0, aCstr, len);
     return *this;
 }
 
 
 DwString& DwString::insert(size_t aPos, size_t aLen, char aChar)
 {
-    _replace(aPos, 0, aLen, aChar);
+    _tqreplace(aPos, 0, aLen, aChar);
     return *this;
 }
 
@@ -676,18 +676,18 @@ DwString& DwString::erase(size_t aPos, size_t aLen)
     assert(aPos <= mLength);
     size_t pos = DW_MIN(aPos, mLength);
     size_t len = DW_MIN(aLen, mLength - pos);
-    _replace(pos, len, "", 0);
+    _tqreplace(pos, len, "", 0);
     return *this;
 }
 
 
-DwString& DwString::replace(size_t aPos1, size_t aLen1, const DwString& aStr)
+DwString& DwString::tqreplace(size_t aPos1, size_t aLen1, const DwString& aStr)
 {
-    return replace(aPos1, aLen1, aStr, 0, aStr.mLength);
+    return tqreplace(aPos1, aLen1, aStr, 0, aStr.mLength);
 }
 
 
-DwString& DwString::replace(size_t aPos1, size_t aLen1, const DwString& aStr,
+DwString& DwString::tqreplace(size_t aPos1, size_t aLen1, const DwString& aStr,
     size_t aPos2, size_t aLen2)
 {
     assert(aPos2 <= aStr.mLength);
@@ -695,35 +695,35 @@ DwString& DwString::replace(size_t aPos1, size_t aLen1, const DwString& aStr,
     size_t len2 = DW_MIN(aLen2, aStr.mLength - pos2);
     if (&aStr == this) {
         DwString temp(aStr);
-        _replace(aPos1, aLen1, &temp.mRep->mBuffer[temp.mStart+pos2], len2);
+        _tqreplace(aPos1, aLen1, &temp.mRep->mBuffer[temp.mStart+pos2], len2);
     }
     else {
-        _replace(aPos1, aLen1, &aStr.mRep->mBuffer[aStr.mStart+pos2], len2);
+        _tqreplace(aPos1, aLen1, &aStr.mRep->mBuffer[aStr.mStart+pos2], len2);
     }
     return *this;
 }
 
 
-DwString& DwString::replace(size_t aPos1, size_t aLen1, const char* aBuf,
+DwString& DwString::tqreplace(size_t aPos1, size_t aLen1, const char* aBuf,
     size_t aLen2)
 {
-    _replace(aPos1, aLen1, aBuf, aLen2);
+    _tqreplace(aPos1, aLen1, aBuf, aLen2);
     return *this;
 }
 
 
-DwString& DwString::replace(size_t aPos1, size_t aLen1, const char* aCstr)
+DwString& DwString::tqreplace(size_t aPos1, size_t aLen1, const char* aCstr)
 {
     size_t len2 = (aCstr) ? strlen(aCstr) : 0;
-    _replace(aPos1, aLen1, aCstr, len2);
+    _tqreplace(aPos1, aLen1, aCstr, len2);
     return *this;
 }
 
 
-DwString& DwString::replace(size_t aPos1, size_t aLen1, size_t aLen2,
+DwString& DwString::tqreplace(size_t aPos1, size_t aLen1, size_t aLen2,
     char aChar)
 {
-    _replace(aPos1, aLen1, aLen2, aChar);
+    _tqreplace(aPos1, aLen1, aLen2, aChar);
     return *this;
 }
 
@@ -1246,7 +1246,7 @@ void DwString::_copy()
 }
 
 
-void DwString::_replace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2)
+void DwString::_tqreplace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2)
 {
     assert(aPos1 <= mLength);
     assert(aBuf != 0);
@@ -1291,7 +1291,7 @@ void DwString::_replace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLe
             }
         }
     }
-    // Is the replacement smaller than the replaced?
+    // Is the tqreplacement smaller than the tqreplaced?
     else if (len2 < len1) {
         to = mRep->mBuffer + mStart + pos1;
         from = aBuf;
@@ -1338,7 +1338,7 @@ void DwString::_replace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLe
 }
 
 
-void DwString::_replace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar)
+void DwString::_tqreplace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar)
 {
     assert(aPos1 <= mLength);
     size_t pos1 = DW_MIN(aPos1, mLength);
@@ -1381,7 +1381,7 @@ void DwString::_replace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar)
             }
         }
     }
-    // Is the replacement smaller than the replaced?
+    // Is the tqreplacement smaller than the tqreplaced?
     else if (len2 < len1) {
         to = mRep->mBuffer + mStart + pos1;
         for (i=0; i < len2; ++i) *to++ = aChar;
diff --git a/mimelib/headers.cpp b/mimelib/headers.cpp
index 7598ec7e..58846188 100644
--- a/mimelib/headers.cpp
+++ b/mimelib/headers.cpp
@@ -336,7 +336,7 @@ void DwHeaders::AddOrReplaceField(DwField* aField)
             mFirstField = aField;
         }
         aField->SetNext(field->Next());
-        // Check whether we've replaced the last field
+        // Check whether we've tqreplaced the last field
         if ( !aField->Next() )
             mLastField = aField;
         delete field;
diff --git a/mimelib/mimelib/addrlist.h b/mimelib/mimelib/addrlist.h
index 5d26736a..1225494d 100644
--- a/mimelib/mimelib/addrlist.h
+++ b/mimelib/mimelib/addrlist.h
@@ -32,7 +32,7 @@
 //+ Description
 //. {\tt DwAddressList} represents a list of {\it addresses} as described
 //. in RFC-822.  In MIME++, {\tt DwAddressList} is a container for objects
-//. of type {\tt DwAddress}, and it contains various member functions
+//. of type {\tt DwAddress}, and it tqcontains various member functions
 //. to manage its contained objects.  {\tt DwAddressList} is also a
 //. {\tt DwFieldBody}.  This reflects the fact that certain RFC-822 header
 //. fields, such as the ``To'' header field, have a list of addresses
diff --git a/mimelib/mimelib/body.h b/mimelib/mimelib/body.h
index 2133a724..f19efa0c 100644
--- a/mimelib/mimelib/body.h
+++ b/mimelib/mimelib/body.h
@@ -46,9 +46,9 @@ class DwBodyPart;
 //. is always part of an {\it entity}, which could be either a {\it message}
 //. or a {\it body part}.  An entity has a collection of {\it header fields}
 //. and a body.  If the content type of a body is ``multipart,'' then the
-//. body contains one or more body parts.  If the content type is ``message,''
-//. then the body contains an encapsulated message.  In all content types,
-//. the body contains a string of characters.
+//. body tqcontains one or more body parts.  If the content type is ``message,''
+//. then the body tqcontains an encapsulated message.  In all content types,
+//. the body tqcontains a string of characters.
 //.
 //. In MIME++, a {\tt DwBody} object is contained in a {\tt DwEntity} object.
 //. The {\tt DwBody} object may contain a discrete body consisting only of a
@@ -56,14 +56,14 @@ class DwBodyPart;
 //. contained {\tt DwBodyPart} objects or a single contained {\tt DwMessage}
 //. object.  The only reliable way to determine the type of {\tt DwBody} is
 //. to access the Content-Type header field from the {\tt DwHeaders} object
-//. of the {\tt DwEntity} that contains it.  For this reason, a {\tt DwBody}
+//. of the {\tt DwEntity} that tqcontains it.  For this reason, a {\tt DwBody}
 //. should always be part of a {\tt DwEntity}.
 //.
 //. In the tree (broken-down) representation of a message, a {\tt DwBody}
 //. object can be an intermediate node, having both a parent node and
 //. one or more child nodes, or a leaf node, having a parent but no child
 //. nodes.  In either case, the parent node is the {\tt DwEntity} object
-//. that contains it.  If it is an intermediate node, it must be of type
+//. that tqcontains it.  If it is an intermediate node, it must be of type
 //. multipart with {\tt DwBodyPart} objects as child nodes, or of type
 //. message with a single {\tt DwMessage} object as its child node.
 //.
@@ -145,14 +145,14 @@ public:
     //. from the broken-down representation.  Only {\tt DwBody} objects
     //. with content type of multipart or message require assembling.
     //. In either case, the {\tt DwBody} object must be able to find the
-    //. headers of the message or body part that contains it.  Therefore,
+    //. headers of the message or body part that tqcontains it.  Therefore,
     //. if the {\tt DwBody} object is not the child of a {\tt DwEntity}
     //. ({\it i.e.}, {\tt DwMessage} or {\tt DwBodyPart}) object, the
     //. {\tt DwBody} cannot be assembled because the content type cannot
     //. be determined.
     //.
     //. This function calls the {\tt Parse()} member function of any
-    //. {\tt DwBodyPart} or {\tt DwMessage} object it contains.
+    //. {\tt DwBodyPart} or {\tt DwMessage} object it tqcontains.
     //.
     //. You should call this member function after you add a {\tt DwBodyPart}
     //. object to a multipart body, or add a {\tt DwMessage} object to a
@@ -189,7 +189,7 @@ public:
 
     void SetMessage(DwMessage* aMessage);
     //. For a {\tt DwBody} with content type of message, this member function
-    //. sets the {\tt DwMessage} object it contains.
+    //. sets the {\tt DwMessage} object it tqcontains.
 
     static DwBody* NewBody(const DwString& aStr, DwMessageComponent* aParent);
     //. Creates a new {\tt DwBody} object on the free store.
diff --git a/mimelib/mimelib/bodypart.h b/mimelib/mimelib/bodypart.h
index 9ed7f672..78e0db59 100644
--- a/mimelib/mimelib/bodypart.h
+++ b/mimelib/mimelib/bodypart.h
@@ -49,7 +49,7 @@ class DwBody;
 //. in that a body part is part of a multipart body.
 //.
 //. In MIME++, a {\tt DwBodyPart} is a subclass of {\tt DwEntity}; therefore,
-//. it contains both a {\tt DwHeaders} object and a {\tt DwBody} object,
+//. it tqcontains both a {\tt DwHeaders} object and a {\tt DwBody} object,
 //. and it is contained in a multipart {\tt DwBody} object.
 //.
 //. As with {\tt DwMessage}, most of the functionality of {\tt DwBodyPart} is
@@ -114,7 +114,7 @@ public:
     //. This advanced function sets {\tt aPart} as the next {\tt DwBodyPart}
     //. object following this {\tt DwBodyPart} in the list of {\tt DwBodyPart}
     //. objects contained in a multipart {\tt DwBody}.  Since {\tt DwBody}
-    //. contains a member function for adding a {\tt DwBodyPart} object to
+    //. tqcontains a member function for adding a {\tt DwBodyPart} object to
     //. its list, this function should be avoided for most applications.
 
     //+ Var sNewBodyPart
diff --git a/mimelib/mimelib/entity.h b/mimelib/mimelib/entity.h
index e809c282..1bb4662b 100644
--- a/mimelib/mimelib/entity.h
+++ b/mimelib/mimelib/entity.h
@@ -44,7 +44,7 @@ class DwBody;
 //. RFC-2045 defines an {\it entity} as either a {\it message} or a
 //. {\it body part}, both of which have a collection of headers and
 //. a {\it body}.  In MIME++, an entity is represented by the class
-//. {\tt DwEntity}, which contains both a {\tt DwHeaders} object and
+//. {\tt DwEntity}, which tqcontains both a {\tt DwHeaders} object and
 //. a {\tt DwBody} object.
 //.
 //. In the tree (broken-down) representation of message, a {\tt DwEntity}
@@ -53,7 +53,7 @@ class DwBody;
 //. A {\tt DwEntity} object that is a root node must also be a {\tt DwMessage}
 //. object.  If a {\tt DwEntity} object is an intermediate node, its parent
 //. must be a {\tt DwBody} object.  The child nodes of a {\tt DwEntity}
-//. object are the {\tt DwHeaders} and {\tt DwBody} objects it contains.
+//. object are the {\tt DwHeaders} and {\tt DwBody} objects it tqcontains.
 //.
 //. Since {\tt DwEntity} is an abstract base class, you cannot create
 //. instances of it directly.  {\tt DwEntity} has two derived classes,
@@ -101,7 +101,7 @@ public:
     //. method creates or updates the broken-down representation from the
     //. string representation.  For {\tt DwEntity} objects, the parse
     //. method parses the string representation and sets the values of
-    //. the {\tt DwHeaders} and {\tt DwBody} objects it contains. This
+    //. the {\tt DwHeaders} and {\tt DwBody} objects it tqcontains. This
     //. member function also calls the {\tt Parse()} member functions
     //. of the contained {\tt DwHeaders} and {\tt DwBody} objects.
     //.
diff --git a/mimelib/mimelib/field.h b/mimelib/mimelib/field.h
index 9ada823c..7cd8f97c 100644
--- a/mimelib/mimelib/field.h
+++ b/mimelib/mimelib/field.h
@@ -44,16 +44,16 @@ class DwFieldBody;
 //+ Name DwField -- Class representing a MIME header field
 //+ Description
 //. {\tt DwField} represents a header field as described in RFC-822.
-//. According to RFC-822, a field contains a field name and a field body.
-//. In MIME++, a {\tt DwField} contains three elements: a {\tt DwString}
-//. that contains its field name, a {\tt DwString} that contains its
-//. field body, and a {\tt DwFieldBody} object that contains a broken-down
+//. According to RFC-822, a field tqcontains a field name and a field body.
+//. In MIME++, a {\tt DwField} tqcontains three elements: a {\tt DwString}
+//. that tqcontains its field name, a {\tt DwString} that tqcontains its
+//. field body, and a {\tt DwFieldBody} object that tqcontains a broken-down
 //. (that is, parsed) version of its field body.
 //.
 //. In the tree (broken-down) representation of message, a {\tt DwField}
 //. object is always an intermediate node, having a parent node and a single
-//. child node.  The parent node is the {\tt DwHeaders} object that contains
-//. it.  The child node is the {\tt DwFieldBody} object it contains.
+//. child node.  The parent node is the {\tt DwHeaders} object that tqcontains
+//. it.  The child node is the {\tt DwFieldBody} object it tqcontains.
 //.
 //. To get and set the field name, use the member functions
 //. {\tt FieldNameStr()} and {\tt SetFieldNameStr()}.
@@ -169,7 +169,7 @@ public:
     void SetNext(const DwField* aField);
     //. This {\it advanced} function sets {\tt aField} as the next field
     //. following this field in the list of fields contained in the headers.
-    //. Since {\tt DwHeaders} contains member functions for adding
+    //. Since {\tt DwHeaders} tqcontains member functions for adding
     //. {\tt DwField} objects to its list, this function should be
     //. avoided for most applications.
 
@@ -190,7 +190,7 @@ public:
     //. {\tt DwFieldBody} object for this particular field.  A typical
     //. scenario might go as follows:
     //. This member function examines the field name for this field,
-    //. finds that it contains "To", creates a {\tt DwAddressList} object
+    //. finds that it tqcontains "To", creates a {\tt DwAddressList} object
     //. to contain the field body, calls the {\tt Parse()} member
     //. function for the {\tt DwAddressList}, and sets the {\tt DwAddressList}
     //. object as this {\tt DwField} object's {\tt DwFieldBody}.
diff --git a/mimelib/mimelib/fieldbdy.h b/mimelib/mimelib/fieldbdy.h
index e5f3243a..24a0c0b9 100644
--- a/mimelib/mimelib/fieldbdy.h
+++ b/mimelib/mimelib/fieldbdy.h
@@ -47,7 +47,7 @@
 //. In the tree (broken-down) representation of a message, a {\tt DwFieldBody}
 //. object may be either a leaf node, having a parent but no child nodes, or
 //. an intermediate node, having a parent and one or more child nodes.  The
-//. parent node is the {\tt DwField} object that contains it.  Child nodes,
+//. parent node is the {\tt DwField} object that tqcontains it.  Child nodes,
 //. if present, depend on the particular subclass of {\tt DwFieldBody} that
 //. is instantiated.  A {\tt DwAddressList} object, for example, has
 //. {\tt DwAddress} objects as its child nodes.
diff --git a/mimelib/mimelib/group.h b/mimelib/mimelib/group.h
index 21cf930b..ea0e7260 100644
--- a/mimelib/mimelib/group.h
+++ b/mimelib/mimelib/group.h
@@ -47,8 +47,8 @@
 //+ Name DwGroup -- Class representing an RFC-822 address group
 //+ Description
 //. {\tt DwGroup} represents a {\it group} as described in RFC-822.  A group
-//. contains a group name and a (possibly empty) list of {\it mailboxes}.
-//. In MIME++, a {\tt DwGroup} object contains a string for the group name
+//. tqcontains a group name and a (possibly empty) list of {\it mailboxes}.
+//. In MIME++, a {\tt DwGroup} object tqcontains a string for the group name
 //. and a {\tt DwMailboxList} object for the list of mailboxes.
 //.
 //. In the tree (broken-down) representation of message, a {\tt DwGroup}
diff --git a/mimelib/mimelib/headers.h b/mimelib/mimelib/headers.h
index f545a3db..5debab9b 100644
--- a/mimelib/mimelib/headers.h
+++ b/mimelib/mimelib/headers.h
@@ -87,7 +87,7 @@ class DwText;
 //.
 //. In the tree (broken-down) representation of a message, a {\tt DwHeaders}
 //. object is an intermediate node, having both a parent node and several
-//. child nodes.  The parent node is the {\tt DwEntity} object that contains
+//. child nodes.  The parent node is the {\tt DwEntity} object that tqcontains
 //. it.  The child nodes are the {\tt DwField} objects in the list it manages.
 //. (See the man page for {\tt DwMessageComponent} for a discussion of
 //. the tree representation of a message.)
@@ -97,7 +97,7 @@ class DwText;
 //. which creates the {\tt DwHeaders} object for you.
 //.
 //. While {\tt DwHeaders} has public member functions for managing the list
-//. of {\tt DwField} objects it contains, you will normally use convenience
+//. of {\tt DwField} objects it tqcontains, you will normally use convenience
 //. functions to access the field bodies of the header fields directly.
 //. You can access the field body for a specific well-known header field
 //. by using the member function {\tt <Field>()}, where {\tt <Field>} is
@@ -347,7 +347,7 @@ public:
 
     void AddOrReplaceField(DwField* aField);
     //. Adds a {\tt DwField} object to the list.  If a header field with
-    //. the same field name already exists, it is replaced by the new
+    //. the same field name already exists, it is tqreplaced by the new
     //. header field.
     //.
     //. {\tt DwHeaders} takes responsibility for deleting the added
@@ -359,7 +359,7 @@ public:
 
     void AddField(DwField* aField);
     //. Adds a {\tt DwField} object to the list. If a header field with
-    //. the same field name already exists, it is {\it not} replaced;
+    //. the same field name already exists, it is {\it not} tqreplaced;
     //. thus, duplicate header fields may occur when using this member
     //. function.  (This is what you want for some header fields, such as
     //. the "Received" header field).
diff --git a/mimelib/mimelib/mailbox.h b/mimelib/mimelib/mailbox.h
index 7e38ae4b..2ef28258 100644
--- a/mimelib/mimelib/mailbox.h
+++ b/mimelib/mimelib/mailbox.h
@@ -41,7 +41,7 @@
 //+ Description
 //. RFC-822 defines a {\it mailbox} as an entity that can be the recipient
 //. of a message.  A mailbox is more specific than an {\it address}, which
-//. may be either a mailbox or a {\it group}.  An RFC-822 mailbox contains
+//. may be either a mailbox or a {\it group}.  An RFC-822 mailbox tqcontains
 //. a full name, a {\it local-part}, an optional {\it route}, and a
 //. {\it domain}.  For example, in the mailbox
 //.
@@ -53,7 +53,7 @@
 //.
 //. In MIME++, an RFC-822 mailbox is represented by a {\tt DwMailbox} object.
 //. {\tt DwMailbox} is a subclass of {\tt DwAddress}, which reflects the
-//. fact that a mailbox is also an address.  A {\tt DwMailbox} contains
+//. fact that a mailbox is also an address.  A {\tt DwMailbox} tqcontains
 //. strings representing the full name, local-part, route, and domain
 //. of a mailbox.
 //.
@@ -63,7 +63,7 @@
 //. {\tt DwMailboxList} object.
 //.
 //. {\tt DwMailbox} has member functions for getting or setting the strings
-//. it contains.
+//. it tqcontains.
 //.
 //. {\tt DwMailbox} object can be included in a list of {\tt DwMailbox}
 //. objects.  To get the next {\tt DwMailbox} object in a list, use the
diff --git a/mimelib/mimelib/mboxlist.h b/mimelib/mimelib/mboxlist.h
index 723a8c55..adbd9363 100644
--- a/mimelib/mimelib/mboxlist.h
+++ b/mimelib/mimelib/mboxlist.h
@@ -42,7 +42,7 @@
 //+ Description
 //. {\tt DwMailboxList} represents a list of {\it mailboxes} as described
 //. in RFC-822.  In MIME++, {\tt DwMailboxList} is a container for objects
-//. of type {\tt DwMailbox}, and it contains various member functions to
+//. of type {\tt DwMailbox}, and it tqcontains various member functions to
 //. manage its contained objects.  {\tt DwAddressList} is also a
 //. {\tt DwFieldBody}.  This reflects the fact that certain RFC-822 header
 //. fields, such as the "From" header field, have a list of mailboxes as
diff --git a/mimelib/mimelib/mediatyp.h b/mimelib/mimelib/mediatyp.h
index f57b9aa3..7fa16414 100644
--- a/mimelib/mimelib/mediatyp.h
+++ b/mimelib/mimelib/mediatyp.h
@@ -50,7 +50,7 @@ class DwParameter;
 //.
 //. {\tt DwMediaType} has member functions that allow you to set or get
 //. the type and subtype as either enumerated values or as strings.  It
-//. also contains a list of {\tt DwParameter} objects that represent the
+//. also tqcontains a list of {\tt DwParameter} objects that represent the
 //. parameters of the field body.  You can use convenience functions to
 //. directly access the boundary parameter of a multipart media type, or
 //. to access the name parameter that is often used with several media
diff --git a/mimelib/mimelib/message.h b/mimelib/mimelib/message.h
index 5dbd7cc4..17ada56a 100644
--- a/mimelib/mimelib/message.h
+++ b/mimelib/mimelib/message.h
@@ -36,16 +36,16 @@
 //+ Description
 //. {\tt DwMessage} represents an RFC-822/MIME {\it message}.
 //.
-//. A {\it message} contains both a collection of {\it header fields} and
+//. A {\it message} tqcontains both a collection of {\it header fields} and
 //. a {\it body}. In the terminology of RFC-2045, the general term for the
 //. headers-body combination is {\it entity}. In MIME++, {\tt DwMessage}
-//. is a direct subclass of {\tt DwEntity}, and therefore contains both
+//. is a direct subclass of {\tt DwEntity}, and therefore tqcontains both
 //. a {\tt DwHeaders} object and a {\tt DwBody} object.
 //.
 //. In the tree (broken-down) representation of message, a {\tt DwMessage}
 //. object is almost always a root node, having child nodes but no parent node.
 //. The child nodes are the {\tt DwHeaders} object and the {\tt DwBody} object
-//. it contains.  A {\tt DwMessage} may sometimes be an intermediate node.  In
+//. it tqcontains.  A {\tt DwMessage} may sometimes be an intermediate node.  In
 //. this special case, the parent node is a {\tt DwBody} object of type
 //. "message/*" and the {\tt DwMessage} object represents an encapsulated
 //. message.
diff --git a/mimelib/mimelib/msgcmp.h b/mimelib/mimelib/msgcmp.h
index c9e6707e..cc2cefb2 100644
--- a/mimelib/mimelib/msgcmp.h
+++ b/mimelib/mimelib/msgcmp.h
@@ -98,7 +98,7 @@
 //.    A collection of headers is part of a message or body part, a header
 //.    field is part of a collection of headers, a field-body is part
 //.    of a header field, and so on.  The parent of
-//.    a component is the component that contains it.  This tree structure
+//.    a component is the component that tqcontains it.  This tree structure
 //.    is important, since a component's parent must be parsed before the
 //.    component can be.  Also, a component's string representation must
 //.    be assembled before its parent's.  To maintain consistency in the
@@ -269,7 +269,7 @@ protected:
     // Is-modified flag
 
     DwMessageComponent* mParent;
-    // Component that contains this component
+    // Component that tqcontains this component
 
     componentType mClassId;
     // Class identifier for runtime type identification
diff --git a/mimelib/mimelib/msgid.h b/mimelib/mimelib/msgid.h
index de066cdb..7e891bbf 100644
--- a/mimelib/mimelib/msgid.h
+++ b/mimelib/mimelib/msgid.h
@@ -36,7 +36,7 @@
 //+ Description
 //. {\tt DwMsgId} represents a {\it msg-id} as described in RFC-822.  In
 //. the BNF grammar in RFC-822, a msg-id has a {\it local-part} and a
-//. {\it domain}.  In MIME++, a {\tt DwMsgId} contains strings that
+//. {\it domain}.  In MIME++, a {\tt DwMsgId} tqcontains strings that
 //. contain the local-part and the domain.
 //.
 //. In the tree (broken-down) representation of message, a {\tt DwMsgId}
diff --git a/mimelib/mimelib/nntp.h b/mimelib/mimelib/nntp.h
index a2c17b78..bd617903 100644
--- a/mimelib/mimelib/nntp.h
+++ b/mimelib/mimelib/nntp.h
@@ -368,7 +368,7 @@ private:
     DwObserver* mObserver;
 
     virtual int PGetLine(char** aPtr, int* aLen);
-    virtual void PGetStatusResponse();
+    virtual void PGeStatusResponse();
     virtual void PGetTextResponse();
 
 };
diff --git a/mimelib/mimelib/string.h b/mimelib/mimelib/string.h
index 35be8e0b..83242c6a 100644
--- a/mimelib/mimelib/string.h
+++ b/mimelib/mimelib/string.h
@@ -88,7 +88,7 @@ public:
 //. other string classes.  {\tt DwString} also handles binary data, which can
 //. contain embedded NUL characters.
 //=============================================================================
-//+ Noentry _copy _replace Length AsCharBuf Substring Prefix Suffix Prepend
+//+ Noentry _copy _tqreplace Length AsCharBuf Substring Prefix Suffix Prepend
 //+ Noentry Append Insert Replace Delete mRep mStart mLength sEmptyString
 //+ Noentry ~DwString
 
@@ -285,13 +285,13 @@ public:
     //. available.
     //. Returns {\tt *this}.
 
-    DwString& replace(size_t aPos1, size_t aLen1, const DwString& aStr);
-    DwString& replace(size_t aPos1, size_t aLen1, const DwString& aStr,
+    DwString& tqreplace(size_t aPos1, size_t aLen1, const DwString& aStr);
+    DwString& tqreplace(size_t aPos1, size_t aLen1, const DwString& aStr,
         size_t aPos2, size_t aLen2);
-    DwString& replace(size_t aPos1, size_t aLen1, const char* aBuf,
+    DwString& tqreplace(size_t aPos1, size_t aLen1, const char* aBuf,
         size_t aLen2);
-    DwString& replace(size_t aPos1, size_t aLen1, const char* aCstr);
-    DwString& replace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar);
+    DwString& tqreplace(size_t aPos1, size_t aLen1, const char* aCstr);
+    DwString& tqreplace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar);
     //. Removes {\tt aLen1} characters beginning at position {\tt aPos1}
     //. and inserts other characters.
     //. Returns {\tt *this}.
@@ -453,7 +453,7 @@ public:
     //. string {\tt aCstr}.
 
     DwString substr(size_t aPos=0, size_t aLen=npos) const;
-    //. Returns a string that contains at most {\tt aLen} characters from
+    //. Returns a string that tqcontains at most {\tt aLen} characters from
     //. the {\tt DwString} object beginning at position {\tt aPos}.  The
     //. returned substring will not contain more characters than what are
     //. available in the superstring {\tt DwString} object.
@@ -557,8 +557,8 @@ protected:
     size_t  mLength;
 
     void _copy();
-    void _replace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2);
-    void _replace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar);
+    void _tqreplace(size_t aPos1, size_t aLen1, const char* aBuf, size_t aLen2);
+    void _tqreplace(size_t aPos1, size_t aLen1, size_t aLen2, char aChar);
 
 private:
     static const size_t kEmptyBufferSize;
diff --git a/mimelib/multipar.cpp b/mimelib/multipar.cpp
index 07514fcf..75825a84 100644
--- a/mimelib/multipar.cpp
+++ b/mimelib/multipar.cpp
@@ -305,7 +305,7 @@ void MultipartMessage::SetBodyPart(int aIdx, const MultipartBodyPart& aPart)
     DwBody& body = mMessage->Body();
     int numParts = NumberOfParts();
     DwBodyPart* part = 0;
-    // If indexed part exists already, just replace its values
+    // If indexed part exists already, just tqreplace its values
     if (0 <= aIdx && aIdx < numParts) {
         part = body.FirstBodyPart();
         for (int curIdx=0; curIdx < aIdx; ++curIdx) {
diff --git a/mimelib/nntp.cpp b/mimelib/nntp.cpp
index 56fb5cc9..a89293ae 100644
--- a/mimelib/nntp.cpp
+++ b/mimelib/nntp.cpp
@@ -72,7 +72,7 @@ int DwNntpClient::Open(const char* aServer, DwUint16 aPort)
     mStatusResponse = mTextResponse = "";
     int err = DwProtocolClient::Open(aServer, aPort);
     if (! err) {
-        PGetStatusResponse();
+        PGeStatusResponse();
     }
     return mReplyCode;
 }
@@ -119,7 +119,7 @@ int DwNntpClient::Article(int aArticleNum)
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
         if (mReplyCode/100%10 == 2) {
             PGetTextResponse();
         }
@@ -144,7 +144,7 @@ int DwNntpClient::Article(const char* aMsgId)
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
         if (mReplyCode/100%10 == 2) {
             PGetTextResponse();
         }
@@ -168,7 +168,7 @@ int DwNntpClient::Head(int aArticleNum)
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
         if (mReplyCode/100%10 == 2) {
             PGetTextResponse();
         }
@@ -192,7 +192,7 @@ int DwNntpClient::Head(const char* aMsgId)
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
         if (mReplyCode/100%10 == 2) {
             PGetTextResponse();
         }
@@ -216,7 +216,7 @@ int DwNntpClient::Body(int articleNum)
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
         if (mReplyCode/100%10 == 2) {
             PGetTextResponse();
         }
@@ -240,7 +240,7 @@ int DwNntpClient::Body(const char* aMsgId)
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
         if (mReplyCode/100%10 == 2) {
             PGetTextResponse();
         }
@@ -264,7 +264,7 @@ int DwNntpClient::Stat(int articleNum)
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
     }
     return mReplyCode;
 }
@@ -285,7 +285,7 @@ int DwNntpClient::Stat(const char* aMsgId)
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
     }
     return mReplyCode;
 }
@@ -306,7 +306,7 @@ int DwNntpClient::Group(const char* aNewsgroupName)
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
     }
     return mReplyCode;
 }
@@ -322,7 +322,7 @@ int DwNntpClient::Help()
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
         if (mReplyCode/100%10 == 1) {
             PGetTextResponse();
         }
@@ -341,7 +341,7 @@ int DwNntpClient::Last()
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
     }
     return mReplyCode;
 }
@@ -357,7 +357,7 @@ int DwNntpClient::List()
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
         if (mReplyCode/100%10 == 2) {
             PGetTextResponse();
         }
@@ -388,7 +388,7 @@ int DwNntpClient::Newgroups(const char* aDate, const char* aTime,
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
         if (mReplyCode/100%10 == 2) {
             PGetTextResponse();
         }
@@ -421,7 +421,7 @@ int DwNntpClient::Newnews(const char* aNewsgroups, const char* aDate,
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
         if (mReplyCode/100%10 == 2) {
             PGetTextResponse();
         }
@@ -440,7 +440,7 @@ int DwNntpClient::Next()
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
     }
     return mReplyCode;
 }
@@ -456,7 +456,7 @@ int DwNntpClient::Post()
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
     }
     return mReplyCode;
 }
@@ -472,7 +472,7 @@ int DwNntpClient::Quit()
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
     }
     return mReplyCode;
 }
@@ -488,7 +488,7 @@ int DwNntpClient::Slave()
     int bufferLen = strlen(mSendBuffer);
     int numSent = PSend(mSendBuffer, bufferLen);
     if (numSent == bufferLen) {
-        PGetStatusResponse();
+        PGeStatusResponse();
     }
     return mReplyCode;
 }
@@ -592,12 +592,12 @@ int DwNntpClient::SendData(const char* aBuf, int aBufLen)
 
     // Get the server's response
 
-    PGetStatusResponse();
+    PGeStatusResponse();
     return mReplyCode;
 }
 
 
-void DwNntpClient::PGetStatusResponse()
+void DwNntpClient::PGeStatusResponse()
 {
     mReplyCode = 0;
     mStatusResponse = "";
diff --git a/plugins/kmail/bodypartformatter/attendeeselector.cpp b/plugins/kmail/bodypartformatter/attendeeselector.cpp
index 8fa67770..57c54642 100644
--- a/plugins/kmail/bodypartformatter/attendeeselector.cpp
+++ b/plugins/kmail/bodypartformatter/attendeeselector.cpp
@@ -34,8 +34,8 @@ AttendeeSelector::AttendeeSelector(TQWidget * parent)
   ui = new AttendeeSelectorWidget( this );
   setMainWidget( ui );
 
-  TQGridLayout *layout = static_cast<TQGridLayout*>( ui->layout() );
-  layout->setMargin( 0 );
+  TQGridLayout *tqlayout = static_cast<TQGridLayout*>( ui->tqlayout() );
+  tqlayout->setMargin( 0 );
 
   ui->addButton->setGuiItem( KStdGuiItem::add() );
   connect( ui->addButton, TQT_SIGNAL(clicked()), TQT_SLOT(addClicked()) );
diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp
index 49b60f5f..66ed33c3 100644
--- a/plugins/kmail/bodypartformatter/text_calendar.cpp
+++ b/plugins/kmail/bodypartformatter/text_calendar.cpp
@@ -118,7 +118,7 @@ CalendarManager::CalendarManager()
       const TQStringList subResources = (*it)->subresources();
       TQMap<TQString, int> prefixSet; // KDE4: QSet
       for ( TQStringList::ConstIterator subIt = subResources.begin(); subIt != subResources.end(); ++subIt ) {
-        if ( !(*subIt).contains( "/.INBOX.directory/" ) )
+        if ( !(*subIt).tqcontains( "/.INBOX.directory/" ) )
           // we don't care about shared folders
           continue;
         prefixSet.insert( (*subIt).left( (*subIt).find( "/.INBOX.directory/" ) ), 0 );
@@ -295,7 +295,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
 
     }
 
-    Attendee* setStatusOnMyself( Incidence* incidence, Attendee* myself,
+    Attendee* seStatusOnMyself( Incidence* incidence, Attendee* myself,
                             Attendee::PartStat status, const TQString &receiver ) const
     {
       Attendee* newMyself = 0;
@@ -426,7 +426,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
     bool cancelPastInvites( Incidence *incidence, const TQString &path ) const
     {
       TQString warnStr;
-      TQDateTime now = TQDateTime::currentDateTime();
+      TQDateTime now = TQDateTime::tqcurrentDateTime();
       TQDate today = now.date();
       Event * const event = dynamic_cast<Event *>( incidence );
       Todo * const todo = dynamic_cast<Todo *>( incidence );
@@ -606,7 +606,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
       }
 
       if ( ( myself && myself->RSVP() ) || heuristicalRSVP( incidence ) ) {
-        Attendee* newMyself = setStatusOnMyself( incidence, myself, status, receiver );
+        Attendee* newMyself = seStatusOnMyself( incidence, myself, status, receiver );
         if ( newMyself && status == Attendee::Delegated ) {
           newMyself->setDelegate( delegateString );
           newMyself->setRSVP( delegatorRSVP );
@@ -649,7 +649,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
       if ( status == Attendee::Delegated ) {
         incidence = icalToString( iCal );
         myself = findMyself( incidence, receiver );
-        myself->setStatus( status );
+        myself->seStatus( status );
         myself->setDelegate( delegateString );
         TQString name, email;
         KPIM::getNameAndMail( delegateString, name, email );
diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp
index 39a4ab28..3fd76b8e 100644
--- a/plugins/kmail/bodypartformatter/text_vcard.cpp
+++ b/plugins/kmail/bodypartformatter/text_vcard.cpp
@@ -104,7 +104,7 @@ namespace {
           writer->queue( contact );
 
           TQString addToLinkText = i18n( "[Add this contact to the addressbook]" );
-          TQString op = TQString::fromLatin1( "addToAddressBook:%1" ).arg( count );
+          TQString op = TQString::tqfromLatin1( "addToAddressBook:%1" ).arg( count );
           writer->queue(
                 "<div align=\"center\"><a href=\"" +
                 bodyPart->makeLink( op ) +
diff --git a/plugins/kmail/bodypartformatter/text_xdiff.cpp b/plugins/kmail/bodypartformatter/text_xdiff.cpp
index 53bb0016..26c366ab 100644
--- a/plugins/kmail/bodypartformatter/text_xdiff.cpp
+++ b/plugins/kmail/bodypartformatter/text_xdiff.cpp
@@ -71,19 +71,19 @@ namespace {
 
 
 
-      TQString addedLineStyle = TQString::fromLatin1(
+      TQString addedLineStyle = TQString::tqfromLatin1(
         "style=\""
         "color: green;\"");
       TQString fileAddStyle( "style=\"font-weight: bold; "
                             "color: green; \"" );
 
-      TQString removedLineStyle = TQString::fromLatin1(
+      TQString removedLineStyle = TQString::tqfromLatin1(
         "style=\""
         "color: red;\"");
       TQString fileRemoveStyle( "style=\"font-weight: bold; "
                                "color: red ;\"" );
 
-      TQString tableStyle = TQString::fromLatin1(
+      TQString tableStyle = TQString::tqfromLatin1(
         "style=\""
         "text-align: -khtml-auto; "
         "border: solid black 1px; "
diff --git a/plugins/kmail/bodypartformatter/ui_attendeeselector.ui b/plugins/kmail/bodypartformatter/ui_attendeeselector.ui
index 06873fe5..54efee6c 100644
--- a/plugins/kmail/bodypartformatter/ui_attendeeselector.ui
+++ b/plugins/kmail/bodypartformatter/ui_attendeeselector.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>AttendeeSelectorWidget</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -48,7 +48,7 @@
             <property name="name">
                 <cstring>attendeeEdit</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>250</width>
                     <height>0</height>
@@ -65,7 +65,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>140</height>
@@ -77,8 +77,8 @@
 <includes>
     <include location="global" impldecl="in declaration">libkdepim/addresseelineedit.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="0"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="0"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/wizards/egroupwarewizard.cpp b/wizards/egroupwarewizard.cpp
index dcf74944..4ab53c3b 100644
--- a/wizards/egroupwarewizard.cpp
+++ b/wizards/egroupwarewizard.cpp
@@ -347,7 +347,7 @@ EGroupwareWizard::EGroupwareWizard() : KConfigWizard( new EGroupwarePropagator )
   setupRulesPage();
   setupChangesPage();
 
-  resize( sizeHint() );
+  resize( tqsizeHint() );
 }
 
 EGroupwareWizard::~EGroupwareWizard()
diff --git a/wizards/groupwarewizard.cpp b/wizards/groupwarewizard.cpp
index d023a8d7..48ac3b5a 100644
--- a/wizards/groupwarewizard.cpp
+++ b/wizards/groupwarewizard.cpp
@@ -33,14 +33,14 @@ GroupwareWizard::GroupwareWizard( TQWidget *parent, const char *name )
 {
   setCaption( i18n( "KDE Groupware Wizard" ) );
 
-  TQVBoxLayout *layout = new TQVBoxLayout( this );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
 
   mOverViewPage = new OverViewPage( this );
 
-  layout->addWidget( mOverViewPage );
+  tqlayout->addWidget( mOverViewPage );
 
   connect( mOverViewPage, TQT_SIGNAL( cancel() ),
-           qApp, TQT_SLOT( quit() ) );
+           tqApp, TQT_SLOT( quit() ) );
 
   resize( 400, 200 );
 }
diff --git a/wizards/kmailchanges.cpp b/wizards/kmailchanges.cpp
index 79e06f58..4ad256f7 100644
--- a/wizards/kmailchanges.cpp
+++ b/wizards/kmailchanges.cpp
@@ -280,7 +280,7 @@ void CreateDisconnectedImapAccount::apply()
   es.setSetting( KEMailSettings::EmailAddress, mEmail );
 
   KPIM::IdentityManager identityManager;
-  if ( !identityManager.allEmails().contains( mEmail ) ) {
+  if ( !identityManager.allEmails().tqcontains( mEmail ) ) {
     // Not sure how to name the identity. First one is "Default", next one mAccountName, but then...
     // let's use the server name after that.
     TQString accountName = mAccountName;
@@ -375,8 +375,8 @@ bool CreateImapAccount::writeToWallet(const TQString & type, int id)
   if ( !mWallet || !mWallet->isOpen() ) {
     delete mWallet;
     WId window = 0;
-    if ( qApp->activeWindow() )
-      window = qApp->activeWindow()->winId();
+    if ( tqApp->activeWindow() )
+      window = tqApp->activeWindow()->winId();
     mWallet = Wallet::openWallet( Wallet::NetworkWallet(), window );
     if ( !mWallet )
       return false;
diff --git a/wizards/kolabwizard.cpp b/wizards/kolabwizard.cpp
index e8a452b1..59b7a251 100644
--- a/wizards/kolabwizard.cpp
+++ b/wizards/kolabwizard.cpp
@@ -72,7 +72,7 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change
         c.writeEntry( "Default domain", basedn );
       }
 
-      basedn.replace(".",",dc=");
+      basedn.tqreplace(".",",dc=");
       basedn.prepend("dc=");
 
       // Set the changes
diff --git a/wizards/overviewpage.cpp b/wizards/overviewpage.cpp
index 2ee90096..e0a544ad 100644
--- a/wizards/overviewpage.cpp
+++ b/wizards/overviewpage.cpp
@@ -42,54 +42,54 @@
 OverViewPage::OverViewPage( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 7, 4, KDialog::marginHint(),
+  TQGridLayout *tqlayout = new TQGridLayout( this, 7, 4, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   const TQString msg = i18n( "KDE Groupware Wizard" );
   TQLabel *label = new TQLabel( "<qt><b><u><h2>" + msg + "</h2></u></b></qt>" , this );
-  layout->addMultiCellWidget( label, 0, 0, 0, 2 );
+  tqlayout->addMultiCellWidget( label, 0, 0, 0, 2 );
 
   label = new TQLabel( this );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "network", KIcon::Desktop ) );
-  layout->addWidget( label, 0, 3 );
+  tqlayout->addWidget( label, 0, 3 );
 
   label = new TQLabel( "", this );
-  layout->addWidget( label, 1, 0 );
-  layout->setRowSpacing( 1, 20 );
+  tqlayout->addWidget( label, 1, 0 );
+  tqlayout->setRowSpacing( 1, 20 );
 
   label = new TQLabel( i18n( "Select the type of server you want connect your KDE to:" ), this );
-  layout->addMultiCellWidget( label, 2, 2, 0, 3 );
+  tqlayout->addMultiCellWidget( label, 2, 2, 0, 3 );
 
   TQPushButton *button = new TQPushButton( i18n("eGroupware"), this );
-  layout->addMultiCellWidget( button, 3, 3, 0, 3 );
+  tqlayout->addMultiCellWidget( button, 3, 3, 0, 3 );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardEGroupware() ) );
 
   // FIXME: Maybe hyperlinks would be better than buttons.
 
   button = new TQPushButton( i18n("Kolab"), this );
-  layout->addMultiCellWidget( button, 4, 4, 0, 3 );
+  tqlayout->addMultiCellWidget( button, 4, 4, 0, 3 );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardKolab() ) );
 
   button = new TQPushButton( i18n("SUSE Linux Openexchange (SLOX)"), this );
-  layout->addMultiCellWidget( button, 5, 5, 0, 3 );
+  tqlayout->addMultiCellWidget( button, 5, 5, 0, 3 );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardSlox() ) );
 
   button = new TQPushButton( i18n("Microsoft Exchange"), this );
   button->hide(); // not quite ready yet
-  layout->addMultiCellWidget( button, 6, 6, 0, 3 );
+  tqlayout->addMultiCellWidget( button, 6, 6, 0, 3 );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardExchange() ) );
 
 
   TQFrame *frame = new TQFrame( this );
   frame->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
-  layout->addMultiCellWidget( frame, 7, 7, 0, 3 );
+  tqlayout->addMultiCellWidget( frame, 7, 7, 0, 3 );
 
   TQPushButton *cancelButton = new KPushButton( KStdGuiItem::close(), this );
-  layout->addWidget( cancelButton, 8, 3 );
+  tqlayout->addWidget( cancelButton, 8, 3 );
 
   connect( cancelButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( cancel() ) );
 
-  layout->setRowStretch( 7, 1 );
+  tqlayout->setRowStretch( 7, 1 );
 
   KAcceleratorManager::manage( this );
 }
diff --git a/wizards/scalixwizard.cpp b/wizards/scalixwizard.cpp
index dfc638f7..beb05948 100644
--- a/wizards/scalixwizard.cpp
+++ b/wizards/scalixwizard.cpp
@@ -200,12 +200,12 @@ class SynchronizeScalixAccount : public KConfigPropagator::Change
 
     void apply()
     {
-      TQMessageBox *msg = new TQMessageBox( qApp->mainWidget() );
+      TQMessageBox *msg = new TQMessageBox( tqApp->mainWidget() );
       msg->setText( "Preparing initial synchronization with Scalix server..." );
       msg->show();
-      qApp->processEvents();
+      tqApp->processEvents();
       sleep( 1 );
-      qApp->processEvents();
+      tqApp->processEvents();
 
       TQString error;
       TQCString dcopService;
diff --git a/wizards/servertype.h b/wizards/servertype.h
index 24503666..8e6954b4 100644
--- a/wizards/servertype.h
+++ b/wizards/servertype.h
@@ -50,7 +50,7 @@ class ServerType : public QObject
     };
 
     /**
-      This map contains the uids and the user visible names
+      This map tqcontains the uids and the user visible names
       of a server type.
      */
     typedef TQValueList<ConnectionInfo> ConnectionInfoList;