TQt4 port Konversation

This enables compilation under both Qt3 and Qt4


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

1 files changed, 11 insertions, 11 deletions

diff --git a/konversation/src/nick.cpp b/konversation/src/nick.cpp
index 4a14ff6..81aad09 100644
--- a/konversation/src/nick.cpp
+++ b/konversation/src/nick.cpp
@@ -27,8 +27,8 @@
 Nick::Nick(KListView *listView,
 const ChannelNickPtr& channelnick)
     : TQObject (),
-    KListViewItem (listView, listView->lastItem(), TQString::null,
-                   channelnick->getNickname(), channelnick->getHostmask())
+    KListViewItem (listView, listView->lastItem(), TQString(),
+                   channelnick->getNickname(), channelnick->getHosttqmask())
 {
     m_channelnickptr = channelnick;
 
@@ -124,7 +124,7 @@ void Nick::refresh()
     }
 
     setText(2, calculateLabel2());
-    repaint();
+    tqrepaint();
 
     if(m_flags != flags)
     {
@@ -152,7 +152,7 @@ TQString Nick::calculateLabel1()
 
 TQString Nick::calculateLabel2()
 {
-    return getChannelNick()->getNickInfo()->getHostmask();
+    return getChannelNick()->getNickInfo()->getHosttqmask();
 }
 
 int Nick::compare(TQListViewItem* item,int col,bool ascending) const
@@ -238,7 +238,7 @@ void Nick::paintCell(TQPainter * p, const TQColorGroup & cg, int column, int wid
 
     if(nickInfo->isAway())
     {
-        cg2.setColor(TQColorGroup::Text, kapp->palette(listView()).disabled().text());
+        cg2.setColor(TQColorGroup::Text, kapp->tqpalette(listView()).disabled().text());
     }
 
     KListViewItem::paintCell(p,cg2,column,width,align);
@@ -249,12 +249,12 @@ int Nick::getSortingValue() const
     int flags;
     TQString sortingOrder = Preferences::sortOrder();
 
-    if(getChannelNick()->isOwner())       flags=sortingOrder.find('q');
-    else if(getChannelNick()->isAdmin())  flags=sortingOrder.find('p');
-    else if(getChannelNick()->isOp() )    flags=sortingOrder.find('o');
-    else if(getChannelNick()->isHalfOp()) flags=sortingOrder.find('h');
-    else if(getChannelNick()->hasVoice()) flags=sortingOrder.find('v');
-    else                                  flags=sortingOrder.find('-');
+    if(getChannelNick()->isOwner())       flags=sortingOrder.tqfind('q');
+    else if(getChannelNick()->isAdmin())  flags=sortingOrder.tqfind('p');
+    else if(getChannelNick()->isOp() )    flags=sortingOrder.tqfind('o');
+    else if(getChannelNick()->isHalfOp()) flags=sortingOrder.tqfind('h');
+    else if(getChannelNick()->hasVoice()) flags=sortingOrder.tqfind('v');
+    else                                  flags=sortingOrder.tqfind('-');
 
     return flags;
 }