1 files changed, 13 insertions, 13 deletions

diff --git a/quanta/components/csseditor/cssselector.cpp b/quanta/components/csseditor/cssselector.cpp
index 458c8d13..2598336c 100644
--- a/quanta/components/csseditor/cssselector.cpp
+++ b/quanta/components/csseditor/cssselector.cpp
@@ -39,7 +39,7 @@
 #include "stylesheetparser.h"
 
 
-CSSSelector::CSSSelector(TQWidget *parent, const char* name) : CSSSelectorS (parent,name),m_orderNumber(0),m_stopProcessingStylesheet(false) {
+CSSSelector::CSSSelector(TQWidget *tqparent, const char* name) : CSSSelectorS (tqparent,name),m_orderNumber(0),m_stopProcessingStylesheet(false) {
 
   m_currentItem = 0L;
 
@@ -174,7 +174,7 @@ void CSSSelector::addTag(){
   TQListViewItem *item = new TQListViewItem(lvTags);
   if(!cbTag->currentText().isEmpty()){
     item->setText(0,cbTag->currentText());
-    QPair<TQString, unsigned int> tmp(TQString::null,++m_orderNumber);
+    TQPair<TQString, unsigned int> tmp(TQString(),++m_orderNumber);
     m_currentStylesheetStructure[item->text(0)]=tmp;
   }
 }
@@ -183,7 +183,7 @@ void CSSSelector::addClass(){
   TQListViewItem *item = new TQListViewItem(lvClasses);
   if(!leClass->text().isEmpty()){
     item->setText(0,leClass->text());
-    QPair<TQString, unsigned int> tmp(TQString::null,++m_orderNumber);
+    TQPair<TQString, unsigned int> tmp(TQString(),++m_orderNumber);
     m_currentStylesheetStructure[item->text(0)]=tmp;
   }
 }
@@ -192,7 +192,7 @@ void CSSSelector::addID(){
   TQListViewItem *item = new TQListViewItem(lvIDs);
   if(!leID->text().isEmpty()){
     item->setText(0,leID->text());
-    QPair<TQString, unsigned int> tmp(TQString::null,++m_orderNumber);
+    TQPair<TQString, unsigned int> tmp(TQString(),++m_orderNumber);
     m_currentStylesheetStructure[item->text(0)]=tmp;
   }
 }
@@ -200,7 +200,7 @@ void CSSSelector::addID(){
 void CSSSelector::addPseudo(){
   TQListViewItem *item = new TQListViewItem(lvPseudo);
   item->setText(0,(lePseudoSelector->text()+":"+cbPseudo->currentText()).stripWhiteSpace());
-  QPair<TQString, unsigned int> tmp(TQString::null,++m_orderNumber);
+  TQPair<TQString, unsigned int> tmp(TQString(),++m_orderNumber);
   m_currentStylesheetStructure[item->text(0)]=tmp;
 }
 
@@ -283,7 +283,7 @@ void CSSSelector::openCSSEditor(TQListViewItem * i){
 
     if(dlg.exec())  {
       i->setText(1,dlg.generateProperties());
-      QPair<TQString, unsigned int> tmp(m_currentStylesheetStructure[i->text(0)]);
+      TQPair<TQString, unsigned int> tmp(m_currentStylesheetStructure[i->text(0)]);
       tmp.first = dlg.generateProperties();
       m_currentStylesheetStructure[i->text(0)] = tmp;
     }
@@ -292,7 +292,7 @@ void CSSSelector::openCSSEditor(TQListViewItem * i){
 
 void CSSSelector::setCurrentListView(TQWidget* w){
   TQObjectList *l = w->queryList( TQLISTVIEW_OBJECT_NAME_STRING );
-  m_currentListView = static_cast<TQListView*>(l->first());
+  m_currentListView = static_cast<TQListView*>(TQT_TQWIDGET(l->first()));
 }
 
 void CSSSelector::removeAll(){
@@ -319,20 +319,20 @@ void CSSSelector::loadCSSContent(const TQString& s){
   p.parse();
   m_orderNumber = p.orderNumber();
 
-  TQMap<TQString, QPair<TQString,unsigned int> >::Iterator it;
+  TQMap<TQString, TQPair<TQString,unsigned int> >::Iterator it;
   m_currentStylesheetStructure = p.stylesheetStructure();
   for ( it = m_currentStylesheetStructure.begin(); it != m_currentStylesheetStructure.end(); ++it ) {
     if(!it.key().startsWith("@rule") && !it.key().startsWith("/*")){
       TQListViewItem *item;
-      if(it.key().contains(":")){
+      if(it.key().tqcontains(":")){
         item = new TQListViewItem(lvPseudo);
       }
       else
-      if(it.key().contains("#")){
+      if(it.key().tqcontains("#")){
         item = new TQListViewItem(lvIDs);
       }
       else
-      if(it.key().contains(".")){
+      if(it.key().tqcontains(".")){
         item = new TQListViewItem(lvClasses);
       }
       else {
@@ -347,7 +347,7 @@ void CSSSelector::loadCSSContent(const TQString& s){
 }
 
 TQString CSSSelector::generateFormattedStyleSection(){
-  TQMap< TQString,QPair<TQString,unsigned int> >::Iterator it;
+  TQMap< TQString,TQPair<TQString,unsigned int> >::Iterator it;
   TQString styleSection,tmpStr;
   unsigned int indentWidth,
                       indentDisplacement = 2;
@@ -374,7 +374,7 @@ TQString CSSSelector::generateFormattedStyleSection(){
                   }
                   indentStr.fill(' ', indentDisplacement);
                   styleSection += tmpStr + indentStr + "}\n\n";
-                  tmpStr = TQString::null;
+                  tmpStr = TQString();
               }
       }
     }