Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


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

9 files changed, 35 insertions, 35 deletions

diff --git a/src/bookmarkselector.cpp b/src/bookmarkselector.cpp
index 02f5905..d957140 100644
--- a/src/bookmarkselector.cpp
+++ b/src/bookmarkselector.cpp
@@ -137,10 +137,10 @@ void BookmarkSelector::drawButton(TQPainter* painter)
     }
 
     // dimm the colors if the tqparent view does not have the focus
-    const DolphinView* tqparentView = urlNavigator()->dolphinView();
+    const DolphinView* parentView = urlNavigator()->dolphinView();
     const Dolphin& dolphin = Dolphin::mainWin();
 
-    const bool isActive = (dolphin.activeView() == tqparentView);
+    const bool isActive = (dolphin.activeView() == parentView);
     if (!isActive) {
         TQColor dimmColor(tqcolorGroup().background());
         foregroundColor = mixColors(foregroundColor, dimmColor);
diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 7ddc762..436d3b6 100644
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -38,10 +38,10 @@
 #include "dolphinsettings.h"
 #include "dolphiniconsviewsettings.h"
 
-DolphinIconsView::DolphinIconsView(DolphinView* tqparent, LayoutMode tqlayoutMode) :
+DolphinIconsView::DolphinIconsView(DolphinView* tqparent, LayoutMode layoutMode) :
     KFileIconView(tqparent, 0),
     m_previewIconSize(-1),
-    m_tqlayoutMode(tqlayoutMode),
+    m_layoutMode(layoutMode),
     m_dolphinView(tqparent)
 {
     setAcceptDrops(true);
@@ -81,7 +81,7 @@ DolphinIconsView::DolphinIconsView(DolphinView* tqparent, LayoutMode tqlayoutMod
 
     setItemsMovable(true);
     setWordWrapIconText(true);
-    if (m_tqlayoutMode == Previews) {
+    if (m_layoutMode == Previews) {
         showPreviews();
     }
     refreshSettings();
@@ -93,8 +93,8 @@ DolphinIconsView::~DolphinIconsView()
 
 void DolphinIconsView::setLayoutMode(LayoutMode mode)
 {
-    if (m_tqlayoutMode != mode) {
-        m_tqlayoutMode = mode;
+    if (m_layoutMode != mode) {
+        m_layoutMode = mode;
         refreshSettings();
     }
 }
@@ -129,7 +129,7 @@ void DolphinIconsView::endItemUpdates()
 
 void DolphinIconsView::refreshSettings()
 {
-    const DolphinIconsViewSettings* settings = DolphinSettings::instance().iconsView(m_tqlayoutMode);
+    const DolphinIconsViewSettings* settings = DolphinSettings::instance().iconsView(m_layoutMode);
     assert(settings != 0);
 
     setIconSize(settings->iconSize());
@@ -151,7 +151,7 @@ void DolphinIconsView::refreshSettings()
     setFont(adjustedFont);
     setIconTextHeight(settings->textlinesCount());
 
-    if (m_tqlayoutMode == Previews) {
+    if (m_layoutMode == Previews) {
         // There is no getter method for the current size in KFileIconView. To
         // prevent a flickering the current size is stored in m_previewIconSize and
         // setPreviewSize is only invoked if the size really has changed.
@@ -168,13 +168,13 @@ void DolphinIconsView::refreshSettings()
 void DolphinIconsView::zoomIn()
 {
     if (isZoomInPossible()) {
-        DolphinIconsViewSettings* settings = DolphinSettings::instance().iconsView(m_tqlayoutMode);
+        DolphinIconsViewSettings* settings = DolphinSettings::instance().iconsView(m_layoutMode);
         const int textWidthHint = settings->textWidthHint();
 
         const int iconSize = increasedIconSize(settings->iconSize());
         settings->setIconSize(iconSize);
 
-        if (m_tqlayoutMode == Previews) {
+        if (m_layoutMode == Previews) {
             const int previewSize = increasedIconSize(settings->previewSize());
             settings->setPreviewSize(previewSize);
         }
@@ -187,13 +187,13 @@ void DolphinIconsView::zoomIn()
 void DolphinIconsView::zoomOut()
 {
     if (isZoomOutPossible()) {
-        DolphinIconsViewSettings* settings = DolphinSettings::instance().iconsView(m_tqlayoutMode);
+        DolphinIconsViewSettings* settings = DolphinSettings::instance().iconsView(m_layoutMode);
         const int textWidthHint = settings->textWidthHint();
 
         const int iconSize = decreasedIconSize(settings->iconSize());
         settings->setIconSize(iconSize);
 
-        if (m_tqlayoutMode == Previews) {
+        if (m_layoutMode == Previews) {
             const int previewSize = decreasedIconSize(settings->previewSize());
             settings->setPreviewSize(previewSize);
         }
@@ -205,14 +205,14 @@ void DolphinIconsView::zoomOut()
 
 bool DolphinIconsView::isZoomInPossible() const
 {
-    DolphinIconsViewSettings* settings = DolphinSettings::instance().iconsView(m_tqlayoutMode);
-    const int size = (m_tqlayoutMode == Icons) ? settings->iconSize() : settings->previewSize();
+    DolphinIconsViewSettings* settings = DolphinSettings::instance().iconsView(m_layoutMode);
+    const int size = (m_layoutMode == Icons) ? settings->iconSize() : settings->previewSize();
     return size < KIcon::SizeEnormous;
 }
 
 bool DolphinIconsView::isZoomOutPossible() const
 {
-    DolphinIconsViewSettings* settings = DolphinSettings::instance().iconsView(m_tqlayoutMode);
+    DolphinIconsViewSettings* settings = DolphinSettings::instance().iconsView(m_layoutMode);
     return settings->iconSize() > KIcon::SizeSmall;
 }
 
@@ -221,7 +221,7 @@ void DolphinIconsView::arrangeItemsInGrid( bool updated )
 
     KFileIconView::arrangeItemsInGrid(updated);
 
-    if (m_tqlayoutMode == Previews) {
+    if (m_layoutMode == Previews) {
         // The class KFileIconView has a bug when the size of the previews differs from the size
         // of the icons: For specific MIME types the y-position and the height is calculated in
         // a wrong manner. The following code bypasses this issue. No bugreport has been submitted
diff --git a/src/dolphiniconsview.h b/src/dolphiniconsview.h
index adfd512..53b223b 100644
--- a/src/dolphiniconsview.h
+++ b/src/dolphiniconsview.h
@@ -47,12 +47,12 @@ public:
         Previews
     };
 
-    DolphinIconsView(DolphinView *tqparent, LayoutMode tqlayoutMode);
+    DolphinIconsView(DolphinView *tqparent, LayoutMode layoutMode);
 
     virtual ~DolphinIconsView();
 
     void setLayoutMode(LayoutMode mode);
-    LayoutMode tqlayoutMode() const { return m_tqlayoutMode; }
+    LayoutMode layoutMode() const { return m_layoutMode; }
 
     /** @see ItemEffectsManager::updateItems */
     virtual void beginItemUpdates();
@@ -156,7 +156,7 @@ private slots:
 
 private:
     int m_previewIconSize;
-    LayoutMode m_tqlayoutMode;
+    LayoutMode m_layoutMode;
     DolphinView* m_dolphinView;
 
     /** Returns the increased icon size for the size \a size. */
diff --git a/src/dolphiniconsviewsettings.cpp b/src/dolphiniconsviewsettings.cpp
index e764e70..1affc38 100644
--- a/src/dolphiniconsviewsettings.cpp
+++ b/src/dolphiniconsviewsettings.cpp
@@ -26,7 +26,7 @@
 
 DolphinIconsViewSettings::DolphinIconsViewSettings(DolphinIconsView::LayoutMode mode) :
     m_arrangement(TQIconView::LeftToRight),
-    m_tqlayoutMode(mode),
+    m_layoutMode(mode),
     m_iconSize(KIcon::SizeMedium),
     m_previewSize(KIcon::SizeMedium),
     m_gridWidth(0),
@@ -189,7 +189,7 @@ int DolphinIconsViewSettings::textWidthHint() const
 
 void DolphinIconsViewSettings::setConfigGroup(KConfig* config)
 {
-    if (m_tqlayoutMode == DolphinIconsView::Previews) {
+    if (m_layoutMode == DolphinIconsView::Previews) {
         config->setGroup("Previews Mode");
     }
     else {
diff --git a/src/dolphiniconsviewsettings.h b/src/dolphiniconsviewsettings.h
index cc78074..5c39adf 100644
--- a/src/dolphiniconsviewsettings.h
+++ b/src/dolphiniconsviewsettings.h
@@ -110,7 +110,7 @@ public:
 
 private:
     TQIconView::Arrangement m_arrangement;
-    DolphinIconsView::LayoutMode m_tqlayoutMode;
+    DolphinIconsView::LayoutMode m_layoutMode;
     int m_iconSize;
     int m_previewSize;
     int m_gridWidth;
diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 5416062..3c476bf 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -858,10 +858,10 @@ void DolphinView::createView()
     switch (m_mode) {
     case IconsView:
     case PreviewsView: {
-        const DolphinIconsView::LayoutMode tqlayoutMode = (m_mode == IconsView) ?
+        const DolphinIconsView::LayoutMode layoutMode = (m_mode == IconsView) ?
                                                         DolphinIconsView::Icons :
                                                         DolphinIconsView::Previews;
-        m_iconsView = new DolphinIconsView(this, tqlayoutMode);
+        m_iconsView = new DolphinIconsView(this, layoutMode);
         m_topLayout->insertWidget(1, m_iconsView);
         setFocusProxy(m_iconsView);
 
diff --git a/src/servicemenus/smb2rdc.desktop b/src/servicemenus/smb2rdc.desktop
index 5399d17..4b55dea 100644
--- a/src/servicemenus/smb2rdc.desktop
+++ b/src/servicemenus/smb2rdc.desktop
@@ -11,7 +11,7 @@ Name[bn]=এই মেশিনে প্রত্যন্ত ডেস্ক�
 Name[bs]=Otvori Remote Desktop vezu na ovaj računar
 Name[ca]=Obre una connexió remota d'escriptori a aquesta màquina
 Name[cs]=Otevřít vzdálené připojení plochy k tomuto počítači
-Name[da]=Åbn ekstern desktopforbindelse til denne tqmaskine
+Name[da]=Åbn ekstern desktopforbindelse til denne maskine
 Name[de]=Verbindung zur Arbeitsfläche dieses Rechners herstellen
 Name[el]=Δημιουργία σύνδεσης σε απομακρυσμένη επιφάνεια εργασίας σε αυτό το μηχάνημα
 Name[es]=Abrir conexión remota de escritorio a este sistema
@@ -29,11 +29,11 @@ Name[ja]=このホストへリモートデスクトップ接続を開く
 Name[kk]=Осы компьютердегі үстелге қашық қосылымды ашу
 Name[km]=បើក​ការ​ត​ភ្ជាប​ផ្ទៃ​តុ​ពី​ចម្ងាយ​ទៅ​ម៉ាស៊ីន​នេះ
 Name[lt]=Užmegzti nutolusio darbastalio prijungimą prie šio kompiuterio
-Name[nb]=Åpne fjerntilkobling til skrivebord til denne tqmaskinen
+Name[nb]=Åpne fjerntilkobling til skrivebord til denne maskinen
 Name[nds]=Schriefdisch-Feernverbinnen na dissen Reekner opmaken
 Name[ne]=यो मेशिनमा टाढाको डेस्कटप जडान खोल्नुहोस्
 Name[nl]=Externe bureaubladverbinding met deze computer openen
-Name[nn]=Opna samband til skrivebordet over nettverket til denne tqmaskina
+Name[nn]=Opna samband til skrivebordet over nettverket til denne maskina
 Name[pa]=ਇਹ ਮਸ਼ੀਨ ਲਈ ਰਿਮੋਟ ਡੈਸਕਟਾਪ ਕੁਨੈਕਸ਼ਨ ਖੋਲ੍ਹੋ
 Name[pl]=Otwórz zdalne połączenie z pulpitem na tej maszynie
 Name[pt]=Abrir Ligação Remota a Ecrã para Este Computador
diff --git a/src/urlnavigatorbutton.cpp b/src/urlnavigatorbutton.cpp
index 165b275..bc0e7b5 100644
--- a/src/urlnavigatorbutton.cpp
+++ b/src/urlnavigatorbutton.cpp
@@ -109,10 +109,10 @@ void URLNavigatorButton::drawButton(TQPainter* painter)
     }
 
     // dimm the colors if the tqparent view does not have the focus
-    const DolphinView* tqparentView = urlNavigator()->dolphinView();
+    const DolphinView* parentView = urlNavigator()->dolphinView();
     const Dolphin& dolphin = Dolphin::mainWin();
 
-    const bool isActive = (dolphin.activeView() == tqparentView);
+    const bool isActive = (dolphin.activeView() == parentView);
     if (!isActive) {
         TQColor dimmColor(tqcolorGroup().background());
         foregroundColor = mixColors(foregroundColor, dimmColor);
diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index 25f8af3..ced4b4b 100644
--- a/src/viewproperties.cpp
+++ b/src/viewproperties.cpp
@@ -77,14 +77,14 @@ ViewProperties::ViewProperties(KURL url) :
         const bool isValidForSubDirs = !node.isEmpty() && node.isValidForSubDirs();
         while ((dir.path() != rootDir) && dir.cdUp()) {
             TQFile file(dir.path() + FILE_NAME);
-            PropertiesNode tqparentNode(&file);
-            if (!tqparentNode.isEmpty()) {
-                const bool inheritProps = tqparentNode.isValidForSubDirs() &&
-                                        (tqparentNode.subDirProperties().m_timeStamp >
+            PropertiesNode parentNode(&file);
+            if (!parentNode.isEmpty()) {
+                const bool inheritProps = parentNode.isValidForSubDirs() &&
+                                        (parentNode.subDirProperties().m_timeStamp >
                                         node.localProperties().m_timeStamp);
     
                 if (inheritProps) {
-                    node.setLocalProperties(tqparentNode.subDirProperties());
+                    node.setLocalProperties(parentNode.subDirProperties());
 				    break;
                 }
             }