Browse Source

Rename a number of old tq methods that are no longer tq specific

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
3ca10fd9a2
100 changed files with 777 additions and 777 deletions
  1. 8
    8
      NewsLog.txt
  2. 2
    2
      akregator/src/addfeeddialog.cpp
  3. 6
    6
      akregator/src/addfeedwidgetbase.ui
  4. 18
    18
      akregator/src/akregator_part.cpp
  5. 17
    17
      akregator/src/akregator_view.cpp
  6. 12
    12
      akregator/src/article.cpp
  7. 2
    2
      akregator/src/article.h
  8. 73
    73
      akregator/src/articlefilter.cpp
  9. 2
    2
      akregator/src/articlefilter.h
  10. 2
    2
      akregator/src/articlelistview.cpp
  11. 63
    63
      akregator/src/articleviewer.cpp
  12. 3
    3
      akregator/src/dragobjects.cpp
  13. 1
    1
      akregator/src/dragobjects.h
  14. 17
    17
      akregator/src/feed.cpp
  15. 4
    4
      akregator/src/feed.h
  16. 6
    6
      akregator/src/feedlist.cpp
  17. 8
    8
      akregator/src/feedlistview.cpp
  18. 1
    1
      akregator/src/feedlistview.h
  19. 1
    1
      akregator/src/feedstorage.h
  20. 2
    2
      akregator/src/feedstoragedummyimpl.cpp
  21. 1
    1
      akregator/src/feedstoragedummyimpl.h
  22. 36
    36
      akregator/src/folder.cpp
  23. 9
    9
      akregator/src/folder.h
  24. 4
    4
      akregator/src/frame.cpp
  25. 3
    3
      akregator/src/kcursorsaver.h
  26. 22
    22
      akregator/src/librss/article.cpp
  27. 2
    2
      akregator/src/librss/category.cpp
  28. 152
    152
      akregator/src/librss/document.cpp
  29. 10
    10
      akregator/src/librss/enclosure.cpp
  30. 1
    1
      akregator/src/librss/global.h
  31. 6
    6
      akregator/src/librss/image.cpp
  32. 2
    2
      akregator/src/librss/loader.cpp
  33. 5
    5
      akregator/src/librss/loader.h
  34. 3
    3
      akregator/src/librss/testlibrss.cpp
  35. 2
    2
      akregator/src/librss/testlibrss.h
  36. 4
    4
      akregator/src/librss/textinput.cpp
  37. 6
    6
      akregator/src/librss/tools_p.cpp
  38. 7
    7
      akregator/src/listtabwidget.cpp
  39. 1
    1
      akregator/src/mainwindow.cpp
  40. 2
    2
      akregator/src/mk4storage/feedstoragemk4impl.cpp
  41. 1
    1
      akregator/src/mk4storage/feedstoragemk4impl.h
  42. 10
    10
      akregator/src/mk4storage/metakit/CHANGES
  43. 1
    1
      akregator/src/mk4storage/metakit/README
  44. 1
    1
      akregator/src/mk4storage/metakit/src/column.h
  45. 1
    1
      akregator/src/mk4storage/metakit/tests/regress.cpp
  46. 4
    4
      akregator/src/mk4storage/mk4confwidgetbase.ui
  47. 2
    2
      akregator/src/nodelist.cpp
  48. 3
    3
      akregator/src/notificationmanager.cpp
  49. 4
    4
      akregator/src/pageviewer.cpp
  50. 8
    8
      akregator/src/pluginmanager.cpp
  51. 4
    4
      akregator/src/progressmanager.cpp
  52. 1
    1
      akregator/src/propertiesdialog.cpp
  53. 7
    7
      akregator/src/propertieswidgetbase.ui
  54. 5
    5
      akregator/src/searchbar.cpp
  55. 1
    1
      akregator/src/searchbar.h
  56. 2
    2
      akregator/src/settings_advancedbase.ui
  57. 1
    1
      akregator/src/settings_appearance.ui
  58. 2
    2
      akregator/src/settings_archive.ui
  59. 2
    2
      akregator/src/settings_browser.ui
  60. 1
    1
      akregator/src/settings_general.ui
  61. 5
    5
      akregator/src/simplenodeselector.cpp
  62. 6
    6
      akregator/src/tabwidget.cpp
  63. 1
    1
      akregator/src/tag.h
  64. 1
    1
      akregator/src/tagaction.cpp
  65. 1
    1
      akregator/src/tagnode.cpp
  66. 5
    5
      akregator/src/tagpropertieswidgetbase.ui
  67. 8
    8
      akregator/src/tagset.cpp
  68. 1
    1
      akregator/src/trayicon.cpp
  69. 6
    6
      akregator/src/treenode.cpp
  70. 1
    1
      akregator/src/treenodeitem.cpp
  71. 3
    3
      akregator/src/viewer.cpp
  72. 2
    2
      certmanager/certificateinfowidget.ui
  73. 9
    9
      certmanager/certificateinfowidgetimpl.cpp
  74. 14
    14
      certmanager/certificatewizard.ui
  75. 9
    9
      certmanager/certificatewizardimpl.cpp
  76. 31
    31
      certmanager/certmanager.cpp
  77. 1
    1
      certmanager/certmanager.h
  78. 1
    1
      certmanager/conf/appearanceconfigpage.cpp
  79. 12
    12
      certmanager/conf/appearanceconfigwidget.cpp
  80. 2
    2
      certmanager/conf/appearanceconfigwidgetbase.ui
  81. 6
    6
      certmanager/conf/configuredialog.cpp
  82. 3
    3
      certmanager/conf/dirservconfigpage.cpp
  83. 1
    1
      certmanager/conf/dnorderconfigpage.cpp
  84. 2
    2
      certmanager/crlview.cpp
  85. 1
    1
      certmanager/hierarchyanalyser.cpp
  86. 3
    3
      certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
  87. 8
    8
      certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
  88. 10
    10
      certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
  89. 2
    2
      certmanager/lib/backends/chiasmus/chiasmusjob.cpp
  90. 2
    2
      certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
  91. 1
    1
      certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
  92. 7
    7
      certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
  93. 3
    3
      certmanager/lib/backends/qgpgme/gnupgprocessbase.h
  94. 5
    5
      certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
  95. 6
    6
      certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
  96. 5
    5
      certmanager/lib/backends/qgpgme/qgpgmejob.cpp
  97. 1
    1
      certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
  98. 3
    3
      certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
  99. 2
    2
      certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
  100. 0
    0
      certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h

+ 8
- 8
NewsLog.txt View File

@@ -66,7 +66,7 @@ Problems addressed
66 66
 ------------------
67 67
 
