[kdewebdev/quanta] fix deprecation warnings; make compatible with QT_NO_ASCII_CAST flag

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

7 files changed, 29 insertions, 31 deletions

diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp
index c3309a42..f42986ab 100644
--- a/quanta/src/document.cpp
+++ b/quanta/src/document.cpp
@@ -164,7 +164,7 @@ Document::Document(KTextEditor::Document *doc,
         m_encoding = encodingIf->encoding();
   if (m_encoding.isEmpty())
       m_encoding = "utf8";  //final fallback
-  m_codec = TQTextCodec::codecForName(m_encoding);
+  m_codec = TQTextCodec::codecForName(m_encoding.ascii());
 
   selectionIf = dynamic_cast<KTextEditor::SelectionInterface *>(m_doc);
   selectionIfExt = dynamic_cast<KTextEditor::SelectionInterfaceExt *>(m_doc);
@@ -630,7 +630,7 @@ void Document::createTempFile()
         encoding = encodingIf->encoding();
   if (encoding.isEmpty())
       encoding = "utf8";  //final fallback
-  tempFile->textStream()->setCodec(TQTextCodec::codecForName(encoding));
+  tempFile->textStream()->setCodec(TQTextCodec::codecForName(encoding.ascii()));
   * (tempFile->textStream()) << editIf->text();
 
   m_tempFileName = TQFileInfo(*(tempFile->file())).filePath();
@@ -852,7 +852,7 @@ void Document::slotCharactersInserted(int line, int column, const TQString& stri
       if (encoding != m_encoding)
       {
         m_encoding = encoding;
-        m_codec = TQTextCodec::codecForName(encoding);
+        m_codec = TQTextCodec::codecForName(encoding.ascii());
       }
       if (!m_codec->canEncode(string[0]))
       {
@@ -2708,7 +2708,7 @@ void Document::createBackup(KConfig* config)
     if (file.open(IO_WriteOnly))
     {
       TQTextStream stream(&file);
-      stream.setCodec(TQTextCodec::codecForName(encoding));
+      stream.setCodec(TQTextCodec::codecForName(encoding.ascii()));
       stream << editIf->text();
       file.close();
     }
@@ -2870,7 +2870,7 @@ void Document::open(const KURL &url, const TQString &encoding)
     {
        encodingIf->setEncoding(encoding);
        m_encoding = encoding;
-       m_codec = TQTextCodec::codecForName(m_encoding);
+       m_codec = TQTextCodec::codecForName(m_encoding.ascii());
     }
     connect(m_doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotOpeningCompleted()));
     connect(m_doc, TQT_SIGNAL(canceled(const TQString&)), this, TQT_SLOT(slotOpeningFailed(const TQString&)));
diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp
index 9943904a..cc25516f 100644
--- a/quanta/src/dtds.cpp
+++ b/quanta/src/dtds.cpp
@@ -784,7 +784,7 @@ void DTDs::setAttributes(TQDomNode *dom, QTag* tag, bool &common)
     tag->className = el.attribute("class", "");
     tag->comment = el.attribute("comment", "");
     if (!tag->comment.isEmpty())
-      tag->comment = " [" + i18n(tag->comment) + "] ";
+      tag->comment = " [" + i18n(tag->comment.ascii()) + "] ";
     tag->comment.prepend(el.attribute("version"));
  } else
  {
diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp
index 1bf2055d..32e1044c 100644
--- a/quanta/src/kqapp.cpp
+++ b/quanta/src/kqapp.cpp
@@ -41,7 +41,7 @@ QuantaApp *quantaApp = 0L; //global pointer to the main application object
 #define SPLASH_PICTURE "quantalogo"
 
 KSplash::KSplash()
- : TQFrame( 0L, TQString("Quanta")+QUANTA_VERSION,
+ : TQFrame( 0L, "Quanta" QUANTA_VERSION,
    TQWidget::WStyle_NoBorder | TQWidget::WStyle_Customize | WX11BypassWM)
 {
    TQPixmap pm( UserIcon(SPLASH_PICTURE) );
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index 07e2ae26..16795ec9 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -806,7 +806,7 @@ void QuantaApp::slotRepaintPreview()
         encoding = encodingIf->encoding();
       if (encoding.isEmpty())
         encoding = "utf8";  //final fallback
-      tmpFile->textStream()->setCodec(TQTextCodec::codecForName(encoding));
+      tmpFile->textStream()->setCodec(TQTextCodec::codecForName(encoding.ascii()));
       *(tmpFile->textStream()) << w->editIf->text();
       tmpFile->close();
       if (!QExtFileInfo::copy(KURL::fromPathOrURL(tempFileName), previewURL, -1, true)) {
@@ -1018,7 +1018,7 @@ void QuantaApp::slotOptionsConfigureKeys()
     {
       if (node.nodeName() == "Action")
       {
-        TagAction *action = dynamic_cast<TagAction*>(actionCollection()->action(node.toElement().attribute("name")));
+        TagAction *action = dynamic_cast<TagAction*>(actionCollection()->action(node.toElement().attribute("name").ascii()));
         if (action)
         {
           action->setModified(true);
@@ -1044,7 +1044,7 @@ void QuantaApp::slotConfigureToolbars(const TQString& defaultToolbar)
 
   saveMainWindowSettings(KGlobal::config(), autoSaveGroup());
   KEditToolbar *dlg;
-  if (defaultToolbar)
+  if (!defaultToolbar.isEmpty())
     dlg = new KEditToolbar(defaultToolbar, factory(), this);
   else
     dlg = new KEditToolbar(factory(), this);
@@ -1094,7 +1094,7 @@ void QuantaApp::slotConfigureToolbars(const TQString& defaultToolbar)
     nodeList = p_toolbar->guiClient->domDocument().elementsByTagName("Action");
     for (uint i = 0; i < nodeList.count(); i++)
     {
-      KAction *action = ac->action(nodeList.item(i).toElement().attribute("name"));
+      KAction *action = ac->action(nodeList.item(i).toElement().attribute("name").ascii());
       if (action)
           action->plug(menu);
     }
@@ -1792,8 +1792,8 @@ TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomEl
 //avoid TQToolBar warning in the log
     QtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar );
     ToolbarTabWidget *toolbarTab = ToolbarTabWidget::ref();
-    TQWidget *w = new TQWidget(toolbarTab, "ToolbarHoldingWidget" + element.attribute("name"));
-    QuantaToolBar *tb = new QuantaToolBar(w, element.attribute("name"), true, true);
+    TQWidget *w = new TQWidget(toolbarTab, TQString("ToolbarHoldingWidget" + element.attribute("name")).ascii());
+    QuantaToolBar *tb = new QuantaToolBar(w, element.attribute("name").ascii(), true, true);
     tb->loadState(element);
     tb->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
 
@@ -2234,7 +2234,7 @@ void QuantaApp::slotLoadToolbarFile(const KURL& url)
     el = node.toElement();
     TQString actionName = el.attribute("name");
     //if there is no such action yet, add to the available actions
-    if (!actionCollection()->action(actionName))
+    if (!actionCollection()->action(actionName.ascii()))
     {
         bool toggable = (el.attribute("toggable", "") == "true");
         TagAction *tagAction = new TagAction(&el, this, toggable);
@@ -2259,7 +2259,7 @@ void QuantaApp::slotLoadToolbarFile(const KURL& url)
     } else
     {
  //      kdDebug(24000) << "The action " << actionName << " is already present!" << endl;
-       TagAction *tagAction = dynamic_cast<TagAction*>(actionCollection()->action(actionName));
+       TagAction *tagAction = dynamic_cast<TagAction*>(actionCollection()->action(actionName.ascii()));
        if (tagAction)
           tagAction->setModified(true);
     }
@@ -2277,7 +2277,7 @@ void QuantaApp::slotLoadToolbarFile(const KURL& url)
    nodeList = toolbarGUI->domDocument().elementsByTagName("Action");
    for (uint i = 0; i < nodeList.count(); i++)
    {
-     action = actionCollection()->action(nodeList.item(i).cloneNode().toElement().attribute("name") );
+     action = actionCollection()->action(nodeList.item(i).cloneNode().toElement().attribute("name").ascii() );
      if (action)
      {
        action->plug(menu);
@@ -2324,7 +2324,7 @@ void QuantaApp::showToolbarFile(const KURL &url)
     nodeList = p_toolbar->guiClient->domDocument().elementsByTagName("Action");
     for (uint i = 0; i < nodeList.count(); i++)
     {
-      action = ac->action(nodeList.item(i).toElement().attribute("name") );
+      action = ac->action(nodeList.item(i).toElement().attribute("name").ascii() );
       if (action)
       {
         action->plug(menu);
@@ -2403,7 +2403,7 @@ KURL QuantaApp::saveToolbarToFile(const TQString& toolbarName, const KURL& destF
            TQDomElement e = n.toElement();
            if (e.tagName() == "Action")
            {
-             TagAction *action = dynamic_cast<TagAction*>(actionCollection()->action(e.attribute("name")));
+             TagAction *action = dynamic_cast<TagAction*>(actionCollection()->action(e.attribute("name").ascii()));
              if (action)
              {
                action->data().save(actStr,1);
@@ -2735,7 +2735,7 @@ void QuantaApp::slotSendToolbar()
   TQStringList toolbarFile;
   toolbarFile += tempFileName;
 
-  TagMailDlg *mailDlg = new TagMailDlg( this, i18n("Send toolbar in email"));
+  TagMailDlg *mailDlg = new TagMailDlg( this, i18n("Send toolbar in email").ascii() );
   TQString toStr;
   TQString message = i18n("Hi,\n This is a Quanta Plus [http://quanta.kdewebdev.org] toolbar.\n\nHave fun.\n");
   TQString titleStr;
@@ -3285,7 +3285,7 @@ bool QuantaApp::slotRemoveToolbar(const TQString& a_name)
      nodeList = toolbarGUI->domDocument().elementsByTagName("Action");
      for (uint i = 0; i < nodeList.count(); i++)
      {
-       action = actionCollection()->action(nodeList.item(i).toElement().attribute("name"));
+       action = actionCollection()->action(nodeList.item(i).toElement().attribute("name").ascii());
        if (dynamic_cast<TagAction*>(action) &&
            dynamic_cast<TagAction*>(action)->isModified())
        {
@@ -3377,7 +3377,7 @@ bool QuantaApp::slotRemoveToolbar(const TQString& a_name)
        nodeList = p_toolbar->dom->elementsByTagName("Action");
      for (uint i = 0; i < nodeList.count(); i++)
      {
-       action = actionCollection()->action(nodeList.item(i).toElement().attribute("name"));
+       action = actionCollection()->action(nodeList.item(i).toElement().attribute("name").ascii());
        if (action && !action->isPlugged())
        {
          if (dynamic_cast<TagAction*>(action) &&
@@ -3609,7 +3609,7 @@ void QuantaApp::slotEmailDTEP()
     TQStringList dtdFile;
     dtdFile += tempFileName;
 
-    TagMailDlg *mailDlg = new TagMailDlg( this, i18n("Send DTEP in Email"));
+    TagMailDlg *mailDlg = new TagMailDlg( this, i18n("Send DTEP in Email").ascii());
     TQString toStr;
     TQString message = i18n("Hi,\n This is a Quanta Plus [http://quanta.kdewebdev.org] DTEP definition tarball.\n\nHave fun.\n");
     TQString titleStr;
@@ -4558,7 +4558,7 @@ void QuantaApp::slotTagMail()
   Document *w = ViewManager::ref()->activeDocument();
   if (!w) return;
 
-  TagMailDlg *mailDlg = new TagMailDlg( this, i18n("Email Link (mailto)"));
+  TagMailDlg *mailDlg = new TagMailDlg( this, i18n("Email Link (mailto)").ascii() );
 
   if ( mailDlg->exec() ) {
     TQString tag = TQString(QuantaCommon::tagCase("<a"));
@@ -4620,7 +4620,7 @@ void QuantaApp::slotTagQuickList()
   Document *w = ViewManager::ref()->activeDocument();
   if (!w) return;
 
-  TagQuickListDlg *listDlg = new TagQuickListDlg(this,i18n("Generate List"));
+  TagQuickListDlg *listDlg = new TagQuickListDlg(this,i18n("Generate List").ascii());
   if ( listDlg->exec() ) {
     int i;
     int n = listDlg->spinBoxRows->value();
diff --git a/quanta/src/quanta.h b/quanta/src/quanta.h
index 7bb5bde3..e55c8814 100644
--- a/quanta/src/quanta.h
+++ b/quanta/src/quanta.h
@@ -19,7 +19,7 @@
 #define QUANTA_H
 
 #define QUANTA_PACKAGE "quanta"
-#define QUANTA_VERSION "3.5.10"
+#define QUANTA_VERSION "3.5.13"
 
 #define IDS_STATUS      1
 #define IDS_INS_OVR     2
@@ -95,8 +95,6 @@ class DebuggerManager;
 class QuantaInit;
 class KToolBarPopupAction;
 class KTempFile;
-class KParts::Part;
-class KParts::PartManager;
 namespace KTextEditor
 {
   class Mark;
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index 3a752299..e7a5fa75 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -983,7 +983,7 @@ void QuantaInit::initActions()
             TQDomElement e = n.toElement(); // try to convert the node to an element.
             if( !e.isNull())
             { // the node was really an element.
-                delete ac->action(e.attribute("name"));
+                delete ac->action(e.attribute("name").ascii());
                 bool toggable = (e.attribute("toggable", "") == "true");
                 new TagAction(&e, m_quanta, toggable);
             }
diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp
index eb5c538f..31fb795b 100644
--- a/quanta/src/quantadoc.cpp
+++ b/quanta/src/quantadoc.cpp
@@ -268,7 +268,7 @@ void QuantaDoc::slotAttribPopup()
     TQString name;
 
     for (int i=0; i < tag->attrCount(); i++ )
-        attrList.append( tag->attribute(i) );
+        attrList.append( tag->attribute(i).ascii() );
 
     if ( QuantaCommon::isKnownTag(w->getDTDIdentifier(),tagName) )
     {
@@ -281,7 +281,7 @@ void QuantaDoc::slotAttribPopup()
       {
         name = list->at(i)->name;
         attribMenu->insertItem( name , i);//list->findIndex(*item) );
-        if (attrList.contains(name))
+        if (attrList.contains(name.ascii()))
         {
           attribMenu->setItemEnabled( i , false );
         }
@@ -297,7 +297,7 @@ void QuantaDoc::slotAttribPopup()
        {
         name = attrs->at(j)->name;
         popUpMenu->insertItem(name, ++menuId);
-        if (attrList.contains(name))
+        if (attrList.contains(name.ascii()))
         {
           popUpMenu->setItemEnabled( menuId , false );
         }