From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 13 Apr 2011 00:46:47 +0000
Subject: Initial conversion of kdepim to TQt This will probably require some
 tweaking before it will build under Qt4, however Qt3 builds are OK.  Any
 alterations this commit makes to kdepim behaviour under Qt3 are unintentional
 and should be fixed.

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 knode/utilities.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'knode/utilities.cpp')

diff --git a/knode/utilities.cpp b/knode/utilities.cpp
index 1e7dcba9..d634b7df 100644
--- a/knode/utilities.cpp
+++ b/knode/utilities.cpp
@@ -134,8 +134,8 @@ bool KNFile::increaseBuffer()
 
 TQString KNSaveHelper::lastPath;
 
-KNSaveHelper::KNSaveHelper(TQString saveName, TQWidget *parent)
-  : p_arent(parent), s_aveName(saveName), file(0), tmpFile(0)
+KNSaveHelper::KNSaveHelper(TQString saveName, TQWidget *tqparent)
+  : p_arent(tqparent), s_aveName(saveName), file(0), tmpFile(0)
 {
 }
 
@@ -157,7 +157,7 @@ KNSaveHelper::~KNSaveHelper()
 
 TQFile* KNSaveHelper::getFile(const TQString &dialogTitle)
 {
-  url = KFileDialog::getSaveURL(lastPath + s_aveName, TQString::null, p_arent, dialogTitle);
+  url = KFileDialog::getSaveURL(lastPath + s_aveName, TQString(), p_arent, dialogTitle);
 
   if (url.isEmpty())
     return 0;
@@ -167,7 +167,7 @@ TQFile* KNSaveHelper::getFile(const TQString &dialogTitle)
   if (url.isLocalFile()) {
     if (TQFileInfo(url.path()).exists() &&
         (KMessageBox::warningContinueCancel(knGlobals.topWidget,
-                                            i18n("<qt>A file named <b>%1</b> already exists.<br>Do you want to tqreplace it?</qt>").arg(url.path()),
+                                            i18n("<qt>A file named <b>%1</b> already exists.<br>Do you want to replace it?</qt>").arg(url.path()),
                                             dialogTitle, i18n("&Replace")) != KMessageBox::Continue)) {
       return 0;
     }
@@ -196,8 +196,8 @@ TQFile* KNSaveHelper::getFile(const TQString &dialogTitle)
 
 TQString KNLoadHelper::l_astPath;
 
-KNLoadHelper::KNLoadHelper(TQWidget *parent)
-  : p_arent(parent), f_ile(0)
+KNLoadHelper::KNLoadHelper(TQWidget *tqparent)
+  : p_arent(tqparent), f_ile(0)
 {
 }
 
@@ -215,7 +215,7 @@ KNFile* KNLoadHelper::getFile( const TQString &dialogTitle )
   if (f_ile)
     return f_ile;
 
-  KURL url = KFileDialog::getOpenURL(l_astPath,TQString::null,p_arent,dialogTitle);
+  KURL url = KFileDialog::getOpenURL(l_astPath,TQString(),p_arent,dialogTitle);
 
   if (url.isEmpty())
     return 0;
@@ -261,10 +261,10 @@ KNFile* KNLoadHelper::setURL(KURL url)
 
 
 // **** keyboard selection dialog *********************************************
-int KNHelper::selectDialog(TQWidget *parent, const TQString &caption, const TQStringList &options, int initialValue)
+int KNHelper::selectDialog(TQWidget *tqparent, const TQString &caption, const TQStringList &options, int initialValue)
 {
   KDialogBase *dlg=new KDialogBase(KDialogBase::Plain, caption, KDialogBase::Ok|KDialogBase::Cancel,
-                                   KDialogBase::Ok, parent);
+                                   KDialogBase::Ok, tqparent);
   TQFrame *page = dlg->plainPage();
   TQHBoxLayout *pageL = new TQHBoxLayout(page,8,5);
 
@@ -390,7 +390,7 @@ void appendTextWPrefix(TQString &result, const TQString &text, int wrapAt, const
       txt.remove(0,breakPos+1);
     } else {
       result+=(prefix+txt+"\n");
-      txt=TQString::null;
+      txt=TQString();
     }
   }
 }
@@ -412,7 +412,7 @@ TQString KNHelper::rewrapStringList(TQStringList text, int wrapAt, TQChar quoteC
     else
       thisLine.prepend(quoteChar+' ');
 
-    thisPrefix=TQString::null;
+    thisPrefix=TQString();
     TQChar c;
     for(int idx=0; idx<(int)(thisLine.length()); idx++) {
       c=thisLine.at(idx);
@@ -431,7 +431,7 @@ TQString KNHelper::rewrapStringList(TQStringList text, int wrapAt, TQChar quoteC
         appendTextWPrefix(quoted, leftover, wrapAt, lastPrefix);
       else
         thisLine.prepend(leftover+" ");
-      leftover=TQString::null;
+      leftover=TQString();
     }
 
     if((int)(thisPrefix.length()+thisLine.length()) > wrapAt) {
-- 
cgit v1.2.3