68 68
 * kolab/issue4335 (partly): D'n'D a mail attachment with the icon is not working (rt#6126)
69
-* kolab/issue3908 (partly): Mail view and print tqlayout problem if description of attachment is to long (#5872)
69
+* kolab/issue3908 (partly): Mail view and print layout problem if description of attachment is to long (#5872)
70 70
 * kolab/issue4455: calendar activate/deactivate handling broken
71 71
 * kolab/issue4282: Adding a new event from an invitation update mail shows unnecssary message
72 72
                    dialog 'store/throw away' (rt#6094)
@@ -269,7 +269,7 @@ Problems addressed
269 269
 * kolab/issue3902: Delete a folder while syncing leads to crash
270 270
 * kolab/issue4250: Edit "Out of office" replies: Resend notification only after: days is missing (rt#6076)
271 271
 * kolab/issue4249: Crash while printing a mail without preview pane (rt#6075)
272
-* kolab/issue4142: Composer: view all fields tqlayout and small problems (rt#6032)
272
+* kolab/issue4142: Composer: view all fields layout and small problems (rt#6032)
273 273
 * kolab/issue4012: Calender view update problem, if the same appointment is moved on the server in other folders (rt#5930)
274 274
 
275 275
 
@@ -551,7 +551,7 @@ Problems addressed
551 551
 
552 552
 * kolab/issue3923(partial): Save as of an attachment of an invitation crashes kontact
553 553
 * kolab/issue3930: time on the Marcus Bains line doesn't change
554
-* kolab/issue3908(partial): Mail view and print tqlayout problem if description of attachment is to long (rt#5872)
554
+* kolab/issue3908(partial): Mail view and print layout problem if description of attachment is to long (rt#5872)
555 555
 * kolab/issue3926: Start khelpcenter instead of webbrowser help: from the introduction/welcome screen (rt#5881)
556 556
 * kolab/issue3481: Keep current email in front after saving an attachment (rt#5746)
557 557
 * kolab/issue3098: OnlineIMAP, sometimes Mail body no longer shown -> Crash
@@ -565,7 +565,7 @@ Problems addressed
565 565
 * kolab/issue3065: Crash in KOAgendaItem::paintEvent
566 566
 * kolab/issue3902: Delete a folder while syncing leads to crash
567 567
 * kolab/issue3903: Kontact hangs when switching to calendar view (rt#5870)
568
-* kolab/issue3908 (partial): Mail view and print tqlayout problem if description of attachment is to long (rt#5872)
568
+* kolab/issue3908 (partial): Mail view and print layout problem if description of attachment is to long (rt#5872)
569 569
 * kolab/issue3807: Reminder: None of the buttons should be the default (rt#5845)
570 570
 * kolab/issue3809: Reminder: sorting in look&feel of kontact (rt#5846)
571 571
 * kolab/issue3813: reccuring events show wrong dates (rt#5855)
@@ -1108,7 +1108,7 @@ Friday, November 21st 2008
1108 1108
 Problems addressed
1109 1109
 ------------------
1110 1110
 
1111
-* kolab/issue2627 tqStatus line for audit log shown, even when it is not implemented.
1111
+* kolab/issue2627 Status line for audit log shown, even when it is not implemented.
1112 1112
 * kolab/issue2617 Kleopatra: After importing a p7c or p12 file the user is informed, that he has imported 0 certifictes.
1113 1113
 * kolab/issue2620 Kleopatra throws an error message, if no .gnupg exists and no agent is running.
1114 1114
 
@@ -1125,7 +1125,7 @@ Sunday, November 9th 2008
1125 1125
 Problems addressed
1126 1126
 ------------------
1127 1127
 
1128
-* kolab/issue2627 tqStatus line for audit log shown, even when it is not implemented.
1128
+* kolab/issue2627 Status line for audit log shown, even when it is not implemented.
1129 1129
 *Support the /vendor/cmu/cyrus-imapd/sharedseen annotation available in Cyrus IMAP server 2.3.9 or higher which allows to share the seen flags between all users that have access to a folder.
1130 1130
 * Detect if the server supports shared seen flags. Also preserve the IMAP server capabilities in kmailrc so that detection also works without a prior sync.
1131 1131
  
@@ -1474,7 +1474,7 @@ Friday, February 29th 2008
1474 1474
 Problems addressed
1475 1475
 -------------------
1476 1476
 
1477
-* Prevent crash after changing the tqlayout and replying then. (778728)
1477
+* Prevent crash after changing the layout and replying then. (778728)
1478 1478
 * kolab/issue2442 kolab/issue2442 (kioslave crashs after closing kontact, if the vacation reminder is activated. (779694)
1479 1479
 * "Enterprise headers" makes impossible to select text in first paragraph of body. [ kde-bug#151150 ] (779994)
1480 1480
 * kolab/issue1700 kleopatra crashes after ldap search. (780211)
@@ -2063,7 +2063,7 @@ Bugfixes
2063 2063
 
2064 2064
 Korganizer
2065 2065
 -----------
2066
-- proko35 W1-9 icon tqalignment was improved.
2066
+- proko35 W1-9 icon alignment was improved.
2067 2067
 
2068 2068
 Additional Fixes
2069 2069
 ================

+ 2
- 2
akregator/src/addfeeddialog.cpp View File

@@ -83,7 +83,7 @@ void AddFeedDialog::slotOk( )
83 83
         feedURL.prepend("http://");
84 84
     f->setXmlUrl(feedURL);
85 85
 
86
-    widget->statusLabel->setText( i18n("Downloading %1").tqarg(feedURL) );
86
+    widget->statusLabel->setText( i18n("Downloading %1").arg(feedURL) );
87 87
 
88 88
     connect( feed, TQT_SIGNAL(fetched(Feed* )),
89 89
              this, TQT_SLOT(fetchCompleted(Feed *)) );
@@ -102,7 +102,7 @@ void AddFeedDialog::fetchCompleted(Feed */*f*/)
102 102
 
103 103
 void AddFeedDialog::fetchError(Feed *)
104 104
 {
105
-    KMessageBox::error(this, i18n("Feed not found from %1.").tqarg(feedURL));
105
+    KMessageBox::error(this, i18n("Feed not found from %1.").arg(feedURL));
106 106
     KDialogBase::slotCancel();
107 107
 }
108 108
 

+ 6
- 6
akregator/src/addfeedwidgetbase.ui View File

@@ -24,7 +24,7 @@
24 24
         </property>
25 25
         <widget class="TQLayoutWidget">
26 26
             <property name="name">
27
-                <cstring>tqlayout16</cstring>
27
+                <cstring>layout16</cstring>
28 28
             </property>
29 29
             <hbox>
30 30
                 <property name="name">
@@ -56,7 +56,7 @@
56 56
                     <property name="sizeType">
57 57
                         <enum>Fixed</enum>
58 58
                     </property>
59
-                    <property name="tqsizeHint">
59
+                    <property name="sizeHint">
60 60
                         <size>
61 61
                             <width>16</width>
62 62
                             <height>20</height>
@@ -65,7 +65,7 @@
65 65
                 </spacer>
66 66
                 <widget class="TQLayoutWidget">
67 67
                     <property name="name">
68
-                        <cstring>tqlayout15</cstring>
68
+                        <cstring>layout15</cstring>
69 69
                     </property>
70 70
                     <grid>
71 71
                         <property name="name">
@@ -75,7 +75,7 @@
75 75
                             <property name="name">
76 76
                                 <cstring>urlEdit</cstring>
77 77
                             </property>
78
-                            <property name="tqminimumSize">
78
+                            <property name="minimumSize">
79 79
                                 <size>
80 80
                                     <width>200</width>
81 81
                                     <height>0</height>
@@ -115,7 +115,7 @@
115 115
                 <cstring>statusLabel</cstring>
116 116
             </property>
117 117
             <property name="text">
118
-                <string>tqStatus</string>
118
+                <string>Status</string>
119 119
             </property>
120 120
         </widget>
121 121
         <spacer>
@@ -128,7 +128,7 @@
128 128
             <property name="sizeType">
129 129
                 <enum>Expanding</enum>
130 130
             </property>
131
-            <property name="tqsizeHint">
131
+            <property name="sizeHint">
132 132
                 <size>
133 133
                     <width>20</width>
134 134
                     <height>50</height>

+ 18
- 18
akregator/src/akregator_part.cpp View File

@@ -146,7 +146,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
146 146
    
147 147
     TQStringList storageParams;
148 148
     
149
-    storageParams.append(TQString("taggingEnabled=%1").tqarg(Settings::showTaggingGUI() ? "true" : "false"));
149
+    storageParams.append(TQString("taggingEnabled=%1").arg(Settings::showTaggingGUI() ? "true" : "false"));
150 150
     
151 151
     if (factory != 0)
152 152
     {
@@ -168,7 +168,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
168 168
     {
169 169
         m_storage = Backend::StorageFactoryRegistry::self()->getFactory("dummy")->createStorage(storageParams);
170 170
 
171
-        KMessageBox::error(parentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").tqarg(Settings::archiveBackend()), i18n("Plugin error") );
171
+        KMessageBox::error(parentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").arg(Settings::archiveBackend()), i18n("Plugin error") );
172 172
     }
173 173
 
174 174
     Filters::ArticleFilterList list;
@@ -232,7 +232,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
232 232
 
233 233
     initFonts();
234 234
 
235
-    RSS::FileRetriever::setUserAgent(TQString("Akregator/%1; librss/remnants").tqarg(AKREGATOR_VERSION));
235
+    RSS::FileRetriever::setUserAgent(TQString("Akregator/%1; librss/remnants").arg(AKREGATOR_VERSION));
236 236
 }
237 237
 
238 238
 void Part::loadPlugins()
@@ -428,11 +428,11 @@ bool Part::openFile()
428 428
 
429 429
             if (file.size() > 0) // don't backup empty files 
430 430
             {
431
-                TQString backup = m_file + "-backup." +  TQString::number(TQDateTime::tqcurrentDateTime().toTime_t());
431
+                TQString backup = m_file + "-backup." +  TQString::number(TQDateTime::currentDateTime().toTime_t());
432 432
         
433 433
                 copyFile(backup);
434 434
         
435
-                KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (invalid XML). A backup was created:<p><b>%2</b></p></qt>").tqarg(backup), i18n("XML Parsing Error") );
435
+                KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (invalid XML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("XML Parsing Error") );
436 436
             }
437 437
 
438 438
             if (!doc.setContent(listBackup))
@@ -444,10 +444,10 @@ bool Part::openFile()
444 444
     {
445 445
         if (file.size() > 0) // don't backup empty files 
446 446
         {
447
-            TQString backup = m_file + "-backup." +  TQString::number(TQDateTime::tqcurrentDateTime().toTime_t());
447
+            TQString backup = m_file + "-backup." +  TQString::number(TQDateTime::currentDateTime().toTime_t());
448 448
             copyFile(backup);
449 449
 
450
-            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>").tqarg(backup), i18n("OPML Parsing Error") );
450
+            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") );
451 451
         }
452 452
         m_view->loadFeeds(createDefaultFeedList());
453 453
     }
@@ -486,7 +486,7 @@ void Part::slotSaveFeedList()
486 486
     if (file.open(IO_WriteOnly) == false)
487 487
     {
488 488
         //FIXME: allow to save the feedlist into different location -tpr 20041118
489
-        KMessageBox::error(m_view, i18n("Access denied: cannot save feed list (%1)").tqarg(m_file), i18n("Write error") );
489
+        KMessageBox::error(m_view, i18n("Access denied: cannot save feed list (%1)").arg(m_file), i18n("Write error") );
490 490
         return;
491 491
     }
492 492
 
@@ -538,7 +538,7 @@ TQWidget* Part::getMainWindow()
538 538
 {
539 539
     // this is a dirty fix to get the main window used for the tray icon
540 540
     
541
-    TQWidgetList *l = kapp->tqtopLevelWidgets();
541
+    TQWidgetList *l = kapp->topLevelWidgets();
542 542
     TQWidgetListIt it( *l );
543 543
     TQWidget *wid;
544 544
 
@@ -639,10 +639,10 @@ void Part::importFile(const KURL& url)
639 639
         if (doc.setContent(TQByteArray(file.readAll())))
640 640
             m_view->importFeeds(doc);
641 641
         else
642
-            KMessageBox::error(m_view, i18n("Could not import the file %1 (no valid OPML)").tqarg(filename), i18n("OPML Parsing Error") );
642
+            KMessageBox::error(m_view, i18n("Could not import the file %1 (no valid OPML)").arg(filename), i18n("OPML Parsing Error") );
643 643
     }
644 644
     else
645
-        KMessageBox::error(m_view, i18n("The file %1 could not be read, check if it exists or if it is readable for the current user.").tqarg(filename), i18n("Read Error"));
645
+        KMessageBox::error(m_view, i18n("The file %1 could not be read, check if it exists or if it is readable for the current user.").arg(filename), i18n("Read Error"));
646 646
 
647 647
     if (isRemote)
648 648
         KIO::NetAccess::removeTempFile(filename);
@@ -656,7 +656,7 @@ void Part::exportFile(const KURL& url)
656 656
 
657 657
         if ( file.exists() &&
658 658
                 KMessageBox::questionYesNo(m_view,
659
-            i18n("The file %1 already exists; do you want to overwrite it?").tqarg(file.name()),
659
+            i18n("The file %1 already exists; do you want to overwrite it?").arg(file.name()),
660 660
             i18n("Export"),
661 661
             i18n("Overwrite"),
662 662
             KStdGuiItem::cancel()) == KMessageBox::No )
@@ -664,7 +664,7 @@ void Part::exportFile(const KURL& url)
664 664
 
665 665
         if ( !file.open(IO_WriteOnly) )
666 666
         {
667
-            KMessageBox::error(m_view, i18n("Access denied: cannot write to file %1").tqarg(file.name()), i18n("Write Error") );
667
+            KMessageBox::error(m_view, i18n("Access denied: cannot write to file %1").arg(file.name()), i18n("Write Error") );
668 668
             return;
669 669
         }
670 670
 
@@ -978,11 +978,11 @@ bool Part::tryToLock(const TQString& backendName)
978 978
                         "can cause the loss of archived articles and crashes at startup.</b> "
979 979
                         "You should disable the archive for now "
980 980
                         "unless you are sure that %2 is not already running.</qt>")
981
-                        .tqarg( programName, programName, backendName );
981
+                        .arg( programName, programName, backendName );
982 982
               // TQString::arg( st ) only replaces the first occurrence of %1
983 983
               // with st while TQString::arg( s1, s2 ) replacess all occurrences
984 984
               // of %1 with s1 and all occurrences of %2 with s2. So don't
985
-              // even think about changing the above to .tqarg( programName ).
985
+              // even think about changing the above to .arg( programName ).
986 986
             else
987 987
                 msg = i18n("<qt>%1 seems to be running on another display on this "
988 988
                         "machine. <b>Running %1 and %2 at the same "
@@ -990,7 +990,7 @@ bool Part::tryToLock(const TQString& backendName)
990 990
                         "the loss of archived articles and crashes at startup.</b> "
991 991
                         "You should disable the archive for now "
992 992
                         "unless you are sure that %2 is not already running.</qt>")
993
-                        .tqarg( oldProgramName, programName, backendName );
993
+                        .arg( oldProgramName, programName, backendName );
994 994
         }
995 995
         else
996 996
         {
@@ -1001,7 +1001,7 @@ bool Part::tryToLock(const TQString& backendName)
1001 1001
                         "You should disable the archive for now "
1002 1002
                         "unless you are sure that it is "
1003 1003
                         "not already running on %2.</qt>")
1004
-                        .tqarg( programName, oldHostName, backendName );
1004
+                        .arg( programName, oldHostName, backendName );
1005 1005
             else
1006 1006
                 msg = i18n("<qt>%1 seems to be running on %3. <b>Running %1 and %2 at the "
1007 1007
                         "same time is not supported by the %4 backend and can cause "
@@ -1009,7 +1009,7 @@ bool Part::tryToLock(const TQString& backendName)
1009 1009
                         "You should disable the archive for now "
1010 1010
                         "unless you are sure that %1 is "
1011 1011
                         "not running on %3.</qt>")
1012
-                        .tqarg( oldProgramName, programName, oldHostName, backendName );
1012
+                        .arg( oldProgramName, programName, oldHostName, backendName );
1013 1013
         }
1014 1014
 
1015 1015
         KCursorSaver idle( KBusyPtr::idle() );

+ 17
- 17
akregator/src/akregator_view.cpp View File

@@ -90,18 +90,18 @@
90 90
 #include <tqfile.h>
91 91
 #include <tqhbox.h>
92 92
 #include <tqlabel.h>
93
-#include <tqlayout.h>
93
+#include <layout.h>
94 94
 #include <tqmultilineedit.h>
95 95
 #include <tqpopupmenu.h>
96 96
 #include <tqptrlist.h>
97
-#include <tqstylesheet.h>
98
-#include <tqtextstream.h>
97
+#include <stylesheet.h>
98
+#include <textstream.h>
99 99
 #include <tqtimer.h>
100 100
 #include <tqtoolbutton.h>
101 101
 #include <tqtooltip.h>
102 102
 #include <tqvaluevector.h>
103 103
 #include <tqwhatsthis.h>
104
-#include <tqclipboard.h>
104
+#include <clipboard.h>
105 105
 
106 106
 namespace Akregator {
107 107
 
@@ -145,7 +145,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor
145 145
 
146 146
         virtual bool visitTagNode(TagNode* node)
147 147
         {
148
-            TQString msg = i18n("<qt>Are you sure you want to delete tag <b>%1</b>? The tag will be removed from all articles.</qt>").tqarg(node->title());
148
+            TQString msg = i18n("<qt>Are you sure you want to delete tag <b>%1</b>? The tag will be removed from all articles.</qt>").arg(node->title());
149 149
             if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Tag"), KStdGuiItem::del()) == KMessageBox::Continue)
150 150
             {
151 151
                 Tag tag = node->tag();
@@ -166,7 +166,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor
166 166
             if (node->title().isEmpty())
167 167
                 msg = i18n("<qt>Are you sure you want to delete this folder and its feeds and subfolders?</qt>");
168 168
             else
169
-                msg = i18n("<qt>Are you sure you want to delete folder <b>%1</b> and its feeds and subfolders?</qt>").tqarg(node->title());
169
+                msg = i18n("<qt>Are you sure you want to delete folder <b>%1</b> and its feeds and subfolders?</qt>").arg(node->title());
170 170
 
171 171
             if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Folder"), KStdGuiItem::del()) == KMessageBox::Continue)
172 172
             {
@@ -182,7 +182,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor
182 182
             if (node->title().isEmpty())
183 183
                 msg = i18n("<qt>Are you sure you want to delete this feed?</qt>");
184 184
             else
185
-                msg = i18n("<qt>Are you sure you want to delete feed <b>%1</b>?</qt>").tqarg(node->title());
185
+                msg = i18n("<qt>Are you sure you want to delete feed <b>%1</b>?</qt>").arg(node->title());
186 186
 
187 187
             if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Feed"), KStdGuiItem::del()) == KMessageBox::Continue)
188 188
             {
@@ -366,7 +366,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
366 366
 
367 367
     if (!Settings::resetQuickFilterOnNodeChange())
368 368
     {
369
-        m_searchBar->slotSetqStatus(Settings::statusFilter());
369
+        m_searchBar->slotSeStatus(Settings::statusFilter());
370 370
         m_searchBar->slotSetText(Settings::textFilter());
371 371
     }
372 372
 
@@ -884,7 +884,7 @@ void View::slotFeedAdd()
884 884
 
885 885
     }
886 886
 
887
-    TreeNode* lastChild = group->tqchildren().last();
887
+    TreeNode* lastChild = group->children().last();
888 888
 
889 889
     addFeed(TQString(), lastChild, group, false);
890 890
 }
@@ -1186,7 +1186,7 @@ void View::slotArticleSelected(const Article& article)
1186 1186
             if (delay > 0)
1187 1187
                 m_markReadTimer->start( delay*1000, true );
1188 1188
             else
1189
-                a.setqStatus(Article::Read);
1189
+                a.seStatus(Article::Read);
1190 1190
         }
1191 1191
     }
1192 1192
 
@@ -1266,7 +1266,7 @@ void View::slotCopyLinkAddress()
1266 1266
             link = article.link().url();
1267 1267
         else
1268 1268
             link = article.guid();
1269
-        TQClipboard *cb = TQApplication::tqclipboard();
1269
+        TQClipboard *cb = TQApplication::clipboard();
1270 1270
         cb->setText(link, TQClipboard::Clipboard);
1271 1271
         cb->setText(link, TQClipboard::Selection);
1272 1272
     }
@@ -1312,7 +1312,7 @@ void View::slotArticleDelete()
1312 1312
         case 0:
1313 1313
             return;
1314 1314
         case 1:
1315
-            msg = i18n("<qt>Are you sure you want to delete article <b>%1</b>?</qt>").tqarg(TQStyleSheet::escape(articles.first().title()));
1315
+            msg = i18n("<qt>Are you sure you want to delete article <b>%1</b>?</qt>").arg(TQStyleSheet::escape(articles.first().title()));
1316 1316
             break;
1317 1317
         default:
1318 1318
             msg = i18n("<qt>Are you sure you want to delete the selected article?</qt>",
@@ -1370,7 +1370,7 @@ void View::slotSetSelectedArticleRead()
1370 1370
         return;
1371 1371
 
1372 1372
     for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
1373
-        (*it).setqStatus(Article::Read);
1373
+        (*it).seStatus(Article::Read);
1374 1374
 }
1375 1375
 
1376 1376
 void View::slotTextToSpeechRequest()
@@ -1408,7 +1408,7 @@ void View::slotSetSelectedArticleUnread()
1408 1408
         return;
1409 1409
 
1410 1410
     for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
1411
-        (*it).setqStatus(Article::Unread);
1411
+        (*it).seStatus(Article::Unread);
1412 1412
 }
1413 1413
 
1414 1414
 void View::slotSetSelectedArticleNew()
@@ -1419,7 +1419,7 @@ void View::slotSetSelectedArticleNew()
1419 1419
         return;
1420 1420
 
1421 1421
     for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
1422
-        (*it).setqStatus(Article::New);
1422
+        (*it).seStatus(Article::New);
1423 1423
 }
1424 1424
 
1425 1425
 void View::slotSetCurrentArticleReadDelayed()
@@ -1429,7 +1429,7 @@ void View::slotSetCurrentArticleReadDelayed()
1429 1429
     if (article.isNull())
1430 1430
         return;
1431 1431
 
1432
-    article.setqStatus(Article::Read);
1432
+    article.seStatus(Article::Read);
1433 1433
 }
1434 1434
 
1435 1435
 void View::slotMouseOverInfo(const KFileItem *kifi)
@@ -1453,7 +1453,7 @@ void View::readProperties(KConfig* config)
1453 1453
         m_searchBar->slotSetText(config->readEntry("searchLine"));
1454 1454
         int statusfilter = config->readNumEntry("searchCombo", -1);
1455 1455
         if (statusfilter != -1)
1456
-            m_searchBar->slotSetqStatus(statusfilter);
1456
+            m_searchBar->slotSeStatus(statusfilter);
1457 1457
     }
1458 1458
 
1459 1459
     int selectedID = config->readNumEntry("selectedNodeID", -1);

+ 12
- 12
akregator/src/article.cpp View File

@@ -55,7 +55,7 @@ struct Article::Private : public Shared
55 55
         0001 0000 Keep
56 56
      */
57 57
 
58
-    enum tqStatus {Deleted=0x01, Trash=0x02, New=0x04, Read=0x08, Keep=0x10};
58
+    enum Status {Deleted=0x01, Trash=0x02, New=0x04, Read=0x08, Keep=0x10};
59 59
 
60 60
     TQString guid;
61 61
     Backend::FeedStorage* archive;
@@ -109,7 +109,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
109 109
         if (article.meta("deleted") == "true") 
110 110
         { // if article is in deleted state, we just add the status and omit the rest
111 111
             d->status = Private::Read | Private::Deleted;
112
-            d->archive->setqStatus(d->guid, d->status);
112
+            d->archive->seStatus(d->guid, d->status);
113 113
         }
114 114
         else
115 115
         { // article is not deleted, let's add it to the archive
@@ -123,7 +123,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
123 123
             d->archive->setCommentsLink(d->guid, article.commentsLink().url());
124 124
             d->archive->setGuidIsPermaLink(d->guid, article.guidIsPermaLink());
125 125
             d->archive->setGuidIsHash(d->guid, article.meta("guidIsHash") == "true");
126
-            d->pubDate = article.pubDate().isValid() ? article.pubDate() : TQDateTime::tqcurrentDateTime();
126
+            d->pubDate = article.pubDate().isValid() ? article.pubDate() : TQDateTime::currentDateTime();
127 127
             d->archive->setPubDate(d->guid, d->pubDate.toTime_t());
128 128
             d->archive->setAuthor(d->guid, article.author());
129 129
                         
@@ -157,7 +157,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
157 157
                 int statusInt = status.toInt();
158 158
                 if (statusInt == New)
159 159
                     statusInt = Unread;
160
-                setqStatus(statusInt);
160
+                seStatus(statusInt);
161 161
             }
162 162
             setKeep(article.meta("keep") == "true");
163 163
         }
@@ -210,9 +210,9 @@ void Article::setDeleted()
210 210
     if (isDeleted())
211 211
         return;
212 212
   
213
-    setqStatus(Read);
213
+    seStatus(Read);
214 214
     d->status = Private::Deleted | Private::Read;
215
-    d->archive->setqStatus(d->guid, d->status);
215
+    d->archive->seStatus(d->guid, d->status);
216 216
     d->archive->setDeleted(d->guid);
217 217
 
218 218
     if (d->feed)
@@ -299,13 +299,13 @@ int Article::status() const
299 299
         return Unread;
300 300
 }
301 301
 
302
-void Article::setqStatus(int stat)
302
+void Article::seStatus(int stat)
303 303
 {
304 304
     // use status() rather than statusBits() here to filter out status flags that we are not
305 305
     // interested in
306
-    int oldtqStatus = status();
306
+    int oldStatus = status();
307 307
 
308
-    if (oldtqStatus != stat)
308
+    if (oldStatus != stat)
309 309
     {
310 310
         switch (stat)
311 311
         {
@@ -319,9 +319,9 @@ void Article::setqStatus(int stat)
319 319
                 d->status = ( d->status | Private::New) & ~Private::Read;
320 320
                 break;
321 321
         }
322
-        d->archive->setqStatus(d->guid, d->status);
322
+        d->archive->seStatus(d->guid, d->status);
323 323
         if (d->feed)
324
-            d->feed->setArticleChanged(*this, oldtqStatus);
324
+            d->feed->setArticleChanged(*this, oldStatus);
325 325
      }
326 326
 }
327 327
 
@@ -404,7 +404,7 @@ RSS::Enclosure Article::enclosure() const
404 404
 void Article::setKeep(bool keep)
405 405
 {
406 406
     d->status = keep ? ( statusBits() | Private::Keep) : ( statusBits() & ~Private::Keep);
407
-    d->archive->setqStatus(d->guid, d->status);
407
+    d->archive->seStatus(d->guid, d->status);
408 408
     if (d->feed)
409 409
         d->feed->setArticleChanged(*this);
410 410
 }

+ 2
- 2
akregator/src/article.h View File

@@ -57,7 +57,7 @@ namespace Akregator
57 57
     class Article
58 58
     {
59 59
         public:
60
-            enum tqStatus { Unread=0, Read, New };
60
+            enum Status { Unread=0, Read, New };
61 61
             typedef TQValueList<Article> List;
62 62
 
63 63
             Article();
@@ -80,7 +80,7 @@ namespace Akregator
80 80
             bool isNull() const;
81 81
             
82 82
             int status() const;
83
-            void setqStatus(int s);
83
+            void seStatus(int s);
84 84
 
85 85
             void offsetPubDate(int secs);
86 86
 

+ 73
- 73
akregator/src/articlefilter.cpp View File

@@ -43,35 +43,35 @@ TQString Criterion::subjectToString(Subject subj)
43 43
     switch (subj)
44 44
     {
45 45
         case Title:
46
-            return TQString::tqfromLatin1("Title");
46
+            return TQString::fromLatin1("Title");
47 47
         case Link:
48
-            return TQString::tqfromLatin1("Link");
48
+            return TQString::fromLatin1("Link");
49 49
         case Author:
50
-            return TQString::tqfromLatin1("Author");
50
+            return TQString::fromLatin1("Author");
51 51
         case Description:
52
-            return TQString::tqfromLatin1("Description");
53
-        case tqStatus:
54
-            return TQString::tqfromLatin1("Status");
52
+            return TQString::fromLatin1("Description");
53
+        case Status:
54
+            return TQString::fromLatin1("Status");
55 55
         case KeepFlag:
56
-            return TQString::tqfromLatin1("KeepFlag");
56
+            return TQString::fromLatin1("KeepFlag");
57 57
         default: // should never happen (TM)
58
-            return TQString::tqfromLatin1("Description");
58
+            return TQString::fromLatin1("Description");
59 59
     }
60 60
 }
61 61
 
62 62
 Criterion::Subject Criterion::stringToSubject(const TQString& subjStr)
63 63
 {
64
-    if (subjStr == TQString::tqfromLatin1("Title"))
64
+    if (subjStr == TQString::fromLatin1("Title"))
65 65
         return Title;
66
-    else if (subjStr == TQString::tqfromLatin1("Link"))
66
+    else if (subjStr == TQString::fromLatin1("Link"))
67 67
         return Link;
68
-    else if (subjStr == TQString::tqfromLatin1("Description"))
68
+    else if (subjStr == TQString::fromLatin1("Description"))
69 69
         return Description;
70
-    else if (subjStr == TQString::tqfromLatin1("Author"))
70
+    else if (subjStr == TQString::fromLatin1("Author"))
71 71
         return Author;
72
-    else if (subjStr == TQString::tqfromLatin1("Status"))
73
-        return tqStatus;
74
-    else if (subjStr == TQString::tqfromLatin1("KeepFlag"))
72
+    else if (subjStr == TQString::fromLatin1("Status"))
73
+        return Status;
74
+    else if (subjStr == TQString::fromLatin1("KeepFlag"))
75 75
         return KeepFlag;
76 76
 
77 77
     // hopefully never reached
@@ -83,27 +83,27 @@ TQString Criterion::predicateToString(Predicate pred)
83 83
     switch (pred)
84 84
     {
85 85
         case Contains:
86
-            return TQString::tqfromLatin1("Contains");
86
+            return TQString::fromLatin1("Contains");
87 87
         case Equals:
88
-            return TQString::tqfromLatin1("Equals");
88
+            return TQString::fromLatin1("Equals");
89 89
         case Matches:
90
-            return TQString::tqfromLatin1("Matches");
90
+            return TQString::fromLatin1("Matches");
91 91
         case Negation:
92
-            return TQString::tqfromLatin1("Negation");
92
+            return TQString::fromLatin1("Negation");
93 93
         default:// hopefully never reached
94
-            return TQString::tqfromLatin1("Contains");
94
+            return TQString::fromLatin1("Contains");
95 95
     }
96 96
 }
97 97
 
98 98
 Criterion::Predicate Criterion::stringToPredicate(const TQString& predStr)
99 99
 {
100
-    if (predStr == TQString::tqfromLatin1("Contains"))
100
+    if (predStr == TQString::fromLatin1("Contains"))
101 101
         return Contains;
102
-    else if (predStr == TQString::tqfromLatin1("Equals"))
102
+    else if (predStr == TQString::fromLatin1("Equals"))
103 103
         return Equals;
104
-    else if (predStr == TQString::tqfromLatin1("Matches"))
104
+    else if (predStr == TQString::fromLatin1("Matches"))
105 105
         return Matches;
106
-    else if (predStr == TQString::tqfromLatin1("Negation"))
106
+    else if (predStr == TQString::fromLatin1("Negation"))
107 107
         return Negation;
108 108
     
109 109
     // hopefully never reached
@@ -124,24 +124,24 @@ Criterion::Criterion( Subject subject, Predicate predicate, const TQVariant &obj
124 124
 
125 125
 void Criterion::writeConfig(KConfig* config) const
126 126
 {
127
-    config->writeEntry(TQString::tqfromLatin1("subject"), subjectToString(m_subject));
127
+    config->writeEntry(TQString::fromLatin1("subject"), subjectToString(m_subject));
128 128
 
129
-    config->writeEntry(TQString::tqfromLatin1("predicate"), predicateToString(m_predicate));
129
+    config->writeEntry(TQString::fromLatin1("predicate"), predicateToString(m_predicate));
130 130
 
131
-    config->writeEntry(TQString::tqfromLatin1("objectType"), TQString(m_object.typeName()));
131
+    config->writeEntry(TQString::fromLatin1("objectType"), TQString(m_object.typeName()));
132 132
 
133
-    config->writeEntry(TQString::tqfromLatin1("objectValue"), m_object);
133
+    config->writeEntry(TQString::fromLatin1("objectValue"), m_object);
134 134
 }
135 135
 
136 136
 void Criterion::readConfig(KConfig* config)
137 137
 {
138
-    m_subject = stringToSubject(config->readEntry(TQString::tqfromLatin1("subject")));
139
-    m_predicate = stringToPredicate(config->readEntry(TQString::tqfromLatin1("predicate")));
140
-    TQVariant::Type type = TQVariant::nameToType(config->readEntry(TQString::tqfromLatin1("objType")).ascii());
138
+    m_subject = stringToSubject(config->readEntry(TQString::fromLatin1("subject")));
139
+    m_predicate = stringToPredicate(config->readEntry(TQString::fromLatin1("predicate")));
140
+    TQVariant::Type type = TQVariant::nameToType(config->readEntry(TQString::fromLatin1("objType")).ascii());
141 141
 
142 142
     if (type != TQVariant::Invalid)
143 143
     {
144
-        m_object = config->readPropertyEntry(TQString::tqfromLatin1("objectValue"), type);
144
+        m_object = config->readPropertyEntry(TQString::fromLatin1("objectValue"), type);
145 145
     }
146 146
 }
147 147
 
@@ -163,7 +163,7 @@ bool Criterion::satisfiedBy( const Article &article ) const
163 163
             // ### Maybe use prettyURL here?
164 164
             concreteSubject = TQVariant(article.link().url());
165 165
             break;
166
-        case tqStatus:
166
+        case Status:
167 167
             concreteSubject = TQVariant(article.status());
168 168
             break;
169 169
         case KeepFlag:
@@ -269,15 +269,15 @@ bool ArticleMatcher::matches( const Article &a ) const
269 269
 
270 270
 void ArticleMatcher::writeConfig(KConfig* config) const
271 271
 {
272
-    config->writeEntry(TQString::tqfromLatin1("matcherAssociation"), associationToString(m_association));
272
+    config->writeEntry(TQString::fromLatin1("matcherAssociation"), associationToString(m_association));
273 273
     
274
-    config->writeEntry(TQString::tqfromLatin1("matcherCriteriaCount"), m_criteria.count());
274
+    config->writeEntry(TQString::fromLatin1("matcherCriteriaCount"), m_criteria.count());
275 275
 
276 276
     int index = 0;
277 277
 
278 278
     for (TQValueList<Criterion>::ConstIterator it = m_criteria.begin(); it != m_criteria.end(); ++it)
279 279
     {
280
-        config->setGroup(config->group()+TQString::tqfromLatin1("_Criterion")+TQString::number(index));
280
+        config->setGroup(config->group()+TQString::fromLatin1("_Criterion")+TQString::number(index));
281 281
         (*it).writeConfig(config);
282 282
         ++index;
283 283
     }
@@ -286,14 +286,14 @@ void ArticleMatcher::writeConfig(KConfig* config) const
286 286
 void ArticleMatcher::readConfig(KConfig* config)
287 287
 {
288 288
     m_criteria.clear();
289
-    m_association = stringToAssociation(config->readEntry(TQString::tqfromLatin1("matcherAssociation")));
289
+    m_association = stringToAssociation(config->readEntry(TQString::fromLatin1("matcherAssociation")));
290 290
 
291
-    int count =  config->readNumEntry(TQString::tqfromLatin1("matcherCriteriaCount"), 0);
291
+    int count =  config->readNumEntry(TQString::fromLatin1("matcherCriteriaCount"), 0);
292 292
     
293 293
     for (int i = 0; i < count; ++i)
294 294
     {
295 295
         Criterion c;
296
-        config->setGroup(config->group()+TQString::tqfromLatin1("_Criterion")+TQString::number(i));
296
+        config->setGroup(config->group()+TQString::fromLatin1("_Criterion")+TQString::number(i));
297 297
         c.readConfig(config);
298 298
         m_criteria.append(c);
299 299
     }
@@ -343,9 +343,9 @@ bool ArticleMatcher::allCriteriaMatch( const Article &a ) const
343 343
 
344 344
 ArticleMatcher::Association ArticleMatcher::stringToAssociation(const TQString& assocStr)
345 345
 {
346
-    if (assocStr == TQString::tqfromLatin1("LogicalAnd"))
346
+    if (assocStr == TQString::fromLatin1("LogicalAnd"))
347 347
         return LogicalAnd;
348
-    else if (assocStr == TQString::tqfromLatin1("LogicalOr"))
348
+    else if (assocStr == TQString::fromLatin1("LogicalOr"))
349 349
         return LogicalOr;
350 350
     else
351 351
         return None;
@@ -356,11 +356,11 @@ TQString ArticleMatcher::associationToString(Association association)
356 356
     switch (association)
357 357
     {
358 358
         case LogicalAnd:
359
-            return TQString::tqfromLatin1("LogicalAnd");
359
+            return TQString::fromLatin1("LogicalAnd");
360 360
         case LogicalOr:
361
-            return TQString::tqfromLatin1("LogicalOr");
361
+            return TQString::fromLatin1("LogicalOr");
362 362
         default:
363
-            return TQString::tqfromLatin1("None");
363
+            return TQString::fromLatin1("None");
364 364
     }
365 365
 }
366 366
 
@@ -408,13 +408,13 @@ TagMatcher::TagMatcher(const TagMatcher& other) : AbstractMatcher(other), d(0)
408 408
 
409 409
 void TagMatcher::writeConfig(KConfig* config) const
410 410
 {
411
-    config->writeEntry(TQString::tqfromLatin1("matcherType"), TQString::tqfromLatin1("TagMatcher"));
412
-    config->writeEntry(TQString::tqfromLatin1("matcherParams"), d->tagID);
411
+    config->writeEntry(TQString::fromLatin1("matcherType"), TQString::fromLatin1("TagMatcher"));
412
+    config->writeEntry(TQString::fromLatin1("matcherParams"), d->tagID);
413 413
 }
414 414
 
415 415
 void TagMatcher::readConfig(KConfig* config)
416 416
 {
417
-    d->tagID = config->readEntry(TQString::tqfromLatin1("matcherParams"));
417
+    d->tagID = config->readEntry(TQString::fromLatin1("matcherParams"));
418 418
 }
419 419
 
420 420
 bool TagMatcher::operator==(const AbstractMatcher& other) const
@@ -449,7 +449,7 @@ SeStatusAction::SeStatusAction(int status) : m_status(status)
449 449
 void SeStatusAction::exec(Article& article)
450 450
 {
451 451
     if (!article.isNull())
452
-        article.setqStatus(m_status);
452
+        article.seStatus(m_status);
453 453
 }
454 454
 
455 455
 int SeStatusAction::status() const
@@ -457,20 +457,20 @@ int SeStatusAction::status() const
457 457
     return m_status;
458 458
 }
459 459
 
460
-void SeStatusAction::setqStatus(int status)
460
+void SeStatusAction::seStatus(int status)
461 461
 {
462 462
     m_status = status;
463 463
 }
464 464
 
465 465
 void SeStatusAction::writeConfig(KConfig* config) const
466 466
 {
467
-    config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("SeStatusAction"));
468
-    config->writeEntry(TQString::tqfromLatin1("actionParams"), m_status);
467
+    config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("SeStatusAction"));
468
+    config->writeEntry(TQString::fromLatin1("actionParams"), m_status);
469 469
 }
470 470
 
471 471
 void SeStatusAction::readConfig(KConfig* config)
472 472
 {
473
-    m_status = config->readNumEntry(TQString::tqfromLatin1("actionParams"), Article::Read);
473
+    m_status = config->readNumEntry(TQString::fromLatin1("actionParams"), Article::Read);
474 474
 }
475 475
 
476 476
 bool SeStatusAction::operator==(const AbstractAction& other)
@@ -581,12 +581,12 @@ bool ArticleFilter::operator==(const ArticleFilter& other) const
581 581
 
582 582
 void ArticleFilterList::writeConfig(KConfig* config) const
583 583
 {
584
-    config->setGroup(TQString::tqfromLatin1("Filters"));
585
-    config->writeEntry(TQString::tqfromLatin1("count"), count());
584
+    config->setGroup(TQString::fromLatin1("Filters"));
585
+    config->writeEntry(TQString::fromLatin1("count"), count());
586 586
     int index = 0;
587 587
     for (ArticleFilterList::ConstIterator it = begin(); it != end(); ++it)
588 588
     {
589
-        config->setGroup(TQString::tqfromLatin1("Filters_")+TQString::number(index));
589
+        config->setGroup(TQString::fromLatin1("Filters_")+TQString::number(index));
590 590
         (*it).writeConfig(config);
591 591
         ++index;
592 592
     }
@@ -595,11 +595,11 @@ void ArticleFilterList::writeConfig(KConfig* config) const
595 595
 void ArticleFilterList::readConfig(KConfig* config)
596 596
 {
597 597
     clear();
598
-    config->setGroup(TQString::tqfromLatin1("Filters"));
599
-    int count = config->readNumEntry(TQString::tqfromLatin1("count"), 0);
598
+    config->setGroup(TQString::fromLatin1("Filters"));
599
+    int count = config->readNumEntry(TQString::fromLatin1("count"), 0);
600 600
     for (int i = 0; i < count; ++i)
601 601
     {
602
-        config->setGroup(TQString::tqfromLatin1("Filters_")+TQString::number(i));
602
+        config->setGroup(TQString::fromLatin1("Filters_")+TQString::number(i));
603 603
         ArticleFilter filter;
604 604
         filter.readConfig(config);
605 605
         append(filter);
@@ -609,13 +609,13 @@ void ArticleFilterList::readConfig(KConfig* config)
609 609
 
610 610
 void AssignTagAction::readConfig(KConfig* config)
611 611
 {
612
-    m_tagID = config->readEntry(TQString::tqfromLatin1("actionParams"));
612
+    m_tagID = config->readEntry(TQString::fromLatin1("actionParams"));
613 613
 }
614 614
 
615 615
 void AssignTagAction::writeConfig(KConfig* config) const
616 616
 {
617
-    config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("AssignTagAction"));
618
-    config->writeEntry(TQString::tqfromLatin1("actionParams"), m_tagID);
617
+    config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("AssignTagAction"));
618
+    config->writeEntry(TQString::fromLatin1("actionParams"), m_tagID);
619 619
 }
620 620
 
621 621
 bool AssignTagAction::operator==(const AbstractAction& other)
@@ -644,7 +644,7 @@ void DeleteAction::readConfig(KConfig* /*config*/)
644 644
 
645 645
 void DeleteAction::writeConfig(KConfig* config) const
646 646
 {
647
-    config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("DeleteAction"));
647
+    config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("DeleteAction"));
648 648
 }
649 649
 
650 650
 bool DeleteAction::operator==(const AbstractAction& other)
@@ -661,27 +661,27 @@ void ArticleFilter::readConfig(KConfig* config)
661 661
     delete d->action;
662 662
     d->action = 0;
663 663
 
664
-    d->name = config->readEntry(TQString::tqfromLatin1("name"));
665
-    d->id = config->readNumEntry(TQString::tqfromLatin1("id"), 0);
664
+    d->name = config->readEntry(TQString::fromLatin1("name"));
665
+    d->id = config->readNumEntry(TQString::fromLatin1("id"), 0);
666 666
 
667
-    TQString matcherType = config->readEntry(TQString::tqfromLatin1("matcherType"));
667
+    TQString matcherType = config->readEntry(TQString::fromLatin1("matcherType"));
668 668
 
669
-    if (matcherType == TQString::tqfromLatin1("TagMatcher"))
669
+    if (matcherType == TQString::fromLatin1("TagMatcher"))
670 670
         d->matcher = new TagMatcher();
671
-    else if (matcherType == TQString::tqfromLatin1("ArticleMatcher"))
671
+    else if (matcherType == TQString::fromLatin1("ArticleMatcher"))
672 672
         d->matcher = new ArticleMatcher();
673 673
 
674 674
     if (d->matcher)
675 675
         d->matcher->readConfig(config);
676 676
 
677 677
 
678
-        TQString actionType = config->readEntry(TQString::tqfromLatin1("actionType"));
678
+        TQString actionType = config->readEntry(TQString::fromLatin1("actionType"));
679 679
 
680
-    if (actionType == TQString::tqfromLatin1("AssignTagAction"))
680
+    if (actionType == TQString::fromLatin1("AssignTagAction"))
681 681
         d->action = new AssignTagAction();
682
-    else if (actionType == TQString::tqfromLatin1("DeleteAction"))
682
+    else if (actionType == TQString::fromLatin1("DeleteAction"))
683 683
         d->action = new DeleteAction();
684
-    else if (actionType == TQString::tqfromLatin1("SeStatusAction"))
684
+    else if (actionType == TQString::fromLatin1("SeStatusAction"))
685 685
         d->action = new SeStatusAction();
686 686
 
687 687
     if (d->action)
@@ -690,8 +690,8 @@ void ArticleFilter::readConfig(KConfig* config)
690 690
 
691 691
 void ArticleFilter::writeConfig(KConfig* config) const
692 692
 {
693
-    config->writeEntry(TQString::tqfromLatin1("name"), d->name);
694
-    config->writeEntry(TQString::tqfromLatin1("id"), d->id);
693
+    config->writeEntry(TQString::fromLatin1("name"), d->name);
694
+    config->writeEntry(TQString::fromLatin1("id"), d->id);
695 695
     d->matcher->writeConfig(config);
696 696
     d->action->writeConfig(config);
697 697
 }

+ 2
- 2
akregator/src/articlefilter.h View File

@@ -174,7 +174,7 @@ class SeStatusAction : public AbstractAction
174 174
         virtual void exec(Article& article);
175 175
         
176 176
         int status() const;
177
-        void setqStatus(int status);
177
+        void seStatus(int status);
178 178
 
179 179
         virtual void writeConfig(KConfig* config) const;
180 180
         virtual void readConfig(KConfig* config);
@@ -259,7 +259,7 @@ class Criterion
259 259
     public:
260 260
 
261 261
         enum Subject {
262
-            Title, Description, Author, Link, tqStatus, KeepFlag
262
+            Title, Description, Author, Link, Status, KeepFlag
263 263
         };
264 264
 
265 265
         static TQString subjectToString(Subject subj);

+ 2
- 2
akregator/src/articlelistview.cpp View File

@@ -564,9 +564,9 @@ void ArticleListView::paintInfoBox(const TQString &message)
564 564
     const uint x = (viewport()->width() - w - 30) / 2 ;
565 565
     const uint y = (viewport()->height() - h - 30) / 2 ;
566 566
 
567
-    p.setBrush( tqcolorGroup().background() );
567
+    p.setBrush( colorGroup().background() );
568 568
     p.drawRoundRect( x, y, w+30, h+30, (8*200)/w, (8*200)/h );
569
-    t.draw( &p, x+15, y+15, TQRect(), tqcolorGroup() );
569
+    t.draw( &p, x+15, y+15, TQRect(), colorGroup() );
570 570
 }
571 571
 
572 572
 void ArticleListView::viewportPaintEvent(TQPaintEvent *e)

+ 63
- 63
akregator/src/articleviewer.cpp View File

@@ -72,9 +72,9 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
72 72
         m_view->m_link = TQString();
73 73
         
74 74
         TQString text;
75
-        text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
75
+        text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
76 76
         
77
-        text += TQString("<div class=\"headertitle\" dir=\"%1\">").tqarg(directionOf(Utils::stripTags(node->title())));
77
+        text += TQString("<div class=\"headertitle\" dir=\"%1\">").arg(directionOf(Utils::stripTags(node->title())));
78 78
         text += node->title();
79 79
         if(node->unread() == 0)
80 80
             text += i18n(" (no unread articles)");
@@ -90,26 +90,26 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
90 90
             TQString file = url.replace("/", "_").replace(":", "_");
91 91
             KURL u(m_view->m_imageDir);
92 92
             u.setFileName(file);
93
-            text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(node->htmlUrl()).tqarg(u.url());
93
+            text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(node->htmlUrl()).arg(u.url());
94 94
         }
95 95
         else text += "<div class=\"body\">";
96 96
         
97 97
         
98 98
         if( !node->description().isEmpty() )
99 99
         {
100
-            text += TQString("<div dir=\"%1\">").tqarg(Utils::stripTags(directionOf(node->description())));
101
-            text += i18n("<b>Description:</b> %1<br><br>").tqarg(node->description());
100
+            text += TQString("<div dir=\"%1\">").arg(Utils::stripTags(directionOf(node->description())));
101
+            text += i18n("<b>Description:</b> %1<br><br>").arg(node->description());
102 102
             text += "</div>\n"; // /description
103 103
         }
104 104
         
105 105
         if ( !node->htmlUrl().isEmpty() )
106 106
         {
107
-            text += TQString("<div dir=\"%1\">").tqarg(directionOf(node->htmlUrl()));
108
-            text += i18n("<b>Homepage:</b> <a href=\"%1\">%2</a>").tqarg(node->htmlUrl()).tqarg(node->htmlUrl());
107
+            text += TQString("<div dir=\"%1\">").arg(directionOf(node->htmlUrl()));
108
+            text += i18n("<b>Homepage:</b> <a href=\"%1\">%2</a>").arg(node->htmlUrl()).arg(node->htmlUrl());
109 109
             text += "</div>\n"; // / link
110 110
         }
111 111
         
112
-        //text += i18n("<b>Unread articles:</b> %1").tqarg(node->unread());
112
+        //text += i18n("<b>Unread articles:</b> %1").arg(node->unread());
113 113
         text += "</div>"; // /body
114 114
         
115 115
         m_view->renderContent(text);
@@ -121,8 +121,8 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
121 121
         m_view->m_link = TQString();
122 122
         
123 123
         TQString text;
124
-        text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
125
-        text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").tqarg(directionOf(Utils::stripTags(node->title()))).tqarg(node->title());
124
+        text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
125
+        text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").arg(directionOf(Utils::stripTags(node->title()))).arg(node->title());
126 126
         if(node->unread() == 0)
127 127
             text += i18n(" (no unread articles)");
128 128
         else
@@ -139,8 +139,8 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
139 139
         m_view->m_link = TQString();
140 140
         
141 141
         TQString text;
142
-        text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
143
-        text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").tqarg(directionOf(Utils::stripTags(node->title()))).tqarg(node->title());
142
+        text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
143
+        text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").arg(directionOf(Utils::stripTags(node->title()))).arg(node->title());
144 144
         if(node->unread() == 0)
145 145
             text += i18n(" (no unread articles)");
146 146
         else
@@ -188,7 +188,7 @@ ArticleViewer::~ArticleViewer()
188 188
 
189 189
 void ArticleViewer::generateNormalModeCSS()
190 190
 {
191
-    const TQColorGroup & cg = TQApplication::tqpalette().active();
191
+    const TQColorGroup & cg = TQApplication::palette().active();
192 192
     
193 193
     // from kmail::headerstyle.cpp
194 194
     m_normalModeCSS = TQString(
@@ -198,10 +198,10 @@ void ArticleViewer::generateNormalModeCSS()
198 198
             "  font-size: %2 ! important;\n"
199 199
             "  color: %3 ! important;\n"
200 200
             "  background: %4 ! important;\n"
201
-            "}\n\n").tqarg(Settings::standardFont())
202
-            .tqarg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
203
-            .tqarg(cg.text().name())
204
-            .tqarg(cg.base().name());
201
+            "}\n\n").arg(Settings::standardFont())
202
+            .arg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
203
+            .arg(cg.text().name())
204
+            .arg(cg.base().name());
205 205
     m_normalModeCSS += TQString(
206 206
     "a {\n"
207 207
     + TQString("  color: %1 ! important;\n")
@@ -214,18 +214,18 @@ void ArticleViewer::generateNormalModeCSS()
214 214
     +"  margin-bottom: 10pt;\n"
215 215
 //    +"  width: 99%;\n"
216 216
     +        "}\n\n")
217
-            .tqarg(cg.link().name())
218
-            .tqarg(cg.background().name())
219
-            .tqarg(cg.text().name());
217
+            .arg(cg.link().name())
218
+            .arg(cg.background().name())
219
+            .arg(cg.text().name());
220 220
 
221 221
     m_normalModeCSS += TQString(".headertitle a:link { color: %1  ! important; }\n"
222 222
     ".headertitle a:visited { color: %2 ! important; }\n"
223 223
     ".headertitle a:hover{ color: %3 ! important; }\n"
224 224
             ".headertitle a:active { color: %4 ! important; }\n")
225
-            .tqarg(cg.highlightedText().name())
226
-            .tqarg(cg.highlightedText().name())
227
-            .tqarg(cg.highlightedText().name())
228
-            .tqarg(cg.highlightedText().name());
225
+            .arg(cg.highlightedText().name())
226
+            .arg(cg.highlightedText().name())
227
+            .arg(cg.highlightedText().name())
228
+            .arg(cg.highlightedText().name());
229 229
     
230 230
     m_normalModeCSS += TQString(
231 231
     ".headertitle {\n"
@@ -244,8 +244,8 @@ void ArticleViewer::generateNormalModeCSS()
244 244
     ".headimage {\n"
245 245
     "  float: right;\n"
246 246
     "  margin-left: 5px;\n"
247
-            "}\n\n").tqarg(cg.highlight().name())
248
-            .tqarg(cg.highlightedText().name());
247
+            "}\n\n").arg(cg.highlight().name())
248
+            .arg(cg.highlightedText().name());
249 249
     
250 250
     m_normalModeCSS += TQString(
251 251
     "body { clear: none; }\n\n"
@@ -267,7 +267,7 @@ void ArticleViewer::generateNormalModeCSS()
267 267
 
268 268
 void ArticleViewer::generateCombinedModeCSS()
269 269
 {
270
-    const TQColorGroup & cg = TQApplication::tqpalette().active();
270
+    const TQColorGroup & cg = TQApplication::palette().active();
271 271
     
272 272
     // from kmail::headerstyle.cpp
273 273
     m_combinedModeCSS = TQString (
@@ -278,10 +278,10 @@ void ArticleViewer::generateCombinedModeCSS()
278 278
             "  font-size: %2 ! important;\n"
279 279
             "  color: %3 ! important;\n"
280 280
             "  background: %4 ! important;\n"
281
-            "}\n\n").tqarg(Settings::standardFont())
282
-            .tqarg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
283
-            .tqarg(cg.text().name())
284
-            .tqarg(cg.base().name());
281
+            "}\n\n").arg(Settings::standardFont())
282
+            .arg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
283
+            .arg(cg.text().name())
284
+            .arg(cg.base().name());
285 285
     m_combinedModeCSS += (
286 286
     "a {\n"
287 287
     + TQString("  color: %1 ! important;\n")
@@ -294,18 +294,18 @@ void ArticleViewer::generateCombinedModeCSS()
294 294
     +"  margin-bottom: 10pt;\n"
295 295
 //    +"  width: 99%;\n"
296 296
     +        "}\n\n")
297
-            .tqarg(cg.link().name())
298
-            .tqarg(cg.background().name())
299
-            .tqarg(cg.text().name());
297
+            .arg(cg.link().name())
298
+            .arg(cg.background().name())
299
+            .arg(cg.text().name());
300 300
 
301 301
     m_combinedModeCSS += TQString(".headertitle a:link { color: %1  ! important; }\n"
302 302
     ".headertitle a:visited { color: %2 ! important; }\n"
303 303
     ".headertitle a:hover{ color: %3 ! important; }\n"
304 304
             ".headertitle a:active { color: %4 ! important; }\n")
305
-            .tqarg(cg.highlightedText().name())
306
-            .tqarg(cg.highlightedText().name())
307
-            .tqarg(cg.highlightedText().name())
308
-            .tqarg(cg.highlightedText().name());
305
+            .arg(cg.highlightedText().name())
306
+            .arg(cg.highlightedText().name())
307
+            .arg(cg.highlightedText().name())
308
+            .arg(cg.highlightedText().name());
309 309
     m_combinedModeCSS += TQString(
310 310
     ".headertitle {\n"
311 311
     "  background: %1 ! important;\n"
@@ -323,8 +323,8 @@ void ArticleViewer::generateCombinedModeCSS()
323 323
     ".headimage {\n"
324 324
     "  float: right;\n"
325 325
     "  margin-left: 5px;\n"
326
-            "}\n\n").tqarg(cg.highlight().name())
327
-            .tqarg(cg.highlightedText().name());
326
+            "}\n\n").arg(cg.highlight().name())
327
+            .arg(cg.highlightedText().name());
328 328
     
329 329
     m_combinedModeCSS += TQString(
330 330
     "body { clear: none; }\n\n"
@@ -368,11 +368,11 @@ void ArticleViewer::displayAboutPage()
368 368
 {
369 369
     TQString location = locate("data", "akregator/about/main.html");
370 370
     TQString content = KPIM::kFileToString(location);
371
-    content = content.tqarg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
371
+    content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
372 372
     if ( kapp->reverseLayout() )
373
-        content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
373
+        content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
374 374
     else
375
-        content = content.tqarg( "" );
375
+        content = content.arg( "" );
376 376
 
377 377
     begin(KURL( location ));
378 378
     TQString info =
@@ -389,25 +389,25 @@ void ArticleViewer::displayAboutPage()
389 389
             "<p>We hope that you will enjoy Akregator.</p>\n"
390 390
             "<p>Thank you,</p>\n"
391 391
             "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The Akregator Team</p>\n")
392
-            .tqarg(AKREGATOR_VERSION) // Akregator version
393
-            .tqarg("http://akregator.kde.org/"); // Akregator homepage URL
392
+            .arg(AKREGATOR_VERSION) // Akregator version
393
+            .arg("http://akregator.kde.org/"); // Akregator homepage URL
394 394
 
395 395
     TQString fontSize = TQString::number( pointsToPixel( Settings::mediumFontSize() ));
396 396
     TQString appTitle = i18n("Akregator");
397 397
     TQString catchPhrase = ""; //not enough space for a catch phrase at default window size i18n("Part of the Kontact Suite");
398 398
     TQString quickDescription = i18n("An RSS feed reader for the K Desktop Environment.");
399
-    write(content.tqarg(fontSize).tqarg(appTitle).tqarg(catchPhrase).tqarg(quickDescription).tqarg(info));
399
+    write(content.arg(fontSize).arg(appTitle).arg(catchPhrase).arg(quickDescription).arg(info));
400 400
     end();
401 401
 }
402 402
 
403 403
 TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& article)
404 404
 {
405 405
     TQString text;
406
-    text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
406
+    text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
407 407
 
408 408
     if (!article.title().isEmpty())
409 409
     {
410
-        text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").tqarg(directionOf(Utils::stripTags(article.title())));
410
+        text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").arg(directionOf(Utils::stripTags(article.title())));
411 411
         if (article.link().isValid())
412 412
             text += "<a href=\""+article.link().url()+"\">";
413 413
         text += article.title().replace("<", "&lt;").replace(">", "&gt;"); // TODO: better leave things escaped in the parser
@@ -417,16 +417,16 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
417 417
     }
418 418
     if (article.pubDate().isValid())
419 419
     {
420
-        text += TQString("<span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Date")));
421
-        text += TQString ("%1:").tqarg(i18n("Date"));
420
+        text += TQString("<span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Date")));
421
+        text += TQString ("%1:").arg(i18n("Date"));
422 422
         text += "</span><span class=\"headertext\">";
423 423
         text += KGlobal::locale()->formatDateTime(article.pubDate(), false, false)+"</span>\n"; // TODO: might need RTL?
424 424
     }
425 425
     TQString author = article.author();
426 426
     if (!author.isEmpty())
427 427
     {
428
-        text += TQString("<br/><span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Author")));
429
-        text += TQString ("%1:").tqarg(i18n("Author"));
428
+        text += TQString("<br/><span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Author")));
429
+        text += TQString ("%1:").arg(i18n("Author"));
430 430
         text += "</span><span class=\"headertext\">";
431 431
         text += author+"</span>\n"; // TODO: might need RTL?
432 432
     }
@@ -437,14 +437,14 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
437 437
         TQString file = Utils::fileNameForUrl(feed->xmlUrl());
438 438
         KURL u(m_imageDir);
439 439
         u.setFileName(file);
440
-        text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(feed->htmlUrl()).tqarg(u.url());
440
+        text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(feed->htmlUrl()).arg(u.url());
441 441
     }
442 442
 
443 443
     
444 444
 
445 445
     if (!article.description().isEmpty())
446 446
     {
447
-        text += TQString("<div dir=\"%1\">").tqarg(directionOf(Utils::stripTags(article.description())) );
447
+        text += TQString("<div dir=\"%1\">").arg(directionOf(Utils::stripTags(article.description())) );
448 448
         text += "<span class=\"content\">"+article.description()+"</span>";
449 449
         text += "</div>";
450 450
     }
@@ -486,7 +486,7 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
486 486
         //int length = article.enclosure().length();
487 487
         //TQString lengthStr = KIO::convertSize(length);
488 488
 
489
-        //text += TQString("<hr><div><a href=\"%1\">%2</a> (%3, %4)</div>").tqarg(url).tqarg(url).tqarg(lengthStr).tqarg(type);
489
+        //text += TQString("<hr><div><a href=\"%1\">%2</a> (%3, %4)</div>").arg(url).arg(url).arg(lengthStr).arg(type);
490 490
     }
491 491
     //kdDebug() << text << endl;
492 492
     return text;
@@ -496,13 +496,13 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
496 496
 TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& article)
