From 7c71ab86d1f7e387fc3df63b48df07231f111862 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 9 Jul 2011 02:23:29 +0000
Subject: 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/koffice@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 filters/kword/html/export/ExportCss.cc | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'filters/kword/html/export/ExportCss.cc')

diff --git a/filters/kword/html/export/ExportCss.cc b/filters/kword/html/export/ExportCss.cc
index 51c4da91f..057cdd86e 100644
--- a/filters/kword/html/export/ExportCss.cc
+++ b/filters/kword/html/export/ExportCss.cc
@@ -308,12 +308,12 @@ TQString HtmlCssWorker::getStartOfListOpeningTag(const CounterData::Style typeLi
     return strResult;
 }
 
-TQString HtmlCssWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin,
+TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
     const LayoutData& tqlayout, const bool force) const
 {
     TQString strLayout;
 
-    if (force || (tqlayoutOrigin.tqalignment!=tqlayout.tqalignment))
+    if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment))
     {
         if ( (tqlayout.tqalignment=="left") || (tqlayout.tqalignment== "right")
             || (tqlayout.tqalignment=="center") || (tqlayout.tqalignment=="justify"))
@@ -331,37 +331,37 @@ TQString HtmlCssWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin,
     }
 
     if ((tqlayout.indentLeft>=0.0)
-        && (force || (tqlayoutOrigin.indentLeft!=tqlayout.indentLeft)))
+        && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)))
     {
             strLayout += TQString("margin-left:%1pt; ").tqarg(tqlayout.indentLeft);
     }
 
     if ((tqlayout.indentRight>=0.0)
-        && (force || (tqlayoutOrigin.indentRight!=tqlayout.indentRight)))
+        && (force || (layoutOrigin.indentRight!=tqlayout.indentRight)))
     {
         strLayout += TQString("margin-right:%1pt; ").tqarg(tqlayout.indentRight);
     }
 
-    if (force || (tqlayoutOrigin.indentLeft!=tqlayout.indentLeft))
+    if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))
     {
         strLayout += TQString("text-indent:%1pt; ").tqarg(tqlayout.indentFirst);
     }
 
     if ((tqlayout.marginBottom>=0.0)
-        && ( force || ( tqlayoutOrigin.marginBottom != tqlayout.marginBottom ) ) )
+        && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) )
     {
        strLayout += TQString("margin-bottom:%1pt; ").tqarg(tqlayout.marginBottom);
     }
 
     if ((tqlayout.marginTop>=0.0)
-        && ( force || ( tqlayoutOrigin.marginTop != tqlayout.marginTop ) ) )
+        && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) )
     {
        strLayout += TQString("margin-top:%1pt; ").tqarg(tqlayout.marginTop);
     }
 
     if (force
-        || ( tqlayoutOrigin.lineSpacingType != tqlayout.lineSpacingType )
-        || ( tqlayoutOrigin.lineSpacing != tqlayout.lineSpacing ) )
+        || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType )
+        || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) )
     {
         switch ( tqlayout.lineSpacingType )
         {
@@ -430,8 +430,8 @@ TQString HtmlCssWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin,
 
     // TODO: Konqueror/KHTML does not support "text-shadow"
     if (!force
-        && ( tqlayoutOrigin.shadowDirection == tqlayout.shadowDirection )
-        && ( tqlayoutOrigin.shadowDistance == tqlayout.shadowDistance ) )
+        && ( layoutOrigin.shadowDirection == tqlayout.shadowDirection )
+        && ( layoutOrigin.shadowDistance == tqlayout.shadowDistance ) )
     {
         // Do nothing!
     }
@@ -518,7 +518,7 @@ TQString HtmlCssWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin,
     // TODO: borders
 
     // This must remain last, as the last property does not have a semi-colon
-    strLayout+=textFormatToCss(tqlayoutOrigin.formatData.text,
+    strLayout+=textFormatToCss(layoutOrigin.formatData.text,
         tqlayout.formatData.text,force);
 
     return strLayout;
@@ -535,7 +535,7 @@ void HtmlCssWorker::openParagraph(const TQString& strTag,
     *m_streamOut << " class=\"" << escapeCssIdentifier(tqlayout.styleName);
     *m_streamOut << "\"";
 
-    TQString strStyle=tqlayoutToCss(styleLayout,tqlayout,false);
+    TQString strStyle=layoutToCss(styleLayout,tqlayout,false);
     if (!strStyle.isEmpty())
     {
         *m_streamOut << " style=\"" << strStyle;
@@ -689,7 +689,7 @@ bool HtmlCssWorker::doFullDefineStyle(LayoutData& tqlayout)
     //   the style could be forced on <p> by the tqlayout.
 
     *m_streamOut << "." << escapeCssIdentifier(tqlayout.styleName);
-    *m_streamOut << "\n{\n  " << tqlayoutToCss(tqlayout,tqlayout,true) << "\n}\n";
+    *m_streamOut << "\n{\n  " << layoutToCss(tqlayout,tqlayout,true) << "\n}\n";
 
     return true;
 }
-- 
cgit v1.2.3