Added controlled conversions to char* instead of automatic ascii conversions.

The definition of -UTQT_NO_ASCII_CAST is no longer needed.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

3 files changed, 14 insertions, 14 deletions

diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp
index db473520..05be2dfe 100644
--- a/kommander/widgets/aboutdialog.cpp
+++ b/kommander/widgets/aboutdialog.cpp
@@ -124,8 +124,8 @@ void AboutDialog::initialize(const TQString& appName, const TQString &icon, cons
   m_appName = appName;
   m_icon = icon;
   m_copyright = copyright;
-  m_aboutData = new TDEAboutData(m_appName, m_appName, m_version);
-  m_aboutData->setCopyrightStatement(m_copyright);
+  m_aboutData = new TDEAboutData(m_appName.utf8(), m_appName.utf8(), m_version.utf8());
+  m_aboutData->setCopyrightStatement(m_copyright.utf8());
   if (!m_icon.isEmpty())
     m_aboutData->setProgramLogo(TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::NoGroup, TDEIcon::SizeMedium).convertToImage());  
 }
@@ -138,7 +138,7 @@ void AboutDialog::addAuthor(const TQString& author, const TQString &task, const
   m_emails.append(email);
   m_tasks.append(task);
   m_addresses.append(webAddress);
-  m_aboutData->addAuthor(author, task, email, webAddress);
+  m_aboutData->addAuthor(author.utf8(), task.utf8(), email.utf8(), webAddress.utf8());
 }
 
 void AboutDialog::addTranslator(const TQString& author, const TQString& email)
@@ -147,7 +147,7 @@ void AboutDialog::addTranslator(const TQString& author, const TQString& email)
     return;
   m_authors.append(author);
   m_emails.append(email);
-  m_aboutData->setTranslator(author, email);
+  m_aboutData->setTranslator(author.utf8(), email.utf8());
 }
 
 void AboutDialog::setDescription(const TQString& description)
@@ -155,7 +155,7 @@ void AboutDialog::setDescription(const TQString& description)
   if (!m_aboutData)
     return;
   m_description = description;
-  m_aboutData->setShortDescription(m_description);
+  m_aboutData->setShortDescription(m_description.utf8());
 }
 
 void AboutDialog::setHomepage(const TQString &homepage)
@@ -163,7 +163,7 @@ void AboutDialog::setHomepage(const TQString &homepage)
   if (!m_aboutData)
     return;
   m_homepage = homepage;
-  m_aboutData->setHomepage(m_homepage);
+  m_aboutData->setHomepage(m_homepage.utf8());
 }
 
 void AboutDialog::setBugAddress(const TQString &bugAddress)
@@ -171,7 +171,7 @@ void AboutDialog::setBugAddress(const TQString &bugAddress)
   if (!m_aboutData)
     return;
   m_bugaddress = bugAddress;
-  m_aboutData->setBugAddress(m_bugaddress);
+  m_aboutData->setBugAddress(m_bugaddress.utf8());
 }
 
 void AboutDialog::setLicense(const TQString &key)
@@ -200,7 +200,7 @@ void AboutDialog::setLicense(const TQString &key)
   {
     if (!key.isEmpty())
       m_license = key;
-      m_aboutData->setLicenseText(m_license);
+      m_aboutData->setLicenseText(m_license.utf8());
   }
   else
   {
@@ -209,9 +209,9 @@ void AboutDialog::setLicense(const TQString &key)
       if (!key.isEmpty())
         file = key;
     }
-    m_aboutData->setLicenseTextFile(file);
-  } 
-  
+    m_aboutData->setLicenseTextFile(file.utf8());
+  }
+
 }
 
 void AboutDialog::setPopulationText(const TQString& a_text)
diff --git a/kommander/widgets/execbutton.cpp b/kommander/widgets/execbutton.cpp
index fa535813..d4969444 100644
--- a/kommander/widgets/execbutton.cpp
+++ b/kommander/widgets/execbutton.cpp
@@ -126,7 +126,7 @@ void ExecButton::startProcess()
   {
     TDEApplication::restoreOverrideCursor();
     if (writeStdout())
-      cout << m_output << flush;
+      cout << m_output.local8Bit() << flush;
   }
   setEnabled(enabledStatus);
 }
@@ -160,7 +160,7 @@ void ExecButton::processExited(MyProcess* p)
   {
     m_output = p->output();
     if (writeStdout())
-      cout << m_output << flush;
+      cout << m_output.local8Bit() << flush;
     delete p;
   }
 }
diff --git a/kommander/widgets/textbrowser.cpp b/kommander/widgets/textbrowser.cpp
index 9e466c5e..4abaa706 100644
--- a/kommander/widgets/textbrowser.cpp
+++ b/kommander/widgets/textbrowser.cpp
@@ -121,7 +121,7 @@ TQString TextBrowser::handleDCOP(int function, const TQStringList& args)
     case DCOP::selection:
       return selectedText();
     case TBR_setNotifyClick:
-      KTextBrowser::setNotifyClick(args[0]);
+      KTextBrowser::setNotifyClick(args[0].utf8());
       break;
     case TBR_isNotifyClick:
       return TQString::number(KTextBrowser::isNotifyClick());