497 497
 {
498 498
     TQString text;
499
-    text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
499
+    text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
500 500
 
501 501
     KURL link = article.link();
502 502
     
503 503
     if (!article.title().isEmpty())
504 504
     {
505
-        text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").tqarg(directionOf(Utils::stripTags(article.title())));
505
+        text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").arg(directionOf(Utils::stripTags(article.title())));
506 506
         if (link.isValid())
507 507
             text += "<a href=\""+link.url()+"\">";
508 508
         text += article.title().replace("<", "&lt;").replace(">", "&gt;"); // TODO: better leave things escaped in the parser
@@ -512,8 +512,8 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art
512 512
     }
513 513
     if (article.pubDate().isValid())
514 514
     {
515
-        text += TQString("<span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Date")));
516
-        text += TQString ("%1:").tqarg(i18n("Date"));
515
+        text += TQString("<span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Date")));
516
+        text += TQString ("%1:").arg(i18n("Date"));
517 517
         text += "</span><span class=\"headertext\">";
518 518
         text += KGlobal::locale()->formatDateTime(article.pubDate(), false, false)+"</span>\n"; // TODO: might need RTL?
519 519
     }
@@ -521,8 +521,8 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art
521 521
     TQString author = article.author();
522 522
     if (!author.isEmpty())
