diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-21 14:05:41 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-21 14:05:41 -0600 |
| commit | 2d6954f69caf63ed5057bd8e1405a65d7d970292 (patch) | |
| tree | 88e6436b2e81d4e68313f02a9021054252e14cc4 /filters/karbon | |
| parent | f0de9e167e289ab7dc33e57f077c1f04ec7c68c8 (diff) | |
| download | koffice-2d6954f69caf63ed5057bd8e1405a65d7d970292.tar.gz koffice-2d6954f69caf63ed5057bd8e1405a65d7d970292.zip | |
Rename obsolete tq methods to standard names
Diffstat (limited to 'filters/karbon')
| -rw-r--r-- | filters/karbon/applixgraphics/applixgraphicimport.cc | 2 | ||||
| -rw-r--r-- | filters/karbon/kontour/kontourimport.cpp | 4 | ||||
| -rw-r--r-- | filters/karbon/xfig/xfigimport.cc | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/filters/karbon/applixgraphics/applixgraphicimport.cc b/filters/karbon/applixgraphics/applixgraphicimport.cc index 82debb58..fd81b108 100644 --- a/filters/karbon/applixgraphics/applixgraphicimport.cc +++ b/filters/karbon/applixgraphics/applixgraphicimport.cc @@ -156,7 +156,7 @@ KoFilter::ConversionStatus APPLIXGRAPHICImport::convert( const TQCString& from, str += "<!DOCTYPE karbon>\n"; str += " <karbon mime=\"application/x-karbon\" version=\"2\" editor=\"APPLIXGRAPHICS import filter\">\n"; // str += " <head>\n"; -// str += " <tqlayout width=\"210\" lmargin=\"0\" format=\"a4\" bmargin=\"0\" height=\"297\" rmargin=\"0\" tmargin=\"0\" orientation=\"portrait\"/>\n"; +// str += " <layout width=\"210\" lmargin=\"0\" format=\"a4\" bmargin=\"0\" height=\"297\" rmargin=\"0\" tmargin=\"0\" orientation=\"portrait\"/>\n"; // str += " <grid dx=\"20\" dy=\"20\" align=\"0\">\n"; // str += " <helplines align=\"0\"/>\n"; // str += " </grid>\n"; diff --git a/filters/karbon/kontour/kontourimport.cpp b/filters/karbon/kontour/kontourimport.cpp index 6e515b3f..30b77ccf 100644 --- a/filters/karbon/kontour/kontourimport.cpp +++ b/filters/karbon/kontour/kontourimport.cpp @@ -198,8 +198,8 @@ KontourImport::convert() if( docElem.attribute( "version" ).toInt() == 2 ) { lay = docElem; - height = lay.firstChild().namedItem( "tqlayout" ).toElement().attribute( "height" ).toDouble(); - width = lay.firstChild().namedItem( "tqlayout" ).toElement().attribute( "width" ).toDouble(); + height = lay.firstChild().namedItem( "layout" ).toElement().attribute( "height" ).toDouble(); + width = lay.firstChild().namedItem( "layout" ).toElement().attribute( "width" ).toDouble(); } else { diff --git a/filters/karbon/xfig/xfigimport.cc b/filters/karbon/xfig/xfigimport.cc index 015c4006..c3d6ab6a 100644 --- a/filters/karbon/xfig/xfigimport.cc +++ b/filters/karbon/xfig/xfigimport.cc @@ -167,7 +167,7 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc, char buf[255]; int value; - KoPageLayout tqlayout; + KoPageLayout layout; ifstream fin( file.local8Bit() ); if (! fin) @@ -177,7 +177,7 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc, GDocument *gdoc = kidoc->gdoc(); //GPage *activePage = gdoc->activePage(); - tqlayout = gdoc->activePage()->pageLayout (); + layout = gdoc->activePage()->pageLayout (); fin.getline (buf, 255); if (::strncmp (buf, "#FIG 3", 6)) { @@ -203,9 +203,9 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc, // orientation fin.getline (buf, 255); if (::strcmp (buf, "Landscape") == 0) - tqlayout.orientation = PG_LANDSCAPE; + layout.orientation = PG_LANDSCAPE; else if (::strcmp (buf, "Portrait") == 0) - tqlayout.orientation = PG_PORTRAIT; + layout.orientation = PG_PORTRAIT; else kdDebug() << "ERROR: invalid orientation" << endl; @@ -215,9 +215,9 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc, // units fin.getline (buf, 255); if (::strcmp (buf, "Metric") == 0) - tqlayout.unit = PG_MM; + layout.unit = PG_MM; else if (::strcmp (buf, "Inches") == 0) - tqlayout.unit = PG_INCH; + layout.unit = PG_INCH; else kdDebug() << "ERROR: invalid units" << endl; |