Rename old tq methods that no longer need a unique name

4 files changed, 10 insertions, 10 deletions

diff --git a/chalk/core/kis_exif_value.cc b/chalk/core/kis_exif_value.cc
index 043bf4e3..85099877 100644
--- a/chalk/core/kis_exif_value.cc
+++ b/chalk/core/kis_exif_value.cc
@@ -340,10 +340,10 @@ TQDomElement ExifValue::save(TQDomDocument& doc)
             UByteArray value = asUndefined();
             TQByteArray data;
             data.setRawData((char*)value.data(), value.size());
-            TQByteArray tqencodedData;
-            KCodecs::base64Encode( data, tqencodedData );
+            TQByteArray encodedData;
+            KCodecs::base64Encode( data, encodedData );
             data.resetRawData( (char*)value.data(), value.size());
-            elmt.setAttribute("value", TQString(tqencodedData));
+            elmt.setAttribute("value", TQString(encodedData));
         }
             break;
         case EXIF_TYPE_SSHORT:
diff --git a/chalk/core/kis_fill_painter.cc b/chalk/core/kis_fill_painter.cc
index 54e730a7..33b68a5b 100644
--- a/chalk/core/kis_fill_painter.cc
+++ b/chalk/core/kis_fill_painter.cc
@@ -209,7 +209,7 @@ struct FillSegment {
 //    FillSegment* parent;
 };
 
-typedef enum { None = 0, Added = 1, Checked = 2 } tqStatus;
+typedef enum { None = 0, Added = 1, Checked = 2 } Status;
 
 KisSelectionSP KisFillPainter::createFloodSelection(int startX, int startY) {
     if (m_width < 0 || m_height < 0) {
@@ -260,9 +260,9 @@ KisSelectionSP KisFillPainter::createFloodSelection(int startX, int startY) {
 
     stack.push(new FillSegment(startX, startY/*, 0*/));
 
-    tqStatus* map = new tqStatus[m_size];
+    Status* map = new Status[m_size];
 
-    memset(map, None, m_size * sizeof(tqStatus));
+    memset(map, None, m_size * sizeof(Status));
 
     int progressPercent = 0; int pixelsDone = 0; int currentPercent = 0;
     emit notifyProgressStage(i18n("Making fill outline..."), 0);
diff --git a/chalk/core/kis_filter_registry.cc b/chalk/core/kis_filter_registry.cc
index b7c8383e..53f17ea8 100644
--- a/chalk/core/kis_filter_registry.cc
+++ b/chalk/core/kis_filter_registry.cc
@@ -40,8 +40,8 @@ KisFilterRegistry::KisFilterRegistry()
     Q_ASSERT(KisFilterRegistry::m_singleton == 0);
     KisFilterRegistry::m_singleton = this;
 
-    KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/Filter"),
-                                                         TQString::tqfromLatin1("(Type == 'Service') and "
+    KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Filter"),
+                                                         TQString::fromLatin1("(Type == 'Service') and "
                                                                              "([X-Chalk-Version] == 2)"));
 
     KTrader::OfferList::ConstIterator iter;
diff --git a/chalk/core/kis_paintop_registry.cc b/chalk/core/kis_paintop_registry.cc
index 012f2027..7d5de556 100644
--- a/chalk/core/kis_paintop_registry.cc
+++ b/chalk/core/kis_paintop_registry.cc
@@ -43,8 +43,8 @@ KisPaintOpRegistry::KisPaintOpRegistry()
     Q_ASSERT(KisPaintOpRegistry::m_singleton == 0);
     KisPaintOpRegistry::m_singleton = this;
 
-    KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/Paintop"),
-                                                         TQString::tqfromLatin1("(Type == 'Service') and "
+    KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Paintop"),
+                                                         TQString::fromLatin1("(Type == 'Service') and "
                                                                              "([X-Chalk-Version] == 2)"));
 
     KTrader::OfferList::ConstIterator iter;