523 523
     {
524
-        text += TQString("<br/><span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Author")));
525
-        text += TQString ("%1:").tqarg(i18n("Author"));
524
+        text += TQString("<br/><span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Author")));
525
+        text += TQString ("%1:").arg(i18n("Author"));
526 526
         text += "</span><span class=\"headertext\">";
527 527
         text += author+"</span>\n"; // TODO: might need RTL?
528 528
     }
@@ -534,14 +534,14 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art
534 534
         TQString file = Utils::fileNameForUrl(feed->xmlUrl());
535 535
         KURL u(m_imageDir);
536 536
         u.setFileName(file);
537
-        text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(feed->htmlUrl()).tqarg(u.url());
537
+        text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(feed->htmlUrl()).arg(u.url());
538 538
     }
539 539
 
540 540
     
541 541
 
542 542
     if (!article.description().isEmpty())
543 543
     {
544
-        text += TQString("<div dir=\"%1\">").tqarg(directionOf(Utils::stripTags(article.description())) );
544
+        text += TQString("<div dir=\"%1\">").arg(directionOf(Utils::stripTags(article.description())) );
545 545
         text += "<span class=\"content\">"+article.description()+"</span>";
546 546
         text += "</div>";
547 547
     }

+ 3
- 3
akregator/src/dragobjects.cpp View File

