Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

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

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)

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()]);

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>

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

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. */

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;
         }
     }

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 &);

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)+"...";

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);
 

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);
 }

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:

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)

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";

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);
     }
 }
 

akregator/src/dragobjects.h

@@ -57,7 +57,7 @@ public: