TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


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

1 files changed, 19 insertions, 19 deletions

diff --git a/kivio/kiviopart/config/kivio_config.cpp b/kivio/kiviopart/config/kivio_config.cpp
index 74e8572b..6428c1fd 100644
--- a/kivio/kiviopart/config/kivio_config.cpp
+++ b/kivio/kiviopart/config/kivio_config.cpp
@@ -28,30 +28,30 @@ namespace Kivio {
 
   KoPageLayout Config::defaultPageLayout()
   {
-    KoPageLayout layout;
+    KoPageLayout tqlayout;
     
-    layout.format = KoPageFormat::formatFromString(Settings::format());
-    layout.orientation = Kivio::orientationFromString(Settings::orientation());
-    layout.ptTop = Settings::borderTop();
-    layout.ptBottom = Settings::borderBottom();
-    layout.ptLeft = Settings::borderLeft();
-    layout.ptRight = Settings::borderRight();
-    layout.ptWidth = Settings::width();
-    layout.ptHeight = Settings::height();
+    tqlayout.format = KoPageFormat::formatFromString(Settings::format());
+    tqlayout.orientation = Kivio::orientationFromString(Settings::orientation());
+    tqlayout.ptTop = Settings::borderTop();
+    tqlayout.ptBottom = Settings::borderBottom();
+    tqlayout.ptLeft = Settings::borderLeft();
+    tqlayout.ptRight = Settings::borderRight();
+    tqlayout.ptWidth = Settings::width();
+    tqlayout.ptHeight = Settings::height();
     
-    return layout;
+    return tqlayout;
   }
   
-  void Config::setDefaultPageLayout(const KoPageLayout& layout)
+  void Config::setDefaultPageLayout(const KoPageLayout& tqlayout)
   {
-    Settings::setFormat(KoPageFormat::formatString(layout.format));
-    Settings::setOrientation(Kivio::orientationString(layout.orientation));
-    Settings::setBorderTop(layout.ptTop);
-    Settings::setBorderBottom(layout.ptBottom);
-    Settings::setBorderLeft(layout.ptLeft);
-    Settings::setBorderRight(layout.ptRight);
-    Settings::setWidth(layout.ptWidth);
-    Settings::setHeight(layout.ptHeight);
+    Settings::setFormat(KoPageFormat::formatString(tqlayout.format));
+    Settings::setOrientation(Kivio::orientationString(tqlayout.orientation));
+    Settings::setBorderTop(tqlayout.ptTop);
+    Settings::setBorderBottom(tqlayout.ptBottom);
+    Settings::setBorderLeft(tqlayout.ptLeft);
+    Settings::setBorderRight(tqlayout.ptRight);
+    Settings::setWidth(tqlayout.ptWidth);
+    Settings::setHeight(tqlayout.ptHeight);
   }
 
   void Config::setGrid(const KivioGridData& /*grid*/)