@@ -43,7 +43,7 @@ bool ArticleDrag::canDecode(const TQMimeSource* e)
43 43
 bool ArticleDrag::decode(const TQMimeSource* e, TQValueList<ArticleDragItem>& articles)
44 44
 {
45 45
     articles.clear();
46
-    TQByteArray array = e->tqencodedData("akregator/articles");
46
+    TQByteArray array = e->encodedData("akregator/articles");
47 47
     
48 48
     TQDataStream stream(array, IO_ReadOnly);
49 49
 
@@ -68,7 +68,7 @@ const char* ArticleDrag::format(int i) const
68 68
     return 0;
69 69
 }
70 70
 
71
-TQByteArray ArticleDrag::tqencodedData(const char* mime) const
71
+TQByteArray ArticleDrag::encodedData(const char* mime) const
72 72
 {
73 73
     TQCString mimetype(mime);
74 74
     if (mimetype == "akregator/articles")
@@ -86,7 +86,7 @@ TQByteArray ArticleDrag::tqencodedData(const char* mime) const
86 86
     }
87 87
     else
88 88
     {
89
-        return KURLDrag::tqencodedData(mime);
89
+        return KURLDrag::encodedData(mime);
90 90
     }
91 91
 }
92 92
 

+ 1
- 1
akregator/src/dragobjects.h View File

@@ -57,7 +57,7 @@ public:
57 57
 
58 58
 protected:
59 59
 
60
-    virtual TQByteArray tqencodedData(const char* mime) const;
60
+    virtual TQByteArray encodedData(const char* mime) const;
61 61
     virtual const char* format(int i) const;
62 62
 
63 63
 private:

+ 17
- 17
akregator/src/feed.cpp View File

@@ -402,7 +402,7 @@ void Feed::slotMarkAllArticlesAsRead()
402 402
         TQValueList<Article>::Iterator en = tarticles.end();
403 403
 
404 404
         for (it = tarticles.begin(); it != en; ++it)
405
-            (*it).setqStatus(Article::Read);
405
+            (*it).seStatus(Article::Read);
406 406
         setNotificationMode(true, true);
407 407
     }
408 408
 }
@@ -412,7 +412,7 @@ void Feed::slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchOnly)
412 412
         queue->addFeed(this);
413 413
     else
414 414
     {
415
-        uint now = TQDateTime::tqcurrentDateTime().toTime_t();
415
+        uint now = TQDateTime::currentDateTime().toTime_t();
416 416
 
417 417
         // workaround for 3.5.x: if the last fetch went wrong, try again after 30 minutes
418 418
         // this fixes annoying behaviour of akregator, especially when the host is reachable
@@ -464,9 +464,9 @@ void Feed::appendArticles(const RSS::Document &doc)
464 464
             d->addedArticlesNotify.append(mya);
465 465
             
466 466
             if (!mya.isDeleted() && !markImmediatelyAsRead())
467
-                mya.setqStatus(Article::New);
467
+                mya.seStatus(Article::New);
468 468
             else
469
-                mya.setqStatus(Article::Read);
469
+                mya.seStatus(Article::Read);
470 470
                 
471 471
             changed = true;
472 472
         }
@@ -479,12 +479,12 @@ void Feed::appendArticles(const RSS::Document &doc)
479 479
             {
480 480
                 mya.setKeep(old.keep());
481 481
                 int oldstatus = old.status();
482
-                old.setqStatus(Article::Read);
482
+                old.seStatus(Article::Read);
483 483
 
484 484
                 d->articles.remove(old.guid());
485 485
                 appendArticle(mya);
486 486
 
487
-                mya.setqStatus(oldstatus);
487
+                mya.seStatus(oldstatus);
488 488
 
489 489
                 d->updatedArticlesNotify.append(mya);
490 490
                 changed = true;
@@ -519,7 +519,7 @@ bool Feed::usesExpiryByAge() const
519 519
 
520 520
 bool Feed::isExpired(const Article& a) const
521 521
 {
522
-    TQDateTime now = TQDateTime::tqcurrentDateTime();
522
+    TQDateTime now = TQDateTime::currentDateTime();
523 523
     int expiryAge = -1;
524 524
 // check whether the feed uses the global default and the default is limitArticleAge
525 525
     if ( d->archiveMode == globalDefault && Settings::archiveMode() == Settings::EnumArchiveMode::limitArticleAge)
@@ -558,7 +558,7 @@ void Feed::fetch(bool followDiscovery)
558 558
     {
559 559
         if ((*it).status() == Article::New)
560 560
         {
561
-            (*it).setqStatus(Article::Unread);
561
+            (*it).seStatus(Article::Unread);
562 562
         }
563 563
     }
564 564
 
@@ -579,7 +579,7 @@ void Feed::tryFetch()
579 579
 {
580 580
     d->fetchError = false;
581 581
 
582
-    d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, tqStatus)) );
582
+    d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, Status)) );
583 583
     //connect(d->loader, TQT_SIGNAL(progress(unsigned long)), this, TQT_SLOT(slotSetProgress(unsigned long)));
584 584
     d->loader->loadFrom( d->xmlUrl, new RSS::FileRetriever );
585 585
 }
@@ -595,7 +595,7 @@ void Feed::slotImageFetched(const TQPixmap& image)
595 595
     nodeModified();
596 596
 }
597 597
 
598
-void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::tqStatus status)
598
+void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status)
599 599
 {
600 600
     // Note that loader instances delete themselves
601 601
     d->loader = 0;
@@ -618,7 +618,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::tqStatus statu
618 618
         else
619 619
         {
620 620
             d->fetchError = true;
621
-            d->lastErrorFetch = TQDateTime::tqcurrentDateTime().toTime_t();
621
+            d->lastErrorFetch = TQDateTime::currentDateTime().toTime_t();
622 622
             emit fetchError(this);
623 623
         }
624 624
         return;
@@ -647,7 +647,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::tqStatus statu
647 647
 
648 648
     appendArticles(doc);
649 649
 
650
-    d->archive->setLastFetch( TQDateTime::tqcurrentDateTime().toTime_t());
650
+    d->archive->setLastFetch( TQDateTime::currentDateTime().toTime_t());
651 651
     emit fetched(this);
652 652
 }
653 653
 
@@ -735,14 +735,14 @@ void Feed::setArticleDeleted(Article& a)
735 735
     articlesModified();
736 736
 }
737 737
 
738
-void Feed::setArticleChanged(Article& a, int oldtqStatus)
738
+void Feed::setArticleChanged(Article& a, int oldStatus)
739 739
 {
740
-    if (oldtqStatus != -1)
740
+    if (oldStatus != -1)
741 741
     {
742
-        int newtqStatus = a.status();
743
-        if (oldtqStatus == Article::Read && newtqStatus != Article::Read)
742
+        int newStatus = a.status();
743
+        if (oldStatus == Article::Read && newStatus != Article::Read)
744 744
             setUnread(unread()+1);
745
-        else if (oldtqStatus != Article::Read && newtqStatus == Article::Read)
745
+        else if (oldStatus != Article::Read && newStatus == Article::Read)
746 746
             setUnread(unread()-1);
747 747
     }
748 748
     d->updatedArticlesNotify.append(a);

+ 4
- 4
akregator/src/feed.h View File

@@ -43,7 +43,7 @@ namespace KPIM {
43 43
 // needed for slot fetchCompleted()
44 44
 using RSS::Document;
45 45
 using RSS::Loader;
46
-using RSS::tqStatus;
46
+using RSS::Status;
47 47
 
48 48
 namespace Akregator
49 49
 {
@@ -254,7 +254,7 @@ namespace Akregator
254 254
             
255 255
         private slots:
256 256
 
257
-            void fetchCompleted(Loader *loader, Document doc, tqStatus status);
257
+            void fetchCompleted(Loader *loader, Document doc, Status status);
258 258
             void slotImageFetched(const TQPixmap& image);
259 259
 
260 260
         private:
@@ -265,10 +265,10 @@ namespace Akregator
265 265
             void setArticleDeleted(Article& a);
266 266
 
267 267
             /** notifies that article @c mya was changed
268
-                @param oldtqStatus if the status was changed, it contains the old status, -1 otherwise
268
+                @param oldStatus if the status was changed, it contains the old status, -1 otherwise
269 269
                 To be called by @ref Article
270 270
              */
271
-            void setArticleChanged(Article& a, int oldtqStatus=-1);
271
+            void setArticleChanged(Article& a, int oldStatus=-1);
272 272
             
273 273
             void enforceLimitArticleNumber();
274 274
 

+ 6
- 6
akregator/src/feedlist.cpp View File

@@ -222,10 +222,10 @@ void FeedList::append(FeedList* list, Folder* parent, TreeNode* after)
222 222
     if ( !flatList()->contains(parent) )
223 223
         parent = rootNode();
224 224
 
225
-    TQValueList<TreeNode*> tqchildren = list->rootNode()->tqchildren();
225
+    TQValueList<TreeNode*> children = list->rootNode()->children();
226 226
 
227
-    TQValueList<TreeNode*>::ConstIterator end(  tqchildren.end() );
228
-    for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != end; ++it)
227
+    TQValueList<TreeNode*>::ConstIterator end(  children.end() );
228
+    for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != end; ++it)
229 229
     {
230 230
         list->rootNode()->removeChild(*it);
231 231
         parent->insertChild(*it, after);
@@ -254,11 +254,11 @@ TQDomDocument FeedList::toXML() const
254 254
     TQDomElement body = doc.createElement( "body" );
255 255
     root.appendChild( body );
256 256
 
257
-    TQValueList<TreeNode*> tqchildren = rootNode()->tqchildren();
257
+    TQValueList<TreeNode*> children = rootNode()->children();
258 258
 
259
-    TQValueList<TreeNode*>::ConstIterator end(  tqchildren.end() );
259
+    TQValueList<TreeNode*>::ConstIterator end(  children.end() );
260 260
 
261
-    for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != end; ++it)
261
+    for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != end; ++it)
262 262
         body.appendChild( (*it)->toOPML(body, doc) );
263 263
 
264 264
     return doc;

+ 8
- 8
akregator/src/feedlistview.cpp View File

@@ -180,8 +180,8 @@ class NodeListView::DeleteItemVisitor : public TreeNodeVisitor
180 180
         virtual bool visitFolder(Folder* node)
181 181
         {
182 182
             // delete child items recursively before deleting parent
183
-            TQValueList<TreeNode*> tqchildren = node->tqchildren();
184
-            for (TQValueList<TreeNode*>::ConstIterator it =  tqchildren.begin(); it != tqchildren.end(); ++it )
183
+            TQValueList<TreeNode*> children = node->children();
184
+            for (TQValueList<TreeNode*>::ConstIterator it =  children.begin(); it != children.end(); ++it )
185 185
                 visit(*it);
186 186
             
187 187
             visitTreeNode(node);
@@ -267,10 +267,10 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
267 267
 
268 268
             }
269 269
             m_view->d->itemDict.insert(node, item);
270
-            TQValueList<TreeNode*> tqchildren = node->tqchildren();
270
+            TQValueList<TreeNode*> children = node->children();
271 271
 
272
-            // add tqchildren recursively
273
-            for (TQValueList<TreeNode*>::ConstIterator it =  tqchildren.begin(); it != tqchildren.end(); ++it )
272
+            // add children recursively
273
+            for (TQValueList<TreeNode*>::ConstIterator it =  children.begin(); it != children.end(); ++it )
274 274
                 visit(*it);
275 275
 
276 276
             m_view->connectToNode(node);
@@ -305,9 +305,9 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
305 305
             }
306 306
             m_view->d->itemDict.insert(node, item);
307 307
             
308
-            // add tqchildren recursively
309
-            TQValueList<TreeNode*> tqchildren = node->tqchildren();
310
-            for (TQValueList<TreeNode*>::ConstIterator it =  tqchildren.begin(); it != tqchildren.end(); ++it )
308
+            // add children recursively
309
+            TQValueList<TreeNode*> children = node->children();
310
+            for (TQValueList<TreeNode*>::ConstIterator it =  children.begin(); it != children.end(); ++it )
311 311
                 visit(*it);
312 312
 
313 313
             m_view->connectToNode(node);

+ 1
- 1
akregator/src/feedlistview.h View File

@@ -157,7 +157,7 @@ protected slots:
157 157
     
158 158
     /** Called when a node in the tree is taken out of the tree (parent->removeChild()) 
159 159
     
160
-    Removes a node and its tqchildren from the tree. Note that it doesn't delete the corresponding view items (get deleted only when the node itself gets deleted) */
160
+    Removes a node and its children from the tree. Note that it doesn't delete the corresponding view items (get deleted only when the node itself gets deleted) */
161 161
     virtual void slotNodeRemoved(Folder* parent, TreeNode* node);
162 162
     
163 163
     /** deletes the item belonging to the deleted node */

+ 1
- 1
akregator/src/feedstorage.h View File

@@ -111,7 +111,7 @@ class AKREGATOR_EXPORT FeedStorage : public TQObject
111 111
         virtual uint pubDate(const TQString& guid) = 0;
112 112
         virtual void setPubDate(const TQString& guid, uint pubdate) = 0;
113 113
         virtual int status(const TQString& guid) = 0;
114
-        virtual void setqStatus(const TQString& guid, int status) = 0;
114
+        virtual void seStatus(const TQString& guid, int status) = 0;
115 115
         virtual TQString title(const TQString& guid) = 0;
116 116
         virtual void setTitle(const TQString& guid, const TQString& title) = 0;
117 117
         virtual TQString description(const TQString& guid) = 0;

+ 2
- 2
akregator/src/feedstoragedummyimpl.cpp View File

@@ -246,7 +246,7 @@ int FeedStorageDummyImpl::status(const TQString& guid)
246 246
     return contains(guid) ? d->entries[guid].status : 0;
247 247
 }
248 248
 
249
-void FeedStorageDummyImpl::setqStatus(const TQString& guid, int status)
249
+void FeedStorageDummyImpl::seStatus(const TQString& guid, int status)
250 250
 {
251 251
     if (contains(guid))
252 252
         d->entries[guid].status = status;
@@ -407,7 +407,7 @@ void FeedStorageDummyImpl::copyArticle(const TQString& guid, FeedStorage* source
407 407
     setHash(guid, source->hash(guid));
408 408
     setLink(guid, source->link(guid));
409 409
     setPubDate(guid, source->pubDate(guid));
410
-    setqStatus(guid, source->status(guid));
410
+    seStatus(guid, source->status(guid));
411 411
     setTitle(guid, source->title(guid));
412 412
     TQStringList tags = source->tags(guid);
413 413
     

+ 1
- 1
akregator/src/feedstoragedummyimpl.h View File

@@ -69,7 +69,7 @@ class FeedStorageDummyImpl : public FeedStorage
69 69
         virtual uint pubDate(const TQString& guid);
70 70
         virtual void setPubDate(const TQString& guid, uint pubdate);
71 71
         virtual int status(const TQString& guid);
72
-        virtual void setqStatus(const TQString& guid, int status);
72
+        virtual void seStatus(const TQString& guid, int status);
73 73
         virtual TQString title(const TQString& guid);
74 74
         virtual void setTitle(const TQString& guid, const TQString& title);
75 75
         virtual TQString description(const TQString& guid);

+ 36
- 36
akregator/src/folder.cpp View File

@@ -39,9 +39,9 @@ namespace Akregator {
39 39
 class Folder::FolderPrivate
40 40
 {
41 41
     public:
42
-        /** List of tqchildren */
43
-        TQValueList<TreeNode*> tqchildren;
44
-        /** caching unread count of tqchildren */
42
+        /** List of children */
43
+        TQValueList<TreeNode*> children;
44
+        /** caching unread count of children */
45 45
         int unread;
46 46
         /** whether or not the folder is expanded */
47 47
         bool open;
@@ -62,9 +62,9 @@ bool Folder::accept(TreeNodeVisitor* visitor)
62 62
 
63 63
 Folder* Folder::fromOPML(TQDomElement e)
64 64
 {
65
-    Folder* fg = new Folder(e.hasAttribute(TQString::tqfromLatin1("text")) ? e.attribute(TQString::tqfromLatin1("text")) : e.attribute(TQString::tqfromLatin1("title")));
66
-    fg->setOpen( e.attribute(TQString::tqfromLatin1("isOpen")) != TQString::tqfromLatin1(("false")));
67
-    fg->setId( e.attribute(TQString::tqfromLatin1("id")).toUInt() );
65
+    Folder* fg = new Folder(e.hasAttribute(TQString::fromLatin1("text")) ? e.attribute(TQString::fromLatin1("text")) : e.attribute(TQString::fromLatin1("title")));
66
+    fg->setOpen( e.attribute(TQString::fromLatin1("isOpen")) != TQString::fromLatin1(("false")));
67
+    fg->setId( e.attribute(TQString::fromLatin1("id")).toUInt() );
68 68
     return fg;
69 69
 }
70 70
 
@@ -77,7 +77,7 @@ Folder::Folder(const TQString& title) : TreeNode(), d(new FolderPrivate)
77 77
 Folder::~Folder()
78 78
 {
79 79
     TreeNode* tmp = 0;
80
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != d->tqchildren.end(); ++it)
80
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != d->children.end(); ++it)
81 81
     {
82 82
         delete tmp;
83 83
         tmp = *it;
@@ -93,8 +93,8 @@ Folder::~Folder()
93 93
 TQStringList Folder::tags() const
94 94
 {
95 95
     TQStringList t;
96
-    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
97
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
96
+    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
97
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
98 98
     {
99 99
         // intersect tag sets instead of appending lists, to avoid dupes. This sucks. Definitely. I want TQSet. Now.
100 100
         TQStringList t2 = (*it)->tags();
@@ -108,8 +108,8 @@ TQStringList Folder::tags() const
108 108
 TQValueList<Article> Folder::articles(const TQString& tag)
109 109
 {
110 110
     TQValueList<Article> seq;
111
-    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
112
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
111
+    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
112
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
113 113
         seq += (*it)->articles(tag);
114 114
      
115 115
     return seq;
@@ -123,21 +123,21 @@ TQDomElement Folder::toOPML( TQDomElement parent, TQDomDocument document ) const
123 123
     el.setAttribute("isOpen", d->open ? "true" : "false");
124 124
     el.setAttribute( "id", TQString::number(id()) );
125 125
 
126
-    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
127
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
126
+    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
127
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
128 128
         el.appendChild( (*it)->toOPML(el, document) );
129 129
         
130 130
     return el;
131 131
 }
132 132
 
133
-TQValueList<TreeNode*> Folder::tqchildren() const
133
+TQValueList<TreeNode*> Folder::children() const
134 134
 {
135
-    return d->tqchildren;
135
+    return d->children;
136 136
 }
137 137
 
138 138
 void Folder::insertChild(TreeNode* node, TreeNode* after)
139 139
 {
140
-    int pos = d->tqchildren.findIndex(after);
140
+    int pos = d->children.findIndex(after);
141 141
     
142 142
     if (pos < 0)
143 143
         prependChild(node);
@@ -150,10 +150,10 @@ void Folder::insertChild(uint index, TreeNode* node)
150 150
 //    kdDebug() << "enter Folder::insertChild(int, node) " << node->title() << endl;
151 151
     if (node)
152 152
     {
153
-        if (index >= d->tqchildren.size())
154
-            d->tqchildren.append(node);
153
+        if (index >= d->children.size())
154
+            d->children.append(node);
155 155
         else
156
-            d->tqchildren.insert(d->tqchildren.at(index), node);
156
+            d->children.insert(d->children.at(index), node);
157 157
         node->setParent(this);
158 158
         connectToNode(node);
159 159
         updateUnreadCount();
@@ -170,7 +170,7 @@ void Folder::appendChild(TreeNode* node)
170 170
 //    kdDebug() << "enter Folder::appendChild() " << node->title() << endl;
171 171
     if (node)
172 172
     {
173
-        d->tqchildren.append(node);
173
+        d->children.append(node);
174 174
         node->setParent(this);
175 175
         connectToNode(node);
176 176
         updateUnreadCount();
@@ -187,7 +187,7 @@ void Folder::prependChild(TreeNode* node)
187 187
 //    kdDebug() << "enter Folder::prependChild() " << node->title() << endl;
188 188
     if (node)
189 189
     {
190
-        d->tqchildren.prepend(node);
190
+        d->children.prepend(node);
191 191
         node->setParent(this);
192 192
         connectToNode(node);
193 193
         updateUnreadCount();
@@ -202,10 +202,10 @@ void Folder::prependChild(TreeNode* node)
202 202
 void Folder::removeChild(TreeNode* node)
203 203
 {
204 204
 //    kdDebug() << "enter Folder::removeChild() node:" << (node ? node->title() : "null") << endl;
205
-    if (node && d->tqchildren.contains(node))
205
+    if (node && d->children.contains(node))
206 206
     {    
207 207
         node->setParent(0);
208
-        d->tqchildren.remove(node);
208
+        d->children.remove(node);
209 209
         disconnectFromNode(node);
210 210
         updateUnreadCount();    
211 211
         emit signalChildRemoved(this, node);
@@ -219,12 +219,12 @@ void Folder::removeChild(TreeNode* node)
219 219
 
220 220
 TreeNode* Folder::firstChild()
221 221
 {
222
-    return d->tqchildren.isEmpty() ? 0 : d->tqchildren.first();
222
+    return d->children.isEmpty() ? 0 : d->children.first();
223 223
 }            
224 224
 
225 225
 TreeNode* Folder::lastChild()
226 226
 {
227
-    return d->tqchildren.isEmpty() ? 0 : d->tqchildren.last();
227
+    return d->children.isEmpty() ? 0 : d->children.last();
228 228
 }
229 229
             
230 230
 bool Folder::isOpen() const
@@ -246,8 +246,8 @@ int Folder::totalCount() const
246 246
 {
247 247
     int totalCount = 0;
248 248
 
249
-    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
250
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
249
+    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
250
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
251 251
         totalCount += (*it)->totalCount();
252 252
     
253 253
     return totalCount;
@@ -257,8 +257,8 @@ void Folder::updateUnreadCount()
257 257
 {
258 258
     int unread = 0;
259 259
 
260
-    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
261
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
260
+    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
261
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
262 262
         unread += (*it)->unread();
263 263
     
264 264
     d->unread = unread;
@@ -267,8 +267,8 @@ void Folder::updateUnreadCount()
267 267
 void Folder::slotMarkAllArticlesAsRead() 
268 268
 {
269 269
     setNotificationMode(false);
270
-    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
271
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
270
+    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
271
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
272 272
         (*it)->slotMarkAllArticlesAsRead();
273 273
     setNotificationMode(true, true);
274 274
 }
@@ -281,7 +281,7 @@ void Folder::slotChildChanged(TreeNode* /*node*/)
281 281
 
282 282
 void Folder::slotChildDestroyed(TreeNode* node)
283 283
 {
284
-    d->tqchildren.remove(node);
284
+    d->children.remove(node);
285 285
     updateUnreadCount();    
286 286
     nodeModified();
287 287
 }
@@ -289,16 +289,16 @@ void Folder::slotChildDestroyed(TreeNode* node)
289 289
 void Folder::slotDeleteExpiredArticles()
290 290
 {
291 291
     setNotificationMode(false);
292
-    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
293
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
292
+    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
293
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
294 294
         (*it)->slotDeleteExpiredArticles();
295 295
     setNotificationMode(true, true);
296 296
 }
297 297
 
298 298
 void Folder::slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchOnly)
299 299
 {
300
-    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
301
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
300
+    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
301
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
302 302
         (*it)->slotAddToFetchQueue(queue, intervalFetchOnly);
303 303
 }
304 304
 

+ 9
- 9
akregator/src/folder.h View File

@@ -61,18 +61,18 @@ namespace Akregator
61 61
 
62 62
             virtual bool accept(TreeNodeVisitor* visitor);
63 63
             
64
-            /** returns recursively concatenated articles of tqchildren  
65
-            @return an article sequence containing articles of tqchildren */
64
+            /** returns recursively concatenated articles of children  
65
+            @return an article sequence containing articles of children */
66 66
             virtual TQValueList<Article> articles(const TQString& tag=TQString());
67 67
 
68 68
             /** returns a list of all tags occurring in the subtree of this folder */
69 69
             virtual TQStringList tags() const;
70 70
             
71
-            /** returns the number of unread articles in all tqchildren    
71
+            /** returns the number of unread articles in all children    
72 72
             @return number of unread articles */
73 73
             virtual int unread() const;
74 74
             
75
-            /** returns the number of articles in all tqchildren
75
+            /** returns the number of articles in all children
76 76
             @return number of articles */
77 77
             virtual int totalCount() const;
78 78
             
@@ -86,10 +86,10 @@ namespace Akregator
86 86
             @return The newly created element representing this feed group */
87 87
             virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const;
88 88
             
89
-            /** returns the (direct) tqchildren of this node.
89
+            /** returns the (direct) children of this node.
90 90
             @return a list of pointers to the child nodes
91 91
              */
92
-            virtual TQValueList<TreeNode*> tqchildren() const;
92
+            virtual TQValueList<TreeNode*> children() const;
93 93
             
94 94
             /** inserts @c node as child after child node @c after.
95 95
             if @c after is not a child of this group, @c node will be inserted as first child
@@ -105,7 +105,7 @@ namespace Akregator
105 105
             @param node the tree node to insert */
106 106
             virtual void appendChild(TreeNode* node);
107 107
 
108
-            /** remove @c node from tqchildren. Note that @c node will not be deleted
108
+            /** remove @c node from children. Note that @c node will not be deleted
109 109
             @param node the child node to remove  */
110 110
             virtual void removeChild(TreeNode* node);
111 111
 
@@ -134,7 +134,7 @@ namespace Akregator
134 134
             /** Delete expired articles recursively. */
135 135
             virtual void slotDeleteExpiredArticles();
136 136
             
137
-            /** Mark articles of tqchildren recursively as read. */
137
+            /** Mark articles of children recursively as read. */
138 138
             virtual void slotMarkAllArticlesAsRead();
139 139
  
140 140
             /** Called when a child was modified. 
@@ -147,7 +147,7 @@ namespace Akregator
147 147
             */
148 148
             virtual void slotChildDestroyed(TreeNode* node);
149 149
 
150
-            /** enqueues tqchildren recursively for fetching
150
+            /** enqueues children recursively for fetching
151 151
             @param queue a fetch queue 
152 152
             @param internvalFetchesOnly */
153 153
             virtual void slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchesOnly=false);

+ 4
- 4
akregator/src/frame.cpp View File

@@ -23,7 +23,7 @@
23 23
 */
24 24
 
25 25
 #include <tqregexp.h>
26
-#include <tqstylesheet.h>
26
+#include <stylesheet.h>
27 27
 
28 28
 #include <kactioncollection.h>
29 29
 #include <kdebug.h>
@@ -175,7 +175,7 @@ void Frame::setStarted()
175 175
 {
176 176
     if(m_progressId.isNull() || m_progressId.isEmpty()) m_progressId = KPIM::ProgressManager::getUniqueID();
177 177
     m_progressItem = KPIM::ProgressManager::createProgressItem(m_progressId, TQStyleSheet::escape( title() ), TQString(), false);
178
-    m_progressItem->setqStatus(i18n("Loading..."));
178
+    m_progressItem->seStatus(i18n("Loading..."));
179 179
     //connect(m_progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQT_SLOT(slotAbortFetch()));
180 180
     m_state=Started;
181 181
     emit started();
@@ -184,7 +184,7 @@ void Frame::setStarted()
184 184
 void Frame::setCanceled(const TQString &s)
185 185
 {
186 186
     if(m_progressItem) {
187
-        m_progressItem->setqStatus(i18n("Loading canceled"));
187
+        m_progressItem->seStatus(i18n("Loading canceled"));
188 188
         m_progressItem->setComplete();
189 189
         m_progressItem = 0;
190 190
     }
@@ -195,7 +195,7 @@ void Frame::setCanceled(const TQString &s)
195 195
 void Frame::setCompleted()
196 196
 {
197 197
     if(m_progressItem) {
198
-        m_progressItem->setqStatus(i18n("Loading completed"));
198
+        m_progressItem->seStatus(i18n("Loading completed"));
199 199
         m_progressItem->setComplete();
200 200
         m_progressItem = 0;
201 201
     }

+ 3
- 3
akregator/src/kcursorsaver.h View File

@@ -17,9 +17,9 @@ namespace Akregator {
17 17
 class KCursorSaver : public TQt
18 18
 {
19 19
 public:
20
-    /// constructor taking TQCursor tqshapes
21
-    KCursorSaver(TQt::tqCursorShape tqshape) {
22
-        TQApplication::setOverrideCursor( TQCursor(tqshape) );
20
+    /// constructor taking TQCursor shapes
21
+    KCursorSaver(TQt::CursorShape shape) {
22
+        TQApplication::setOverrideCursor( TQCursor(shape) );
23 23
         inited = true;
24 24
     }
25 25
 

+ 22
- 22
akregator/src/librss/article.cpp View File

@@ -78,35 +78,35 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
78 78
 		TQDomNode n;
79 79
 		for (n = node.firstChild(); !n.isNull(); n = n.nextSibling()) {
80 80
 			const TQDomElement e = n.toElement();
81
-			if ( (e.tagName()==TQString::tqfromLatin1("link")) &&
82
-				(e.attribute(TQString::tqfromLatin1("rel"), TQString::tqfromLatin1("alternate")) == TQString::tqfromLatin1("alternate")))
81
+			if ( (e.tagName()==TQString::fromLatin1("link")) &&
82
+				(e.attribute(TQString::fromLatin1("rel"), TQString::fromLatin1("alternate")) == TQString::fromLatin1("alternate")))
83 83
 				{   
84
-					d->link=n.toElement().attribute(TQString::tqfromLatin1("href"));
84
+					d->link=n.toElement().attribute(TQString::fromLatin1("href"));
85 85
 					break;
86 86
 				}
87 87
 		}
88 88
 	}
89 89
 	else
90 90
 	{
91
-		if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull())
91
+		if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull())
92 92
 			d->link = elemText;
93 93
 	}
94 94
 
95 95
 
96 96
     // prefer content/content:encoded over summary/description for feeds that provide it
97
-    TQString tagName=(format==AtomFeed)? TQString::tqfromLatin1("content"): TQString::tqfromLatin1("content:encoded");
97
+    TQString tagName=(format==AtomFeed)? TQString::fromLatin1("content"): TQString::fromLatin1("content:encoded");
98 98
     
99 99
     if (!(elemText = extractNode(node, tagName, false)).isNull())
100 100
         d->description = elemText;
101 101
     
102 102
     if (d->description.isEmpty())
103 103
     {
104
-		if (!(elemText = extractNode(node, TQString::tqfromLatin1("body"), false)).isNull())
104
+		if (!(elemText = extractNode(node, TQString::fromLatin1("body"), false)).isNull())
105 105
 			d->description = elemText;
106 106
     
107 107
 		if (d->description.isEmpty())  // 3rd try: see http://www.intertwingly.net/blog/1299.html
108 108
 		{
109
-			if (!(elemText = extractNode(node, TQString::tqfromLatin1((format==AtomFeed)? "summary" : "description"), false)).isNull())
109
+			if (!(elemText = extractNode(node, TQString::fromLatin1((format==AtomFeed)? "summary" : "description"), false)).isNull())
110 110
 				d->description = elemText;
111 111
 		}
112 112
 	}
@@ -116,21 +116,21 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
116 116
 	if (format == AtomFeed)
117 117
 	{
118 118
         if (version == vAtom_1_0)
119
-            elemText = extractNode(node, TQString::tqfromLatin1("updated"));
119
+            elemText = extractNode(node, TQString::fromLatin1("updated"));
120 120
         else
121
-           elemText = extractNode(node, TQString::tqfromLatin1("issued"));
121
+           elemText = extractNode(node, TQString::fromLatin1("issued"));
122 122
 
123 123
 		if (!elemText.isNull())
124 124
 			time = parseISO8601Date(elemText); 	
125 125
 	}
126 126
 	else 
127 127
 	{
128
-		elemText = extractNode(node, TQString::tqfromLatin1("pubDate"));
128
+		elemText = extractNode(node, TQString::fromLatin1("pubDate"));
129 129
 		if (!elemText.isNull())
130 130
 			time = KRFCDate::parseDate(elemText);
131 131
 	}
132 132
 	
133
-	if (!(elemText = extractNode(node, TQString::tqfromLatin1("dc:date"))).isNull())
133
+	if (!(elemText = extractNode(node, TQString::fromLatin1("dc:date"))).isNull())
134 134
 	{
135 135
 		time = parseISO8601Date(elemText);
136 136
 	}
@@ -139,11 +139,11 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
139 139
         if (time != 0)
140 140
 		d->pubDate.setTime_t(time);
141 141
 
142
-	if (!(elemText = extractNode(node, TQString::tqfromLatin1("wfw:comment"))).isNull()) {
142
+	if (!(elemText = extractNode(node, TQString::fromLatin1("wfw:comment"))).isNull()) {
143 143
 		d->commentsLink = elemText;
144 144
 	}
145 145
 
146
-    if (!(elemText = extractNode(node, TQString::tqfromLatin1("slash:comments"))).isNull()) {
146
+    if (!(elemText = extractNode(node, TQString::fromLatin1("slash:comments"))).isNull()) {
147 147
         d->numComments = elemText.toInt();
148 148
     }
149 149
 
@@ -152,19 +152,19 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
152 152
     // in RSS 1.0, we use <item about> attribute as ID
153 153
     // FIXME: pass format version instead of checking for attribute
154 154
 
155
-    if (!element.isNull() && element.hasAttribute(TQString::tqfromLatin1("rdf:about")))
155
+    if (!element.isNull() && element.hasAttribute(TQString::fromLatin1("rdf:about")))
156 156
     {
157
-        d->guid = element.attribute(TQString::tqfromLatin1("rdf:about")); // HACK: using ns properly did not work
157
+        d->guid = element.attribute(TQString::fromLatin1("rdf:about")); // HACK: using ns properly did not work
158 158
         d->guidIsPermaLink = false;
159 159
     }
160 160
     else
161 161
     {
162
-        tagName=(format==AtomFeed)? TQString::tqfromLatin1("id"): TQString::tqfromLatin1("guid");
162
+        tagName=(format==AtomFeed)? TQString::fromLatin1("id"): TQString::fromLatin1("guid");
163 163
         TQDomNode n = node.namedItem(tagName);
164 164
 	    if (!n.isNull())
165 165
         {
166 166
             d->guidIsPermaLink = (format==AtomFeed)? false : true;
167
-            if (n.toElement().attribute(TQString::tqfromLatin1("isPermaLink"), "true") == "false") d->guidIsPermaLink = false;
167
+            if (n.toElement().attribute(TQString::fromLatin1("isPermaLink"), "true") == "false") d->guidIsPermaLink = false;
168 168
             if (!(elemText = extractNode(node, tagName)).isNull())
169 169
                 d->guid = elemText;
170 170
         }
@@ -178,10 +178,10 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
178 178
 		md5Machine.update(d->title.utf8());
179 179
 		md5Machine.update(d->description.utf8());
180 180
 		d->guid = TQString(md5Machine.hexDigest().data());
181
-        d->meta[TQString::tqfromLatin1("guidIsHash")] = TQString::tqfromLatin1("true");
181
+        d->meta[TQString::fromLatin1("guidIsHash")] = TQString::fromLatin1("true");
182 182
 	}
183 183
 
184
-    TQDomNode enclosure = element.namedItem(TQString::tqfromLatin1("enclosure"));
184
+    TQDomNode enclosure = element.namedItem(TQString::fromLatin1("enclosure"));
185 185
     if (enclosure.isElement())
186 186
         d->enclosure = Enclosure::fromXML(enclosure.toElement());
187 187
 
@@ -191,12 +191,12 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
191 191
     {
192 192
         if (i.isElement())
193 193
         {
194
-            if (i.toElement().tagName() == TQString::tqfromLatin1("metaInfo:meta"))
194
+            if (i.toElement().tagName() == TQString::fromLatin1("metaInfo:meta"))
195 195
             {
196
-                TQString type = i.toElement().attribute(TQString::tqfromLatin1("type"));
196
+                TQString type = i.toElement().attribute(TQString::fromLatin1("type"));
197 197
                 d->meta[type] = i.toElement().text();
198 198
             }
199
-            else if (i.toElement().tagName() == TQString::tqfromLatin1("category"))
199
+            else if (i.toElement().tagName() == TQString::fromLatin1("category"))
200 200
             {
201 201
                 d->categories.append(Category::fromXML(i.toElement()));
202 202
             }

+ 2
- 2
akregator/src/librss/category.cpp View File

@@ -64,8 +64,8 @@ bool Category::isNull() const
64 64
 Category Category::fromXML(const TQDomElement& e)
65 65
 {
66 66
     Category obj;
67
-    if (e.hasAttribute(TQString::tqfromLatin1("domain")))
68
-        obj.d->domain = e.attribute(TQString::tqfromLatin1("domain"));
67
+    if (e.hasAttribute(TQString::fromLatin1("domain")))
68
+        obj.d->domain = e.attribute(TQString::fromLatin1("domain"));
69 69
     obj.d->category = e.text();
70 70
     obj.d->isNull = false;
71 71
     return obj;

+ 152
- 152
akregator/src/librss/document.cpp View File

@@ -79,15 +79,15 @@ static TQString extractLink(const TQDomNode& node, Format format)
79 79
         TQDomNode n;
80 80
         for (n = node.firstChild(); !n.isNull(); n = n.nextSibling()) {
81 81
             const TQDomElement e = n.toElement();
82
-            if ( (e.tagName() == TQString::tqfromLatin1("link")) 
83
-                  && (e.attribute(TQString::tqfromLatin1("rel"), TQString::tqfromLatin1("alternate")) == TQString::tqfromLatin1("alternate")))
82
+            if ( (e.tagName() == TQString::fromLatin1("link")) 
83
+                  && (e.attribute(TQString::fromLatin1("rel"), TQString::fromLatin1("alternate")) == TQString::fromLatin1("alternate")))
84 84
             {   
85
-                return n.toElement().attribute(TQString::tqfromLatin1("href"));
85
+                return n.toElement().attribute(TQString::fromLatin1("href"));
86 86
             }
87 87
         }
88 88
     }
89 89
 
90
-    return extractNode(node, TQString::tqfromLatin1("link"));
90
+    return extractNode(node, TQString::fromLatin1("link"));
91 91
     
92 92
 }
93 93
 
@@ -100,20 +100,20 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
100 100
     TQString attr;
101 101
 
102 102
     // we should probably check that it ISN'T feed or rss, rather than check if it is xhtml
103
-    if (rootNode.toElement().tagName()==TQString::tqfromLatin1("html"))
103
+    if (rootNode.toElement().tagName()==TQString::fromLatin1("html"))
104 104
         d->valid=false;
105 105
     else
106 106
         d->valid=true;
107 107
     
108
-    attr = rootNode.toElement().attribute(TQString::tqfromLatin1("version"), TQString());
109
-    if (rootNode.toElement().tagName()==TQString::tqfromLatin1("feed"))
108
+    attr = rootNode.toElement().attribute(TQString::fromLatin1("version"), TQString());
109
+    if (rootNode.toElement().tagName()==TQString::fromLatin1("feed"))
110 110
     {
111 111
         d->format=AtomFeed;
112
-        if (attr == TQString::tqfromLatin1("0.3"))
112
+        if (attr == TQString::fromLatin1("0.3"))
113 113
             d->version = vAtom_0_3;
114
-        else if (attr == TQString::tqfromLatin1("0.2")) /* smt -> review */
114
+        else if (attr == TQString::fromLatin1("0.2")) /* smt -> review */
115 115
             d->version = vAtom_0_2;
116
-        else if (attr == TQString::tqfromLatin1("0.1")) /* smt -> review */
116
+        else if (attr == TQString::fromLatin1("0.1")) /* smt -> review */
117 117
             d->version = vAtom_0_1;
118 118
         else
119 119
             d->version = vAtom_1_0;
@@ -121,13 +121,13 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
121 121
     else
122 122
     {
123 123
         d->format=RSSFeed;
124
-        if (attr == TQString::tqfromLatin1("0.91"))
124
+        if (attr == TQString::fromLatin1("0.91"))
125 125
             d->version = v0_91;
126
-        else if (attr == TQString::tqfromLatin1("0.92"))
126
+        else if (attr == TQString::fromLatin1("0.92"))
127 127
             d->version = v0_92;
128
-        else if (attr == TQString::tqfromLatin1("0.93"))
128
+        else if (attr == TQString::fromLatin1("0.93"))
129 129
             d->version = v0_93;
130
-        else if (attr == TQString::tqfromLatin1("0.94"))
130
+        else if (attr == TQString::fromLatin1("0.94"))
131 131
             d->version = v0_94;
132 132
         else // otherwise, we just assume a RSS2 compatible feed. As rss2 is generally
133 133
              // backward-compatible, this should work
@@ -137,7 +137,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
137 137
     
138 138
     if (d->format==UnknownFormat)
139 139
     {
140
-        attr = rootNode.toElement().attribute(TQString::tqfromLatin1("xmlns"), TQString());
140
+        attr = rootNode.toElement().attribute(TQString::fromLatin1("xmlns"), TQString());
141 141
         if (!attr.isNull()) {
142 142
         /*
143 143
          * 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)
147 147
          * distinguish the RSS versions by analyzing the relationship between
148 148
          * the nodes.
149 149
          */
150
-            if (attr == TQString::tqfromLatin1("http://my.netscape.com/rdf/simple/0.9/")) {
150
+            if (attr == TQString::fromLatin1("http://my.netscape.com/rdf/simple/0.9/")) {
151 151
                 d->format=RSSFeed;
152 152
                 d->version = v0_90;
153 153
              }
154
-            else if (attr == TQString::tqfromLatin1("http://purl.org/rss/1.0/")) {
154
+            else if (attr == TQString::fromLatin1("http://purl.org/rss/1.0/")) {
155 155
                 d->format=RSSFeed;
156 156
                 d->version = v1_0;
157 157
             }
@@ -163,7 +163,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
163 163
     if (d->format == AtomFeed)
164 164
         channelNode=rootNode;
165 165
     else
166
-        channelNode=rootNode.namedItem(TQString::tqfromLatin1("channel"));
166
+        channelNode=rootNode.namedItem(TQString::fromLatin1("channel"));
167 167
 
168 168
     if (!(elemText = extractTitle(channelNode)).isNull())
169 169
         d->title = elemText;
@@ -192,27 +192,27 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
192 192
     else
193 193
     {
194 194
 	// following is a HACK for broken 0.91 feeds like xanga.com's
195
-	if (!rootNode.namedItem(TQString::tqfromLatin1("item")).isNull())
195
+	if (!rootNode.namedItem(TQString::fromLatin1("item")).isNull())
196 196
 	    parentNode = rootNode;
197 197
 	else
198 198
             parentNode = channelNode;
199 199
     }
200 200
     
201 201
     // image and textinput aren't supported by Atom.. handle in case feed provides
202
-    TQDomNode n = parentNode.namedItem(TQString::tqfromLatin1("image"));
202
+    TQDomNode n = parentNode.namedItem(TQString::fromLatin1("image"));
203 203
     if (!n.isNull())
204 204
         d->image = new Image(n);
205 205
 
206
-    n = parentNode.namedItem(TQString::tqfromLatin1("textinput"));
206
+    n = parentNode.namedItem(TQString::fromLatin1("textinput"));
207 207
     if (!n.isNull())
208 208
         d->textInput = new TextInput(n);
209 209
 
210 210
     // Our (hopefully faster) version of elementsByTagName()
211 211
     TQString tagName;
212 212
     if (d->format == AtomFeed)
213
-        tagName=TQString::tqfromLatin1("entry");
213
+        tagName=TQString::fromLatin1("entry");
214 214
     else
215
-        tagName=TQString::tqfromLatin1("item");
215
+        tagName=TQString::fromLatin1("item");
216 216
 
217 217
     for (n = parentNode.firstChild(); !n.isNull(); n = n.nextSibling()) {
218 218
         const TQDomElement e = n.toElement();
@@ -220,212 +220,212 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
220 220
             d->articles.append(Article(e, d->format, d->version));
221 221
     }
222 222
 
223
-    if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("copyright"))).isNull())
223
+    if (!(elemText = extractNode(channelNode, TQString::fromLatin1("copyright"))).isNull())
224 224
         d->copyright = elemText;
225 225
 
226 226
     if (d->format == AtomFeed)
227
-        elemText = rootNode.toElement().attribute(TQString::tqfromLatin1("xml:lang"), TQString());
227
+        elemText = rootNode.toElement().attribute(TQString::fromLatin1("xml:lang"), TQString());
228 228
     else
229
-        elemText = extractNode(channelNode, TQString::tqfromLatin1("language"));
229
+        elemText = extractNode(channelNode, TQString::fromLatin1("language"));
230 230
 
231 231
     if (!elemText.isNull()){
232
-        if (elemText == TQString::tqfromLatin1("af"))
232
+        if (elemText == TQString::fromLatin1("af"))
233 233
             d->language = af;
234
-        else if (elemText == TQString::tqfromLatin1("sq"))
234
+        else if (elemText == TQString::fromLatin1("sq"))
235 235
             d->language = sq;
236
-        else if (elemText == TQString::tqfromLatin1("eu"))
236
+        else if (elemText == TQString::fromLatin1("eu"))
237 237
             d->language = eu;
238
-        else if (elemText == TQString::tqfromLatin1("be"))
238
+        else if (elemText == TQString::fromLatin1("be"))
239 239
             d->language = be;
240
-        else if (elemText == TQString::tqfromLatin1("bg"))
240
+        else if (elemText == TQString::fromLatin1("bg"))
241 241
             d->language = bg;
242
-        else if (elemText == TQString::tqfromLatin1("ca"))
242
+        else if (elemText == TQString::fromLatin1("ca"))
243 243
             d->language = ca;
244
-        else if (elemText == TQString::tqfromLatin1("zh-cn"))
244
+        else if (elemText == TQString::fromLatin1("zh-cn"))
245 245
             d->language = zh_cn;
246
-        else if (elemText == TQString::tqfromLatin1("zh-tw"))
246
+        else if (elemText == TQString::fromLatin1("zh-tw"))
247 247
             d->language = zh_tw;
248
-        else if (elemText == TQString::tqfromLatin1("hr"))
248
+        else if (elemText == TQString::fromLatin1("hr"))
249 249
             d->language = hr;
250
-        else if (elemText == TQString::tqfromLatin1("cs"))
250
+        else if (elemText == TQString::fromLatin1("cs"))
251 251
             d->language = cs;
252
-        else if (elemText == TQString::tqfromLatin1("da"))
252
+        else if (elemText == TQString::fromLatin1("da"))
253 253
             d->language = da;
254
-        else if (elemText == TQString::tqfromLatin1("nl"))
254
+        else if (elemText == TQString::fromLatin1("nl"))
255 255
             d->language = nl;
256
-        else if (elemText == TQString::tqfromLatin1("nl-be"))
256
+        else if (elemText == TQString::fromLatin1("nl-be"))
257 257
             d->language = nl_be;
258
-        else if (elemText == TQString::tqfromLatin1("nl-nl"))
258
+        else if (elemText == TQString::fromLatin1("nl-nl"))
259 259
             d->language = nl_nl;
260
-        else if (elemText == TQString::tqfromLatin1("en"))
260
+        else if (elemText == TQString::fromLatin1("en"))
261 261
             d->language = en;
262
-        else if (elemText == TQString::tqfromLatin1("en-au"))
262
+        else if (elemText == TQString::fromLatin1("en-au"))
263 263
             d->language = en_au;
264
-        else if (elemText == TQString::tqfromLatin1("en-bz"))
264
+        else if (elemText == TQString::fromLatin1("en-bz"))
265 265
             d->language = en_bz;
266
-        else if (elemText == TQString::tqfromLatin1("en-ca"))